diff --git a/src/ROUTES.ts b/src/ROUTES.ts index dcda868efb942..0126d8736f1fa 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -154,10 +154,18 @@ const ROUTES = { route: 'settings/wallet/card/:cardID?', getRoute: (cardID: string) => `settings/wallet/card/${cardID}` as const, }, + SETTINGS_DOMAINCARD_DETAIL: { + route: 'settings/card/:cardID?', + getRoute: (cardID: string) => `settings/card/${cardID}` as const, + }, SETTINGS_REPORT_FRAUD: { route: 'settings/wallet/card/:cardID/report-virtual-fraud', getRoute: (cardID: string) => `settings/wallet/card/${cardID}/report-virtual-fraud` as const, }, + SETTINGS_DOMAINCARD_REPORT_FRAUD: { + route: 'settings/card/:cardID/report-virtual-fraud', + getRoute: (cardID: string) => `settings/card/${cardID}/report-virtual-fraud` as const, + }, SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME: { route: 'settings/wallet/card/:domain/get-physical/name', getRoute: (domain: string) => `settings/wallet/card/${domain}/get-physical/name` as const, @@ -1015,18 +1023,34 @@ const ROUTES = { route: 'settings/workspaces/:policyID/expensify-card/:cardID', getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/expensify-card/${cardID}`, backTo), }, + EXPENSIFY_CARD_DETAILS: { + route: 'settings/:policyID/expensify-card/:cardID', + getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/${policyID}/expensify-card/${cardID}`, backTo), + }, WORKSPACE_EXPENSIFY_CARD_NAME: { route: 'settings/workspaces/:policyID/expensify-card/:cardID/edit/name', getRoute: (policyID: string, cardID: string) => `settings/workspaces/${policyID}/expensify-card/${cardID}/edit/name` as const, }, + EXPENSIFY_CARD_NAME: { + route: 'settings/:policyID/expensify-card/:cardID/edit/name', + getRoute: (policyID: string, cardID: string) => `settings/${policyID}/expensify-card/${cardID}/edit/name` as const, + }, WORKSPACE_EXPENSIFY_CARD_LIMIT: { route: 'settings/workspaces/:policyID/expensify-card/:cardID/edit/limit', getRoute: (policyID: string, cardID: string) => `settings/workspaces/${policyID}/expensify-card/${cardID}/edit/limit` as const, }, + EXPENSIFY_CARD_LIMIT: { + route: 'settings/:policyID/expensify-card/:cardID/edit/limit', + getRoute: (policyID: string, cardID: string) => `settings/${policyID}/expensify-card/${cardID}/edit/limit` as const, + }, WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE: { route: 'settings/workspaces/:policyID/expensify-card/:cardID/edit/limit-type', getRoute: (policyID: string, cardID: string) => `settings/workspaces/${policyID}/expensify-card/${cardID}/edit/limit-type` as const, }, + EXPENSIFY_CARD_LIMIT_TYPE: { + route: 'settings/:policyID/expensify-card/:cardID/edit/limit-type', + getRoute: (policyID: string, cardID: string) => `settings/${policyID}/expensify-card/${cardID}/edit/limit-type` as const, + }, WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: { route: 'settings/workspaces/:policyID/expensify-card/issue-new', getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/expensify-card/issue-new`, backTo), diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 9186c2b58bfaa..0e87ec8c36c7d 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -176,6 +176,8 @@ const SCREENS = { SEARCH_ADVANCED_FILTERS: 'SearchAdvancedFilters', SEARCH_SAVED_SEARCH: 'SearchSavedSearch', SETTINGS_CATEGORIES: 'SettingsCategories', + EXPENSIFY_CARD: 'ExpensifyCard', + DOMAIN_CARD: 'DomainCard', RESTRICTED_ACTION: 'RestrictedAction', REPORT_EXPORT: 'Report_Export', MISSING_PERSONAL_DETAILS: 'MissingPersonalDetails', @@ -244,6 +246,16 @@ const SCREENS = { SETTINGS_CATEGORY_EDIT: 'Settings_Category_Edit', SETTINGS_CATEGORIES_ROOT: 'Settings_Categories', }, + EXPENSIFY_CARD: { + EXPENSIFY_CARD_DETAILS: 'Expensify_Card_Details', + EXPENSIFY_CARD_NAME: 'Expensify_Card_Name', + EXPENSIFY_CARD_LIMIT: 'Expensify_Card_Limit', + EXPENSIFY_CARD_LIMIT_TYPE: 'Expensify_Card_Limit_Type', + }, + DOMAIN_CARD: { + DOMAIN_CARD_DETAIL: 'Domain_Card_Detail', + DOMAIN_CARD_REPORT_FRAUD: 'Domain_Card_Report_Fraud', + }, SETTINGS_TAGS_ROOT: 'Settings_Tags', diff --git a/src/components/ReportActionItem/IssueCardMessage.tsx b/src/components/ReportActionItem/IssueCardMessage.tsx index c1f4e534a3c19..c9fa9a6f2df0a 100644 --- a/src/components/ReportActionItem/IssueCardMessage.tsx +++ b/src/components/ReportActionItem/IssueCardMessage.tsx @@ -16,9 +16,10 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject'; type IssueCardMessageProps = { action: OnyxEntry; + policyID: string | undefined; }; -function IssueCardMessage({action}: IssueCardMessageProps) { +function IssueCardMessage({action, policyID}: IssueCardMessageProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS); @@ -40,7 +41,7 @@ function IssueCardMessage({action}: IssueCardMessageProps) { return ( <> - ${ReportActionsUtils.getCardIssuedMessage(action, true)}`} /> + ${ReportActionsUtils.getCardIssuedMessage(action, true, policyID)}`} /> {shouldShowAddMissingDetailsButton && (