Merge pull request #88004 from Expensify/scott-dryUpClipboardMessage

Expand fallback condition & DRY up message for clipboard copy

(cherry picked from commit e12021e)

(cherry-picked to staging by AndrewGable)

Author: AndrewGable

src/libs/ReportActionsUtils.ts

@@ -448,8 +448,12 @@ function getReimbursedMessage(translate: LocalizedTranslate, reportAction: OnyxI
     // Real-time Pusher updates only carry `method`, so we fall back to it here for compatibility.
     const effectivePaymentMethod = originalMessage?.paymentMethod ?? originalMessage?.method;
 
-    // If no structured data, fall back to message fragments from backend (old actions)
-    if (!effectivePaymentMethod || !originalMessage) {
+    // If no structured data, or if this is a Pusher-only payload for a payment method that requires
+    // bank account digits (ACH, Fast_ACH, StripeConnect) but `creditBankAccountLast4` hasn't been
+    // populated yet by the openReport path, fall back to the pre-formatted server message fragments
+    // which already contain the correct account info. Check payments don't need enriched fields, so
+    // they are excluded from this fallback.
+    if (!effectivePaymentMethod || !originalMessage || (!originalMessage.paymentMethod && effectivePaymentMethod !== 'Check' && !originalMessage.creditBankAccountLast4)) {
         const messageFragments = reportAction?.message;
         let fallback = getReportActionMessageText(reportAction as OnyxEntry<ReportAction>);
         if (Array.isArray(messageFragments) && messageFragments.length > 1) {

src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx

@@ -73,13 +73,13 @@ import {
     getPolicyChangeLogMaxExpenseAmountMessage,
     getPolicyChangeLogMaxExpenseAmountNoReceiptMessage,
     getPolicyChangeLogUpdateEmployee,
-    getReimbursedMessage,
     getReimburserUpdateMessage,
     getRemovedCardFeedMessage,
     getRemovedConnectionMessage,
     getRenamedAction,
     getRenamedCardFeedMessage,
     getReportAction,
+    getReportActionMessageFragments,
     getReportActionMessageText,
     getRoomAvatarUpdatedMessage,
     getSetAutoJoinMessage,
@@ -965,7 +965,7 @@ const ContextMenuActions: ContextMenuAction[] = [
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED)) {
                     Clipboard.setString(getMarkedReimbursedMessage(translate, reportAction));
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REIMBURSED)) {
-                    Clipboard.setString(getReimbursedMessage(translate, reportAction, report, currentUserPersonalDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID));
+                    Clipboard.setString(getReportActionMessageFragments(translate, reportAction).at(0)?.text ?? '');
                 } else if (isReimbursementQueuedAction(reportAction)) {
                     Clipboard.setString(
                         getReimbursementQueuedActionMessage({reportAction, translate, formatPhoneNumber: formatPhoneNumberPhoneUtils, report, shouldUseShortDisplayName: false}),