Skip to content

Commit 0b54313

Browse files
mjasikowskimjasikowski
authored
Merge pull request Expensify#89978 from huult/83836-migrate-expensify-cards-settings-version-2
83836 migrate expensify cards settings version 2
2 parents 9102f4d + c2f1edc commit 0b54313

10 files changed

Lines changed: 58 additions & 167 deletions

File tree

‎src/ROUTES.ts‎

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,17 @@ const DYNAMIC_ROUTES = {
382382
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW,
383383
],
384384
},
385-
WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE: {
385+
EXPENSIFY_CARD_LIMIT_TYPE: {
386386
path: 'edit/limit-type',
387-
entryScreens: [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS],
387+
entryScreens: [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS, SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_DETAILS],
388+
},
389+
EXPENSIFY_CARD_LIMIT: {
390+
path: 'edit/limit',
391+
entryScreens: [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS, SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_DETAILS],
392+
},
393+
EXPENSIFY_CARD_NAME: {
394+
path: 'edit/name',
395+
entryScreens: [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS, SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_DETAILS],
388396
},
389397
WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT: {
390398
path: 'account',
@@ -2816,36 +2824,6 @@ const ROUTES = {
28162824
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
28172825
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/${policyID}/expensify-card/${cardID}`, backTo),
28182826
},
2819-
WORKSPACE_EXPENSIFY_CARD_NAME: {
2820-
route: 'workspaces/:policyID/expensify-card/:cardID/edit/name',
2821-
2822-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2823-
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/${cardID}/edit/name`, backTo),
2824-
},
2825-
EXPENSIFY_CARD_NAME: {
2826-
route: 'settings/:policyID/expensify-card/:cardID/edit/name',
2827-
2828-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2829-
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/${policyID}/expensify-card/${cardID}/edit/name`, backTo),
2830-
},
2831-
WORKSPACE_EXPENSIFY_CARD_LIMIT: {
2832-
route: 'workspaces/:policyID/expensify-card/:cardID/edit/limit',
2833-
2834-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2835-
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/${cardID}/edit/limit`, backTo),
2836-
},
2837-
EXPENSIFY_CARD_LIMIT: {
2838-
route: 'settings/:policyID/expensify-card/:cardID/edit/limit',
2839-
2840-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2841-
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/${policyID}/expensify-card/${cardID}/edit/limit`, backTo),
2842-
},
2843-
EXPENSIFY_CARD_LIMIT_TYPE: {
2844-
route: 'settings/:policyID/expensify-card/:cardID/edit/limit-type',
2845-
2846-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
2847-
getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/${policyID}/expensify-card/${cardID}/edit/limit-type`, backTo),
2848-
},
28492827
EXPENSIFY_CARD_EXPIRY_OPTIONS: {
28502828
route: 'settings/:policyID/expensify-card/:cardID/edit/expiry-options',
28512829

‎src/SCREENS.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,9 @@ const SCREENS = {
452452
},
453453
EXPENSIFY_CARD: {
454454
EXPENSIFY_CARD_DETAILS: 'Expensify_Card_Details',
455-
EXPENSIFY_CARD_NAME: 'Expensify_Card_Name',
456-
EXPENSIFY_CARD_LIMIT: 'Expensify_Card_Limit',
457-
EXPENSIFY_CARD_LIMIT_TYPE: 'Expensify_Card_Limit_Type',
455+
DYNAMIC_EXPENSIFY_CARD_NAME: 'Dynamic_Expensify_Card_Name',
456+
DYNAMIC_EXPENSIFY_CARD_LIMIT: 'Dynamic_Expensify_Card_Limit',
457+
DYNAMIC_EXPENSIFY_CARD_LIMIT_TYPE: 'Dynamic_Expensify_Card_Limit_Type',
458458
EXPENSIFY_CARD_EXPIRY_OPTIONS: 'Expensify_Card_Expiry_Options',
459459
},
460460
DOMAIN_CARD: {
@@ -717,12 +717,9 @@ const SCREENS = {
717717
COMPANY_CARD_EXPORT: 'Workspace_CompanyCard_Export',
718718
EXPENSIFY_CARD: 'Workspace_ExpensifyCard',
719719
EXPENSIFY_CARD_DETAILS: 'Workspace_ExpensifyCard_Details',
720-
EXPENSIFY_CARD_LIMIT: 'Workspace_ExpensifyCard_Limit',
721720
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: 'Dynamic_Workspace_ExpensifyCard_New',
722721
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE: 'Dynamic_Workspace_ExpensifyCard_IssueNew_ConfirmMagicCode',
723-
EXPENSIFY_CARD_NAME: 'Workspace_ExpensifyCard_Name',
724722
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED: 'Dynamic_Workspace_ExpensifyCard_Select_Feed',
725-
DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE: 'Dynamic_Workspace_ExpensifyCard_LimitType',
726723
EXPENSIFY_CARD_ADD_WORK_EMAIL: 'Workspace_ExpensifyCard_Add_Work_Email',
727724
EXPENSIFY_CARD_VERIFY_WORK_EMAIL: 'Workspace_ExpensifyCard_Verify_Work_Email',
728725
EXPENSIFY_CARD_BANK_ACCOUNT: 'Workspace_ExpensifyCard_BankAccount',

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,9 @@ const TagsModalStackNavigator = createModalStackNavigator({
348348

349349
const ExpensifyCardModalStackNavigator = createModalStackNavigator({
350350
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage').default,
351-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardNamePage').default,
352-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_LIMIT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitPage').default,
353-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_LIMIT_TYPE]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage').default,
351+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/DynamicExpensifyCardNamePage').default,
352+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_LIMIT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/DynamicExpensifyCardLimitPage').default,
353+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_LIMIT_TYPE]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/DynamicExpensifyCardLimitTypePage').default,
354354
});
355355

356356
const DomainCardModalStackNavigator = createModalStackNavigator({
@@ -879,9 +879,6 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
879879
require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardVerifyWorkAccountPage').default,
880880
[SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts').default,
881881
[SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage').default,
882-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardNamePage').default,
883-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitPage').default,
884-
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage').default,
885882
[SCREENS.WORKSPACE.COMPANY_CARDS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage').default,
886883
[SCREENS.WORKSPACE.COMPANY_CARDS_SETTINGS_FEED_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage').default,
887884
[SCREENS.WORKSPACE.COMPANY_CARDS_SETTINGS_STATEMENT_CLOSE_DATE]: () =>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,6 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
275275
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT,
276276
SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY,
277277
SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS,
278-
SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME,
279-
SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT,
280-
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE,
281278
SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED,
282279
SCREENS.WORKSPACE.EXPENSIFY_CARD_ADD_WORK_EMAIL,
283280
SCREENS.WORKSPACE.EXPENSIFY_CARD_VERIFY_WORK_EMAIL,

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -824,15 +824,8 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
824824
[SCREENS.WORKSPACE.COMPANY_CARD_EXPORT]: {
825825
path: ROUTES.WORKSPACE_COMPANY_CARD_EXPORT.route,
826826
},
827-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT]: {
828-
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT.route,
829-
},
830827
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW]: DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.path,
831828
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE]: DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE.path,
832-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME]: {
833-
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_NAME.route,
834-
},
835-
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE]: DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE.path,
836829
[SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: {
837830
path: ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.route,
838831
},
@@ -1559,15 +1552,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
15591552
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_DETAILS]: {
15601553
path: ROUTES.EXPENSIFY_CARD_DETAILS.route,
15611554
},
1562-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_NAME]: {
1563-
path: ROUTES.EXPENSIFY_CARD_NAME.route,
1564-
},
1565-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_LIMIT]: {
1566-
path: ROUTES.EXPENSIFY_CARD_LIMIT.route,
1567-
},
1568-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_LIMIT_TYPE]: {
1569-
path: ROUTES.EXPENSIFY_CARD_LIMIT_TYPE.route,
1570-
},
1555+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_NAME]: DYNAMIC_ROUTES.EXPENSIFY_CARD_NAME.path,
1556+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_LIMIT]: DYNAMIC_ROUTES.EXPENSIFY_CARD_LIMIT.path,
1557+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_LIMIT_TYPE]: DYNAMIC_ROUTES.EXPENSIFY_CARD_LIMIT_TYPE.path,
15711558
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_EXPIRY_OPTIONS]: {
15721559
path: ROUTES.EXPENSIFY_CARD_EXPIRY_OPTIONS.route,
15731560
},

‎src/libs/Navigation/types.ts‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,47 +1352,23 @@ type SettingsNavigatorParamList = {
13521352
// 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
13531353
backTo?: Routes;
13541354
};
1355-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME]: {
1356-
policyID: string;
1357-
cardID: string;
1358-
// 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
1359-
backTo?: Routes;
1360-
};
1361-
[SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT]: {
1362-
policyID: string;
1363-
cardID: string;
1364-
// 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
1365-
backTo?: Routes;
1366-
};
1367-
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE]: {
1368-
policyID: string;
1369-
cardID: string;
1370-
// 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
1371-
backTo?: Routes;
1372-
};
13731355
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_DETAILS]: {
13741356
policyID: string;
13751357
cardID: string;
13761358
// 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
13771359
backTo?: Routes;
13781360
};
1379-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_NAME]: {
1361+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_NAME]: {
13801362
policyID: string;
13811363
cardID: string;
1382-
// 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
1383-
backTo?: Routes;
13841364
};
1385-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_LIMIT]: {
1365+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_LIMIT]: {
13861366
policyID: string;
13871367
cardID: string;
1388-
// 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
1389-
backTo?: Routes;
13901368
};
1391-
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_LIMIT_TYPE]: {
1369+
[SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_LIMIT_TYPE]: {
13921370
policyID: string;
13931371
cardID: string;
1394-
// 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
1395-
backTo?: Routes;
13961372
};
13971373
[SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_EXPIRY_OPTIONS]: {
13981374
policyID: string;

src/pages/workspace/expensifyCard/WorkspaceEditCardLimitPage.tsx renamed to src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitPage.tsx

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
1010
import useCurrencyForExpensifyCard from '@hooks/useCurrencyForExpensifyCard';
1111
import {useCurrencyListActions} from '@hooks/useCurrencyList';
1212
import useDefaultFundID from '@hooks/useDefaultFundID';
13+
import useDynamicBackPath from '@hooks/useDynamicBackPath';
1314
import useLocalize from '@hooks/useLocalize';
1415
import useOnyx from '@hooks/useOnyx';
1516
import useThemeStyles from '@hooks/useThemeStyles';
@@ -23,25 +24,23 @@ import type {SettingsNavigatorParamList} from '@navigation/types';
2324
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
2425
import CONST from '@src/CONST';
2526
import ONYXKEYS from '@src/ONYXKEYS';
26-
import ROUTES from '@src/ROUTES';
27-
import SCREENS from '@src/SCREENS';
27+
import {DYNAMIC_ROUTES} from '@src/ROUTES';
28+
import type SCREENS from '@src/SCREENS';
2829
import INPUT_IDS from '@src/types/form/EditExpensifyCardLimitForm';
2930

3031
type ConfirmationWarningTranslationPaths = 'workspace.expensifyCard.smartLimitWarning' | 'workspace.expensifyCard.monthlyLimitWarning' | 'workspace.expensifyCard.fixedLimitWarning';
3132

32-
type WorkspaceEditCardLimitPageProps = PlatformStackScreenProps<
33-
SettingsNavigatorParamList,
34-
typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT | typeof SCREENS.EXPENSIFY_CARD.EXPENSIFY_CARD_LIMIT
35-
>;
33+
type DynamicExpensifyCardLimitPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_LIMIT>;
3634

37-
function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) {
38-
const {policyID, cardID, backTo} = route.params;
35+
function DynamicExpensifyCardLimitPage({route}: DynamicExpensifyCardLimitPageProps) {
36+
const {policyID, cardID} = route.params;
3937
const {convertToDisplayString} = useCurrencyListActions();
4038
const {translate} = useLocalize();
4139
const {inputCallbackRef} = useAutoFocusInput();
4240
const styles = useThemeStyles();
4341
const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
4442
const defaultFundID = useDefaultFundID(policyID);
43+
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.EXPENSIFY_CARD_LIMIT.path);
4544

4645
const currency = useCurrencyForExpensifyCard({policyID});
4746

@@ -68,15 +67,9 @@ function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) {
6867
return newLimit - currentSpend;
6968
};
7069

71-
const isWorkspaceRhp = route.name === SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT;
72-
7370
const goBack = useCallback(() => {
74-
if (backTo) {
75-
Navigation.goBack(backTo);
76-
return;
77-
}
78-
Navigation.goBack(isWorkspaceRhp ? ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.getRoute(policyID, cardID) : ROUTES.EXPENSIFY_CARD_DETAILS.getRoute(policyID, cardID));
79-
}, [backTo, isWorkspaceRhp, policyID, cardID]);
71+
Navigation.goBack(backPath);
72+
}, [backPath]);
8073

8174
const updateCardLimit = (newLimit: number) => {
8275
const newAvailableSpend = getNewAvailableSpend(newLimit);
@@ -112,7 +105,6 @@ function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) {
112105
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM> => {
113106
const errors = getFieldRequiredErrors(values, [INPUT_IDS.LIMIT], translate);
114107

115-
// We only want integers to be sent as the limit
116108
if (!Number(values.limit)) {
117109
errors.limit = translate('iou.error.invalidAmount');
118110
} else if (!Number.isInteger(Number(values.limit))) {
@@ -134,7 +126,7 @@ function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) {
134126
featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
135127
>
136128
<ScreenWrapper
137-
testID="WorkspaceEditCardLimitPage"
129+
testID="DynamicExpensifyCardLimitPage"
138130
shouldEnablePickerAvoiding={false}
139131
shouldEnableMaxHeight
140132
>
@@ -163,6 +155,8 @@ function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) {
163155
inputID={INPUT_IDS.LIMIT}
164156
ref={inputCallbackRef}
165157
/>
158+
{/* We migrated https://github.com/Expensify/App/issues/83836 to a dynamic card limit page.`ConfirmModal` is deprecated, so we temporarily disabled the ESLint warning for this component. */}
159+
{/* eslint-disable-next-line @typescript-eslint/no-deprecated */}
166160
<ConfirmModal
167161
title={translate('workspace.expensifyCard.changeCardLimit')}
168162
isVisible={isConfirmModalVisible}
@@ -182,4 +176,4 @@ function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) {
182176
);
183177
}
184178

185-
export default WorkspaceEditCardLimitPage;
179+
export default DynamicExpensifyCardLimitPage;

0 commit comments

Comments
 (0)