Skip to content

Commit 4945eae

Browse files
committed
update policyID
1 parent f94ce70 commit 4945eae

5 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/ROUTES.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,15 +466,15 @@ const DYNAMIC_ROUTES = {
466466
],
467467
},
468468
EXPENSIFY_CARD_DETAILS: {
469-
path: 'expensify-card-details/:cardID',
469+
path: 'expensify-card-details/:cardID/:policyID',
470470
entryScreens: [
471471
SCREENS.WORKSPACE.EXPENSIFY_CARD,
472472
SCREENS.REPORT,
473473
SCREENS.RIGHT_MODAL.SEARCH_REPORT,
474474
SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT,
475475
SCREENS.RIGHT_MODAL.EXPENSE_REPORT,
476476
],
477-
getRoute: (cardID: string) => `expensify-card-details/${cardID}` as const,
477+
getRoute: (cardID: string, policyID: string) => `expensify-card-details/${cardID}/${policyID}` as const,
478478
},
479479
EXPENSIFY_CARD_LIMIT_TYPE: {
480480
path: 'edit/limit-type',

src/libs/ReportActionsUtils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4355,6 +4355,7 @@ function getCardIssuedMessage({
43554355
reportAction,
43564356
shouldRenderHTML = false,
43574357
shouldNavigateToCardDetails = false,
4358+
policyID = '-1',
43584359
expensifyCard,
43594360
companyCard,
43604361
translate,
@@ -4374,7 +4375,7 @@ function getCardIssuedMessage({
43744375
const assignee = shouldRenderHTML ? `<mention-user accountID="${assigneeAccountID}"/>` : Parser.htmlToText(`<mention-user accountID="${assigneeAccountID}"/>`);
43754376

43764377
const navigateRoute = shouldNavigateToCardDetails
4377-
? createDynamicRoute(DYNAMIC_ROUTES.EXPENSIFY_CARD_DETAILS.getRoute(String(cardID)))
4378+
? createDynamicRoute(DYNAMIC_ROUTES.EXPENSIFY_CARD_DETAILS.getRoute(String(cardID), policyID))
43784379
: ROUTES.SETTINGS_DOMAIN_CARD_DETAIL.getRoute(String(cardID));
43794380
const isExpensifyCardActive = isCardActive(expensifyCard);
43804381
const expensifyCardLink = (expensifyCardLinkText: string) =>

src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function DynamicExpensifyCardLimitPage({route}: DynamicExpensifyCardLimitPagePro
6868
};
6969

7070
const goBack = useCallback(() => {
71-
Navigation.goBack(backPath);
71+
Navigation.goBack(backPath, {compareParams: false});
7272
}, [backPath]);
7373

7474
const updateCardLimit = (newLimit: number) => {

src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitTypePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function DynamicExpensifyCardLimitTypePage({route}: WorkspaceEditCardLimitTypePa
7575
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.EXPENSIFY_CARD_LIMIT_TYPE.path);
7676

7777
const goBack = () => {
78-
Navigation.goBack(backPath);
78+
Navigation.goBack(backPath, {compareParams: false});
7979
};
8080

8181
const fetchCardLimitTypeData = () => {

src/pages/workspace/expensifyCard/DynamicExpensifyCardNamePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function DynamicExpensifyCardNamePage({route}: DynamicExpensifyCardNamePageProps
4040
const card = cardsList?.[cardID];
4141

4242
const goBack = useCallback(() => {
43-
Navigation.goBack(backPath);
43+
Navigation.goBack(backPath, {compareParams: false});
4444
}, [backPath]);
4545

4646
const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM>) => {

0 commit comments

Comments
 (0)