Skip to content

Commit b4a0d22

Browse files
mjasikowskimjasikowski
authored
Merge pull request #86977 from huult/83864-migrate-expensify-cards-part-2
2 parents 11c3200 + 99dffe6 commit b4a0d22

21 files changed

Lines changed: 127 additions & 128 deletions

‎src/ROUTES.ts‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ const DYNAMIC_ROUTES = {
279279
},
280280
WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS: {
281281
path: 'account-reconciliation-settings',
282-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION, SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT],
282+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION, SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT],
283283
},
284284
ADDRESS_COUNTRY: {
285285
path: 'country',
@@ -348,7 +348,35 @@ const DYNAMIC_ROUTES = {
348348
},
349349
WORKSPACE_INVITE_MESSAGE_ROLE: {
350350
path: 'role',
351-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_INVITE_MESSAGE, SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_INVITE_NEW_MEMBER, SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW],
351+
entryScreens: [
352+
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_INVITE_MESSAGE,
353+
SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_INVITE_NEW_MEMBER,
354+
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW,
355+
],
356+
},
357+
WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE: {
358+
path: 'edit/limit-type',
359+
entryScreens: [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS],
360+
},
361+
WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT: {
362+
path: 'account',
363+
entryScreens: [
364+
SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS,
365+
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT,
366+
SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_RECONCILIATION_ACCOUNT_SETTINGS,
367+
],
368+
},
369+
WORKSPACE_EXPENSIFY_CARD_SELECT_FEED: {
370+
path: 'select-feed',
371+
entryScreens: [SCREENS.WORKSPACE.EXPENSIFY_CARD],
372+
},
373+
WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE: {
374+
path: 'confirm-magic-code',
375+
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW],
376+
},
377+
WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: {
378+
path: 'issue-new',
379+
entryScreens: [SCREENS.WORKSPACE.EXPENSIFY_CARD, SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT, SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED],
352380
},
353381
KEYBOARD_SHORTCUTS: {
354382
path: 'keyboard-shortcuts',
@@ -2774,12 +2802,6 @@ const ROUTES = {
27742802
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
27752803
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/${policyID}/expensify-card/${cardID}/edit/limit`, backTo),
27762804
},
2777-
WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE: {
2778-
route: 'workspaces/:policyID/expensify-card/:cardID/edit/limit-type',
2779-
2780-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2781-
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/${cardID}/edit/limit-type`, backTo),
2782-
},
27832805
EXPENSIFY_CARD_LIMIT_TYPE: {
27842806
route: 'settings/:policyID/expensify-card/:cardID/edit/limit-type',
27852807

@@ -2798,18 +2820,6 @@ const ROUTES = {
27982820
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
27992821
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/${cardID}/edit/expiry-options`, backTo),
28002822
},
2801-
WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: {
2802-
route: 'workspaces/:policyID/expensify-card/issue-new',
2803-
2804-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2805-
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/issue-new`, backTo),
2806-
},
2807-
WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE: {
2808-
route: 'workspaces/:policyID/expensify-card/issue-new/confirm-magic-code',
2809-
2810-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2811-
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/issue-new/confirm-magic-code`, backTo),
2812-
},
28132823
WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT: {
28142824
route: 'workspaces/:policyID/expensify-card/choose-bank-account',
28152825
getRoute: (policyID: string | undefined) => {
@@ -2823,17 +2833,6 @@ const ROUTES = {
28232833
route: 'workspaces/:policyID/expensify-card/settings',
28242834
getRoute: (policyID: string) => `workspaces/${policyID}/expensify-card/settings` as const,
28252835
},
2826-
WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT: {
2827-
route: 'workspaces/:policyID/expensify-card/settings/account',
2828-
2829-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2830-
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/settings/account`, backTo),
2831-
},
2832-
WORKSPACE_EXPENSIFY_CARD_SELECT_FEED: {
2833-
route: 'workspaces/:policyID/expensify-card/select-feed',
2834-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2835-
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/select-feed`, backTo),
2836-
},
28372836
WORKSPACE_EXPENSIFY_CARD_ADD_WORK_EMAIL: {
28382837
route: 'workspaces/:policyID/expensify-card/:fundID/work-email',
28392838
getRoute: (policyID: string, fundID: number) => `workspaces/${policyID}/expensify-card/${encodeURIComponent(fundID)}/work-email` as const,

‎src/SCREENS.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -705,16 +705,16 @@ const SCREENS = {
705705
EXPENSIFY_CARD: 'Workspace_ExpensifyCard',
706706
EXPENSIFY_CARD_DETAILS: 'Workspace_ExpensifyCard_Details',
707707
EXPENSIFY_CARD_LIMIT: 'Workspace_ExpensifyCard_Limit',
708-
EXPENSIFY_CARD_ISSUE_NEW: 'Workspace_ExpensifyCard_New',
709-
EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE: 'Workspace_ExpensifyCard_New_Confirm_Magic_Code',
708+
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: 'Dynamic_Workspace_ExpensifyCard_New',
709+
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE: 'Dynamic_Workspace_ExpensifyCard_IssueNew_ConfirmMagicCode',
710710
EXPENSIFY_CARD_NAME: 'Workspace_ExpensifyCard_Name',
711-
EXPENSIFY_CARD_SELECT_FEED: 'Workspace_ExpensifyCard_Select_Feed',
711+
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED: 'Dynamic_Workspace_ExpensifyCard_Select_Feed',
712+
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE: 'Dynamic_Workspace_ExpensifyCard_LimitType',
712713
EXPENSIFY_CARD_ADD_WORK_EMAIL: 'Workspace_ExpensifyCard_Add_Work_Email',
713714
EXPENSIFY_CARD_VERIFY_WORK_EMAIL: 'Workspace_ExpensifyCard_Verify_Work_Email',
714-
EXPENSIFY_CARD_LIMIT_TYPE: 'Workspace_ExpensifyCard_LimitType',
715715
EXPENSIFY_CARD_BANK_ACCOUNT: 'Workspace_ExpensifyCard_BankAccount',
716716
EXPENSIFY_CARD_SETTINGS: 'Workspace_ExpensifyCard_Settings',
717-
EXPENSIFY_CARD_SETTINGS_ACCOUNT: 'Workspace_ExpensifyCard_Settings_Account',
717+
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT: 'Dynamic_Workspace_ExpensifyCard_Settings_Account',
718718
EXPENSIFY_CARD_SETTINGS_FREQUENCY: 'Workspace_ExpensifyCard_Settings_Frequency',
719719
INVOICES: 'Workspace_Invoices',
720720
INVOICES_VERIFY_ACCOUNT: 'Workspace_Invoices_Verify_Account',

‎src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -849,26 +849,28 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
849849
[SCREENS.WORKSPACE.COMPANY_CARD_EDIT_TRANSACTION_START_DATE]: () =>
850850
require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardEditTransactionStartDatePage').default,
851851
[SCREENS.WORKSPACE.COMPANY_CARD_EXPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardAccountSelectCardPage').default,
852-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/issueNew/IssueNewCardPage').default,
853-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE]: () =>
852+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/issueNew/DynamicIssueNewCardPage').default,
853+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE]: () =>
854854
require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/issueNew/IssueNewCardConfirmMagicCodePage').default,
855855
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceCardSettingsPage').default,
856-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceSettlementAccountPage').default,
856+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT]: () =>
857+
require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/DynamicWorkspaceSettlementAccountPage').default,
857858
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage').default,
858859
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage').default,
859860
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_FREQUENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelInvoicingSettlementFrequencyPage').default,
860861
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_MONTHLY_LIMIT]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelInvoicingMonthlyLimitPage').default,
861862
[SCREENS.WORKSPACE.TRAVEL_EXPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelInvoicingExportPage').default,
862863
[SCREENS.WORKSPACE.TRAVEL_MISSING_PERSONAL_DETAILS]: () => require<ReactComponentModule>('../../../../pages/Travel/TravelLegalNamePage').default,
863-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SELECT_FEED]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage').default,
864+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED]: () =>
865+
require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage').default,
864866
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ADD_WORK_EMAIL]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardAddWorkEmailPage').default,
865867
[SCREENS.WORKSPACE.EXPENSIFY_CARD_VERIFY_WORK_EMAIL]: () =>
866868
require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardVerifyWorkAccountPage').default,
867869
[SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts').default,
868870
[SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage').default,
869871
[SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardNamePage').default,
870872
[SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitPage').default,
871-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage').default,
873+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage').default,
872874
[SCREENS.WORKSPACE.COMPANY_CARDS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage').default,
873875
[SCREENS.WORKSPACE.COMPANY_CARDS_SETTINGS_FEED_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage').default,
874876
[SCREENS.WORKSPACE.COMPANY_CARDS_SETTINGS_STATEMENT_CLOSE_DATE]: () =>

‎src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,17 +268,17 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
268268
SCREENS.WORKSPACE.COMPANY_CARD_EXPORT,
269269
],
270270
[SCREENS.WORKSPACE.EXPENSIFY_CARD]: [
271-
SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW,
272-
SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE,
271+
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW,
272+
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE,
273273
SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT,
274274
SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS,
275-
SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT,
275+
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT,
276276
SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY,
277277
SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS,
278278
SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME,
279279
SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT,
280-
SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE,
281-
SCREENS.WORKSPACE.EXPENSIFY_CARD_SELECT_FEED,
280+
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE,
281+
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED,
282282
SCREENS.WORKSPACE.EXPENSIFY_CARD_ADD_WORK_EMAIL,
283283
SCREENS.WORKSPACE.EXPENSIFY_CARD_VERIFY_WORK_EMAIL,
284284
],

‎src/libs/Navigation/linkingConfig/config.ts‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -826,18 +826,12 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
826826
[SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT]: {
827827
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT.route,
828828
},
829-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: {
830-
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.route,
831-
},
832-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE]: {
833-
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE.route,
834-
},
829+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW]: DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.path,
830+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE]: DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE.path,
835831
[SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME]: {
836832
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_NAME.route,
837833
},
838-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE]: {
839-
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE.route,
840-
},
834+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE]: DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE.path,
841835
[SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: {
842836
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.route,
843837
},
@@ -847,12 +841,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
847841
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: {
848842
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_FREQUENCY.route,
849843
},
850-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: {
851-
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT.route,
852-
},
853-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SELECT_FEED]: {
854-
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SELECT_FEED.route,
855-
},
844+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT]: DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT.path,
845+
846+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED]: DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_SELECT_FEED.path,
856847
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ADD_WORK_EMAIL]: {
857848
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_ADD_WORK_EMAIL.route,
858849
},

‎src/libs/Navigation/types.ts‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,31 +1236,25 @@ type SettingsNavigatorParamList = {
12361236
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
12371237
backTo?: Routes;
12381238
};
1239-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: {
1239+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW]: {
12401240
policyID: string;
1241-
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
1242-
backTo?: Routes;
12431241
};
1244-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE]: {
1242+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE]: {
12451243
policyID: string;
1246-
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
1247-
backTo?: Routes;
12481244
};
12491245
[SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: {
12501246
policyID: string;
12511247
};
12521248
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS]: {
12531249
policyID: string;
12541250
};
1255-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: {
1251+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT]: {
12561252
policyID: string;
1257-
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
1258-
backTo?: Routes;
12591253
};
1260-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: {
1254+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED]: {
12611255
policyID: string;
12621256
};
1263-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SELECT_FEED]: {
1257+
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: {
12641258
policyID: string;
12651259
};
12661260
[SCREENS.WORKSPACE.EXPENSIFY_CARD_ADD_WORK_EMAIL]: {
@@ -1374,7 +1368,7 @@ type SettingsNavigatorParamList = {
13741368
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
13751369
backTo?: Routes;
13761370
};
1377-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE]: {
1371+
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE]: {
13781372
policyID: string;
13791373
cardID: string;
13801374
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md

0 commit comments

Comments
 (0)