Skip to content

Commit 5295689

Browse files
LukasModLukasMod
committed
Merge branch 'main' of github.com:Expensify/App into feature/onyxutils-get-synchronous-2
2 parents 140e4f0 + 24a0a75 commit 5295689

111 files changed

Lines changed: 3289 additions & 538 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/actions/javascript/isDeployChecklistLocked/index.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9228,6 +9228,9 @@ const CONST = {
92289228
VALIDATE_ACCOUNT: 'validate_account',
92299229
REVEAL_CARD_DETAILS: 'reveal_card_details',
92309230
REGISTER_AUTHENTICATION_KEY: 'register_authentication_key',
9231+
REPLACE_CARD: 'replace_card',
9232+
SHIP_CARD: 'ship_card',
9233+
REPORT_CARD_FRAUD: 'report_card_fraud',
92319234
},
92329235
EXPENSIFY_CARD: {
92339236
FEED_NAME: 'Expensify Card',

‎config/eslint/eslint.config.mjs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ const config = defineConfig([
335335
'rulesdir/require-live-region-for-status-updates': 'error',
336336
'rulesdir/require-a11y-disable-justification': 'error',
337337
'rulesdir/no-direct-pre-insert-fullscreen-under-rhp': 'error',
338-
'rulesdir/no-useOnyx-dependencies-arg': 'error',
339338
// Ships as a warning while the synchronous read is still being introduced; promoted to an error once the first wave of conversions lands.
340339
'rulesdir/no-onyx-get-in-render': 'warn',
341340
'rulesdir/require-locale-for-localized-date-format': 'error',

‎config/eslint/eslint.seatbelt.tsv‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"../../src/Expensify.tsx" "react-hooks/set-state-in-effect" 1
6363
"../../src/GlobalModals.tsx" "no-restricted-syntax" 2
6464
"../../src/ONYXKEYS.ts" "no-restricted-syntax" 2
65-
"../../src/ROUTES.ts" "@typescript-eslint/no-deprecated/getUrlWithBackToParam" 66
65+
"../../src/ROUTES.ts" "@typescript-eslint/no-deprecated/getUrlWithBackToParam" 63
6666
"../../src/ROUTES.ts" "@typescript-eslint/no-unsafe-type-assertion" 3
6767
"../../src/TIMEZONES.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
6868
"../../src/components/AccountingConnectionConfirmationModal.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
@@ -286,7 +286,6 @@
286286
"../../src/components/ReportActionItem/MoneyReportView.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
287287
"../../src/components/ReportActionItem/MoneyRequestReceiptView.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
288288
"../../src/components/ReportActionItem/MoneyRequestReceiptView.tsx" "react-hooks/set-state-in-effect" 1
289-
"../../src/components/ReportActionItem/MoneyRequestReportPreview/useReportPreviewActionDecision.ts" "rulesdir/no-useOnyx-dependencies-arg" 1
290289
"../../src/components/ReportActionItem/TaskPreview.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
291290
"../../src/components/ReportActionItem/TaskView.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
292291
"../../src/components/ReportActionItem/receiptHoverUtils/index.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
@@ -478,7 +477,6 @@
478477
"../../src/hooks/usePrevious.ts" "react-hooks/refs" 1
479478
"../../src/hooks/useReceiptScanDrop.tsx" "@typescript-eslint/no-unsafe-type-assertion" 3
480479
"../../src/hooks/useReportScrollManager/index.native.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
481-
"../../src/hooks/useReportTransactionViolations.ts" "rulesdir/no-useOnyx-dependencies-arg" 1
482480
"../../src/hooks/useResetBankAccountModal.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
483481
"../../src/hooks/useResponsiveLayout/index.native.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
484482
"../../src/hooks/useResponsiveLayout/index.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
@@ -637,7 +635,7 @@
637635
"../../src/libs/OptionsListUtils/index.ts" "@typescript-eslint/no-deprecated/deprecatedGetReportName" 3
638636
"../../src/libs/OptionsListUtils/index.ts" "@typescript-eslint/no-deprecated/deprecatedLastReportActions[reportID]" 3
639637
"../../src/libs/OptionsListUtils/index.ts" "@typescript-eslint/no-deprecated/translateLocal" 7
640-
"../../src/libs/OptionsListUtils/index.ts" "@typescript-eslint/no-unsafe-type-assertion" 6
638+
"../../src/libs/OptionsListUtils/index.ts" "@typescript-eslint/no-unsafe-type-assertion" 5
641639
"../../src/libs/OptionsListUtils/index.ts" "rulesdir/no-onyx-connect" 3
642640
"../../src/libs/OptionsListUtils/searchMatchUtils.ts" "@typescript-eslint/no-deprecated/translateLocal" 2
643641
"../../src/libs/PageHTMLCapture/index.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
@@ -1049,6 +1047,8 @@
10491047
"../../src/pages/iou/request/step/DynamicIOURequestEditReport.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
10501048
"../../src/pages/iou/request/step/DynamicIOURequestStepDistance.tsx" "react-hooks/set-state-in-effect" 1
10511049
"../../src/pages/iou/request/step/DynamicIOURequestStepReport.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
1050+
"../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
1051+
"../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx" "react-hooks/set-state-in-effect" 1
10521052
"../../src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
10531053
"../../src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
10541054
"../../src/pages/iou/request/step/IOURequestEditReportCommon.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
@@ -1068,8 +1068,6 @@
10681068
"../../src/pages/iou/request/step/IOURequestStepScan/hooks/useScanRouteParams.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
10691069
"../../src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
10701070
"../../src/pages/iou/request/step/IOURequestStepScan/utils/getFileSource.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
1071-
"../../src/pages/iou/request/step/IOURequestStepSubrate.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
1072-
"../../src/pages/iou/request/step/IOURequestStepSubrate.tsx" "react-hooks/set-state-in-effect" 1
10731071
"../../src/pages/iou/request/step/IOURequestStepWaypoint.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
10741072
"../../src/pages/iou/request/step/StepScreenWrapper.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
10751073
"../../src/pages/iou/request/step/withFullTransactionOrNotFound.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1

‎cspell.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@
456456
"americanexpressfdx",
457457
"bankofamerica",
458458
"Amina",
459+
"anchorless",
459460
"androiddebugkey",
460461
"androidx",
461462
"apksigner",
@@ -484,6 +485,7 @@
484485
"autocorrection",
485486
"autodocs",
486487
"autofilled",
488+
"autofocused",
487489
"automations",
488490
"autoplay",
489491
"autoreleasepool",

‎eslint-plugin-local-rules/no-useOnyx-dependencies-arg.js‎

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

‎package-lock.json‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"date-fns-tz": "^3.2.0",
141141
"dom-serializer": "^0.2.2",
142142
"domhandler": "^5.0.3",
143-
"expensify-common": "2.0.197",
143+
"expensify-common": "2.0.198",
144144
"expo": "57.0.8",
145145
"expo-asset": "57.0.7",
146146
"expo-audio": "57.0.3",

‎src/ONYXKEYS.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@ const ONYXKEYS = {
333333
/** The end date (epoch timestamp) of the workspace owner’s grace period after the free trial ends. */
334334
NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END: 'nvp_private_billingGracePeriodEnd',
335335

336+
/** The end date (epoch timestamp) of the workspace owner’s grace period for an overdue Consolidated Travel Billing invoice. */
337+
NVP_PRIVATE_OWNER_TRAVEL_BILLING_GRACE_PERIOD_END: 'nvp_private_travelBillingGracePeriodEnd',
338+
336339
/** The NVP containing the target url to navigate to when deleting a transaction */
337340
NVP_DELETE_TRANSACTION_NAVIGATE_BACK_URL: 'nvp_deleteTransactionNavigateBackURL',
338341

@@ -1751,6 +1754,7 @@ type OnyxValuesMapping = {
17511754
[ONYXKEYS.NVP_PRIVATE_FREEBIE_CREDITS]: number;
17521755
[ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: number;
17531756
[ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: number;
1757+
[ONYXKEYS.NVP_PRIVATE_OWNER_TRAVEL_BILLING_GRACE_PERIOD_END]: number;
17541758
[ONYXKEYS.NVP_DELETE_TRANSACTION_NAVIGATE_BACK_URL]: string | undefined;
17551759
[ONYXKEYS.NVP_RECONNECT_APP_IF_FULL_RECONNECT_BEFORE]: string;
17561760
[ONYXKEYS.NVP_PRIVATE_FIRST_POLICY_CREATED_DATE]: string;

‎src/ROUTES.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,16 @@ const DYNAMIC_ROUTES = {
467467
// In the new manual expense flow the confirmation fields are inlined on the create page, so it is also an entry point.
468468
entryScreens: [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION, SCREENS.MONEY_REQUEST.CREATE],
469469
},
470+
MONEY_REQUEST_STEP_SUBRATE: {
471+
path: 'per-diem-subrate/:pageIndex',
472+
entryScreens: [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TIME],
473+
getRoute: (pageIndex: string | number = 0) => `per-diem-subrate/${pageIndex}` as const,
474+
},
475+
MONEY_REQUEST_STEP_SUBRATE_EDIT: {
476+
path: 'per-diem-subrate-edit/:pageIndex',
477+
entryScreens: [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION],
478+
getRoute: (pageIndex: string | number) => `per-diem-subrate-edit/${pageIndex}` as const,
479+
},
470480
PROFILE: {
471481
path: 'a/:accountID',
472482
entryScreens: ['*'],
@@ -2452,16 +2462,6 @@ const ROUTES = {
24522462
return getUrlWithBackToParam(`${action as string}/${iouType as string}/vendor/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo);
24532463
},
24542464
},
2455-
MONEY_REQUEST_STEP_SUBRATE: {
2456-
route: ':action/:iouType/subrate/:transactionID/:reportID/:backToReport?/:pageIndex',
2457-
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string, backTo = '') =>
2458-
getUrlWithBackToParam(`${action as string}/${iouType as string}/subrate/${transactionID}/${reportID}${backToReport ? `/${backToReport}` : ''}/0`, backTo),
2459-
},
2460-
MONEY_REQUEST_STEP_SUBRATE_EDIT: {
2461-
route: ':action/:iouType/subrate/:transactionID/:reportID/edit/:pageIndex',
2462-
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, pageIndex = 0, backTo = '') =>
2463-
getUrlWithBackToParam(`${action as string}/${iouType as string}/subrate/${transactionID}/${reportID}/edit/${pageIndex}`, backTo),
2464-
},
24652465
MONEY_REQUEST_RECEIPT_PREVIEW: {
24662466
route: ':action/:iouType/receipt/:transactionID/:reportID',
24672467
getRoute: (reportID: string, transactionID: string, action: IOUAction, iouType: IOUType) => {

‎src/SCREENS.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ const SCREENS = {
356356
DYNAMIC_STEP_ACCOUNTANT: 'Dynamic_Money_Request_Accountant',
357357
DYNAMIC_STEP_DESTINATION: 'Dynamic_Money_Request_Destination',
358358
DYNAMIC_STEP_TIME: 'Dynamic_Money_Request_Time',
359-
STEP_SUBRATE: 'Money_Request_SubRate',
359+
DYNAMIC_STEP_SUBRATE: 'Dynamic_Money_Request_SubRate',
360360
DYNAMIC_STEP_DESTINATION_EDIT: 'Dynamic_Money_Request_Destination_Edit',
361361
DYNAMIC_STEP_TIME_EDIT: 'Dynamic_Money_Request_Time_Edit',
362-
STEP_SUBRATE_EDIT: 'Money_Request_SubRate_Edit',
362+
DYNAMIC_STEP_SUBRATE_EDIT: 'Dynamic_Money_Request_SubRate_Edit',
363363
DYNAMIC_STEP_REPORT: 'Dynamic_Money_Request_Report',
364364
DYNAMIC_EDIT_REPORT: 'Dynamic_Money_Request_Edit_Report',
365365
SPLIT_EXPENSE: 'Money_Request_Split_Expense',

0 commit comments

Comments
 (0)