Merge branch 'Expensify:main' into issue/63704

allgandalf · web-flow · commit b26837b1bc11 · 2025-07-14T12:04:43.000+05:30
diff --git a/docs/articles/expensify-classic/settings/Report-Suspicious-Activity.md b/docs/articles/expensify-classic/settings/Report-Suspicious-Activity.md
@@ -1,6 +1,6 @@
 ---
-title: Locked Account Tool
-description: Understand how the locked account tool works in Expensify Classic, what features it restricts, and how to request an unlock.
+title: Report Suspicious Activity
+description: Learn how to report suspicious activity and lock your account in Expensify Classic, what features it restricts, and how to request an unlock.
 keywords: [locked account, Expensify Classic, domain admin, secondary login, reimbursements blocked, card locked, unlock account]
 ---
 <div id="expensify-classic" markdown="1">
@@ -11,7 +11,7 @@ The locked account tool prevents high-risk actions from being taken on accounts
 
 ## When is it appropriate to click the button for your own account or for your employee’s account?
 
-Use the **Lock Account** button if:
+Use the **Report Suspicious Activity** button if:
 - You suspect unauthorized activity on your own or an employee's account.
 - There are changes to bank accounts, logins, or suspicious payment activity.
 - You want to pause activity on an account until Concierge investigates.
@@ -22,6 +22,11 @@ Use the **Lock Account** button if:
 
 The following actions are restricted when an account is locked in Expensify Classic:
 
+## Admin Functionality
+
+- If you are the owner of a reimbursement account in Expensify, all ability to process reimbursements for anyone with access to the bank account will be locked. 
+- If you are a Domain Admin and have Expensify Cards, all Expensify Cards for the domain or workspace will be locked and all card activity will be suspended.
+
 ### Profile settings
 - Adding a secondary login
 - Adding or removing Two Factor Authentication (2FA)
@@ -60,9 +65,9 @@ The following actions are restricted when an account is locked in Expensify Clas
 ## How to do it?
 
 
-- **Members:** The **Lock Account** button appears at the bottom of the screen in `Settings > Account > Profile`.
+- **Members:** The **Report Suspicious Activity** button appears at the bottom of the screen in `Settings > Account > Profile`.
 
-- **Domain Admins:** You can lock a domain member's account using the **Lock Account** option located in `Settings > Domains > Domain Members > Edit Settings`.
+- **Domain Admins:** You can lock a domain member's account using the **Report Suspicious Activity** option located in `Settings > Domains > Domain Members > Edit Settings`.
 
 ---
 
diff --git a/docs/articles/new-expensify/settings/Report-Suspicious-Activity.md b/docs/articles/new-expensify/settings/Report-Suspicious-Activity.md
@@ -1,17 +1,17 @@
 ---
-title: Lock Account Tool
-description: Learn how the locked account tool works in New Expensify, when to use it, what features are blocked, and how users can regain access.
-keywords: [locked account, New Expensify, lock features, wallet disabled, card suspended, 2FA blocked, unlock account]
+title: Report Suspicious Activity
+description: Learn how to report suspicious activity and lock your account in New Expensify, when to use it, what features are blocked, and how users can regain access.
+keywords: [locked account, New Expensify, lock features, wallet disabled, card suspended, 2FA blocked, unlock account, suspicious activity]
 ---
 <div id="new-expensify" markdown="1">
 
 The Lock Account tool blocks access to high-risk features when an account is suspected to be compromised. It protects sensitive data by preventing unauthorized actions and triggering internal review by the Expensify team.
 
 ---
 
-# When to Use the Lock Account Button
+# When to Use the Report Suspicious Activity Button
 
-Click the **Lock Account** button if:
+Click the **Report Suspicious Activity** button if:
 
 - You believe your own account has been compromised (e.g., suspicious logins, changes to contact info, or unfamiliar devices).
 - You’re a Workspace Admin and suspect an employee’s account is at risk.
@@ -25,6 +25,11 @@ Locking the account restricts access to sensitive features and alerts Concierge
 
 The following actions will be blocked when an account is locked:
 
+## Admin Functionality
+
+- If you are the owner of a reimbursement account in Expensify, all ability to process reimbursements for anyone with access to the bank account will be locked. 
+- If you are a Domain Admin and have Expensify Cards, all Expensify Cards for the domain or workspace will be locked and all card activity will be suspended. 
+
 ## Contact & Security
 - Adding or removing a contact method
 - Changing the default contact method
@@ -61,15 +66,15 @@ The following actions will be blocked when an account is locked:
 To lock your own account or an employee’s account:
 
 1. Go to **Account > Security**.
-2. Click **Lock Account**.
+2. Click **Report Suspicious Activity**.
 
 ⚠️ **Important:** This action is not reversible from within the product. Once an account is locked, only Expensify Support can unlock it.
 
 ---
 
 # How to Unlock an Account
 
-Unlocking a locked account requires assistance from Expensify Support. Once you click **Lock Account**, Concierge will begin reviewing the account and contact you with the next steps. You may be asked to:
+Unlocking a locked account requires assistance from Expensify Support. Once you click **Report Suspicious Activity**, Concierge will begin reviewing the account and contact you with the next steps. You may be asked to:
 
 - Verify identity
 - Reset login credentials
diff --git a/docs/redirects.csv b/docs/redirects.csv
@@ -866,5 +866,7 @@ https://help.expensify.com/articles/new-expensify/reports-and-expenses/Duplicate
 https://help.expensify.com/articles/new-expensify/expenses-&-payments/Duplicate-detection.html,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Duplicate-Detection
 https://help.expensify.com/articles/new-expensify/reports-and-expenses/Export-download-expenses,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Search-and-Download-Expenses
 https://help.expensify.com/articles/new-expensify/expenses-and-payments/Send-an-invoice.html,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Send-an-Invoice
+https://help.expensify.com/articles/expensify-classic/settings/Locked-Account-Tool,https://help.expensify.com/articles/expensify-classic/settings/Report-Suspicious-Activity
+https://help.expensify.com/articles/new-expensify/settings/Lock-Account-Tool,https://help.expensify.com/articles/new-expensify/settings/Report-Suspicious-Activity
 https://help.expensify.com/articles/new-expensify/reports-and-expenses/Split-Expenses,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Split-Personal-Expenses
 https://help.expensify.com/articles/new-expensify/reports-and-expenses/Suggested-Search,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Using-Search-on-the-Reports-Page
diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx
@@ -8,6 +8,7 @@ import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {setSpreadsheetData} from '@libs/actions/ImportSpreadsheet';
+import {setImportedSpreadsheetIsImportingMultiLevelTags} from '@libs/actions/Policy/Tag';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import {splitExtensionFromFileName} from '@libs/fileDownload/FileUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -155,7 +156,9 @@ function ImportSpreadsheet({backTo, goTo}: ImportSpreadsheetProps) {
                 {...panResponder.panHandlers}
             >
                 <Text style={[styles.textFileUpload, styles.mb1]}>{spreadsheet?.isImportingMultiLevelTags ? translate('spreadsheet.import') : translate('spreadsheet.upload')}</Text>
-                <RenderHTML html={getTextForImportModal()} />
+                <Text style={[styles.subTextFileUpload, styles.textSupporting]}>
+                    <RenderHTML html={getTextForImportModal()} />
+                </Text>
             </View>
             <FilePicker acceptableFileTypes={acceptableFileTypes}>
                 {({openPicker}) => (
@@ -195,7 +198,12 @@ function ImportSpreadsheet({backTo, goTo}: ImportSpreadsheetProps) {
                     <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                         <HeaderWithBackButton
                             title={translate('spreadsheet.importSpreadsheet')}
-                            onBackButtonPress={() => Navigation.goBack(backTo)}
+                            onBackButtonPress={() => {
+                                if (spreadsheet?.isImportingMultiLevelTags) {
+                                    setImportedSpreadsheetIsImportingMultiLevelTags(false);
+                                }
+                                Navigation.goBack(backTo);
+                            }}
                         />
 
                         <View style={[styles.flex1, styles.uploadFileView(isSmallScreenWidth)]}>
diff --git a/src/components/KYCWall/BaseKYCWall.tsx b/src/components/KYCWall/BaseKYCWall.tsx
@@ -109,7 +109,7 @@ function KYCWall({
             }
 
             if (paymentMethod === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT) {
-                openPersonalBankAccountSetupView();
+                openPersonalBankAccountSetupView({shouldSetUpUSBankAccount: isIOUReport(iouReport)});
             } else if (paymentMethod === CONST.PAYMENT_METHODS.DEBIT_CARD) {
                 Navigation.navigate(addDebitCardRoute ?? ROUTES.HOME);
             } else if (paymentMethod === CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT || policy) {
diff --git a/src/libs/PaymentUtils.ts b/src/libs/PaymentUtils.ts
@@ -26,13 +26,18 @@ type TriggerKYCFlow = (event: KYCFlowEvent, iouPaymentType: PaymentMethodType) =
 type AccountType = ValueOf<typeof CONST.PAYMENT_METHODS> | undefined;
 
 /**
- * Check to see if user has either a debit card or personal bank account added that can be used with a wallet.
+ * Check to see if user has either a debit card or personal US bank account added that can be used with a wallet.
  */
 function hasExpensifyPaymentMethod(fundList: Record<string, Fund>, bankAccountList: Record<string, BankAccount>, shouldIncludeDebitCard = true): boolean {
     const validBankAccount = Object.values(bankAccountList).some((bankAccountJSON) => {
         const bankAccount = new BankAccountModel(bankAccountJSON);
 
-        return bankAccount.getPendingAction() !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && bankAccount.isOpen() && bankAccount.getType() === CONST.BANK_ACCOUNT.TYPE.PERSONAL;
+        return (
+            bankAccount.getPendingAction() !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
+            bankAccount.isOpen() &&
+            bankAccount.getType() === CONST.BANK_ACCOUNT.TYPE.PERSONAL &&
+            bankAccount?.getCountry() === CONST.COUNTRY.US
+        );
     });
 
     // Hide any billing cards that are not P2P debit cards for now because you cannot make them your default method, or delete them
diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts
@@ -51,6 +51,23 @@ export {openOnfidoFlow, answerQuestionsForWallet, verifyIdentity, acceptWalletTe
 
 type AccountFormValues = typeof ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM | typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM;
 
+type OpenPersonalBankAccountSetupViewProps = {
+    /** The reportID of the report to redirect to once the flow is finished */
+    exitReportID?: string;
+
+    /** The policyID of the policy to set the bank account on */
+    policyID?: string;
+
+    /** The source of the bank account */
+    source?: string;
+
+    /** Whether to set up a US bank account */
+    shouldSetUpUSBankAccount?: boolean;
+
+    /** Whether the user is validated */
+    isUserValidated?: boolean;
+};
+
 function clearPlaid(): Promise<void | void[]> {
     Onyx.set(ONYXKEYS.PLAID_LINK_TOKEN, '');
     Onyx.set(ONYXKEYS.PLAID_CURRENT_EVENT, null);
@@ -74,7 +91,7 @@ function setPlaidEvent(eventName: string | null) {
 /**
  * Open the personal bank account setup flow, with an optional exitReportID to redirect to once the flow is finished.
  */
-function openPersonalBankAccountSetupView(exitReportID?: string, policyID?: string, source?: string, isUserValidated = true) {
+function openPersonalBankAccountSetupView({exitReportID, policyID, source, shouldSetUpUSBankAccount = false, isUserValidated = true}: OpenPersonalBankAccountSetupViewProps) {
     clearInternationalBankAccount().then(() => {
         if (exitReportID) {
             Onyx.merge(ONYXKEYS.PERSONAL_BANK_ACCOUNT, {exitReportID});
@@ -89,6 +106,10 @@ function openPersonalBankAccountSetupView(exitReportID?: string, policyID?: stri
             Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_VERIFY_ACCOUNT.getRoute(Navigation.getActiveRoute(), ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route));
             return;
         }
+        if (shouldSetUpUSBankAccount) {
+            Navigation.navigate(ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT);
+            return;
+        }
         Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT.getRoute(Navigation.getActiveRoute()));
     });
 }
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -11225,6 +11225,18 @@ function updateLastLocationPermissionPrompt() {
     Onyx.set(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT, new Date().toISOString());
 }
 
+function setMultipleMoneyRequestParticipantsFromReport(transactionIDs: string[], reportValue: OnyxEntry<OnyxTypes.Report>) {
+    const participants = getMoneyRequestParticipantsFromReport(reportValue);
+    const updatedTransactions: Record<`${typeof ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${string}`, NullishDeep<OnyxTypes.Transaction>> = {};
+    transactionIDs.forEach((transactionID) => {
+        updatedTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`] = {
+            participants,
+            participantsAutoAssigned: true,
+        };
+    });
+    return Onyx.mergeCollection(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, updatedTransactions);
+}
+
 /** Instead of merging the duplicates, it updates the transaction we want to keep and puts the others on hold without deleting them */
 function resolveDuplicates(params: MergeDuplicatesParams) {
     if (!params.transactionID) {
@@ -11685,7 +11697,6 @@ function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction
 
     const originalTransactionID = draftTransaction?.comment?.originalTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID;
     const originalTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`];
-    const originalTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${originalTransactionID}`] ?? [];
     const iouActions = getIOUActionForTransactions([originalTransactionID], expenseReport?.reportID);
 
     // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
@@ -11827,10 +11838,7 @@ function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction
         key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
         value: {
             data: {
-                [`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`]: {
-                    ...originalTransactionViolations,
-                    reportID: CONST.REPORT.SPLIT_REPORT_ID,
-                },
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`]: null,
             },
         },
     });
@@ -11840,7 +11848,7 @@ function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction
         key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
         value: {
             data: {
-                [`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`]: originalTransactionViolations,
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`]: originalTransaction,
             },
         },
     });
@@ -11929,6 +11937,7 @@ export {
     setMoneyRequestParticipantsFromReport,
     getMoneyRequestParticipantsFromReport,
     setMoneyRequestPendingFields,
+    setMultipleMoneyRequestParticipantsFromReport,
     setMoneyRequestReceipt,
     setMoneyRequestTag,
     setMoneyRequestTaxAmount,
diff --git a/src/pages/home/report/PureReportActionItem.tsx b/src/pages/home/report/PureReportActionItem.tsx
@@ -969,7 +969,7 @@ function PureReportActionItem({
                                 success
                                 style={[styles.w100, styles.requestPreviewBox]}
                                 text={translate('bankAccount.addBankAccount')}
-                                onPress={() => openPersonalBankAccountSetupView(Navigation.getTopmostReportId() ?? targetReport?.reportID, undefined, undefined, isUserValidated)}
+                                onPress={() => openPersonalBankAccountSetupView({exitReportID: Navigation.getTopmostReportId() ?? targetReport?.reportID, isUserValidated})}
                                 pressOnEnter
                                 large
                             />
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
@@ -61,6 +61,7 @@ import {
     setMoneyRequestParticipants,
     setMoneyRequestParticipantsFromReport,
     setMoneyRequestReceipt,
+    setMultipleMoneyRequestParticipantsFromReport,
     startSplitBill,
     trackExpense,
     updateLastLocationPermissionPrompt,
@@ -499,9 +500,8 @@ function IOURequestStepScan({
                     createTransaction(files, participant);
                     return;
                 }
-
-                const setParticipantsPromises = files.map((receiptFile) => setMoneyRequestParticipantsFromReport(receiptFile.transactionID, report));
-                Promise.all(setParticipantsPromises).then(() => navigateToConfirmationPage());
+                const transactionIDs = files.map((receiptFile) => receiptFile.transactionID);
+                setMultipleMoneyRequestParticipantsFromReport(transactionIDs, report).then(() => navigateToConfirmationPage());
                 return;
             }
 
diff --git a/src/pages/settings/Wallet/ChooseTransferAccountPage.tsx b/src/pages/settings/Wallet/ChooseTransferAccountPage.tsx
@@ -15,8 +15,8 @@ import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {getLastFourDigits} from '@libs/BankAccountUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import * as BankAccounts from '@userActions/BankAccounts';
-import * as PaymentMethods from '@userActions/PaymentMethods';
+import {openPersonalBankAccountSetupView} from '@userActions/BankAccounts';
+import {saveWalletTransferAccountTypeAndID} from '@userActions/PaymentMethods';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -30,7 +30,7 @@ type BankAccountListItem = ListItem & {
 };
 
 function ChooseTransferAccountPage() {
-    const [walletTransfer, walletTransferResult] = useOnyx(ONYXKEYS.WALLET_TRANSFER);
+    const [walletTransfer, walletTransferResult] = useOnyx(ONYXKEYS.WALLET_TRANSFER, {canBeMissing: true});
 
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -41,7 +41,7 @@ function ChooseTransferAccountPage() {
      * @param account of the selected account data
      */
     const selectAccountAndNavigateBack = (accountType?: string, account?: AccountData) => {
-        PaymentMethods.saveWalletTransferAccountTypeAndID(
+        saveWalletTransferAccountTypeAndID(
             accountType ?? '',
             (accountType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT ? account?.bankAccountID?.toString() : account?.fundID?.toString()) ?? '',
         );
@@ -53,10 +53,10 @@ function ChooseTransferAccountPage() {
             Navigation.navigate(ROUTES.SETTINGS_ADD_DEBIT_CARD);
             return;
         }
-        BankAccounts.openPersonalBankAccountSetupView();
+        openPersonalBankAccountSetupView({});
     };
 
-    const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {canBeMissing: true});
     const selectedAccountID = walletTransfer?.selectedAccountID;
     const data = useMemo(() => {
         const options = Object.values(bankAccountsList ?? {}).map((bankAccount): BankAccountListItem => {
diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
@@ -250,7 +250,7 @@ function WalletPage({shouldListenForResize = false}: WalletPageProps) {
             return;
         }
         if (paymentType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT || paymentType === CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT) {
-            openPersonalBankAccountSetupView();
+            openPersonalBankAccountSetupView({});
             return;
         }
 
diff --git a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ function KYCWall({`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`if (paymentMethod === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT) {`
`112`		`- openPersonalBankAccountSetupView();`
	`112`	`+ openPersonalBankAccountSetupView({shouldSetUpUSBankAccount: isIOUReport(iouReport)});`
`113`	`113`	`} else if (paymentMethod === CONST.PAYMENT_METHODS.DEBIT_CARD) {`
`114`	`114`	`Navigation.navigate(addDebitCardRoute ?? ROUTES.HOME);`
`115`	`115`	`} else if (paymentMethod === CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT \|\| policy) {`