Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from Expensify:main #46

Merged
merged 606 commits into from
Nov 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
606 commits
Select commit Hold shift + click to select a range
1e430e7
Merge branch 'main' into osp/e2e-staggered
ospfranco Nov 7, 2023
91b0498
show last message for thread
bernhardoj Nov 7, 2023
062d120
Get rid of extra nullish coalescing operators
VickyStash Nov 7, 2023
29a510b
Merge branch 'main' into tgolen-remove-multiple-withOnyx
tgolen Nov 7, 2023
03d858f
Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…
kubabutkiewicz Nov 7, 2023
ff032c6
fix: resolve comments
kubabutkiewicz Nov 7, 2023
f45c0a5
fix: fixed typo
kubabutkiewicz Nov 7, 2023
6679b76
fix: wrappe initial focus into memo
barttom Nov 7, 2023
26378c9
exclude rooms having undefined reportID
Nov 7, 2023
3c2487d
Add mainAvatar and secondaryAvatar default values
VickyStash Nov 7, 2023
561ef19
Merge branch 'main' into fix/29886-distance-stop-button
paultsimura Nov 7, 2023
def4bce
Modify comment
neonbhai Nov 7, 2023
b8d20d0
Align online & offline "Add stop" flows
paultsimura Nov 7, 2023
9d3d11e
Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…
kubabutkiewicz Nov 7, 2023
248b6b6
Merge branch 'main' into fix/29886-distance-stop-button
paultsimura Nov 7, 2023
d10e959
Prettier changes
neonbhai Nov 7, 2023
9c1200b
fix: types
kubabutkiewicz Nov 7, 2023
0694c8f
Update and rename ANZ.md to Connect-ANZ.md
bfitzexpensify Nov 7, 2023
ab16481
Update money request options for different room types
puneetlath Nov 7, 2023
16da9a6
Rename participants to otherParticipants
puneetlath Nov 7, 2023
fce7b70
prettier
puneetlath Nov 7, 2023
e883529
Fix isDM function to only be true for type chat
puneetlath Nov 7, 2023
f481ca9
Update tests for updated scenarios
puneetlath Nov 7, 2023
d0fb1c6
Add a new template for requesting a library to be added in package.json
tgolen Nov 7, 2023
637f822
Add a few more items to the template
tgolen Nov 7, 2023
6c12150
Change label
tgolen Nov 7, 2023
73b81f4
update hover and press
dangrous Nov 8, 2023
2220aba
Create isInsideH1 function in htmlEngineUtils.js
yakupafsin Nov 3, 2023
24f5b63
Override font size of code block for h1 tag
yakupafsin Nov 3, 2023
6c8d749
Unnecessary comment has been romeved
yakupafsin Nov 4, 2023
800c2c7
Creating style function for code tag fontSize
yakupafsin Nov 6, 2023
af4414b
Applying getCodeFontSize function into CodeRenderer.js
yakupafsin Nov 6, 2023
457b341
Modifying isInsideH1 function in htmlEngineUtils.js
yakupafsin Nov 6, 2023
cbd03d9
define isInsideH1 as a boolean variable
yakupafsin Nov 6, 2023
81d3bd8
Modifying `getCodeFontSize` function
yakupafsin Nov 6, 2023
3222677
Mentioned fontSize controlled in another function
yakupafsin Nov 6, 2023
4780950
Run Prettier for code formatting
yakupafsin Nov 6, 2023
2f6b481
Update htmlEngineUtils.js
yakupafsin Nov 7, 2023
2f4fe78
Update StyleUtils.ts
yakupafsin Nov 7, 2023
76e119b
add story for testing
dangrous Nov 8, 2023
0e8eabe
fix another places
tienifr Nov 8, 2023
11fa8ab
Merge branch 'main' into Rory-FixSettingsPageRegression
roryabraham Nov 8, 2023
9f8248a
Fix android keyboard doesn't show up and ios text input content doesn…
tsa321 Nov 8, 2023
1df1ae8
prettier ran
keisyrzk Nov 8, 2023
7aca252
Merge branch 'main' of https://github.com/tienifr/App into fix/30821
tienifr Nov 8, 2023
7ea652d
Merge branch 'main' into osp/e2e-staggered
ospfranco Nov 8, 2023
1e1b83c
fix: No space between description & show more option
Krishna2323 Nov 8, 2023
2ead425
Merge branch 'Expensify:main' into fix-#26942
r3770 Nov 8, 2023
c679584
Merge branch 'main' of github.com:Expensify/App into beaman-removeFin…
Beamanator Nov 8, 2023
a207631
Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…
kubabutkiewicz Nov 8, 2023
f226f32
Fix test runner
ospfranco Nov 8, 2023
dbd0c92
Merge branch 'main' of https://github.com/tienifr/App into fix/30281
tienifr Nov 8, 2023
d4fe698
Prevent from adding an extra stop from a deeplink;
paultsimura Nov 8, 2023
ba5fb64
Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…
kubabutkiewicz Nov 8, 2023
a938f08
Merge branch 'Expensify:main' into fix/29379
ishpaul777 Nov 8, 2023
e149093
Optimize with isChildOfNode function
yakupafsin Nov 8, 2023
29b4d95
Resolve lint error
yakupafsin Nov 8, 2023
44e88a8
Clarify email is about closing, not owner
Beamanator Nov 8, 2023
793d122
Rename var to make it more accurate
Beamanator Nov 8, 2023
493fc45
Remove unused data
Beamanator Nov 8, 2023
fc3e333
Build release version inline instead of using actions and try to unin…
ospfranco Nov 8, 2023
5797605
Merge branch 'Expensify:main' into krishna2323/issue/30174
Krishna2323 Nov 8, 2023
075f8e3
Merge branch 'main' of https://github.com/tienifr/App into fix/30821
tienifr Nov 8, 2023
84c4551
Update documetnation
ospfranco Nov 8, 2023
685a4db
Merge branch 'Expensify:main' into krishna2323/issue/30174
Krishna2323 Nov 8, 2023
91979f9
Remove Global Nav and Sub Nav
zukilover Nov 8, 2023
667eaef
Skip switching branches during testing
ospfranco Nov 8, 2023
135c09f
Revert uninstalling old app
ospfranco Nov 8, 2023
2786049
Merge branch 'main' into osp/e2e-staggered
ospfranco Nov 8, 2023
bdf9bac
Add custom setup script
ospfranco Nov 8, 2023
bbfb713
Add custom setup script ruby and gradle build part
ospfranco Nov 8, 2023
786b5d1
fix: new room page is misaligned
tienifr Nov 8, 2023
687c108
Fix generated artifact path
ospfranco Nov 8, 2023
36ba8ef
Update version to 1.3.96-9
OSBotify Nov 8, 2023
13ff2ac
Update version to 1.3.96-10
OSBotify Nov 8, 2023
8331d28
Bump the onyx version
tgolen Nov 8, 2023
2e156ea
Merge pull request #31048 from Krishna2323/krishna2323/issue/30039
roryabraham Nov 8, 2023
821ee3a
Merge pull request #30970 from tienifr/fix/30821
Li357 Nov 8, 2023
1149ca7
Merge pull request #31063 from tienifr/fix/30976
madmax330 Nov 8, 2023
9a61a1e
Update version to 1.3.96-11
OSBotify Nov 8, 2023
8adb043
Use not cancelled alone instead of always
roryabraham Nov 8, 2023
dc493dd
Update version to 1.3.96-12
OSBotify Nov 8, 2023
dc48d90
Update version to 1.3.96-13
OSBotify Nov 8, 2023
f521697
fix: add null check to emoji suggestions
allroundexperts Nov 8, 2023
fde4563
Update onyx version
tgolen Nov 8, 2023
8f5a3a4
Merge pull request #30808 from r3770/fix-#26942
cead22 Nov 8, 2023
4547f97
Merge branch 'main' into tgolen-remove-multiple-withOnyx
tgolen Nov 8, 2023
8321895
Merge pull request #27399 from Expensify/Rory-OnlyOneActiveDeploy
AndrewGable Nov 8, 2023
ebff8c8
fix: lint issues
allroundexperts Nov 8, 2023
130ce1c
Merge pull request #29226 from kubabutkiewicz/ts-migration/useKeyboar…
chiragsalian Nov 8, 2023
2300d06
Add blank line before comment
puneetlath Nov 8, 2023
5671ea4
Rename waypoints -> waypoint
paultsimura Nov 8, 2023
24f306c
Merge pull request #29264 from kubabutkiewicz/ts-migration/useCurrent…
AndrewGable Nov 8, 2023
49f730f
Merge pull request #30881 from paultsimura/fix/30407-distance-from-ex…
neil-marcellini Nov 8, 2023
a468073
Merge branch 'main' into 24877-migrate-device-lib-to-ts
fvlvte Nov 8, 2023
ae92c8d
Merge branch 'main' into 24877-migrate-device-lib-to-ts
fvlvte Nov 8, 2023
0cb9969
Merge pull request #30597 from Expensify/cmartins-resetVBBA
luacmartins Nov 8, 2023
01e5649
Merge branch 'Expensify:main' into participants-invite-fix
neonbhai Nov 8, 2023
a4c0db1
Using boolean instead Boolean
yakupafsin Nov 8, 2023
05586ea
Merge pull request #31072 from allroundexperts/fix-31027
pecanoro Nov 8, 2023
7d21954
Update version to 1.3.96-14
OSBotify Nov 8, 2023
fac5b04
Merge pull request #30876 from yakupafsin/30203-change-font-size-for-…
roryabraham Nov 8, 2023
9007e87
Merge branch 'main' into Sebryu-DynamicChecklistPOC
sebryu Nov 8, 2023
fae9178
Merge pull request #31025 from Expensify/puneet-request-options
pecanoro Nov 8, 2023
188d60a
Merge pull request #31066 from Expensify/tgolen-bump-onyx
cristipaval Nov 8, 2023
068e97f
Update version to 1.3.96-15
OSBotify Nov 8, 2023
070c173
unzip and print correct results
ospfranco Nov 8, 2023
e25d03a
Update version to 1.3.97-0
OSBotify Nov 8, 2023
e1c98cb
Merge pull request #30159 from software-mansion-labs/ts-migration/get…
Nov 8, 2023
c473b17
Merge pull request #30833 from adhorodyski/chore/testing-utils
amyevans Nov 8, 2023
dfd13fc
Merge pull request #30946 from zukilover/feat/remove-global-sub-nav
Nov 8, 2023
01759d1
Merge pull request #30972 from barttom/fix/29780/change-implementatio…
deetergp Nov 8, 2023
97d9087
provide reasonable defaults
jasperhuangg Nov 8, 2023
5e286c0
Merge pull request #31079 from Expensify/jasper-fixCrashToLowerCase
roryabraham Nov 8, 2023
ca79bae
Update version to 1.3.97-1
OSBotify Nov 8, 2023
3f2de5c
Merge pull request #30901 from software-mansion-labs/fix-lottie-height
roryabraham Nov 8, 2023
a8f525b
Update community redirects for Expensify Card disputes and statement
joekaufmanexpensify Nov 8, 2023
dee9b31
Merge pull request #31082 from Expensify/joekaufmanexpensify-patch-4
coleaeason Nov 9, 2023
e204f13
Adding multiple files to Auto-Reconciliation.md
SofiedeVreese Nov 9, 2023
9c77c78
Bring back checks for already built artifacts
ospfranco Nov 9, 2023
6955074
Remove extra comment
VickyStash Nov 9, 2023
c2f29a8
Add branch to typing test
ospfranco Nov 9, 2023
41a51b2
combine the condition
bernhardoj Nov 9, 2023
6c52316
Merge branch 'main' into @kosmydel/lottie-react-native-web-support
kosmydel Nov 9, 2023
5a94095
Merge pull request #29975 from software-mansion-labs/@kosmydel/lottie…
roryabraham Nov 9, 2023
93efdf0
Merge branch 'main' into Sebryu-DynamicChecklistPOC
sebryu Nov 9, 2023
edbf015
Merge branch 'main' into migrateIconToTypeScript
JKobrynski Nov 9, 2023
b0be474
Merge branch 'main' into migrateIconToTypeScript
JKobrynski Nov 9, 2023
9862a3e
Merge pull request #30791 from Expensify/dangrous-updateradiochecks
nkuoch Nov 9, 2023
0d05be8
fix type error
JKobrynski Nov 9, 2023
ee562a9
Device lib fixes.
fvlvte Nov 9, 2023
5bd34f6
Merge branch 'main' into migrateReportActionSkeletonViewToTypeScript
JKobrynski Nov 9, 2023
b9e9a8c
Merge branch 'main' into Sebryu-DynamicChecklistPOC
sebryu Nov 9, 2023
4d02f75
Create Creating-Per-Diem-Expenses.md
sonialiap Nov 9, 2023
08a02e5
Update Creating-Per-Diem-Expenses.md
sonialiap Nov 9, 2023
3ff8299
Update Creating-Per-Diem-Expenses.md
sonialiap Nov 9, 2023
bbc54c3
fix: cannot navigate by tab key
tienifr Nov 9, 2023
275eb00
Merge branch 'Expensify:main' into @kosmydel/handle-invisible-characters
kosmydel Nov 9, 2023
1da5e43
Merge pull request #31118 from tienifr/fix/31098
mountiny Nov 9, 2023
30505fe
Update version to 1.3.97-2
OSBotify Nov 9, 2023
663fa1e
fix: package.json & package-lock.json to reduce vulnerabilities
snyk-bot Nov 9, 2023
0d778af
Money Request description input style refactor
esh-g Nov 9, 2023
ba1af3b
Merge pull request #29939 from tienifr/fix/28941
flodnv Nov 9, 2023
271cdd8
Skip the reassure ReportScreen tests
mountiny Nov 9, 2023
41d71ab
Move View wrapper to AttachmentViewPdf
Beamanator Nov 9, 2023
16e40c9
Merge pull request #31122 from Expensify/snyk-fix-aae59100b631ecbdb44…
rlinoz Nov 9, 2023
595bb78
... you saw nothing ...
Beamanator Nov 9, 2023
37f2dff
Add longer timeouts to the other tests
mountiny Nov 9, 2023
feae468
Merge pull request #30793 from margelo/osp/e2e-staggered
mountiny Nov 9, 2023
732aad9
Merge pull request #30774 from JKobrynski/migrateReportActionSkeleton…
MonilBhavsar Nov 9, 2023
8bd4a7b
Merge pull request #27709 from fvlvte/24877-migrate-device-lib-to-ts
mountiny Nov 9, 2023
4692030
Fix lint
mountiny Nov 9, 2023
7b78542
Merge pull request #31127 from esh-g/iou-description-style
mountiny Nov 9, 2023
0df7409
Update version to 1.3.97-3
OSBotify Nov 9, 2023
346e6b6
Return 0 instead of an empty string
tgolen Nov 9, 2023
c3692a7
Merge pull request #31035 from Expensify/tgolen-library-review-template
grgia Nov 9, 2023
e9fb54c
Merge pull request #30993 from JKobrynski/migrateUsePrivatePersonalDe…
grgia Nov 9, 2023
2657550
Merge pull request #27482 from Expensify/Rory-FixSettingsPageRegression
grgia Nov 9, 2023
9e02e96
Merge pull request #31130 from Expensify/beaman-reFixPdfAttachmentModal
pecanoro Nov 9, 2023
5c1ba6e
Update version to 1.3.97-4
OSBotify Nov 9, 2023
5cff53b
Merge pull request #30832 from DylanDylann/fix/24141
luacmartins Nov 9, 2023
668e0b7
fix: correctly setting up the billable value of IOU
abdel-h66 Nov 2, 2023
00ba233
Merge pull request #30920 from neonbhai/participants-invite-fix
Nov 9, 2023
3432f08
Merge pull request #27414 from software-mansion-labs/@kosmydel/handle…
Nov 9, 2023
12966ae
Merge pull request #30420 from software-mansion-labs/form-migration/M…
luacmartins Nov 9, 2023
448cbc2
handle scroll index
Nov 9, 2023
7c65648
Revert "Fix: Wallet page does not update instantly when bank account …
neil-marcellini Nov 9, 2023
ce259c1
Revert "handle scroll index"
Nov 9, 2023
b0c82d9
Merge pull request #30913 from Krishna2323/krishna2323/issue/30174
AndrewGable Nov 9, 2023
5d49047
Merge pull request #31153 from Expensify/revert-30700-fix/29767
neil-marcellini Nov 9, 2023
aeb7f28
Update version to 1.3.97-5
OSBotify Nov 9, 2023
e94e8c5
Revert "##23220 WEB maintainVisibleContentPosition"
dangrous Nov 9, 2023
02c4ad9
Merge pull request #31158 from Expensify/revert-28793-feat/##23220-we…
puneetlath Nov 9, 2023
e2c1c03
Update version to 1.3.97-6
OSBotify Nov 9, 2023
ea5cef5
Merge pull request #30811 from Expensify/MitchExpensify-patch-1
marcaaron Nov 9, 2023
de53c0c
Merge pull request #31041 from tsa321/andios-compscroll
tylerkaraszewski Nov 9, 2023
64155e7
Merge pull request #30997 from bernhardoj/fix/29570-search-option-sub…
flodnv Nov 9, 2023
a2d5128
Merge pull request #29661 from VickyStash/ts-migration/app-lib
neil-marcellini Nov 9, 2023
19ab19d
Trust the input tag and compare between the input tag and the last co…
roryabraham Nov 9, 2023
b9643cd
Merge pull request #31161 from Expensify/Rory-FixDeployComments
puneetlath Nov 9, 2023
2addd69
Merge pull request #29166 from keisyrzk/update_ReimbursementAccountPage
mountiny Nov 9, 2023
1928c95
Merge pull request #30441 from JKobrynski/migrateCurrentUserPersonalD…
marcaaron Nov 10, 2023
5ccbfc3
[ImgBot] Optimize images
ImgBotApp Nov 10, 2023
99dd643
Merge pull request #31167 from Expensify/imgbot
github-actions[bot] Nov 10, 2023
d4a97bc
Merge pull request #30802 from abdel-h66/30454-fix-billable
MariaHCD Nov 10, 2023
6733533
fix: prettier
BartoszGrajdek Nov 10, 2023
0888bda
Merge pull request #31096 from Expensify/SofiedeVreese-patch-1
rlinoz Nov 10, 2023
358e4b1
Merge pull request #30836 from tienifr/fix/30274
Julesssss Nov 10, 2023
030e4b8
Force building main branch version of the app
ospfranco Nov 10, 2023
2c90ed6
Merge pull request #31175 from margelo/osp/force-building-e2e-app
mountiny Nov 10, 2023
9628af9
Merge pull request #28866 from Expensify/tgolen-remove-multiple-withOnyx
mountiny Nov 10, 2023
1f07068
fix: RNW patch for measureInWindow
sangar-1028 Nov 10, 2023
e220352
Merge pull request #30914 from Expensify/beaman-removeFinalOwnerEmail…
Beamanator Nov 10, 2023
13b7718
ownerEmail was just removed everywhere
Beamanator Nov 10, 2023
5e9f3df
fix: remove shouldUseTargetLocation from PopoverWithMeasuredContent
sangar-1028 Nov 10, 2023
c5fee97
I mean.... fine
Beamanator Nov 10, 2023
ee275ef
Merge pull request #31177 from Expensify/beaman-removeOwnerEmail
Beamanator Nov 10, 2023
a75ce3e
fix: emoji picker not open first time
sangar-1028 Nov 10, 2023
6bf03f2
fix: remove unnecessary variable
sangar-1028 Nov 10, 2023
d15d493
Merge pull request #31131 from Expensify/vit-skipTemporarilyReportScr…
robertjchen Nov 10, 2023
a6629d4
Merge pull request #31184 from s-alves10/fix/issue-31069
mountiny Nov 10, 2023
3754f41
Update version to 1.3.97-7
OSBotify Nov 10, 2023
bd9ab87
Update version to 1.3.98-0
OSBotify Nov 10, 2023
cf01854
Merge pull request #30620 from tienifr/fix/30281
bondydaa Nov 10, 2023
2625721
Merge pull request #30925 from mkhutornyi/fix-30616
bondydaa Nov 10, 2023
c94bec8
Merge pull request #30930 from abzokhattab/refactoring-mention-replac…
marcochavezf Nov 10, 2023
9aa6ae1
Merge pull request #29953 from tienifr/fix/28330
johnmlee101 Nov 10, 2023
da1dda3
Merge pull request #30579 from JKobrynski/migrateIconToTypeScript
roryabraham Nov 10, 2023
ebc35e7
Merge pull request #31113 from Expensify/sonialiap-patch-1
Nov 10, 2023
02c8c94
Update redirects.csv
sonialiap Nov 10, 2023
63875ad
Merge pull request #31198 from Expensify/sonialiap-patch-3
justinpersaud Nov 10, 2023
747dd42
Change textinput import to text
NikkiWines Nov 10, 2023
a941a6a
Merge pull request #29745 from software-mansion-labs/ts-migration/sec…
johnmlee101 Nov 10, 2023
47b8ffc
Merge pull request #31201 from Expensify/nikki-fix-import
chiragsalian Nov 10, 2023
8ba3206
[ImgBot] Optimize images
ImgBotApp Nov 10, 2023
7f2788b
Merge pull request #31206 from Expensify/imgbot
github-actions[bot] Nov 10, 2023
3939bea
Update version to 1.3.98-1
OSBotify Nov 10, 2023
416e4bb
Revert "Merge pull request #31201 from Expensify/nikki-fix-import"
johnmlee101 Nov 10, 2023
01b05ce
Revert "Merge pull request #29166 from keisyrzk/update_ReimbursementA…
johnmlee101 Nov 10, 2023
ab4a148
Merge pull request #31214 from Expensify/john-revert
marcaaron Nov 10, 2023
f31ecae
Update version to 1.3.98-2
OSBotify Nov 10, 2023
4f345f8
Merge pull request #31017 from paultsimura/fix/29886-distance-stop-bu…
iwiznia Nov 10, 2023
3716368
Merge pull request #27532 from software-mansion-labs/Sebryu-DynamicCh…
roryabraham Nov 10, 2023
2045847
Revert "Handle invisible characters in forms"
chiragsalian Nov 10, 2023
fc7a769
Merge pull request #30493 from VickyStash/ts-migration/subscriptAvata…
NikkiWines Nov 10, 2023
16d353a
Add esModuleInterop flag
roryabraham Nov 10, 2023
5645b26
Test using local action version
roryabraham Nov 10, 2023
bf6cbf1
Use import * as github
roryabraham Nov 10, 2023
d0374e3
Rebuild gh actions
roryabraham Nov 10, 2023
971ca1b
Use node 20 for authorChecklist
roryabraham Nov 10, 2023
d42f801
markdown change to trigger retry
roryabraham Nov 10, 2023
7a36213
Merge pull request #30864 from ishpaul777/fix/29379
NikkiWines Nov 10, 2023
9f9cb09
Merge pull request #31223 from Expensify/Rory-ESModuleInterop
chiragsalian Nov 10, 2023
7c65b04
Merge branch 'main' into revert-27414-@kosmydel/handle-invisible-char…
chiragsalian Nov 10, 2023
5e2c39f
Merge pull request #31219 from Expensify/revert-27414-@kosmydel/handl…
marcaaron Nov 11, 2023
f285c9c
Update version to 1.3.98-3
OSBotify Nov 11, 2023
f0fb7a8
Merge pull request #29674 from software-mansion-labs/ts-migration/scr…
srikarparsi Nov 11, 2023
f596a7d
add memoization
Nov 11, 2023
84b75d6
merged main
Nov 11, 2023
58ee613
Revert "Remove duplicate withOnyx calls"
situchan Nov 11, 2023
2e8b89b
Merge pull request #31231 from situchan/revert-28866-tgolen-remove-mu…
marcochavezf Nov 11, 2023
7f654b5
add early return
Nov 11, 2023
ffe1c63
Merge pull request #31013 from sourcecodedeveloper/navigateRoomCrash
roryabraham Nov 11, 2023
2a047f8
rm #gsc.tab=0 from url
rushatgabhane Nov 12, 2023
d3c44fa
rm #gsc.tab=0 from url
rushatgabhane Nov 12, 2023
2153584
Revert "rm #gsc.tab=0 from url"
rushatgabhane Nov 12, 2023
2c00a37
rm #gsc.tab=0 all occurences of #gsc.tab
rushatgabhane Nov 12, 2023
604bdaa
Merge pull request #31244 from rushatgabhane/fix-url
francoisl Nov 12, 2023
adb041a
Merge pull request #31022 from Expensify/bfitzexpensify-patch-4
MonilBhavsar Nov 13, 2023
771f252
Merge pull request #30424 from c3024/30198-selectTextOnFocus-for-Goog…
Julesssss Nov 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
exclude rooms having undefined reportID
  • Loading branch information
sourcecodedeveloper committed Nov 7, 2023
commit 26378c9eff52946b81600593763e65a841e7fbe4
29 changes: 19 additions & 10 deletions src/pages/workspace/WorkspaceInitialPage.js
Original file line number Diff line number Diff line change
@@ -179,24 +179,33 @@ function WorkspaceInitialPage(props) {
},
];

const availableRooms = _.filter(
props.reports,
(report) =>
report &&
report.reportID !== undefined &&
report.policyID === policy.id &&
(report.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS || report.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE),
);

const threeDotsMenuItems = [
{
icon: Expensicons.Trashcan,
text: props.translate('workspace.common.delete'),
onSelected: () => setIsDeleteModalOpen(true),
},
{
icon: Expensicons.Hashtag,
text: props.translate('workspace.common.goToRoom', {roomName: CONST.REPORT.WORKSPACE_CHAT_ROOMS.ADMINS}),
onSelected: () => goToRoom(CONST.REPORT.CHAT_TYPE.POLICY_ADMINS),
},
{
icon: Expensicons.Hashtag,
text: props.translate('workspace.common.goToRoom', {roomName: CONST.REPORT.WORKSPACE_CHAT_ROOMS.ANNOUNCE}),
onSelected: () => goToRoom(CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE),
},
];

availableRooms.forEach((room) => {
threeDotsMenuItems.push({
icon: Expensicons.Hashtag,
text: props.translate('workspace.common.goToRoom', {
roomName: room.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS ? CONST.REPORT.WORKSPACE_CHAT_ROOMS.ADMINS : CONST.REPORT.WORKSPACE_CHAT_ROOMS.ANNOUNCE,
}),
onSelected: () => goToRoom(room.chatType),
});
});

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}