Merge pull request #36851 from Expensify/monil-fixHOLDTranslate

[CP Staging] Handle translations in hold money request workflow
Expensify · Feb 20, 2024 · 292605f · 292605f
2 parents eb26916 + b336cd3
commit 292605f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -26,6 +26,7 @@ import type {
     FormattedMaxLengthParams,
     GoBackMessageParams,
     GoToRoomParams,
+    HeldRequestParams,
     InstantSummaryParams,
     LocalTimeParams,
     LoggedInAsParams,
@@ -666,8 +667,10 @@ export default {
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
         enableWallet: 'Enable Wallet',
         hold: 'Hold',
-        holdRequest: 'Hold Request',
-        unholdRequest: 'Unhold Request',
+        holdRequest: 'Hold request',
+        unholdRequest: 'Unhold request',
+        heldRequest: ({comment}: HeldRequestParams) => `held this request with the comment: ${comment}`,
+        unheldRequest: 'unheld this request',
         explainHold: "Explain why you're holding this request.",
         reason: 'Reason',
         holdReasonRequired: 'A reason is required when holding.',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -25,6 +25,7 @@ import type {
     FormattedMaxLengthParams,
     GoBackMessageParams,
     GoToRoomParams,
+    HeldRequestParams,
     InstantSummaryParams,
     LocalTimeParams,
     LoggedInAsParams,
@@ -660,8 +661,10 @@ export default {
         },
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Inició el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
         enableWallet: 'Habilitar Billetera',
-        holdRequest: 'Bloquear solicitud de dinero',
-        unholdRequest: 'Desbloquear solicitud de dinero',
+        holdRequest: 'Bloquear solicitud',
+        unholdRequest: 'Desbloquear solicitud',
+        heldRequest: ({comment}: HeldRequestParams) => `bloqueó esta solicitud con el comentario: ${comment}`,
+        unheldRequest: 'desbloqueó esta solicitud',
         explainHold: 'Explica la razón para bloquear esta solicitud.',
         reason: 'Razón',
         holdReasonRequired: 'Se requiere una razón para bloquear.',

diff --git a/src/languages/types.ts b/src/languages/types.ts
@@ -293,6 +293,8 @@ type ElectronicFundsParams = {percentage: string; amount: string};
 
 type LogSizeParams = {size: number};
 
+type HeldRequestParams = {comment: string};
+
 export type {
     AdminCanceledRequestParams,
     ApprovedAmountParams,
@@ -395,4 +397,5 @@ export type {
     WelcomeToRoomParams,
     ZipCodeExampleFormatParams,
     LogSizeParams,
+    HeldRequestParams,
 };
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -3529,7 +3529,7 @@ function buildOptimisticHoldReportAction(comment: string, created = DateUtils.ge
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
                 style: 'normal',
-                text: `held this money request with the comment: ${comment}`,
+                text: Localize.translateLocal('iou.heldRequest', {comment}),
             },
             {
                 type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
@@ -3564,7 +3564,7 @@ function buildOptimisticUnHoldReportAction(created = DateUtils.getDBTime()): Opt
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
                 style: 'normal',
-                text: `unheld this money request`,
+                text: Localize.translateLocal('iou.unheldRequest'),
             },
         ],
         person: [

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -466,6 +466,10 @@ function ReportActionItem(props) {
             children = <ReportActionItemBasicMessage message={ModifiedExpenseMessage.getForReportAction(props.report.reportID, props.action)} />;
         } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED) {
             children = <ReportActionItemBasicMessage message={ReportActionsUtils.getMarkedReimbursedMessage(props.action)} />;
+        } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
+            children = <ReportActionItemBasicMessage message={props.translate('iou.heldRequest', {comment: lodashGet(props, 'action.message[1].text', '')})} />;
+        } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
+            children = <ReportActionItemBasicMessage message={props.translate('iou.unheldRequest')} />;
         } else {
             const hasBeenFlagged =
                 !_.contains([CONST.MODERATION.MODERATOR_DECISION_APPROVED, CONST.MODERATION.MODERATOR_DECISION_PENDING], moderationDecision) &&

diff --git a/src/pages/iou/HoldReasonPage.tsx b/src/pages/iou/HoldReasonPage.tsx
@@ -84,7 +84,7 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
                         valueType="string"
                         name="comment"
                         defaultValue={undefined}
-                        label="Reason"
+                        label={translate('iou.reason')}
                         accessibilityLabel={translate('iou.reason')}
                         autoFocus
                     />