Merge branch 'main' of github.com:callstack-internal/Expensify-App into perf-send-message-phase-3

Author: LukasMod

src/ROUTES.ts

@@ -2751,10 +2751,17 @@ const ROUTES = {
     },
     WORKSPACE_EXPENSIFY_CARD_SELECT_FEED: {
         route: 'workspaces/:policyID/expensify-card/select-feed',
-
         // eslint-disable-next-line no-restricted-syntax -- Legacy route generation
         getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/expensify-card/select-feed`, backTo),
     },
+    WORKSPACE_EXPENSIFY_CARD_ADD_WORK_EMAIL: {
+        route: 'workspaces/:policyID/expensify-card/:fundID/work-email',
+        getRoute: (policyID: string, fundID: number) => `workspaces/${policyID}/expensify-card/${encodeURIComponent(fundID)}/work-email` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_VERIFY_WORK_EMAIL: {
+        route: 'workspaces/:policyID/expensify-card/:fundID/verify-work-email',
+        getRoute: (policyID: string, fundID: number) => `workspaces/${policyID}/expensify-card/${encodeURIComponent(fundID)}/verify-work-email` as const,
+    },
     WORKSPACE_EXPENSIFY_CARD_SETTINGS_FREQUENCY: {
         route: 'workspaces/:policyID/expensify-card/settings/frequency',
         getRoute: (policyID: string) => `workspaces/${policyID}/expensify-card/settings/frequency` as const,

src/SCREENS.ts

@@ -699,6 +699,8 @@ const SCREENS = {
         EXPENSIFY_CARD_ISSUE_NEW_CONFIRM_MAGIC_CODE: 'Workspace_ExpensifyCard_New_Confirm_Magic_Code',
         EXPENSIFY_CARD_NAME: 'Workspace_ExpensifyCard_Name',
         EXPENSIFY_CARD_SELECT_FEED: 'Workspace_ExpensifyCard_Select_Feed',
+        EXPENSIFY_CARD_ADD_WORK_EMAIL: 'Workspace_ExpensifyCard_Add_Work_Email',
+        EXPENSIFY_CARD_VERIFY_WORK_EMAIL: 'Workspace_ExpensifyCard_Verify_Work_Email',
         EXPENSIFY_CARD_LIMIT_TYPE: 'Workspace_ExpensifyCard_LimitType',
         EXPENSIFY_CARD_BANK_ACCOUNT: 'Workspace_ExpensifyCard_BankAccount',
         EXPENSIFY_CARD_SETTINGS: 'Workspace_ExpensifyCard_Settings',

src/components/MoneyReportHeader.tsx

@@ -705,6 +705,7 @@ function MoneyReportHeaderContent({reportID: reportIDProp, shouldDisplayBackButt
                 }
                 approveMoneyRequest({
                     expenseReport: moneyRequestReport,
+                    expenseReportPolicy: policy,
                     policy,
                     currentUserAccountIDParam: accountID,
                     currentUserEmailParam: email ?? '',
@@ -1917,6 +1918,7 @@ function MoneyReportHeaderContent({reportID: reportIDProp, shouldDisplayBackButt
                 event,
                 iouPaymentType,
                 triggerKYCFlow,
+                expenseReportPolicy: policy,
                 policy,
                 onPress: confirmPayment,
                 currentAccountID: accountID,

src/components/MoneyReportHeaderPrimaryAction/useConfirmApproval.ts

@@ -43,6 +43,7 @@ function useConfirmApproval(reportID: string | undefined, startApprovedAnimation
             startApprovedAnimation();
             approveMoneyRequest({
                 expenseReport: moneyRequestReport,
+                expenseReportPolicy: policy,
                 policy,
                 currentUserAccountIDParam: accountID,
                 currentUserEmailParam: email ?? '',

src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx

@@ -32,6 +32,7 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
     const activePolicy = usePolicy(activePolicyID);
     const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`);
+    const [expenseReportPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`);
     const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
     const [iouReportNextStep] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReportID}`);
     const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
@@ -51,6 +52,7 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe
         } else {
             approveMoneyRequest({
                 expenseReport: iouReport,
+                expenseReportPolicy,
                 policy: activePolicy,
                 currentUserAccountIDParam: currentUserAccountID,
                 currentUserEmailParam: currentUserEmail,

src/components/MoneyRequestReportView/SelectionToolbar.tsx

@@ -116,6 +116,7 @@ function PayActionButton({
         } else {
             approveMoneyRequest({
                 expenseReport: iouReport,
+                expenseReportPolicy: policy,
                 policy: activePolicy,
                 currentUserAccountIDParam: currentUserAccountID,
                 currentUserEmailParam: currentUserEmail,

src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx

@@ -106,6 +106,7 @@ function SettlementButton({
     const {translate, localeCompare} = useLocalize();
     const {isOffline} = useNetwork();
     const policy = usePolicy(policyID);
+    const expenseReportPolicy = usePolicy(iouReport?.policyID);
     const {accountID, email} = useCurrentUserPersonalDetails();
 
     // The app would crash due to subscribing to the entire report collection if chatReportID is an empty string. So we should have a fallback ID here.
@@ -498,6 +499,7 @@ function SettlementButton({
             } else {
                 approveMoneyRequest({
                     expenseReport: iouReport,
+                    expenseReportPolicy,
                     policy,
                     currentUserAccountIDParam: accountID,
                     currentUserEmailParam: email ?? '',

src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx

@@ -1,6 +1,12 @@
 import {useCallback} from 'react';
 import type {OnyxCollection} from 'react-native-onyx';
-import {getCardSettings, getFundIdFromSettingsKey} from '@libs/CardUtils';
+import {
+    getCardSettings,
+    getFundIdFromSettingsKey,
+    getLinkedPolicyIDsFromExpensifyCardSettings,
+    getPreferredPolicyFromExpensifyCardSettings,
+    isPolicyIDInLinkedExpensifyCardPolicyList,
+} from '@libs/CardUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ExpensifyCardSettings} from '@src/types/onyx';
@@ -19,12 +25,21 @@ function useDefaultFundID(policyID: string | undefined) {
 
     const getDomainFundID = useCallback(
         (cardSettings: OnyxCollection<ExpensifyCardSettings>) => {
-            const matchingKey = Object.entries(cardSettings ?? {}).find(
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                ([key, settings]) => settings?.preferredPolicy && settings.preferredPolicy === policyID && !key.includes(workspaceAccountID.toString()),
-            );
+            const eligibleEntries = Object.entries(cardSettings ?? {}).filter(([key, settings]) => !!settings && !key.includes(workspaceAccountID.toString()));
 
-            return getFundIdFromSettingsKey(matchingKey?.[0] ?? '');
+            if (policyID) {
+                const preferredMatch = eligibleEntries.find(([, settings]) => getPreferredPolicyFromExpensifyCardSettings(settings)?.toUpperCase() === policyID.toUpperCase());
+                if (preferredMatch) {
+                    return getFundIdFromSettingsKey(preferredMatch[0]);
+                }
+
+                const linkedMatch = eligibleEntries.find(([, settings]) => isPolicyIDInLinkedExpensifyCardPolicyList(getLinkedPolicyIDsFromExpensifyCardSettings(settings), policyID));
+                if (linkedMatch) {
+                    return getFundIdFromSettingsKey(linkedMatch[0]);
+                }
+            }
+
+            return getFundIdFromSettingsKey('');
         },
         [policyID, workspaceAccountID],
     );