Skip to content

Commit cc1ef92

Browse files
author
Nabi
committed
Merge branch 'main' into feature/update-duplicate-rhp-screen
2 parents 8d9bba7 + 3ec7273 commit cc1ef92

203 files changed

Lines changed: 5615 additions & 3403 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
key: ${{ runner.os }}-jest
4040

4141
- name: Jest tests
42-
run: npm test -- --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --maxWorkers=2 --coverage --coverageDirectory=coverage/shard-${{ matrix.chunk }}
42+
run: npm test -- --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --maxWorkers=6 --coverage --coverageDirectory=coverage/shard-${{ matrix.chunk }}
4343

4444
- name: Upload coverage to Codecov (PRs - tokenless)
4545
if: ${{ github.event_name == 'pull_request' }}

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009038903
115-
versionName "9.3.89-3"
114+
versionCode 1009038905
115+
versionName "9.3.89-5"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

config/eslint/eslint.seatbelt.tsv

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
"../../src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 3
124124
"../../src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx" "react-hooks/refs" 6
125125
"../../src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx" "react-hooks/set-state-in-effect" 3
126+
"../../src/components/MoneyRequestReportView/MoneyRequestReportView.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
126127
"../../src/components/MultiGestureCanvas/index.tsx" "no-restricted-syntax" 1
127128
"../../src/components/MultiGestureCanvas/index.tsx" "react-hooks/preserve-manual-memoization" 1
128129
"../../src/components/MultiGestureCanvas/index.tsx" "react-hooks/refs" 2
@@ -208,7 +209,7 @@
208209
"../../src/hooks/useDialogContainerFocus/index.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
209210
"../../src/hooks/useDomainGroupFilter.ts" "react-hooks/set-state-in-effect" 1
210211
"../../src/hooks/useDragAndDrop/types.ts" "@typescript-eslint/no-deprecated/React.MutableRefObject" 1
211-
"../../src/hooks/useExpenseActions.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
212+
"../../src/hooks/useExpenseActions.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 3
212213
"../../src/hooks/useFilesValidation.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
213214
"../../src/hooks/useInitial.ts" "react-hooks/refs" 4
214215
"../../src/hooks/useIsBlockedToAddFeed.ts" "react-hooks/set-state-in-effect" 1
@@ -386,19 +387,20 @@
386387
"../../src/libs/actions/ReimbursementAccount/resetNonUSDBankAccount.ts" "no-restricted-syntax" 1
387388
"../../src/libs/actions/ReimbursementAccount/resetUSDBankAccount.ts" "no-restricted-syntax" 1
388389
"../../src/libs/actions/Report/MarkAllMessageAsRead.tsx" "no-restricted-syntax" 1
389-
"../../src/libs/actions/Report/index.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
390+
"../../src/libs/actions/Report/index.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
390391
"../../src/libs/actions/Report/index.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 3
391392
"../../src/libs/actions/Report/index.ts" "@typescript-eslint/no-deprecated/reportAction.originalMessage" 1
392393
"../../src/libs/actions/Report/index.ts" "no-restricted-syntax" 10
393394
"../../src/libs/actions/Report/index.ts" "rulesdir/no-onyx-connect" 4
394395
"../../src/libs/actions/ReportLayout.ts" "no-restricted-syntax" 1
395396
"../../src/libs/actions/ScheduleCall.ts" "no-restricted-syntax" 1
396397
"../../src/libs/actions/Search.ts" "no-restricted-syntax" 1
397-
"../../src/libs/actions/Session/index.ts" "no-restricted-imports" 1
398+
"../../src/libs/actions/Session/index.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
398399
"../../src/libs/actions/Session/index.ts" "no-restricted-syntax" 9
399400
"../../src/libs/actions/Session/index.ts" "rulesdir/no-onyx-connect" 2
400401
"../../src/libs/actions/StatsCounter.ts" "no-restricted-syntax" 2
401402
"../../src/libs/actions/Subscription.ts" "no-restricted-syntax" 1
403+
"../../src/libs/actions/Task.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
402404
"../../src/libs/actions/Task.ts" "no-restricted-syntax" 7
403405
"../../src/libs/actions/TaxRate.ts" "no-restricted-syntax" 1
404406
"../../src/libs/actions/TeachersUnite.ts" "no-restricted-syntax" 1
@@ -464,7 +466,7 @@
464466
"../../src/pages/RoomMembersPage.tsx" "react-hooks/set-state-in-effect" 1
465467
"../../src/pages/ScheduleCall/ScheduleCallPage.tsx" "react-hooks/preserve-manual-memoization" 1
466468
"../../src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx" "react-hooks/set-state-in-effect" 1
467-
"../../src/pages/Search/SearchMoneyRequestReportPage.tsx" "no-restricted-imports" 1
469+
"../../src/pages/Search/SearchMoneyRequestReportPage.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
468470
"../../src/pages/Search/SearchPage.tsx" "react-hooks/set-state-in-effect" 1
469471
"../../src/pages/Search/SearchTransactionsChangeReport.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
470472
"../../src/pages/Share/ShareRootPage.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
@@ -473,12 +475,13 @@
473475
"../../src/pages/ValidateLoginPage/index.web.tsx" "react-hooks/set-state-in-effect" 1
474476
"../../src/pages/domain/Groups/PreferredWorkspaceToggle.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
475477
"../../src/pages/domain/Saml/SamlLoginSectionContent.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
476-
"../../src/pages/inbox/DeleteTransactionNavigateBackHandler.tsx" "no-restricted-imports" 1
478+
"../../src/pages/inbox/DeleteTransactionNavigateBackHandler.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
477479
"../../src/pages/inbox/ReportFetchHandler.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
478480
"../../src/pages/inbox/ReportNavigateAwayHandler.tsx" "react-hooks/exhaustive-deps" 1
479481
"../../src/pages/inbox/hooks/useDeferNonEssentials.ts" "no-restricted-imports" 2
480482
"../../src/pages/inbox/hooks/useFlushDeferredWriteOnFocus.ts" "no-restricted-imports" 1
481483
"../../src/pages/inbox/hooks/useReportWasDeleted.ts" "react-hooks/set-state-in-effect" 1
484+
"../../src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
482485
"../../src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx" "react-hooks/preserve-manual-memoization" 1
483486
"../../src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx" "react-hooks/refs" 1
484487
"../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
@@ -495,7 +498,7 @@
495498
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "react-hooks/preserve-manual-memoization" 1
496499
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "react-hooks/refs" 5
497500
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "react-hooks/set-state-in-effect" 1
498-
"../../src/pages/inbox/report/ReportActionsList.tsx" "no-restricted-imports" 1
501+
"../../src/pages/inbox/report/ReportActionsList.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 4
499502
"../../src/pages/inbox/report/ReportActionsList.tsx" "react-hooks/refs" 5
500503
"../../src/pages/inbox/report/ReportActionsList.tsx" "react-hooks/set-state-in-effect" 3
501504
"../../src/pages/inbox/report/TripSummary.tsx" "rulesdir/no-default-id-values" 1
@@ -624,6 +627,7 @@
624627
"../../src/pages/workspace/companyCards/WorkspaceVerifyWorkAccountPage.tsx" "react-hooks/set-state-in-effect" 1
625628
"../../src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
626629
"../../src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
630+
"../../src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
627631
"../../src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx" "react-hooks/preserve-manual-memoization" 1
628632
"../../src/pages/workspace/downgrade/WorkspaceDowngradePage.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
629633
"../../src/pages/workspace/downgrade/WorkspaceDowngradePage.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
@@ -648,7 +652,6 @@
648652
"../../src/pages/workspace/taxes/WorkspaceTaxesPage.tsx" "react-hooks/set-state-in-effect" 1
649653
"../../src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 3
650654
"../../src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
651-
"../../src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx" "react-hooks/preserve-manual-memoization" 3
652655
"../../src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 2
653656
"../../src/stories/ReportActionItemImages.stories.tsx" "no-restricted-syntax" 1
654657
"../../src/stories/TextInput.stories.tsx" "react-hooks/set-state-in-effect" 1
@@ -657,7 +660,6 @@
657660
"../../src/types/onyx/AccountData.ts" "no-restricted-syntax" 1
658661
"../../src/types/onyx/BankAccount.ts" "no-restricted-syntax" 1
659662
"../../src/types/onyx/CancellationDetails.ts" "no-restricted-syntax" 1
660-
"../../src/types/onyx/Card.ts" "no-restricted-syntax" 1
661663
"../../src/types/onyx/CardFeeds.ts" "no-restricted-syntax" 1
662664
"../../src/types/onyx/Domain.ts" "no-restricted-syntax" 1
663665
"../../src/types/onyx/DomainErrors.ts" "no-restricted-syntax" 1

cspell.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
"Idology",
169169
"Inactives",
170170
"Inclusivity",
171+
"innerradius",
171172
"Intacct",
172173
"Invoicify",
173174
"Italiano",
@@ -495,6 +496,7 @@
495496
"codegen",
496497
"codeshare",
497498
"codesign",
499+
"colorscale",
498500
"commentbubbles",
499501
"contenteditable",
500502
"copiloted",
@@ -656,7 +658,9 @@
656658
"killall",
657659
"kilometre",
658660
"kilometres",
661+
"labelcomponent",
659662
"labelledby",
663+
"labelradius",
660664
"laggy",
661665
"lastiPhoneLogin",
662666
"lastname",
@@ -665,6 +669,7 @@
665669
"lightningcss",
666670
"linecap",
667671
"linejoin",
672+
"lineheight",
668673
"lintable",
669674
"lintrk",
670675
"listformat",
@@ -741,6 +746,7 @@
741746
"onloaderror",
742747
"onopentag",
743748
"onplayerror",
749+
"ontext",
744750
"onxy",
745751
"openxmlformats",
746752
"ordinality",
@@ -867,6 +873,7 @@
867873
"tabindex",
868874
"teachersunite",
869875
"testflight",
876+
"textanchor",
870877
"threadsafe",
871878
"thumbsup",
872879
"tickcount",
@@ -909,13 +916,15 @@
909916
"useMemo",
910917
"usernotifications",
911918
"utilise",
919+
"verticalanchor",
912920
"victoryaxis",
913921
"victorybar",
914922
"victorychart",
915923
"victorygroup",
916924
"victorylabel",
917925
"victorylegend",
918926
"victoryline",
927+
"victorypie",
919928
"viewability",
920929
"viewport",
921930
"viewports",

docs/articles/new-expensify/connections/TriNet.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ Before connecting Expensify with TriNet, ensure that:
4343

4444
# FAQ
4545

46+
## Can I connect multiple HR platforms at the same time?
47+
48+
No. Expensify only supports one HR platform connection per workspace at a time. If you already have an HR platform connected (for example, Gusto) and try to connect TriNet, you will see a prompt to disconnect the existing platform first. To switch, go to **Settings > Workspaces > [Workspace Name] > HR** and disconnect the current provider before connecting a new one.
49+
4650
## Will my employees receive a notification?
4751
Yes, each employee will receive a welcome email at their work email address. This email includes account validation steps and a password setup link. Employees can also download the Expensify app for iOS and Android.
4852

ios/NewExpensify/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.3.89.3</string>
47+
<string>9.3.89.5</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.3.89</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.89.3</string>
16+
<string>9.3.89.5</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.3.89</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.89.3</string>
16+
<string>9.3.89.5</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)