From 3799f5da19a89ff50589c72e8af3a27bb1ffb616 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 26 Mar 2026 16:00:15 +0000
Subject: [PATCH 01/24] Update CTA and workspace chat copy for track-intent
 users

Uses NVP_INTRO_SELECTED at the user level to identify track-intent
users and conditionally update copy across three areas:
- Workspace chat welcome text: "This is where you will track expenses"
- CTA buttons (Submit/Approve): "Mark as done"
- System messages (submitted/approved): "marked as done"

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/MoneyReportHeader.tsx           | 18 +++++++++++-------
 .../ApproveActionButton.tsx                    |  4 +++-
 .../SubmitActionButton.tsx                     |  4 +++-
 src/components/ReportWelcomeText.tsx           |  3 +++
 src/languages/en.ts                            |  3 +++
 src/languages/es.ts                            |  3 +++
 src/libs/SidebarUtils.ts                       |  7 ++++++-
 .../inbox/report/PureReportActionItem.tsx      | 10 ++++++++--
 src/selectors/Onboarding.ts                    | 10 +++++++++-
 9 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index ab64bc864990..f37dfadf6102 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1,7 +1,7 @@
 import {useRoute} from '@react-navigation/native';
 import {isUserValidatedSelector} from '@selectors/Account';
 import {shouldFailAllRequestsSelector} from '@selectors/Network';
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {hasSeenTourSelector, isTrackIntentUserSelector} from '@selectors/Onboarding';
 import {getArchiveReason} from '@selectors/Report';
 import {validTransactionDraftsSelector} from '@selectors/TransactionDraft';
 import truncate from 'lodash/truncate';
@@ -253,6 +253,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
     const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
 
     const activePolicy = usePolicy(activePolicyID);
     const [integrationsExportTemplates] = useOnyx(ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES);
@@ -1385,11 +1386,14 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
         beginExportWithTemplate,
     ]);
 
+    const submitButtonText = isTrackIntentUser ? translate('common.markAsDone') : translate('common.submit');
+    const approveButtonText = isTrackIntentUser ? translate('common.markAsDone') : translate('iou.approve');
+
     const primaryActionsImplementation = {
         [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
             <AnimatedSubmitButton
                 success
-                text={translate('common.submit')}
+                text={submitButtonText}
                 onPress={() => handleSubmitReport()}
                 isSubmittingAnimationRunning={isSubmittingAnimationRunning}
                 onAnimationFinish={stopAnimation}
@@ -1400,7 +1404,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
             <Button
                 success
                 onPress={() => confirmApproval()}
-                text={translate('iou.approve')}
+                text={approveButtonText}
                 isDisabled={isBlockSubmitDueToPreventSelfApproval}
             />
         ),
@@ -1599,7 +1603,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
         const actions: Array<DropdownOption<string> & Pick<PopoverMenuItem, 'backButtonText' | 'rightIcon'>> = [];
         if (hasSubmitAction && !shouldBlockSubmit) {
             actions.push({
-                text: translate('common.submit'),
+                text: submitButtonText,
                 icon: expensifyIcons.Send,
                 value: CONST.REPORT.PRIMARY_ACTIONS.SUBMIT,
                 onSelected: () => handleSubmitReport(true),
@@ -1607,7 +1611,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
         }
         if (hasApproveAction && !isBlockSubmitDueToPreventSelfApproval) {
             actions.push({
-                text: translate('iou.approve'),
+                text: approveButtonText,
                 icon: expensifyIcons.ThumbsUp,
                 value: CONST.REPORT.PRIMARY_ACTIONS.APPROVE,
                 onSelected: () => {
@@ -1731,7 +1735,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
         },
         [CONST.REPORT.SECONDARY_ACTIONS.SUBMIT]: {
             value: CONST.REPORT.SECONDARY_ACTIONS.SUBMIT,
-            text: translate('common.submit'),
+            text: submitButtonText,
             icon: expensifyIcons.Send,
             sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.SUBMIT,
             onSelected: () => {
@@ -1756,7 +1760,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
             },
         },
         [CONST.REPORT.SECONDARY_ACTIONS.APPROVE]: {
-            text: translate('iou.approve'),
+            text: approveButtonText,
             icon: expensifyIcons.ThumbsUp,
             value: CONST.REPORT.SECONDARY_ACTIONS.APPROVE,
             sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.APPROVE,
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
index efc59419c318..dd7d737a0d0f 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
@@ -7,6 +7,7 @@ import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
 import {hasHeldExpenses as hasHeldExpensesReportUtils, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import {approveMoneyRequest} from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -37,6 +38,7 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe
     const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
 
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
     const hasViolations = hasViolationsReportUtils(iouReport?.reportID, transactionViolations, currentUserAccountID, currentUserEmail);
@@ -67,7 +69,7 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe
 
     return (
         <Button
-            text={translate('iou.approve')}
+            text={isTrackIntentUser ? translate('common.markAsDone') : translate('iou.approve')}
             success
             onPress={confirmApproval}
             sentryLabel={CONST.SENTRY_LABEL.REPORT_PREVIEW.APPROVE_BUTTON}
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
index 71caf8cfe990..d0f9c4fc087b 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
@@ -7,6 +7,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import {canSubmitAndIsAwaitingForCurrentUser, getReportTransactions, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import {hasAnyPendingRTERViolation as hasAnyPendingRTERViolationTransactionUtils} from '@libs/TransactionUtils';
 import {submitReport} from '@userActions/IOU';
 import {markPendingRTERTransactionsAsCash} from '@userActions/Transaction';
@@ -37,6 +38,7 @@ function SubmitActionButton({iouReportID, chatReportID, isSubmittingAnimationRun
     const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`);
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const {isOffline} = useNetwork();
     const transactions = getReportTransactions(iouReportID).filter((t) => isOffline || t.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 
@@ -64,7 +66,7 @@ function SubmitActionButton({iouReportID, chatReportID, isSubmittingAnimationRun
     return (
         <AnimatedSubmitButton
             success={isWaitingForSubmissionFromCurrentUser}
-            text={translate('common.submit')}
+            text={isTrackIntentUser ? translate('common.markAsDone') : translate('common.submit')}
             onPress={() => {
                 confirmPendingRTERAndProceed(() => {
                     submitReport({
diff --git a/src/components/ReportWelcomeText.tsx b/src/components/ReportWelcomeText.tsx
index 1ddcf6fb7662..14aa6d0c8caa 100644
--- a/src/components/ReportWelcomeText.tsx
+++ b/src/components/ReportWelcomeText.tsx
@@ -9,6 +9,7 @@ import usePreferredPolicy from '@hooks/usePreferredPolicy';
 import useReportAttributes from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
 import {getReportName} from '@libs/ReportNameUtils';
@@ -54,6 +55,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
     const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicyID}`);
     const isReportArchived = useReportIsArchived(report?.reportID);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const isConciergeChat = isConciergeChatReport(report, conciergeReportID);
     const isChatRoom = isChatRoomReportUtils(report);
     const isSelfDM = isSelfDMReportUtils(report);
@@ -124,6 +126,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
         reportDetailsLink,
         shouldShowUsePlusButtonText,
         additionalText,
+        isTrackIntentUser: !!isTrackIntentUser,
     });
 
     return (
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 531278e240ff..c5c59347cdb9 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -145,6 +145,7 @@ const translations = {
         selectMultiple: 'Select multiple',
         saveChanges: 'Save changes',
         submit: 'Submit',
+        markAsDone: 'Mark as done',
         // @context Status label meaning an item has already been sent or submitted (e.g., a form or report). Not the action “to submit.”
         submitted: 'Submitted',
         rotate: 'Rotate',
@@ -903,6 +904,7 @@ const translations = {
         beginningOfChatHistory: (users: string) => `This chat is with ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `This is where <strong>${submitterDisplayName}</strong> will submit expenses to <strong>${workspaceName}</strong>. Just use the + button.`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
         beginningOfChatHistorySystemDM: "Welcome! Let's get you set up.",
         chatWithAccountManager: 'Chat with your account manager here',
@@ -1376,6 +1378,7 @@ const translations = {
         sendInvoice: (amount: string) => `Send ${amount} invoice`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         submitted: (memo?: string) => `submitted${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo?: string) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `submitted via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delay submissions</a>`,
         queuedToSubmitViaDEW: 'queued to submit via custom approval workflow',
         failedToAutoSubmitViaDEW: (reason: string) => `failed to submit the report via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delay submissions</a>. ${reason}`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ea998cd47094..21ebd8ecc9e8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -54,6 +54,7 @@ const translations: TranslationDeepObject<typeof en> = {
         save: 'Guardar',
         saveChanges: 'Guardar cambios',
         submit: 'Enviar',
+        markAsDone: 'Marcar como listo',
         submitted: 'Enviado',
         rotate: 'Rotar',
         zoom: 'Zoom',
@@ -775,6 +776,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users) => `Este chat es con ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName, submitterDisplayName) =>
             `Aquí es donde <strong>${submitterDisplayName}</strong> enviará los gastos al espacio de trabajo <strong>${workspaceName}</strong>. Solo usa el botón +.`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'Aquí es donde harás seguimiento de tus gastos',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         beginningOfChatHistorySystemDM: '¡Bienvenido! Vamos a configurar tu cuenta.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
@@ -1245,6 +1247,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount) => `Enviar factura de ${amount}`,
         expenseAmount: (formattedAmount, comment) => `${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         submitted: (memo) => `enviado${memo ? `, dijo ${memo}` : ''}`,
+        markedAsDone: (memo) => `marcado como listo${memo ? `, dijo ${memo}` : ''}`,
         automaticallySubmitted: `envió mediante <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">retrasar envíos</a>`,
         queuedToSubmitViaDEW: 'en cola para enviar a través del flujo de aprobación personalizado',
         failedToAutoSubmitViaDEW: (reason: string) => `no ha podido enviar este informe mediante <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">retrasar envíos</a>. ${reason}`,
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 499431389703..2fbfc05d46a6 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -203,6 +203,7 @@ type WelcomeMessageParams = {
     reportDetailsLink?: string;
     shouldShowUsePlusButtonText?: boolean;
     additionalText?: string;
+    isTrackIntentUser?: boolean;
 };
 
 function compareStringDates(a: string, b: string): 0 | 1 | -1 {
@@ -1247,6 +1248,7 @@ function getWelcomeMessage(params: WelcomeMessageParams): WelcomeMessage {
         reportDetailsLink = '',
         shouldShowUsePlusButtonText = false,
         additionalText = '',
+        isTrackIntentUser = false,
     } = params;
 
     const welcomeMessage: WelcomeMessage = {};
@@ -1259,7 +1261,10 @@ function getWelcomeMessage(params: WelcomeMessageParams): WelcomeMessage {
     }
 
     if (isPolicyExpenseChat(report)) {
-        if (policy?.description) {
+        if (isTrackIntentUser) {
+            welcomeMessage.messageHtml = translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatTrack');
+            welcomeMessage.messageText = Parser.htmlToText(welcomeMessage.messageHtml);
+        } else if (policy?.description) {
             welcomeMessage.messageHtml = policy.description;
             welcomeMessage.messageText = Parser.htmlToText(welcomeMessage.messageHtml);
         } else {
diff --git a/src/pages/inbox/report/PureReportActionItem.tsx b/src/pages/inbox/report/PureReportActionItem.tsx
index 94d30e023f5d..a30ec4cde2b5 100644
--- a/src/pages/inbox/report/PureReportActionItem.tsx
+++ b/src/pages/inbox/report/PureReportActionItem.tsx
@@ -239,6 +239,7 @@ import {
 } from '@userActions/Report';
 import {isAnonymousUser, signOutAndRedirectToSignIn} from '@userActions/Session';
 import {isBlockedFromConcierge} from '@userActions/User';
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -549,6 +550,7 @@ function PureReportActionItem({
     const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
     const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const {transitionActionSheetState} = ActionSheetAwareScrollView.useActionSheetAwareScrollViewActions();
+    const isTrackIntentUser = isTrackIntentUserSelector(introSelected);
     const {translate, formatPhoneNumber, localeCompare, formatTravelDate, getLocalDateFromDatetime, datetimeToCalendarTime} = useLocalize();
     const {showConfirmModal} = useConfirmModal();
     const personalDetail = useCurrentUserPersonalDetails();
@@ -1353,7 +1355,9 @@ function PureReportActionItem({
             const isDEWPolicy = hasDynamicExternalWorkflow(policy);
 
             const isPendingAdd = action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
-            if (wasSubmittedViaHarvesting) {
+            if (isTrackIntentUser) {
+                children = <ReportActionItemBasicMessage message={translate('iou.markedAsDone', getOriginalMessage(action)?.message)} />;
+            } else if (wasSubmittedViaHarvesting) {
                 children = (
                     <ReportActionItemMessageWithExplain
                         message={translate('iou.automaticallySubmitted')}
@@ -1375,7 +1379,9 @@ function PureReportActionItem({
             const isDEWPolicy = hasDynamicExternalWorkflow(policy);
             const isPendingAdd = action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
 
-            if (wasAutoApproved) {
+            if (isTrackIntentUser) {
+                children = <ReportActionItemBasicMessage message={translate('iou.markedAsDone')} />;
+            } else if (wasAutoApproved) {
                 children = (
                     <ReportActionItemMessageWithExplain
                         message={translate('iou.automaticallyApproved')}
diff --git a/src/selectors/Onboarding.ts b/src/selectors/Onboarding.ts
index c46ace40f88a..124b5d73612a 100644
--- a/src/selectors/Onboarding.ts
+++ b/src/selectors/Onboarding.ts
@@ -1,4 +1,5 @@
 import type {OnyxValue} from 'react-native-onyx';
+import CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
@@ -78,4 +79,11 @@ function isOnboardingLoadingSelector(onboarding: OnyxValue<typeof ONYXKEYS.NVP_O
     return !!onboarding?.isLoading;
 }
 
-export {hasCompletedGuidedSetupFlowSelector, tryNewDotOnyxSelector, hasSeenTourSelector, wasInvitedToNewDotSelector, isOnboardingLoadingSelector};
+/**
+ * Selector to check if the user selected a track-intent onboarding choice
+ */
+function isTrackIntentUserSelector(introSelected: OnyxValue<typeof ONYXKEYS.NVP_INTRO_SELECTED>): boolean {
+    return introSelected?.choice === CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE || introSelected?.choice === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND;
+}
+
+export {hasCompletedGuidedSetupFlowSelector, tryNewDotOnyxSelector, hasSeenTourSelector, wasInvitedToNewDotSelector, isOnboardingLoadingSelector, isTrackIntentUserSelector};

From b9657d6abf9c53e6455444c8307825d2a071de64 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 26 Mar 2026 16:10:39 +0000
Subject: [PATCH 02/24] Fix: run Prettier to fix import ordering

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 .../MoneyRequestReportPreview/ApproveActionButton.tsx           | 2 +-
 .../MoneyRequestReportPreview/SubmitActionButton.tsx            | 2 +-
 src/components/ReportWelcomeText.tsx                            | 2 +-
 src/pages/inbox/report/PureReportActionItem.tsx                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
index dd7d737a0d0f..0f346d36550d 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
@@ -1,3 +1,4 @@
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React from 'react';
 import Button from '@components/Button';
 import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider';
@@ -7,7 +8,6 @@ import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
 import {hasHeldExpenses as hasHeldExpensesReportUtils, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
-import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import {approveMoneyRequest} from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
index d0f9c4fc087b..64a89e1c1c20 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
@@ -1,3 +1,4 @@
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React from 'react';
 import AnimatedSubmitButton from '@components/AnimatedSubmitButton';
 import useConfirmPendingRTERAndProceed from '@hooks/useConfirmPendingRTERAndProceed';
@@ -7,7 +8,6 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import {canSubmitAndIsAwaitingForCurrentUser, getReportTransactions, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
-import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import {hasAnyPendingRTERViolation as hasAnyPendingRTERViolationTransactionUtils} from '@libs/TransactionUtils';
 import {submitReport} from '@userActions/IOU';
 import {markPendingRTERTransactionsAsCash} from '@userActions/Transaction';
diff --git a/src/components/ReportWelcomeText.tsx b/src/components/ReportWelcomeText.tsx
index 14aa6d0c8caa..384b5dd91b1f 100644
--- a/src/components/ReportWelcomeText.tsx
+++ b/src/components/ReportWelcomeText.tsx
@@ -1,3 +1,4 @@
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -9,7 +10,6 @@ import usePreferredPolicy from '@hooks/usePreferredPolicy';
 import useReportAttributes from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
 import {getReportName} from '@libs/ReportNameUtils';
diff --git a/src/pages/inbox/report/PureReportActionItem.tsx b/src/pages/inbox/report/PureReportActionItem.tsx
index a30ec4cde2b5..0a7e01c84586 100644
--- a/src/pages/inbox/report/PureReportActionItem.tsx
+++ b/src/pages/inbox/report/PureReportActionItem.tsx
@@ -1,4 +1,5 @@
 /* eslint-disable rulesdir/no-deep-equal-in-memo */
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import {deepEqual} from 'fast-equals';
 import mapValues from 'lodash/mapValues';
 import React, {memo, use, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
@@ -239,7 +240,6 @@ import {
 } from '@userActions/Report';
 import {isAnonymousUser, signOutAndRedirectToSignIn} from '@userActions/Session';
 import {isBlockedFromConcierge} from '@userActions/User';
-import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';

From c79e8ec7c7cf59c4cb8f51fbc04b799d1394b55e Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 26 Mar 2026 16:19:55 +0000
Subject: [PATCH 03/24] Fix: add missing translation keys to all non-English
 language files

Add markAsDone, beginningOfChatHistoryPolicyExpenseChatTrack, and
markedAsDone keys to de, fr, it, ja, nl, pl, pt-BR, and zh-hans
translation files with English fallback values.

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/languages/de.ts      | 3 +++
 src/languages/fr.ts      | 5 ++++-
 src/languages/it.ts      | 3 +++
 src/languages/ja.ts      | 3 +++
 src/languages/nl.ts      | 3 +++
 src/languages/pl.ts      | 3 +++
 src/languages/pt-BR.ts   | 3 +++
 src/languages/zh-hans.ts | 5 ++++-
 8 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index cb44b3e6d71c..8e4734ea31c0 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -147,6 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Mehrfachauswahl',
         saveChanges: 'Änderungen speichern',
         submit: 'Senden',
+        markAsDone: 'Mark as done',
         submitted: 'Übermittelt',
         rotate: 'Drehen',
         zoom: 'Zoom',
@@ -874,6 +875,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Dieser Chat ist mit ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Hier reicht <strong>${submitterDisplayName}</strong> Auslagen bei <strong>${workspaceName}</strong> ein. Nutze einfach die +-Taste.`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
         beginningOfChatHistorySelfDM: 'Dies ist dein persönlicher Bereich. Nutze ihn für Notizen, Aufgaben, Entwürfe und Erinnerungen.',
         beginningOfChatHistorySystemDM: 'Willkommen! Lassen Sie uns Ihre Einrichtung vornehmen.',
         chatWithAccountManager: 'Chatte hier mit deiner/deinem Account Manager',
@@ -1328,6 +1330,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `${amount}-Rechnung senden`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `für ${comment}` : ''}`,
         submitted: (memo?: string) => `eingereicht${memo ? `, mit dem Vermerk ${memo}` : ''}`,
+        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `eingereicht über <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">Einreichungen verzögern</a>`,
         queuedToSubmitViaDEW: 'zur Einreichung über benutzerdefinierten Genehmigungsworkflow eingereiht',
         queuedToApproveViaDEW: 'Zur Genehmigung über benutzerdefinierten Genehmigungsworkflow eingereiht',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index e876cc4ef770..1262fccf6e97 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -147,6 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Sélection multiple',
         saveChanges: 'Enregistrer les modifications',
         submit: 'Soumettre',
+        markAsDone: 'Mark as done',
         submitted: 'Soumis',
         rotate: 'Pivoter',
         zoom: 'Zoom',
@@ -877,6 +878,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Cette discussion est avec ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `C’est ici que <strong>${submitterDisplayName}</strong> soumettra des dépenses à <strong>${workspaceName}</strong>. Utilisez simplement le bouton +.`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: ‘This is where you will track expenses’,
         beginningOfChatHistorySelfDM: 'Ceci est votre espace personnel. Utilisez-le pour vos notes, tâches, brouillons et rappels.',
         beginningOfChatHistorySystemDM: 'Bienvenue ! Procédons à la configuration.',
         chatWithAccountManager: 'Discutez avec votre gestionnaire de compte ici',
@@ -1332,8 +1334,9 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Envoyer la facture de ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `pour ${comment}` : ''}`,
         submitted: (memo?: string) => `soumis${memo ? `, indiquant « ${memo} »` : ''}`,
+        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ‘’}`,
         automaticallySubmitted: `soumis via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">soumissions différées</a>`,
-        queuedToSubmitViaDEW: 'en file d’attente pour être soumis via le circuit d’approbation personnalisé',
+        queuedToSubmitViaDEW: ‘en file d’attente pour être soumis via le circuit d’approbation personnalisé’,
         queuedToApproveViaDEW: 'mis en file d’attente pour approbation via un processus d’approbation personnalisé',
         trackedAmount: (formattedAmount: string, comment?: string) => `suivi de ${formattedAmount}${comment ? `pour ${comment}` : ''}`,
         splitAmount: (amount: string) => `diviser ${amount}`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index b21c14d7996e..ff452dadcd82 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -147,6 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Selezione multipla',
         saveChanges: 'Salva modifiche',
         submit: 'Invia',
+        markAsDone: 'Mark as done',
         submitted: 'Inviato',
         rotate: 'Ruota',
         zoom: 'Zoom',
@@ -875,6 +876,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Questa chat è con ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Qui è dove <strong>${submitterDisplayName}</strong> invierà le spese a <strong>${workspaceName}</strong>. Usa semplicemente il pulsante +.`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
         beginningOfChatHistorySelfDM: 'Questo è il tuo spazio personale. Usalo per note, attività, bozze e promemoria.',
         beginningOfChatHistorySystemDM: 'Benvenuto/a! Procediamo con la configurazione.',
         chatWithAccountManager: 'Chatta qui con il tuo account manager',
@@ -1327,6 +1329,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Invia fattura da ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `per ${comment}` : ''}`,
         submitted: (memo?: string) => `inviato${memo ? `, con nota: ${memo}` : ''}`,
+        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `inviato tramite <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">invio posticipato</a>`,
         queuedToSubmitViaDEW: 'in coda per l’invio tramite flusso di approvazione personalizzato',
         queuedToApproveViaDEW: 'in coda per l’approvazione tramite flusso di approvazione personalizzato',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 28225098c822..8f8f5bd6d20e 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -147,6 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: '複数選択',
         saveChanges: '変更を保存',
         submit: '送信',
+        markAsDone: 'Mark as done',
         submitted: '送信済み',
         rotate: '回転',
         zoom: 'ズーム',
@@ -861,6 +862,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `このチャットの相手は${users}です。`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `ここは<strong>${submitterDisplayName}</strong>さんが<strong>${workspaceName}</strong>に経費精算を提出する場所です。+ボタンを押すだけでOKです。`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
         beginningOfChatHistorySelfDM: 'ここはあなたの個人スペースです。メモ、タスク、下書き、リマインダーに活用してください。',
         beginningOfChatHistorySystemDM: 'ようこそ！設定を始めましょう。',
         chatWithAccountManager: 'ここでアカウントマネージャーとチャットする',
@@ -1310,6 +1312,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `${amount} の請求書を送信`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `${comment}用` : ''}`,
         submitted: (memo?: string) => `送信済み${memo ? `、メモ: ${memo}` : ''}`,
+        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `<a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">提出の延期</a> 経由で提出されました`,
         queuedToSubmitViaDEW: 'カスタム承認ワークフローで提出待ち',
         queuedToApproveViaDEW: 'カスタム承認ワークフローで承認待ちに設定されました',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index ff12d3c7b4ab..e14d3e309862 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -147,6 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Meerdere selecteren',
         saveChanges: 'Wijzigingen opslaan',
         submit: 'Verzenden',
+        markAsDone: 'Mark as done',
         submitted: 'Ingediend',
         rotate: 'Draaien',
         zoom: 'Zoom',
@@ -873,6 +874,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Deze chat is met ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Dit is waar <strong>${submitterDisplayName}</strong> declaraties indient bij <strong>${workspaceName}</strong>. Gebruik gewoon de +-knop.`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
         beginningOfChatHistorySelfDM: 'Dit is je persoonlijke ruimte. Gebruik het voor notities, taken, concepten en herinneringen.',
         beginningOfChatHistorySystemDM: 'Welkom! Laten we je instellen.',
         chatWithAccountManager: 'Chat hier met je accountmanager',
@@ -1326,6 +1328,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Verzend factuur van ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `voor ${comment}` : ''}`,
         submitted: (memo?: string) => `ingediend${memo ? `, met de omschrijving ${memo}` : ''}`,
+        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `ingediend via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">uitgestelde indieningen</a>`,
         queuedToSubmitViaDEW: 'in wachtrij om via aangepast goedkeuringsproces in te dienen',
         queuedToApproveViaDEW: 'in de wachtrij gezet voor goedkeuring via aangepaste goedkeuringsworkflow',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 14a1ac16d41d..c2c9ad41f461 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -147,6 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Wielokrotny wybór',
         saveChanges: 'Zapisz zmiany',
         submit: 'Wyślij',
+        markAsDone: 'Mark as done',
         submitted: 'Przesłano',
         rotate: 'Obróć',
         zoom: 'Powiększenie',
@@ -874,6 +875,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Ten czat jest z ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Tutaj <strong>${submitterDisplayName}</strong> będzie przesyłać wydatki do <strong>${workspaceName}</strong>. Po prostu użyj przycisku +.`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
         beginningOfChatHistorySelfDM: 'To Twoja osobista przestrzeń. Używaj jej na notatki, zadania, szkice i przypomnienia.',
         beginningOfChatHistorySystemDM: 'Witamy! Zacznijmy konfigurację.',
         chatWithAccountManager: 'Porozmawiaj tutaj z opiekunem konta',
@@ -1326,6 +1328,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Wyślij fakturę na ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `za ${comment}` : ''}`,
         submitted: (memo?: string) => `przesłano${memo ? `, wpisując ${memo}` : ''}`,
+        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `przesłano przez <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">opóźnianie wysyłania</a>`,
         queuedToSubmitViaDEW: 'w kolejce do przesłania przez niestandardowy proces zatwierdzania',
         queuedToApproveViaDEW: 'oczekuje na zatwierdzenie w niestandardowym procesie akceptacji',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index df911a68994c..a14dcfc1dd5b 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -147,6 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Seleção múltipla',
         saveChanges: 'Salvar alterações',
         submit: 'Enviar',
+        markAsDone: 'Mark as done',
         submitted: 'Enviado',
         rotate: 'Girar',
         zoom: 'Zoom',
@@ -873,6 +874,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Este chat é com ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `É aqui que <strong>${submitterDisplayName}</strong> enviará despesas para <strong>${workspaceName}</strong>. Basta usar o botão +.`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
         beginningOfChatHistorySelfDM: 'Este é o seu espaço pessoal. Use-o para anotações, tarefas, rascunhos e lembretes.',
         beginningOfChatHistorySystemDM: 'Bem-vindo(a)! Vamos fazer a sua configuração.',
         chatWithAccountManager: 'Converse com seu gerente de conta aqui',
@@ -1325,6 +1327,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Enviar fatura de ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `para ${comment}` : ''}`,
         submitted: (memo?: string) => `enviado${memo ? `, dizendo ${memo}` : ''}`,
+        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `enviado via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">atrasar envios</a>`,
         queuedToSubmitViaDEW: 'na fila para enviar via fluxo de aprovação personalizado',
         queuedToApproveViaDEW: 'na fila para aprovar via fluxo de aprovação personalizado',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 32724067ed42..ca3c51ab42fc 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -147,6 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: '多选',
         saveChanges: '保存更改',
         submit: '提交',
+        markAsDone: 'Mark as done',
         submitted: '已提交',
         rotate: '旋转',
         zoom: '缩放',
@@ -848,7 +849,8 @@ const translations: TranslationDeepObject<typeof en> = {
             `此聊天用于 <strong>${invoicePayer}</strong> 与 <strong>${invoiceReceiver}</strong> 之间的发票。请使用 + 按钮发送发票。`,
         beginningOfChatHistory: (users: string) => `此聊天对象为 ${users}。`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
-            `这是 <strong>${submitterDisplayName}</strong> 向 <strong>${workspaceName}</strong> 提交报销的地方。只需使用“+”按钮即可。`,
+            `这是 <strong>${submitterDisplayName}</strong> 向 <strong>${workspaceName}</strong> 提交报销的地方。只需使用”+”按钮即可。`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
         beginningOfChatHistorySelfDM: '这是你的个人空间。可在此记录笔记、任务、草稿和提醒事项。',
         beginningOfChatHistorySystemDM: '欢迎！让我们帮你完成设置。',
         chatWithAccountManager: '在这里与您的客户经理聊天',
@@ -1287,6 +1289,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `发送 ${amount} 发票`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `用于 ${comment}` : ''}`,
         submitted: (memo?: string) => `已提交${memo ? `，备注为 ${memo}` : ''}`,
+        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `通过<a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">延迟提交</a>提交`,
         queuedToSubmitViaDEW: '已排队，待通过自定义审批流程提交',
         queuedToApproveViaDEW: '已排队，等待通过自定义审批流程批准',

From e6a100e5acad4a05a6c860550dae70b2f4faa248 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 26 Mar 2026 17:01:40 +0000
Subject: [PATCH 04/24] Fix: replace Unicode smart quotes with straight quotes
 in fr.ts string delimiters

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/languages/fr.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 1262fccf6e97..534f4c95d476 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -1334,9 +1334,9 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Envoyer la facture de ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `pour ${comment}` : ''}`,
         submitted: (memo?: string) => `soumis${memo ? `, indiquant « ${memo} »` : ''}`,
-        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ‘’}`,
+        markedAsDone: (memo?: string) => `marked as done${memo ? `, saying ${memo}` : ''}`,
         automaticallySubmitted: `soumis via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">soumissions différées</a>`,
-        queuedToSubmitViaDEW: ‘en file d’attente pour être soumis via le circuit d’approbation personnalisé’,
+        queuedToSubmitViaDEW: 'en file d’attente pour être soumis via le circuit d’approbation personnalisé',
         queuedToApproveViaDEW: 'mis en file d’attente pour approbation via un processus d’approbation personnalisé',
         trackedAmount: (formattedAmount: string, comment?: string) => `suivi de ${formattedAmount}${comment ? `pour ${comment}` : ''}`,
         splitAmount: (amount: string) => `diviser ${amount}`,

From 177b9adaa7d108593585b781ddb31728e685f9c8 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 26 Mar 2026 17:23:19 +0000
Subject: [PATCH 05/24] Fix: restore fr.ts from main and reapply changes
 without smart quote corruption

The previous commit accidentally replaced ASCII single quote delimiters
with Unicode smart quotes (U+2018/U+2019) on several lines in fr.ts,
causing Prettier and TypeScript check failures. This restores the file
from main and cleanly reapplies the intended changes (markAsDone,
beginningOfChatHistoryPolicyExpenseChatTrack, markedAsDone, and removal
of increasedDistance).

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/languages/fr.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 534f4c95d476..2caf4f6c6424 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -147,7 +147,7 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Sélection multiple',
         saveChanges: 'Enregistrer les modifications',
         submit: 'Soumettre',
-        markAsDone: 'Mark as done',
+        markAsDone: `Mark as done`,
         submitted: 'Soumis',
         rotate: 'Pivoter',
         zoom: 'Zoom',
@@ -878,7 +878,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Cette discussion est avec ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `C’est ici que <strong>${submitterDisplayName}</strong> soumettra des dépenses à <strong>${workspaceName}</strong>. Utilisez simplement le bouton +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: ‘This is where you will track expenses’,
+        beginningOfChatHistoryPolicyExpenseChatTrack: `This is where you will track expenses`,
         beginningOfChatHistorySelfDM: 'Ceci est votre espace personnel. Utilisez-le pour vos notes, tâches, brouillons et rappels.',
         beginningOfChatHistorySystemDM: 'Bienvenue ! Procédons à la configuration.',
         chatWithAccountManager: 'Discutez avec votre gestionnaire de compte ici',

From 4bbb82c4ffa59563cf6b7c734f9f629ad94a3891 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 27 Mar 2026 05:35:48 +0000
Subject: [PATCH 06/24] Fix: update sidebar badge and search/reports CTA to
 show 'Mark as done' for track-intent users

The sidebar LHN badge and Reports tab action buttons still showed 'Submit'/'Approve'
instead of 'Mark as done' for track-intent users. Updated three locations:
- OptionRowLHN: sidebar action badge text
- ActionCell: search/reports list item action buttons
- useSearchBulkActions: bulk action submit/approve buttons

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/LHNOptionsList/OptionRowLHN.tsx             | 5 ++++-
 .../Search/SearchList/ListItem/ActionCell/index.tsx        | 7 ++++++-
 src/hooks/useSearchBulkActions.ts                          | 6 ++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx
index 730a18f7ffbb..4a517421d874 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN.tsx
@@ -163,7 +163,10 @@ function OptionRowLHN({
     }
 
     const brickRoadIndicator = optionItem.brickRoadIndicator;
-    const actionBadgeText = !isProduction && optionItem.actionBadge ? translate(`common.actionBadge.${optionItem.actionBadge}`) : '';
+    const isTrackIntentUser = onboardingPurpose === CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE || onboardingPurpose === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND;
+    const shouldUseMarkAsDone =
+        isTrackIntentUser && (optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.SUBMIT || optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.APPROVE);
+    const actionBadgeText = !isProduction && optionItem.actionBadge ? (shouldUseMarkAsDone ? translate('common.markAsDone') : translate(`common.actionBadge.${optionItem.actionBadge}`)) : '';
     let accessibilityLabelForBadge = '';
     if (brickRoadIndicator) {
         accessibilityLabelForBadge = [translate('common.yourReviewIsRequired'), actionBadgeText].filter(Boolean).join(', ');
diff --git a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
index 1ab70eeac6ea..37e253276fdc 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
@@ -1,9 +1,12 @@
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React from 'react';
 import Button from '@components/Button';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {SearchTransactionAction} from '@src/types/onyx/SearchResults';
 import actionTranslationsMap from './actionTranslationsMap';
 import PayActionCell from './PayActionCell';
@@ -38,6 +41,7 @@ function ActionCell({
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
 
     const shouldUseViewAction = action === CONST.SEARCH.ACTION_TYPES.VIEW || action === CONST.SEARCH.ACTION_TYPES.PAID || action === CONST.SEARCH.ACTION_TYPES.DONE;
 
@@ -78,7 +82,8 @@ function ActionCell({
         );
     }
 
-    const text = translate(actionTranslationsMap[action]);
+    const shouldUseMarkAsDone = isTrackIntentUser && (action === CONST.SEARCH.ACTION_TYPES.SUBMIT || action === CONST.SEARCH.ACTION_TYPES.APPROVE);
+    const text = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(actionTranslationsMap[action]);
 
     return (
         <Button
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 9b67f61b20ce..89b533bccd6a 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -1,3 +1,4 @@
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {InteractionManager} from 'react-native';
 import type {OnyxCollection} from 'react-native-onyx';
@@ -127,6 +128,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
 
     const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION);
     const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION);
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
 
     const isExpenseReportType = queryJSON?.type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT;
     const expensifyIcons = useMemoizedLazyExpensifyIcons([
@@ -862,7 +864,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         if (shouldShowApproveOption) {
             options.push({
                 icon: expensifyIcons.ThumbsUp,
-                text: translate('search.bulkActions.approve'),
+                text: isTrackIntentUser ? translate('common.markAsDone') : translate('search.bulkActions.approve'),
                 value: CONST.SEARCH.BULK_ACTION_TYPES.APPROVE,
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
@@ -918,7 +920,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         if (shouldShowSubmitOption) {
             options.push({
                 icon: expensifyIcons.Send,
-                text: translate('common.submit'),
+                text: isTrackIntentUser ? translate('common.markAsDone') : translate('common.submit'),
                 value: CONST.SEARCH.BULK_ACTION_TYPES.SUBMIT,
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {

From 4cbace30fa7148f428730ce1c0c6b399a9699d99 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 27 Mar 2026 05:38:35 +0000
Subject: [PATCH 07/24] Fix: run Prettier on OptionRowLHN.tsx

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/LHNOptionsList/OptionRowLHN.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx
index 4a517421d874..d5b55da61331 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN.tsx
@@ -164,8 +164,7 @@ function OptionRowLHN({
 
     const brickRoadIndicator = optionItem.brickRoadIndicator;
     const isTrackIntentUser = onboardingPurpose === CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE || onboardingPurpose === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND;
-    const shouldUseMarkAsDone =
-        isTrackIntentUser && (optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.SUBMIT || optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.APPROVE);
+    const shouldUseMarkAsDone = isTrackIntentUser && (optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.SUBMIT || optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.APPROVE);
     const actionBadgeText = !isProduction && optionItem.actionBadge ? (shouldUseMarkAsDone ? translate('common.markAsDone') : translate(`common.actionBadge.${optionItem.actionBadge}`)) : '';
     let accessibilityLabelForBadge = '';
     if (brickRoadIndicator) {

From 5b52d76f3ae1219cb3d4dee2c0a7da54e7369f88 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 27 Mar 2026 05:55:11 +0000
Subject: [PATCH 08/24] Fix: resolve nested ternary and add missing useMemo
 dependencies

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/LHNOptionsList/OptionRowLHN.tsx | 5 ++++-
 src/components/MoneyReportHeader.tsx           | 2 ++
 src/hooks/useSearchBulkActions.ts              | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx
index d5b55da61331..b69869655975 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN.tsx
@@ -165,7 +165,10 @@ function OptionRowLHN({
     const brickRoadIndicator = optionItem.brickRoadIndicator;
     const isTrackIntentUser = onboardingPurpose === CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE || onboardingPurpose === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND;
     const shouldUseMarkAsDone = isTrackIntentUser && (optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.SUBMIT || optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.APPROVE);
-    const actionBadgeText = !isProduction && optionItem.actionBadge ? (shouldUseMarkAsDone ? translate('common.markAsDone') : translate(`common.actionBadge.${optionItem.actionBadge}`)) : '';
+    let actionBadgeText = '';
+    if (!isProduction && optionItem.actionBadge) {
+        actionBadgeText = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(`common.actionBadge.${optionItem.actionBadge}`);
+    }
     let accessibilityLabelForBadge = '';
     if (brickRoadIndicator) {
         accessibilityLabelForBadge = [translate('common.yourReviewIsRequired'), actionBadgeText].filter(Boolean).join(', ');
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index f37dfadf6102..98a8b4b98063 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1660,6 +1660,8 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
         expensifyIcons.Send,
         expensifyIcons.ThumbsUp,
         kycWallRef,
+        approveButtonText,
+        submitButtonText,
     ]);
 
     const connectedIntegrationName = connectedIntegration
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 89b533bccd6a..5ee393f60c46 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -1193,6 +1193,8 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         styles.textWrap,
         userBillingGraceEndPeriods,
         currentSearchKey,
+        isTrackIntentUser,
+        shouldShowBusinessBankAccountOptions,
     ]);
 
     const handleOfflineModalClose = useCallback(() => {

From d9aec65a6afa7ad605b33f362cc7527097338c95 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 27 Mar 2026 11:04:31 +0000
Subject: [PATCH 09/24] Fix: show 'Marked as done' instead of 'Submitted' in
 animation for track-intent users

After clicking 'Mark as done', the AnimatedSubmitButton briefly showed 'Submitted'
as the status label. Added isTrackIntentUser check to display 'Marked as done'
instead. Added new common.markedAsDoneStatus translation key for this status label.

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/AnimatedSubmitButton/index.tsx | 6 +++++-
 src/languages/de.ts                           | 1 +
 src/languages/en.ts                           | 2 ++
 src/languages/es.ts                           | 1 +
 src/languages/fr.ts                           | 1 +
 src/languages/it.ts                           | 1 +
 src/languages/ja.ts                           | 1 +
 src/languages/nl.ts                           | 1 +
 src/languages/pl.ts                           | 1 +
 src/languages/pt-BR.ts                        | 1 +
 src/languages/zh-hans.ts                      | 1 +
 11 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/AnimatedSubmitButton/index.tsx b/src/components/AnimatedSubmitButton/index.tsx
index 52553b905b57..afd1e94ce76f 100644
--- a/src/components/AnimatedSubmitButton/index.tsx
+++ b/src/components/AnimatedSubmitButton/index.tsx
@@ -1,3 +1,4 @@
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import type {View} from 'react-native';
 import Animated, {Keyframe, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
@@ -5,9 +6,11 @@ import {scheduleOnRN} from 'react-native-worklets';
 import Button from '@components/Button';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type WithSentryLabel from '@src/types/utils/SentryLabel';
 
 type AnimatedSubmitButtonProps = WithSentryLabel & {
@@ -33,6 +36,7 @@ type AnimatedSubmitButtonProps = WithSentryLabel & {
 function AnimatedSubmitButton({success, text, onPress, isSubmittingAnimationRunning, onAnimationFinish, isDisabled, sentryLabel}: AnimatedSubmitButtonProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const isAnimationRunning = isSubmittingAnimationRunning;
     const buttonDuration = isSubmittingAnimationRunning ? CONST.ANIMATION_SUBMIT_DURATION : CONST.ANIMATION_SUBMITTED_DURATION;
     const gap = styles.expenseAndReportPreviewTextButtonContainer.gap;
@@ -120,7 +124,7 @@ function AnimatedSubmitButton({success, text, onPress, isSubmittingAnimationRunn
                 >
                     <Button
                         success={success}
-                        text={showLoading ? text : translate('common.submitted')}
+                        text={showLoading ? text : translate(isTrackIntentUser ? 'common.markedAsDoneStatus' : 'common.submitted')}
                         isLoading={showLoading}
                         icon={!showLoading ? icon : undefined}
                         isDisabled
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 8e4734ea31c0..cb9425bae33a 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -149,6 +149,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: 'Senden',
         markAsDone: 'Mark as done',
         submitted: 'Übermittelt',
+        markedAsDoneStatus: 'Marked as done',
         rotate: 'Drehen',
         zoom: 'Zoom',
         password: 'Passwort',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index c5c59347cdb9..b291da54e09d 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -148,6 +148,8 @@ const translations = {
         markAsDone: 'Mark as done',
         // @context Status label meaning an item has already been sent or submitted (e.g., a form or report). Not the action “to submit.”
         submitted: 'Submitted',
+        // @context Status label meaning an item has been marked as done (track-intent users). Not the action “to mark as done.”
+        markedAsDoneStatus: 'Marked as done',
         rotate: 'Rotate',
         zoom: 'Zoom',
         password: 'Password',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 21ebd8ecc9e8..e442d88b87d8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -56,6 +56,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: 'Enviar',
         markAsDone: 'Marcar como listo',
         submitted: 'Enviado',
+        markedAsDoneStatus: 'Marcado como listo',
         rotate: 'Rotar',
         zoom: 'Zoom',
         password: 'Contraseña',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 2caf4f6c6424..a390df3f6c44 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -149,6 +149,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: 'Soumettre',
         markAsDone: `Mark as done`,
         submitted: 'Soumis',
+        markedAsDoneStatus: 'Marked as done',
         rotate: 'Pivoter',
         zoom: 'Zoom',
         password: 'Mot de passe',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index ff452dadcd82..f36ae9444830 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -149,6 +149,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: 'Invia',
         markAsDone: 'Mark as done',
         submitted: 'Inviato',
+        markedAsDoneStatus: 'Marked as done',
         rotate: 'Ruota',
         zoom: 'Zoom',
         password: 'Password',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 8f8f5bd6d20e..781a399dbf1f 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -149,6 +149,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: '送信',
         markAsDone: 'Mark as done',
         submitted: '送信済み',
+        markedAsDoneStatus: 'Marked as done',
         rotate: '回転',
         zoom: 'ズーム',
         password: 'パスワード',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index e14d3e309862..b440e860e8c7 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -149,6 +149,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: 'Verzenden',
         markAsDone: 'Mark as done',
         submitted: 'Ingediend',
+        markedAsDoneStatus: 'Marked as done',
         rotate: 'Draaien',
         zoom: 'Zoom',
         password: 'Wachtwoord',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index c2c9ad41f461..6e81404e058a 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -149,6 +149,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: 'Wyślij',
         markAsDone: 'Mark as done',
         submitted: 'Przesłano',
+        markedAsDoneStatus: 'Marked as done',
         rotate: 'Obróć',
         zoom: 'Powiększenie',
         password: 'Hasło',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index a14dcfc1dd5b..5cdf58dd260a 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -149,6 +149,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: 'Enviar',
         markAsDone: 'Mark as done',
         submitted: 'Enviado',
+        markedAsDoneStatus: 'Marked as done',
         rotate: 'Girar',
         zoom: 'Zoom',
         password: 'Senha',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index ca3c51ab42fc..02e5bef51f98 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -149,6 +149,7 @@ const translations: TranslationDeepObject<typeof en> = {
         submit: '提交',
         markAsDone: 'Mark as done',
         submitted: '已提交',
+        markedAsDoneStatus: 'Marked as done',
         rotate: '旋转',
         zoom: '缩放',
         password: '密码',

From 681b05d9f63ebd7035400f27ef711a048c903c40 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 27 Mar 2026 11:13:15 +0000
Subject: [PATCH 10/24] Fix: use extraSmall button for 'Mark as done' in
 ActionCell to prevent text truncation

The 'Mark as done' text is longer than 'Submit'/'Approve' and gets truncated
within the 80px ACTION column. Using extraSmall button size (smaller font and
padding) allows the text to fit without changing the column width or affecting
other action buttons.

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 .../Search/SearchList/ListItem/ActionCell/index.tsx         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
index 37e253276fdc..3ac08eda1f14 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
@@ -85,12 +85,14 @@ function ActionCell({
     const shouldUseMarkAsDone = isTrackIntentUser && (action === CONST.SEARCH.ACTION_TYPES.SUBMIT || action === CONST.SEARCH.ACTION_TYPES.APPROVE);
     const text = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(actionTranslationsMap[action]);
 
+    const useExtraSmall = extraSmall || shouldUseMarkAsDone;
+
     return (
         <Button
             text={text}
             onPress={goToItem}
-            small={!extraSmall}
-            extraSmall={extraSmall}
+            small={!useExtraSmall}
+            extraSmall={useExtraSmall}
             style={[styles.w100, shouldDisablePointerEvents && styles.pointerEventsNone]}
             isLoading={isLoading}
             success

From fe98ba7bf5efe51e494c790a05d7882d9c8e4dc7 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 11:10:55 +0000
Subject: [PATCH 11/24] Fix: only use 'Mark as done' copy when workspace has
 approvals disabled

When a track-intent user has a workspace with Approvals enabled, the CTA
buttons and system messages should use the standard Submit/Approve
terminology. The 'Mark as done' copy should only apply when the workspace
has approvals disabled (submit-and-close mode).

Added isSubmitAndClose(policy) check alongside the existing
isTrackIntentUser check across all affected components:
- SubmitActionButton, ApproveActionButton, MoneyReportHeader
- AnimatedSubmitButton (new policyID prop)
- OptionRowLHN sidebar badge (new isApprovalDisabledForReport prop)
- ActionCell in search/reports list
- useSearchBulkActions bulk action buttons
- PureReportActionItem system messages

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/AnimatedSubmitButton/index.tsx        |  9 +++++++--
 src/components/LHNOptionsList/OptionRowLHN.tsx       |  4 +++-
 src/components/LHNOptionsList/OptionRowLHNData.tsx   |  2 ++
 src/components/LHNOptionsList/types.ts               |  3 +++
 src/components/MoneyReportHeader.tsx                 |  8 +++++---
 .../ApproveActionButton.tsx                          |  4 +++-
 .../MoneyRequestReportPreview/SubmitActionButton.tsx |  4 +++-
 .../Search/SearchList/ListItem/ActionCell/index.tsx  |  4 +++-
 src/hooks/useSearchBulkActions.ts                    | 12 +++++++++---
 src/pages/inbox/report/PureReportActionItem.tsx      |  6 +++---
 10 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/components/AnimatedSubmitButton/index.tsx b/src/components/AnimatedSubmitButton/index.tsx
index afd1e94ce76f..1d7a09770c1f 100644
--- a/src/components/AnimatedSubmitButton/index.tsx
+++ b/src/components/AnimatedSubmitButton/index.tsx
@@ -8,6 +8,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {isSubmitAndClose} from '@libs/PolicyUtils';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -31,12 +32,16 @@ type AnimatedSubmitButtonProps = WithSentryLabel & {
 
     // Whether the button should be disabled
     isDisabled?: boolean;
+
+    // The policy ID for the report, used to check approval mode
+    policyID?: string;
 };
 
-function AnimatedSubmitButton({success, text, onPress, isSubmittingAnimationRunning, onAnimationFinish, isDisabled, sentryLabel}: AnimatedSubmitButtonProps) {
+function AnimatedSubmitButton({success, text, onPress, isSubmittingAnimationRunning, onAnimationFinish, isDisabled, sentryLabel, policyID}: AnimatedSubmitButtonProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
+    const [animationPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
     const isAnimationRunning = isSubmittingAnimationRunning;
     const buttonDuration = isSubmittingAnimationRunning ? CONST.ANIMATION_SUBMIT_DURATION : CONST.ANIMATION_SUBMITTED_DURATION;
     const gap = styles.expenseAndReportPreviewTextButtonContainer.gap;
@@ -124,7 +129,7 @@ function AnimatedSubmitButton({success, text, onPress, isSubmittingAnimationRunn
                 >
                     <Button
                         success={success}
-                        text={showLoading ? text : translate(isTrackIntentUser ? 'common.markedAsDoneStatus' : 'common.submitted')}
+                        text={showLoading ? text : translate(isTrackIntentUser && isSubmitAndClose(animationPolicy) ? 'common.markedAsDoneStatus' : 'common.submitted')}
                         isLoading={showLoading}
                         icon={!showLoading ? icon : undefined}
                         isDisabled
diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx
index b69869655975..88ca676985b1 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN.tsx
@@ -58,6 +58,7 @@ function OptionRowLHN({
     isScreenFocused = false,
     testID,
     conciergeReportID,
+    isApprovalDisabledForReport,
 }: OptionRowLHNProps) {
     const {isProduction} = useEnvironment();
     const theme = useTheme();
@@ -164,7 +165,8 @@ function OptionRowLHN({
 
     const brickRoadIndicator = optionItem.brickRoadIndicator;
     const isTrackIntentUser = onboardingPurpose === CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE || onboardingPurpose === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND;
-    const shouldUseMarkAsDone = isTrackIntentUser && (optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.SUBMIT || optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.APPROVE);
+    const shouldUseMarkAsDone =
+        isTrackIntentUser && isApprovalDisabledForReport && (optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.SUBMIT || optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.APPROVE);
     let actionBadgeText = '';
     if (!isProduction && optionItem.actionBadge) {
         actionBadgeText = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(`common.actionBadge.${optionItem.actionBadge}`);
diff --git a/src/components/LHNOptionsList/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHNData.tsx
index fa0c33618a99..89651a5a70de 100644
--- a/src/components/LHNOptionsList/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHNData.tsx
@@ -6,6 +6,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useGetExpensifyCardFromReportAction from '@hooks/useGetExpensifyCardFromReportAction';
 import useOnyx from '@hooks/useOnyx';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import {isSubmitAndClose} from '@libs/PolicyUtils';
 import {getIOUReportIDOfLastAction} from '@libs/OptionsListUtils';
 import {getLastVisibleActionIncludingTransactionThread, getOriginalMessage, isActionableTrackExpense, isInviteOrRemovedAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {canUserPerformWriteAction as canUserPerformWriteActionUtil} from '@libs/ReportUtils';
@@ -235,6 +236,7 @@ function OptionRowLHNData({
             report={fullReport}
             hasDraftComment={hasDraftComment}
             conciergeReportID={conciergeReportID}
+            isApprovalDisabledForReport={isSubmitAndClose(policy)}
         />
     );
 }
diff --git a/src/components/LHNOptionsList/types.ts b/src/components/LHNOptionsList/types.ts
index eeafd63ccd5e..20a2d7a7b79a 100644
--- a/src/components/LHNOptionsList/types.ts
+++ b/src/components/LHNOptionsList/types.ts
@@ -146,6 +146,9 @@ type OptionRowLHNProps = {
 
     /** The concierge report ID from Onyx */
     conciergeReportID: OnyxEntry<string>;
+
+    /** Whether the report's policy has approvals disabled (submit and close) */
+    isApprovalDisabledForReport?: boolean;
 };
 
 type RenderItemProps = {item: Report; index: number};
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index b1b840cc5d6e..2236479b4ac4 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -69,7 +69,7 @@ import {
 } from '@libs/NextStepUtils';
 import type {KYCFlowEvent, TriggerKYCFlow} from '@libs/PaymentUtils';
 import {handleUnvalidatedAccount, selectPaymentType} from '@libs/PaymentUtils';
-import {getConnectedIntegration, getValidConnectedIntegration, hasDynamicExternalWorkflow, isPolicyAccessible, sortPoliciesByName} from '@libs/PolicyUtils';
+import {getConnectedIntegration, getValidConnectedIntegration, hasDynamicExternalWorkflow, isPolicyAccessible, isSubmitAndClose, sortPoliciesByName} from '@libs/PolicyUtils';
 import {
     getFilteredReportActionsForReportView,
     getIOUActionForReportID,
@@ -1387,8 +1387,9 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
         beginExportWithTemplate,
     ]);
 
-    const submitButtonText = isTrackIntentUser ? translate('common.markAsDone') : translate('common.submit');
-    const approveButtonText = isTrackIntentUser ? translate('common.markAsDone') : translate('iou.approve');
+    const shouldUseMarkAsDoneCopy = isTrackIntentUser && isSubmitAndClose(policy);
+    const submitButtonText = shouldUseMarkAsDoneCopy ? translate('common.markAsDone') : translate('common.submit');
+    const approveButtonText = shouldUseMarkAsDoneCopy ? translate('common.markAsDone') : translate('iou.approve');
 
     const primaryActionsImplementation = {
         [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
@@ -1399,6 +1400,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
                 isSubmittingAnimationRunning={isSubmittingAnimationRunning}
                 onAnimationFinish={stopAnimation}
                 isDisabled={shouldBlockSubmit}
+                policyID={moneyRequestReport?.policyID}
             />
         ),
         [CONST.REPORT.PRIMARY_ACTIONS.APPROVE]: (
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
index 0f346d36550d..3fe53f100286 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
@@ -7,6 +7,7 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
+import {isSubmitAndClose} from '@libs/PolicyUtils';
 import {hasHeldExpenses as hasHeldExpensesReportUtils, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
 import {approveMoneyRequest} from '@userActions/IOU';
 import CONST from '@src/CONST';
@@ -39,6 +40,7 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
+    const [iouReportPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`);
 
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
     const hasViolations = hasViolationsReportUtils(iouReport?.reportID, transactionViolations, currentUserAccountID, currentUserEmail);
@@ -69,7 +71,7 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe
 
     return (
         <Button
-            text={isTrackIntentUser ? translate('common.markAsDone') : translate('iou.approve')}
+            text={isTrackIntentUser && isSubmitAndClose(iouReportPolicy) ? translate('common.markAsDone') : translate('iou.approve')}
             success
             onPress={confirmApproval}
             sentryLabel={CONST.SENTRY_LABEL.REPORT_PREVIEW.APPROVE_BUTTON}
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
index 64a89e1c1c20..58dda1ab6c3d 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx
@@ -7,6 +7,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {isSubmitAndClose} from '@libs/PolicyUtils';
 import {canSubmitAndIsAwaitingForCurrentUser, getReportTransactions, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
 import {hasAnyPendingRTERViolation as hasAnyPendingRTERViolationTransactionUtils} from '@libs/TransactionUtils';
 import {submitReport} from '@userActions/IOU';
@@ -66,7 +67,7 @@ function SubmitActionButton({iouReportID, chatReportID, isSubmittingAnimationRun
     return (
         <AnimatedSubmitButton
             success={isWaitingForSubmissionFromCurrentUser}
-            text={isTrackIntentUser ? translate('common.markAsDone') : translate('common.submit')}
+            text={isTrackIntentUser && isSubmitAndClose(policy) ? translate('common.markAsDone') : translate('common.submit')}
             onPress={() => {
                 confirmPendingRTERAndProceed(() => {
                     submitReport({
@@ -87,6 +88,7 @@ function SubmitActionButton({iouReportID, chatReportID, isSubmittingAnimationRun
             isSubmittingAnimationRunning={isSubmittingAnimationRunning}
             onAnimationFinish={stopAnimation}
             sentryLabel={CONST.SENTRY_LABEL.REPORT_PREVIEW.SUBMIT_BUTTON}
+            policyID={iouReport?.policyID}
         />
     );
 }
diff --git a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
index 3ac08eda1f14..55d14e2c7ee5 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
@@ -5,6 +5,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {isSubmitAndClose} from '@libs/PolicyUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {SearchTransactionAction} from '@src/types/onyx/SearchResults';
@@ -42,6 +43,7 @@ function ActionCell({
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
+    const [actionCellPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
 
     const shouldUseViewAction = action === CONST.SEARCH.ACTION_TYPES.VIEW || action === CONST.SEARCH.ACTION_TYPES.PAID || action === CONST.SEARCH.ACTION_TYPES.DONE;
 
@@ -82,7 +84,7 @@ function ActionCell({
         );
     }
 
-    const shouldUseMarkAsDone = isTrackIntentUser && (action === CONST.SEARCH.ACTION_TYPES.SUBMIT || action === CONST.SEARCH.ACTION_TYPES.APPROVE);
+    const shouldUseMarkAsDone = isTrackIntentUser && isSubmitAndClose(actionCellPolicy) && (action === CONST.SEARCH.ACTION_TYPES.SUBMIT || action === CONST.SEARCH.ACTION_TYPES.APPROVE);
     const text = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(actionTranslationsMap[action]);
 
     const useExtraSmall = extraSmall || shouldUseMarkAsDone;
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 767d00f5c821..4b306f075cad 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -35,7 +35,7 @@ import initSplitExpense from '@libs/actions/SplitExpenses';
 import {setNameValuePair} from '@libs/actions/User';
 import {getTransactionsAndReportsFromSearch} from '@libs/MergeTransactionUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {getConnectedIntegration} from '@libs/PolicyUtils';
+import {getConnectedIntegration, isSubmitAndClose} from '@libs/PolicyUtils';
 import {getSecondaryExportReportActions, isMergeActionForSelectedTransactions} from '@libs/ReportSecondaryActionUtils';
 import {
     getIntegrationIcon,
@@ -902,7 +902,10 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         if (shouldShowApproveOption) {
             options.push({
                 icon: expensifyIcons.ThumbsUp,
-                text: isTrackIntentUser ? translate('common.markAsDone') : translate('search.bulkActions.approve'),
+                text:
+                    isTrackIntentUser && selectedReports.every((report) => isSubmitAndClose(policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`]))
+                        ? translate('common.markAsDone')
+                        : translate('search.bulkActions.approve'),
                 value: CONST.SEARCH.BULK_ACTION_TYPES.APPROVE,
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
@@ -958,7 +961,10 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         if (shouldShowSubmitOption) {
             options.push({
                 icon: expensifyIcons.Send,
-                text: isTrackIntentUser ? translate('common.markAsDone') : translate('common.submit'),
+                text:
+                    isTrackIntentUser && selectedReports.every((report) => isSubmitAndClose(policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`]))
+                        ? translate('common.markAsDone')
+                        : translate('common.submit'),
                 value: CONST.SEARCH.BULK_ACTION_TYPES.SUBMIT,
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {
diff --git a/src/pages/inbox/report/PureReportActionItem.tsx b/src/pages/inbox/report/PureReportActionItem.tsx
index ef0a7d78e3f8..3f3ef1b5d3b0 100644
--- a/src/pages/inbox/report/PureReportActionItem.tsx
+++ b/src/pages/inbox/report/PureReportActionItem.tsx
@@ -73,7 +73,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {getBankAccountLastFourDigits} from '@libs/PaymentUtils';
 import Permissions from '@libs/Permissions';
 import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
-import {getCleanedTagName, hasDynamicExternalWorkflow, isPolicyAdmin, isPolicyMember, isPolicyOwner} from '@libs/PolicyUtils';
+import {getCleanedTagName, hasDynamicExternalWorkflow, isPolicyAdmin, isPolicyMember, isPolicyOwner, isSubmitAndClose} from '@libs/PolicyUtils';
 import {containsActionableFollowUps, parseFollowupsFromHtml} from '@libs/ReportActionFollowupUtils';
 import {
     extractLinksFromMessageHtml,
@@ -1355,7 +1355,7 @@ function PureReportActionItem({
             const isDEWPolicy = hasDynamicExternalWorkflow(policy);
 
             const isPendingAdd = action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
-            if (isTrackIntentUser) {
+            if (isTrackIntentUser && isSubmitAndClose(policy)) {
                 children = <ReportActionItemBasicMessage message={translate('iou.markedAsDone', getOriginalMessage(action)?.message)} />;
             } else if (wasSubmittedViaHarvesting) {
                 children = (
@@ -1379,7 +1379,7 @@ function PureReportActionItem({
             const isDEWPolicy = hasDynamicExternalWorkflow(policy);
             const isPendingAdd = action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
 
-            if (isTrackIntentUser) {
+            if (isTrackIntentUser && isSubmitAndClose(policy)) {
                 children = <ReportActionItemBasicMessage message={translate('iou.markedAsDone')} />;
             } else if (wasAutoApproved) {
                 children = (

From 0413a9a0979acc54c7919ce8945ab42510440199 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 11:14:17 +0000
Subject: [PATCH 12/24] Fix: run prettier to fix import ordering

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/LHNOptionsList/OptionRowLHNData.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHNData.tsx
index 89651a5a70de..90335e2eb556 100644
--- a/src/components/LHNOptionsList/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHNData.tsx
@@ -6,8 +6,8 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useGetExpensifyCardFromReportAction from '@hooks/useGetExpensifyCardFromReportAction';
 import useOnyx from '@hooks/useOnyx';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
-import {isSubmitAndClose} from '@libs/PolicyUtils';
 import {getIOUReportIDOfLastAction} from '@libs/OptionsListUtils';
+import {isSubmitAndClose} from '@libs/PolicyUtils';
 import {getLastVisibleActionIncludingTransactionThread, getOriginalMessage, isActionableTrackExpense, isInviteOrRemovedAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {canUserPerformWriteAction as canUserPerformWriteActionUtil} from '@libs/ReportUtils';
 import SidebarUtils from '@libs/SidebarUtils';

From 7396cc476f6efb8b7866e4acfe46876b6cc9b0dd Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 11:17:24 +0000
Subject: [PATCH 13/24] Fix: remove unused datetimeToCalendarTime destructuring

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/pages/inbox/report/PureReportActionItem.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/inbox/report/PureReportActionItem.tsx b/src/pages/inbox/report/PureReportActionItem.tsx
index 3f3ef1b5d3b0..978e4b40c7d5 100644
--- a/src/pages/inbox/report/PureReportActionItem.tsx
+++ b/src/pages/inbox/report/PureReportActionItem.tsx
@@ -551,7 +551,7 @@ function PureReportActionItem({
     const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const {transitionActionSheetState} = ActionSheetAwareScrollView.useActionSheetAwareScrollViewActions();
     const isTrackIntentUser = isTrackIntentUserSelector(introSelected);
-    const {translate, formatPhoneNumber, localeCompare, formatTravelDate, getLocalDateFromDatetime, datetimeToCalendarTime} = useLocalize();
+    const {translate, formatPhoneNumber, localeCompare, formatTravelDate, getLocalDateFromDatetime} = useLocalize();
     const {showConfirmModal} = useConfirmModal();
     const personalDetail = useCurrentUserPersonalDetails();
     const {shouldUseNarrowLayout} = useResponsiveLayout();

From 7716c0f1757775487cde434b8fc7372a4b3fa67e Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 18:08:02 +0000
Subject: [PATCH 14/24] Fix: keep original button size for 'Mark as done' in
 ActionCell

Remove the extraSmall override that was shrinking the button from 28px
to 20px when shouldUseMarkAsDone was true. The button should retain its
original small size regardless of the text change.

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 .../Search/SearchList/ListItem/ActionCell/index.tsx         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
index 55d14e2c7ee5..7886ed5273dc 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
@@ -87,14 +87,12 @@ function ActionCell({
     const shouldUseMarkAsDone = isTrackIntentUser && isSubmitAndClose(actionCellPolicy) && (action === CONST.SEARCH.ACTION_TYPES.SUBMIT || action === CONST.SEARCH.ACTION_TYPES.APPROVE);
     const text = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(actionTranslationsMap[action]);
 
-    const useExtraSmall = extraSmall || shouldUseMarkAsDone;
-
     return (
         <Button
             text={text}
             onPress={goToItem}
-            small={!useExtraSmall}
-            extraSmall={useExtraSmall}
+            small={!extraSmall}
+            extraSmall={extraSmall}
             style={[styles.w100, shouldDisablePointerEvents && styles.pointerEventsNone]}
             isLoading={isLoading}
             success

From f2cff703e464a5158cf5eeff522168b04c768da8 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 18:40:37 +0000
Subject: [PATCH 15/24] Fix: reduce horizontal padding on 'Mark as done' button
 in ActionCell

The 'Mark as done' text is longer than 'Submit' and gets clipped in the
fixed-width action column. Reduce paddingHorizontal from 12px to 8px
(styles.ph2) via innerStyles when shouldUseMarkAsDone is true.

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/Search/SearchList/ListItem/ActionCell/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
index 7886ed5273dc..b54eabf64cf1 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
@@ -99,6 +99,7 @@ function ActionCell({
             isDisabled={isOffline || shouldDisablePointerEvents}
             shouldStayNormalOnDisable={shouldDisablePointerEvents}
             isNested
+            innerStyles={shouldUseMarkAsDone ? [styles.ph2] : undefined}
             sentryLabel={CONST.SENTRY_LABEL.SEARCH.ACTION_CELL_ACTION}
         />
     );

From dc09c5754b6fbff0dc37b513453b8c6561a6760b Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 19:12:45 +0000
Subject: [PATCH 16/24] Update beginningOfChatHistoryPolicyExpenseChatTrack
 copy across all language files

Changed from "This is where you will track expenses" to "This is where you'll track expenses."

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/languages/de.ts      | 2 +-
 src/languages/en.ts      | 2 +-
 src/languages/es.ts      | 2 +-
 src/languages/fr.ts      | 2 +-
 src/languages/it.ts      | 2 +-
 src/languages/ja.ts      | 2 +-
 src/languages/nl.ts      | 2 +-
 src/languages/pl.ts      | 2 +-
 src/languages/pt-BR.ts   | 2 +-
 src/languages/zh-hans.ts | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 004c9139294c..2fee695fe587 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -878,7 +878,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Dieser Chat ist mit ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Hier reicht <strong>${submitterDisplayName}</strong> Auslagen bei <strong>${workspaceName}</strong> ein. Nutze einfach die +-Taste.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'Dies ist dein persönlicher Bereich. Nutze ihn für Notizen, Aufgaben, Entwürfe und Erinnerungen.',
         beginningOfChatHistorySystemDM: 'Willkommen! Lassen Sie uns Ihre Einrichtung vornehmen.',
         chatWithAccountManager: 'Chatte hier mit deiner/deinem Account Manager',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 3679f5024e29..8338970dd2ca 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -908,7 +908,7 @@ const translations = {
         beginningOfChatHistory: (users: string) => `This chat is with ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `This is where <strong>${submitterDisplayName}</strong> will submit expenses to <strong>${workspaceName}</strong>. Just use the + button.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
         beginningOfChatHistorySystemDM: "Welcome! Let's get you set up.",
         chatWithAccountManager: 'Chat with your account manager here',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 70eb00b75e69..b9ba1a938322 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -779,7 +779,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users) => `Este chat es con ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName, submitterDisplayName) =>
             `Aquí es donde <strong>${submitterDisplayName}</strong> enviará los gastos al espacio de trabajo <strong>${workspaceName}</strong>. Solo usa el botón +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'Aquí es donde harás seguimiento de tus gastos',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         beginningOfChatHistorySystemDM: '¡Bienvenido! Vamos a configurar tu cuenta.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index dbde0d4f2c4c..1ac5cd11f0e7 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -881,7 +881,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Cette discussion est avec ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `C’est ici que <strong>${submitterDisplayName}</strong> soumettra des dépenses à <strong>${workspaceName}</strong>. Utilisez simplement le bouton +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: `This is where you will track expenses`,
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'Ceci est votre espace personnel. Utilisez-le pour vos notes, tâches, brouillons et rappels.',
         beginningOfChatHistorySystemDM: 'Bienvenue ! Procédons à la configuration.',
         chatWithAccountManager: 'Discutez avec votre gestionnaire de compte ici',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 901fbbccb7ac..3a2169b8919f 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -879,7 +879,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Questa chat è con ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Qui è dove <strong>${submitterDisplayName}</strong> invierà le spese a <strong>${workspaceName}</strong>. Usa semplicemente il pulsante +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'Questo è il tuo spazio personale. Usalo per note, attività, bozze e promemoria.',
         beginningOfChatHistorySystemDM: 'Benvenuto/a! Procediamo con la configurazione.',
         chatWithAccountManager: 'Chatta qui con il tuo account manager',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 5f9bba61eed5..d906960aac92 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -865,7 +865,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `このチャットの相手は${users}です。`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `ここは<strong>${submitterDisplayName}</strong>さんが<strong>${workspaceName}</strong>に経費精算を提出する場所です。+ボタンを押すだけでOKです。`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'ここはあなたの個人スペースです。メモ、タスク、下書き、リマインダーに活用してください。',
         beginningOfChatHistorySystemDM: 'ようこそ！設定を始めましょう。',
         chatWithAccountManager: 'ここでアカウントマネージャーとチャットする',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index ec7f84201e99..18bd6c185297 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -877,7 +877,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Deze chat is met ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Dit is waar <strong>${submitterDisplayName}</strong> declaraties indient bij <strong>${workspaceName}</strong>. Gebruik gewoon de +-knop.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'Dit is je persoonlijke ruimte. Gebruik het voor notities, taken, concepten en herinneringen.',
         beginningOfChatHistorySystemDM: 'Welkom! Laten we je instellen.',
         chatWithAccountManager: 'Chat hier met je accountmanager',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f61a9d765f48..3f8c255f81ea 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -878,7 +878,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Ten czat jest z ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Tutaj <strong>${submitterDisplayName}</strong> będzie przesyłać wydatki do <strong>${workspaceName}</strong>. Po prostu użyj przycisku +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'To Twoja osobista przestrzeń. Używaj jej na notatki, zadania, szkice i przypomnienia.',
         beginningOfChatHistorySystemDM: 'Witamy! Zacznijmy konfigurację.',
         chatWithAccountManager: 'Porozmawiaj tutaj z opiekunem konta',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index eef4a394d6da..a28653293159 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -877,7 +877,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Este chat é com ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `É aqui que <strong>${submitterDisplayName}</strong> enviará despesas para <strong>${workspaceName}</strong>. Basta usar o botão +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: 'Este é o seu espaço pessoal. Use-o para anotações, tarefas, rascunhos e lembretes.',
         beginningOfChatHistorySystemDM: 'Bem-vindo(a)! Vamos fazer a sua configuração.',
         chatWithAccountManager: 'Converse com seu gerente de conta aqui',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index a6e022d6c665..1d504c8643ef 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -853,7 +853,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `此聊天对象为 ${users}。`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `这是 <strong>${submitterDisplayName}</strong> 向 <strong>${workspaceName}</strong> 提交报销的地方。只需使用”+”按钮即可。`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'This is where you will track expenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
         beginningOfChatHistorySelfDM: '这是你的个人空间。可在此记录笔记、任务、草稿和提醒事项。',
         beginningOfChatHistorySystemDM: '欢迎！让我们帮你完成设置。',
         chatWithAccountManager: '在这里与您的客户经理聊天',

From d678c25f7dc3428dd069407d9741bbf6664558b1 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 19:24:24 +0000
Subject: [PATCH 17/24] Fix: apply proper translations for non-English language
 files

Replaced English fallback values with language-specific translations
from the Polyglot Parrot for markAsDone, markedAsDoneStatus,
beginningOfChatHistoryPolicyExpenseChatTrack, and markedAsDone
across all 9 non-English language files (de, es, fr, it, ja, nl,
pl, pt-BR, zh-hans).

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/languages/de.ts      | 8 ++++----
 src/languages/es.ts      | 2 +-
 src/languages/fr.ts      | 8 ++++----
 src/languages/it.ts      | 8 ++++----
 src/languages/ja.ts      | 8 ++++----
 src/languages/nl.ts      | 8 ++++----
 src/languages/pl.ts      | 8 ++++----
 src/languages/pt-BR.ts   | 8 ++++----
 src/languages/zh-hans.ts | 8 ++++----
 9 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 2fee695fe587..bb1875a91773 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -148,9 +148,9 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Mehrfachauswahl',
         saveChanges: 'Änderungen speichern',
         submit: 'Senden',
-        markAsDone: 'Mark as done',
+        markAsDone: 'Als erledigt markieren',
         submitted: 'Übermittelt',
-        markedAsDoneStatus: 'Marked as done',
+        markedAsDoneStatus: 'Als erledigt markiert',
         rotate: 'Drehen',
         zoom: 'Zoom',
         password: 'Passwort',
@@ -878,7 +878,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Dieser Chat ist mit ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Hier reicht <strong>${submitterDisplayName}</strong> Auslagen bei <strong>${workspaceName}</strong> ein. Nutze einfach die +-Taste.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'Hier können Sie Ausgaben nachverfolgen',
         beginningOfChatHistorySelfDM: 'Dies ist dein persönlicher Bereich. Nutze ihn für Notizen, Aufgaben, Entwürfe und Erinnerungen.',
         beginningOfChatHistorySystemDM: 'Willkommen! Lassen Sie uns Ihre Einrichtung vornehmen.',
         chatWithAccountManager: 'Chatte hier mit deiner/deinem Account Manager',
@@ -1333,7 +1333,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `${amount}-Rechnung senden`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `für ${comment}` : ''}`,
         submitted: (memo?: string) => `eingereicht${memo ? `, mit dem Vermerk ${memo}` : ''}`,
-        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo) => `als erledigt markiert${memo ? `, mit dem Vermerk ${memo}` : ''}`,
         automaticallySubmitted: `eingereicht über <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">Einreichungen verzögern</a>`,
         queuedToSubmitViaDEW: 'zur Einreichung über benutzerdefinierten Genehmigungsworkflow eingereiht',
         queuedToApproveViaDEW: 'Zur Genehmigung über benutzerdefinierten Genehmigungsworkflow eingereiht',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b9ba1a938322..9dead7aef028 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -779,7 +779,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users) => `Este chat es con ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName, submitterDisplayName) =>
             `Aquí es donde <strong>${submitterDisplayName}</strong> enviará los gastos al espacio de trabajo <strong>${workspaceName}</strong>. Solo usa el botón +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'Aquí es donde harás seguimiento de los gastos',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         beginningOfChatHistorySystemDM: '¡Bienvenido! Vamos a configurar tu cuenta.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 1ac5cd11f0e7..1d0a6a87f6aa 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -148,9 +148,9 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Sélection multiple',
         saveChanges: 'Enregistrer les modifications',
         submit: 'Soumettre',
-        markAsDone: `Mark as done`,
+        markAsDone: 'Marquer comme terminé',
         submitted: 'Soumis',
-        markedAsDoneStatus: 'Marked as done',
+        markedAsDoneStatus: 'Marqué comme terminé',
         rotate: 'Pivoter',
         zoom: 'Zoom',
         password: 'Mot de passe',
@@ -881,7 +881,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Cette discussion est avec ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `C’est ici que <strong>${submitterDisplayName}</strong> soumettra des dépenses à <strong>${workspaceName}</strong>. Utilisez simplement le bouton +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'C\u2019est ici que vous suivrez vos dépenses',
         beginningOfChatHistorySelfDM: 'Ceci est votre espace personnel. Utilisez-le pour vos notes, tâches, brouillons et rappels.',
         beginningOfChatHistorySystemDM: 'Bienvenue ! Procédons à la configuration.',
         chatWithAccountManager: 'Discutez avec votre gestionnaire de compte ici',
@@ -1337,7 +1337,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Envoyer la facture de ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `pour ${comment}` : ''}`,
         submitted: (memo?: string) => `soumis${memo ? `, indiquant « ${memo} »` : ''}`,
-        markedAsDone: (memo?: string) => `marked as done${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo?: string) => `marqué comme terminé${memo ? `, en indiquant « ${memo} »` : ''}`,
         automaticallySubmitted: `soumis via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">soumissions différées</a>`,
         queuedToSubmitViaDEW: 'en file d’attente pour être soumis via le circuit d’approbation personnalisé',
         queuedToApproveViaDEW: 'mis en file d’attente pour approbation via un processus d’approbation personnalisé',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 3a2169b8919f..1bc168be54f3 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -148,9 +148,9 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Selezione multipla',
         saveChanges: 'Salva modifiche',
         submit: 'Invia',
-        markAsDone: 'Mark as done',
+        markAsDone: 'Segna come completata',
         submitted: 'Inviato',
-        markedAsDoneStatus: 'Marked as done',
+        markedAsDoneStatus: 'Contrassegnato come completato',
         rotate: 'Ruota',
         zoom: 'Zoom',
         password: 'Password',
@@ -879,7 +879,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Questa chat è con ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Qui è dove <strong>${submitterDisplayName}</strong> invierà le spese a <strong>${workspaceName}</strong>. Usa semplicemente il pulsante +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'Qui è dove terrai traccia delle spese',
         beginningOfChatHistorySelfDM: 'Questo è il tuo spazio personale. Usalo per note, attività, bozze e promemoria.',
         beginningOfChatHistorySystemDM: 'Benvenuto/a! Procediamo con la configurazione.',
         chatWithAccountManager: 'Chatta qui con il tuo account manager',
@@ -1332,7 +1332,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Invia fattura da ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `per ${comment}` : ''}`,
         submitted: (memo?: string) => `inviato${memo ? `, con nota: ${memo}` : ''}`,
-        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo) => `contrassegnata come completata${memo ? `, dicendo ${memo}` : ''}`,
         automaticallySubmitted: `inviato tramite <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">invio posticipato</a>`,
         queuedToSubmitViaDEW: 'in coda per l’invio tramite flusso di approvazione personalizzato',
         queuedToApproveViaDEW: 'in coda per l’approvazione tramite flusso di approvazione personalizzato',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index d906960aac92..4f5dbb3f7dd9 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -148,9 +148,9 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: '複数選択',
         saveChanges: '変更を保存',
         submit: '送信',
-        markAsDone: 'Mark as done',
+        markAsDone: '完了にする',
         submitted: '送信済み',
-        markedAsDoneStatus: 'Marked as done',
+        markedAsDoneStatus: '完了済み',
         rotate: '回転',
         zoom: 'ズーム',
         password: 'パスワード',
@@ -865,7 +865,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `このチャットの相手は${users}です。`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `ここは<strong>${submitterDisplayName}</strong>さんが<strong>${workspaceName}</strong>に経費精算を提出する場所です。+ボタンを押すだけでOKです。`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'ここは経費を管理する場所です',
         beginningOfChatHistorySelfDM: 'ここはあなたの個人スペースです。メモ、タスク、下書き、リマインダーに活用してください。',
         beginningOfChatHistorySystemDM: 'ようこそ！設定を始めましょう。',
         chatWithAccountManager: 'ここでアカウントマネージャーとチャットする',
@@ -1315,7 +1315,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `${amount} の請求書を送信`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `${comment}用` : ''}`,
         submitted: (memo?: string) => `送信済み${memo ? `、メモ: ${memo}` : ''}`,
-        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo) => `完了としてマークしました${memo ? `（メモ：${memo}）` : ''}`,
         automaticallySubmitted: `<a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">提出の延期</a> 経由で提出されました`,
         queuedToSubmitViaDEW: 'カスタム承認ワークフローで提出待ち',
         queuedToApproveViaDEW: 'カスタム承認ワークフローで承認待ちに設定されました',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 18bd6c185297..079f5759927f 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -148,9 +148,9 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Meerdere selecteren',
         saveChanges: 'Wijzigingen opslaan',
         submit: 'Verzenden',
-        markAsDone: 'Mark as done',
+        markAsDone: 'Markeren als voltooid',
         submitted: 'Ingediend',
-        markedAsDoneStatus: 'Marked as done',
+        markedAsDoneStatus: 'Als voltooid gemarkeerd',
         rotate: 'Draaien',
         zoom: 'Zoom',
         password: 'Wachtwoord',
@@ -877,7 +877,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Deze chat is met ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Dit is waar <strong>${submitterDisplayName}</strong> declaraties indient bij <strong>${workspaceName}</strong>. Gebruik gewoon de +-knop.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'Hier houd je je uitgaven bij',
         beginningOfChatHistorySelfDM: 'Dit is je persoonlijke ruimte. Gebruik het voor notities, taken, concepten en herinneringen.',
         beginningOfChatHistorySystemDM: 'Welkom! Laten we je instellen.',
         chatWithAccountManager: 'Chat hier met je accountmanager',
@@ -1331,7 +1331,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Verzend factuur van ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `voor ${comment}` : ''}`,
         submitted: (memo?: string) => `ingediend${memo ? `, met de omschrijving ${memo}` : ''}`,
-        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo) => `gemarkeerd als voltooid${memo ? `, met als omschrijving ${memo}` : ''}`,
         automaticallySubmitted: `ingediend via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">uitgestelde indieningen</a>`,
         queuedToSubmitViaDEW: 'in wachtrij om via aangepast goedkeuringsproces in te dienen',
         queuedToApproveViaDEW: 'in de wachtrij gezet voor goedkeuring via aangepaste goedkeuringsworkflow',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 3f8c255f81ea..e72167679f73 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -148,9 +148,9 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Wielokrotny wybór',
         saveChanges: 'Zapisz zmiany',
         submit: 'Wyślij',
-        markAsDone: 'Mark as done',
+        markAsDone: 'Oznacz jako wykonane',
         submitted: 'Przesłano',
-        markedAsDoneStatus: 'Marked as done',
+        markedAsDoneStatus: 'Oznaczone jako ukończone',
         rotate: 'Obróć',
         zoom: 'Powiększenie',
         password: 'Hasło',
@@ -878,7 +878,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Ten czat jest z ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `Tutaj <strong>${submitterDisplayName}</strong> będzie przesyłać wydatki do <strong>${workspaceName}</strong>. Po prostu użyj przycisku +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'Tutaj będziesz śledzić wydatki',
         beginningOfChatHistorySelfDM: 'To Twoja osobista przestrzeń. Używaj jej na notatki, zadania, szkice i przypomnienia.',
         beginningOfChatHistorySystemDM: 'Witamy! Zacznijmy konfigurację.',
         chatWithAccountManager: 'Porozmawiaj tutaj z opiekunem konta',
@@ -1331,7 +1331,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Wyślij fakturę na ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `za ${comment}` : ''}`,
         submitted: (memo?: string) => `przesłano${memo ? `, wpisując ${memo}` : ''}`,
-        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo) => `oznaczono jako zakończone${memo ? `, z adnotacją: ${memo}` : ''}`,
         automaticallySubmitted: `przesłano przez <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">opóźnianie wysyłania</a>`,
         queuedToSubmitViaDEW: 'w kolejce do przesłania przez niestandardowy proces zatwierdzania',
         queuedToApproveViaDEW: 'oczekuje na zatwierdzenie w niestandardowym procesie akceptacji',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index a28653293159..212ba1b55fb9 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -148,9 +148,9 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: 'Seleção múltipla',
         saveChanges: 'Salvar alterações',
         submit: 'Enviar',
-        markAsDone: 'Mark as done',
+        markAsDone: 'Marcar como concluído',
         submitted: 'Enviado',
-        markedAsDoneStatus: 'Marked as done',
+        markedAsDoneStatus: 'Marcado como concluído',
         rotate: 'Girar',
         zoom: 'Zoom',
         password: 'Senha',
@@ -877,7 +877,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Este chat é com ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `É aqui que <strong>${submitterDisplayName}</strong> enviará despesas para <strong>${workspaceName}</strong>. Basta usar o botão +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'É aqui que você vai acompanhar as despesas',
         beginningOfChatHistorySelfDM: 'Este é o seu espaço pessoal. Use-o para anotações, tarefas, rascunhos e lembretes.',
         beginningOfChatHistorySystemDM: 'Bem-vindo(a)! Vamos fazer a sua configuração.',
         chatWithAccountManager: 'Converse com seu gerente de conta aqui',
@@ -1330,7 +1330,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `Enviar fatura de ${amount}`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `para ${comment}` : ''}`,
         submitted: (memo?: string) => `enviado${memo ? `, dizendo ${memo}` : ''}`,
-        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo) => `marcado como concluído${memo ? `, dizendo ${memo}` : ''}`,
         automaticallySubmitted: `enviado via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">atrasar envios</a>`,
         queuedToSubmitViaDEW: 'na fila para enviar via fluxo de aprovação personalizado',
         queuedToApproveViaDEW: 'na fila para aprovar via fluxo de aprovação personalizado',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 1d504c8643ef..db09c0f1782e 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -148,9 +148,9 @@ const translations: TranslationDeepObject<typeof en> = {
         selectMultiple: '多选',
         saveChanges: '保存更改',
         submit: '提交',
-        markAsDone: 'Mark as done',
+        markAsDone: '标记为完成',
         submitted: '已提交',
-        markedAsDoneStatus: 'Marked as done',
+        markedAsDoneStatus: '已标记为完成',
         rotate: '旋转',
         zoom: '缩放',
         password: '密码',
@@ -853,7 +853,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `此聊天对象为 ${users}。`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `这是 <strong>${submitterDisplayName}</strong> 向 <strong>${workspaceName}</strong> 提交报销的地方。只需使用”+”按钮即可。`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: "This is where you'll track expenses.",
+        beginningOfChatHistoryPolicyExpenseChatTrack: '在这里跟踪你的报销费用',
         beginningOfChatHistorySelfDM: '这是你的个人空间。可在此记录笔记、任务、草稿和提醒事项。',
         beginningOfChatHistorySystemDM: '欢迎！让我们帮你完成设置。',
         chatWithAccountManager: '在这里与您的客户经理聊天',
@@ -1292,7 +1292,7 @@ const translations: TranslationDeepObject<typeof en> = {
         sendInvoice: (amount: string) => `发送 ${amount} 发票`,
         expenseAmount: (formattedAmount: string, comment?: string) => `${formattedAmount}${comment ? `用于 ${comment}` : ''}`,
         submitted: (memo?: string) => `已提交${memo ? `，备注为 ${memo}` : ''}`,
-        markedAsDone: (memo) => `marked as done${memo ? `, saying ${memo}` : ''}`,
+        markedAsDone: (memo) => `标记为已完成${memo ? `，说明：${memo}` : ''}`,
         automaticallySubmitted: `通过<a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">延迟提交</a>提交`,
         queuedToSubmitViaDEW: '已排队，待通过自定义审批流程提交',
         queuedToApproveViaDEW: '已排队，等待通过自定义审批流程批准',

From 9a722610331b96d514d0fba81625f8b1cdf6576d Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 19:36:41 +0000
Subject: [PATCH 18/24] Fix: add missing betas argument to
 createTransactionThreadReport call

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/libs/actions/IOU/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts
index 14236f8a307a..ec81ea207262 100644
--- a/src/libs/actions/IOU/index.ts
+++ b/src/libs/actions/IOU/index.ts
@@ -13337,7 +13337,7 @@ function updateMultipleMoneyRequests({
         // bulk-edit comments are visible immediately while still offline.
         let didCreateThreadInThisIteration = false;
         if (!transactionThreadReportID && iouReport?.reportID) {
-            const optimisticTransactionThread = createTransactionThreadReport(undefined, currentUserEmail, userAccountID, iouReport, reportAction, transaction);
+            const optimisticTransactionThread = createTransactionThreadReport(undefined, currentUserEmail, userAccountID, undefined, iouReport, reportAction, transaction);
             if (optimisticTransactionThread?.reportID) {
                 transactionThreadReportID = optimisticTransactionThread.reportID;
                 transactionThread = optimisticTransactionThread;

From 505694b80c8890429a469f4387cc20b918c58856 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Mon, 30 Mar 2026 19:36:45 +0000
Subject: [PATCH 19/24] Revert unnecessary approve-related overrides for
 track-intent users

The Approve button can never appear for submit-and-close policies
(canApproveIOU checks isSubmitAndClose and returns false), so the
approve-to-markAsDone overrides were dead code. Removed from:
- ApproveActionButton (reverted to plain translate('iou.approve'))
- ActionCell (removed APPROVE from shouldUseMarkAsDone condition)
- useSearchBulkActions (reverted bulk approve text)
- OptionRowLHN (removed APPROVE badge override)

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/LHNOptionsList/OptionRowLHN.tsx              | 3 +--
 .../MoneyRequestReportPreview/ApproveActionButton.tsx       | 6 +-----
 .../Search/SearchList/ListItem/ActionCell/index.tsx         | 2 +-
 src/hooks/useSearchBulkActions.ts                           | 5 +----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx
index 88ca676985b1..a1869cfc06bb 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN.tsx
@@ -165,8 +165,7 @@ function OptionRowLHN({
 
     const brickRoadIndicator = optionItem.brickRoadIndicator;
     const isTrackIntentUser = onboardingPurpose === CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE || onboardingPurpose === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND;
-    const shouldUseMarkAsDone =
-        isTrackIntentUser && isApprovalDisabledForReport && (optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.SUBMIT || optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.APPROVE);
+    const shouldUseMarkAsDone = isTrackIntentUser && isApprovalDisabledForReport && optionItem.actionBadge === CONST.REPORT.ACTION_BADGE.SUBMIT;
     let actionBadgeText = '';
     if (!isProduction && optionItem.actionBadge) {
         actionBadgeText = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(`common.actionBadge.${optionItem.actionBadge}`);
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
index 3fe53f100286..efc59419c318 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx
@@ -1,4 +1,3 @@
-import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React from 'react';
 import Button from '@components/Button';
 import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider';
@@ -7,7 +6,6 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
-import {isSubmitAndClose} from '@libs/PolicyUtils';
 import {hasHeldExpenses as hasHeldExpensesReportUtils, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
 import {approveMoneyRequest} from '@userActions/IOU';
 import CONST from '@src/CONST';
@@ -39,8 +37,6 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe
     const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
-    const [iouReportPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`);
 
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
     const hasViolations = hasViolationsReportUtils(iouReport?.reportID, transactionViolations, currentUserAccountID, currentUserEmail);
@@ -71,7 +67,7 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe
 
     return (
         <Button
-            text={isTrackIntentUser && isSubmitAndClose(iouReportPolicy) ? translate('common.markAsDone') : translate('iou.approve')}
+            text={translate('iou.approve')}
             success
             onPress={confirmApproval}
             sentryLabel={CONST.SENTRY_LABEL.REPORT_PREVIEW.APPROVE_BUTTON}
diff --git a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
index b54eabf64cf1..b78e41583c77 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
@@ -84,7 +84,7 @@ function ActionCell({
         );
     }
 
-    const shouldUseMarkAsDone = isTrackIntentUser && isSubmitAndClose(actionCellPolicy) && (action === CONST.SEARCH.ACTION_TYPES.SUBMIT || action === CONST.SEARCH.ACTION_TYPES.APPROVE);
+    const shouldUseMarkAsDone = isTrackIntentUser && isSubmitAndClose(actionCellPolicy) && action === CONST.SEARCH.ACTION_TYPES.SUBMIT;
     const text = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(actionTranslationsMap[action]);
 
     return (
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index c00d40069157..74a50372558a 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -933,10 +933,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         if (shouldShowApproveOption) {
             options.push({
                 icon: expensifyIcons.ThumbsUp,
-                text:
-                    isTrackIntentUser && selectedReports.every((report) => isSubmitAndClose(policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`]))
-                        ? translate('common.markAsDone')
-                        : translate('search.bulkActions.approve'),
+                text: translate('search.bulkActions.approve'),
                 value: CONST.SEARCH.BULK_ACTION_TYPES.APPROVE,
                 shouldCloseModalOnSelect: true,
                 onSelected: () => {

From 604fbeba9a6788408a33404480b8ccc19a6b5a3d Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 31 Mar 2026 18:12:49 +0000
Subject: [PATCH 20/24] Revert innerStyles change and use 'Done' instead of
 'Mark as done' in ActionCell

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/Search/SearchList/ListItem/ActionCell/index.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
index b78e41583c77..ad76a75aaa7d 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/index.tsx
@@ -85,7 +85,7 @@ function ActionCell({
     }
 
     const shouldUseMarkAsDone = isTrackIntentUser && isSubmitAndClose(actionCellPolicy) && action === CONST.SEARCH.ACTION_TYPES.SUBMIT;
-    const text = shouldUseMarkAsDone ? translate('common.markAsDone') : translate(actionTranslationsMap[action]);
+    const text = shouldUseMarkAsDone ? translate('common.done') : translate(actionTranslationsMap[action]);
 
     return (
         <Button
@@ -99,7 +99,6 @@ function ActionCell({
             isDisabled={isOffline || shouldDisablePointerEvents}
             shouldStayNormalOnDisable={shouldDisablePointerEvents}
             isNested
-            innerStyles={shouldUseMarkAsDone ? [styles.ph2] : undefined}
             sentryLabel={CONST.SENTRY_LABEL.SEARCH.ACTION_CELL_ACTION}
         />
     );

From 0f69e486ff01103f269929fcbe95e3f1ebc9e985 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 1 Apr 2026 03:42:49 +0000
Subject: [PATCH 21/24] Fix: preserve policy description priority and guard
 empty selectedReports

- SidebarUtils: check policy.description before isTrackIntentUser so
  custom workspace descriptions are not overridden by track-intent copy
- useSearchBulkActions: add selectedReports.length > 0 guard before
  .every() to prevent showing "Mark as done" when no reports are selected

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/hooks/useSearchBulkActions.ts | 2 +-
 src/libs/SidebarUtils.ts          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index a05d7a1106be..80ef8e4e45b7 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -997,7 +997,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             options.push({
                 icon: expensifyIcons.Send,
                 text:
-                    isTrackIntentUser && selectedReports.every((report) => isSubmitAndClose(policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`]))
+                    isTrackIntentUser && selectedReports.length > 0 && selectedReports.every((report) => isSubmitAndClose(policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`]))
                         ? translate('common.markAsDone')
                         : translate('common.submit'),
                 value: CONST.SEARCH.BULK_ACTION_TYPES.SUBMIT,
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 2ee98ea6d78d..37957f85c1a6 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -1284,12 +1284,12 @@ function getWelcomeMessage(params: WelcomeMessageParams): WelcomeMessage {
     }
 
     if (isPolicyExpenseChat(report)) {
-        if (isTrackIntentUser) {
-            welcomeMessage.messageHtml = translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatTrack');
-            welcomeMessage.messageText = Parser.htmlToText(welcomeMessage.messageHtml);
-        } else if (policy?.description) {
+        if (policy?.description) {
             welcomeMessage.messageHtml = policy.description;
             welcomeMessage.messageText = Parser.htmlToText(welcomeMessage.messageHtml);
+        } else if (isTrackIntentUser) {
+            welcomeMessage.messageHtml = translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatTrack');
+            welcomeMessage.messageText = Parser.htmlToText(welcomeMessage.messageHtml);
         } else {
             welcomeMessage.messageHtml = translate(
                 'reportActionsView.beginningOfChatHistoryPolicyExpenseChat',

From d71c6b3ec9eedb8b634c4d8a7c02bea56b918208 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 1 Apr 2026 16:55:00 +0000
Subject: [PATCH 22/24] Fix: run prettier on ApprovePrimaryAction and
 SubmitPrimaryAction

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 .../MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx     | 2 +-
 .../MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx
index c2217e235de8..fb0c7cf43352 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx
@@ -1,3 +1,4 @@
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React from 'react';
 import Button from '@components/Button';
 import useLocalize from '@hooks/useLocalize';
@@ -5,7 +6,6 @@ import useOnyx from '@hooks/useOnyx';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {isSubmitAndClose} from '@libs/PolicyUtils';
 import {getNextApproverAccountID, isReportOwner} from '@libs/ReportUtils';
-import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import useConfirmApproval from './useConfirmApproval';
diff --git a/src/components/MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx
index 28413244054c..f154c73f7095 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx
@@ -1,3 +1,4 @@
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React from 'react';
 import AnimatedSubmitButton from '@components/AnimatedSubmitButton';
 import {useSearchStateContext} from '@components/Search/SearchContext';
@@ -16,7 +17,6 @@ import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {isSubmitAndClose} from '@libs/PolicyUtils';
 import {getFilteredReportActionsForReportView} from '@libs/ReportActionsUtils';
 import {getNextApproverAccountID, hasViolations as hasViolationsReportUtils, isReportOwner, shouldBlockSubmitDueToStrictPolicyRules} from '@libs/ReportUtils';
-import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import {hasAnyPendingRTERViolation as hasAnyPendingRTERViolationTransactionUtils} from '@libs/TransactionUtils';
 import {submitReport} from '@userActions/IOU';
 import {markPendingRTERTransactionsAsCash} from '@userActions/Transaction';

From 1d2af42eadf49908a979cbb3971bf444f272ba5b Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 1 Apr 2026 17:01:40 +0000
Subject: [PATCH 23/24] Fix: define missing submitButtonText and
 approveButtonText in MoneyReportHeader

The track-intent copy logic replaced inline translate() calls with
submitButtonText and approveButtonText variables but never defined them,
causing @typescript-eslint/no-unsafe-assignment errors. Add the missing
variable definitions using the same pattern as SubmitPrimaryAction.tsx
and ApprovePrimaryAction.tsx: fetch isTrackIntentUser via Onyx selector,
compute shouldUseMarkAsDoneCopy, and derive the button text strings.

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/MoneyReportHeader.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index b1fa4380666a..bd69324e2edc 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1,7 +1,7 @@
 import {useRoute} from '@react-navigation/native';
 import {isUserValidatedSelector} from '@selectors/Account';
 import {shouldFailAllRequestsSelector} from '@selectors/Network';
-import {hasSeenTourSelector} from '@selectors/Onboarding';
+import {hasSeenTourSelector, isTrackIntentUserSelector} from '@selectors/Onboarding';
 import passthroughPolicyTagListSelector from '@selectors/PolicyTagList';
 import {validTransactionDraftsSelector} from '@selectors/TransactionDraft';
 import truncate from 'lodash/truncate';
@@ -70,7 +70,7 @@ import {
 } from '@libs/NextStepUtils';
 import type {KYCFlowEvent, TriggerKYCFlow} from '@libs/PaymentUtils';
 import {handleUnvalidatedAccount, selectPaymentType} from '@libs/PaymentUtils';
-import {getConnectedIntegration, getValidConnectedIntegration, hasDynamicExternalWorkflow, isPolicyAccessible, sortPoliciesByName} from '@libs/PolicyUtils';
+import {getConnectedIntegration, getValidConnectedIntegration, hasDynamicExternalWorkflow, isPolicyAccessible, isSubmitAndClose, sortPoliciesByName} from '@libs/PolicyUtils';
 import {
     getFilteredReportActionsForReportView,
     getIOUActionForTransactionID,
@@ -366,6 +366,10 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
     const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
     const [isPDFModalVisible, setIsPDFModalVisible] = useState(false);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
+    const shouldUseMarkAsDoneCopy = isTrackIntentUser && isSubmitAndClose(policy);
+    const submitButtonText = shouldUseMarkAsDoneCopy ? translate('common.markAsDone') : translate('common.submit');
+    const approveButtonText = shouldUseMarkAsDoneCopy ? translate('common.markAsDone') : translate('iou.approve');
     const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
     const currentTransaction = transactions.at(0);
     const [originalIOUTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(currentTransaction?.comment?.originalTransactionID)}`);

From cbe6818464dc42e613082baded029dc82812cb09 Mon Sep 17 00:00:00 2001
From: "Jayesh Mangwani (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Wed, 1 Apr 2026 17:17:02 +0000
Subject: [PATCH 24/24] Fix: pass missing betas param to openReport in
 TestDriveDemo

Co-authored-by: Jayesh Mangwani <jayeshmangwani@users.noreply.github.com>
---
 src/components/TestDrive/TestDriveDemo.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/TestDrive/TestDriveDemo.tsx b/src/components/TestDrive/TestDriveDemo.tsx
index 12d7f65d2525..bdac728c501e 100644
--- a/src/components/TestDrive/TestDriveDemo.tsx
+++ b/src/components/TestDrive/TestDriveDemo.tsx
@@ -33,6 +33,7 @@ function TestDriveDemo() {
     const [onboardingReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${onboarding?.chatReportID}`);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const [betas] = useOnyx(ONYXKEYS.BETAS);
     const {
         taskReport: viewTourTaskReport,
         taskParentReport: viewTourTaskParentReport,
@@ -56,7 +57,7 @@ function TestDriveDemo() {
         if (!viewTourTaskReport) {
             if (conciergeReportID && !hasCalledOpenReportRef.current) {
                 hasCalledOpenReportRef.current = true;
-                openReport({reportID: conciergeReportID, introSelected});
+                openReport({reportID: conciergeReportID, introSelected, betas});
             }
             return;
         }
@@ -83,6 +84,7 @@ function TestDriveDemo() {
         parentReportAction,
         conciergeReportID,
         introSelected,
+        betas,
     ]);
 
     useEffect(() => {