Skip to content

Commit 2ee9f5e

Browse files
jmusialjmusial
committed
Merge branch 'main' into perf/split-expense-report-list-item-row-defer-action-cell
2 parents 35dfdaa + 4378b1e commit 2ee9f5e

356 files changed

Lines changed: 7928 additions & 4810 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.

‎Mobile-Expensify‎

‎__mocks__/react-native-vision-camera.ts‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎__mocks__/reportData/violations.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const receiptErrorsR14932: ReceiptErrors = {
3333
transactionID: RECEIPT_ERRORS_TRANSACTION_ID_R14932,
3434
source: CONST.POLICY.ID_FAKE,
3535
transactionPolicy: undefined,
36+
transactionPolicyTagList: undefined,
3637
},
3738
},
3839
};

‎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 1009036903
115-
versionName "9.3.69-3"
114+
versionCode 1009037001
115+
versionName "9.3.70-1"
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"

‎assets/images/camera-flip.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎assets/images/simple-illustrations/simple-illustration__calculator-money.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎config/eslint/eslint.seatbelt.tsv‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@
343343
"../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
344344
"../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 1
345345
"../../src/libs/actions/IOU/PerDiem.ts" "no-restricted-syntax" 2
346-
"../../src/libs/actions/IOU/Receipt.ts" "@typescript-eslint/no-deprecated/getPolicyTagsData" 1
347346
"../../src/libs/actions/IOU/Receipt.ts" "no-restricted-syntax" 1
348347
"../../src/libs/actions/IOU/RejectMoneyRequest.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 2
349348
"../../src/libs/actions/IOU/RejectMoneyRequest.ts" "no-restricted-syntax" 1
@@ -355,7 +354,6 @@
355354
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 4
356355
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/Localize.translateLocal" 2
357356
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1
358-
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/getPolicyTagsData" 1
359357
"../../src/libs/actions/IOU/Split.ts" "no-restricted-syntax" 3
360358
"../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
361359
"../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1
@@ -427,7 +425,6 @@
427425
"../../src/libs/actions/TwoFactorAuthActions.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
428426
"../../src/libs/actions/UnreportedExpenses.tsx" "no-restricted-syntax" 1
429427
"../../src/libs/actions/User.ts" "no-restricted-syntax" 8
430-
"../../src/libs/actions/User.ts" "rulesdir/no-onyx-connect" 1
431428
"../../src/libs/actions/VacationDelegate.ts" "no-restricted-syntax" 2
432429
"../../src/libs/actions/Wallet.ts" "no-restricted-syntax" 1
433430
"../../src/libs/actions/Welcome/index.ts" "no-restricted-syntax" 1
@@ -474,7 +471,12 @@
474471
"../../src/pages/ReimbursementAccount/EnterSignerInfo/index.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
475472
"../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx" "react-hooks/refs" 3
476473
"../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx" "react-hooks/set-state-in-effect" 4
474+
"../../src/pages/ReimbursementAccount/USD/BankInfo/BankInfo.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
475+
"../../src/pages/ReimbursementAccount/USD/BeneficialOwnerInfo/BeneficialOwnersStep.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
476+
"../../src/pages/ReimbursementAccount/USD/BusinessInfo/BusinessInfo.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
477477
"../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/IndustryCode/IndustryCodeSelector.tsx" "react-hooks/set-state-in-effect" 1
478+
"../../src/pages/ReimbursementAccount/USD/CompleteVerification/CompleteVerification.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
479+
"../../src/pages/ReimbursementAccount/USD/Requestor/PersonalInfo/PersonalInfo.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
478480
"../../src/pages/ReportDescriptionPage.tsx" "no-restricted-syntax" 1
479481
"../../src/pages/ReportDetailsPage.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
480482
"../../src/pages/ReportDetailsPage.tsx" "react-hooks/preserve-manual-memoization" 4
@@ -511,9 +513,9 @@
511513
"../../src/pages/inbox/report/PureReportActionItem.tsx" "react-hooks/refs" 2
512514
"../../src/pages/inbox/report/PureReportActionItem.tsx" "react-hooks/set-state-in-effect" 1
513515
"../../src/pages/inbox/report/ReactionList/HeaderReactionList.tsx" "no-restricted-syntax" 1
514-
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
515-
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx" "react-hooks/preserve-manual-memoization" 2
516-
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx" "react-hooks/refs" 8
516+
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
517+
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx" "react-hooks/preserve-manual-memoization" 2
518+
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx" "react-hooks/refs" 8
517519
"../../src/pages/inbox/report/ReportActionCompose/SuggestionEmoji.tsx" "react-hooks/refs" 1
518520
"../../src/pages/inbox/report/ReportActionCompose/SuggestionMention.tsx" "react-hooks/refs" 3
519521
"../../src/pages/inbox/report/ReportActionItemMessage.tsx" "@typescript-eslint/no-deprecated/getReportName" 1
@@ -550,9 +552,8 @@
550552
"../../src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 3
551553
"../../src/pages/iou/request/step/IOURequestStepDistanceMap.tsx" "react-hooks/set-state-in-effect" 1
552554
"../../src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
553-
"../../src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx" "react-hooks/set-state-in-effect" 1
554555
"../../src/pages/iou/request/step/IOURequestStepMerchant.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
555-
"../../src/pages/iou/request/step/IOURequestStepReport.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
556+
"../../src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
556557
"../../src/pages/iou/request/step/IOURequestStepScan/ReceiptView/index.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
557558
"../../src/pages/iou/request/step/IOURequestStepScan/ReceiptView/index.tsx" "react-hooks/set-state-in-effect" 1
558559
"../../src/pages/iou/request/step/IOURequestStepScan/components/MobileWebCameraView.tsx" "react-hooks/immutability" 1

0 commit comments

Comments
 (0)