Merge conflicts

Expensify · Sep 27, 2024 · 1dde318 · 1dde318
1 parent 75ad856
commit 1dde318
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 63 deletions.
diff --git a/src/components/ArchivedReportFooter.tsx b/src/components/ArchivedReportFooter.tsx
@@ -57,35 +57,14 @@ function ArchivedReportFooter({report, reportClosedAction, personalDetails = {}}
         policyName = lodashEscape(policyName);
     }
 
-    let text: string;
-    switch (archiveReason) {
-        case CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED:
-            text = translate(`reportArchiveReasons.${archiveReason}`, {
-                displayName: `<strong>${displayName}</strong>`,
-            });
-            break;
-        case CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED:
-            text = translate(`reportArchiveReasons.${archiveReason}`, {
-                displayName: `<strong>${displayName}</strong>`,
-                oldDisplayName: `<strong>${oldDisplayName}</strong>`,
-            });
-            break;
-        case CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY:
-            text = translate(`reportArchiveReasons.${archiveReason}`, {
-                displayName: `<strong>${displayName}</strong>`,
-                policyName: `<strong>${policyName}</strong>`,
-                shouldUseYou: actorPersonalDetails?.accountID === getCurrentUserAccountID(),
-            });
-            break;
-        case CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED:
-            text = translate(`reportArchiveReasons.${archiveReason}`, {
-                policyName: `<strong>${policyName}</strong>`,
-            });
-            break;
-        default:
-            text = translate(`reportArchiveReasons.${archiveReason}`);
-            break;
-    }
+    const text = shouldRenderHTML
+        ? translate(`reportArchiveReasons.${archiveReason}`, {
+              displayName: `<strong>${displayName}</strong>`,
+              oldDisplayName: `<strong>${oldDisplayName}</strong>`,
+              policyName: `<strong>${policyName}</strong>`,
+              shouldUseYou: actorPersonalDetails?.accountID === getCurrentUserAccountID(),
+          })
+        : translate(`reportArchiveReasons.${archiveReason}`);
 
     return (
         <Banner

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
@@ -390,14 +390,11 @@ function ReportPreview({
             return {supportText: formattedMerchant};
         }
         return {
-            supportText: translate(
-                'iou.expenseCount',
-                {
-                    scanningReceipts: numberOfScanningReceipts,
-                    pendingReceipts: numberOfPendingRequests,
-                    count: numberOfRequests,
-                },
-            ),
+            supportText: translate('iou.expenseCount', {
+                scanningReceipts: numberOfScanningReceipts,
+                pendingReceipts: numberOfPendingRequests,
+                count: numberOfRequests,
+            }),
         };
     }, [formattedMerchant, formattedDescription, moneyRequestComment, translate, numberOfRequests, numberOfScanningReceipts, numberOfPendingRequests]);
 

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -2890,7 +2890,7 @@ const translations = {
                 one: `1 UDD added`,
                 other: (count: number) => `${count} UDDs added`,
             }),
-            mappingTitle: ({mappingName}: IntacctMappingTitleParams): string => {
+            mappingTitle: ({mappingName}: IntacctMappingTitleParams) => {
                 switch (mappingName) {
                     case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.DEPARTMENTS:
                         return 'departments';

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -6,7 +6,6 @@ import type {
     AddEmployeeParams,
     AddressLineParams,
     AdminCanceledRequestParams,
-    AgeParams,
     AlreadySignedInParams,
     ApprovalWorkflowErrorParams,
     ApprovedAmountParams,
@@ -55,8 +54,6 @@ import type {
     DeleteActionParams,
     DeleteConfirmationParams,
     DidSplitAmountMessageParams,
-    DimensionsCountParams,
-    DistanceRateOperationsParams,
     EditActionParams,
     ElectronicFundsParams,
     EnterMagicCodeParams,
@@ -2928,7 +2925,7 @@ const translations = {
                 one: `1 UDD añadido`,
                 other: (count: number) => `${count} UDDs añadido`,
             }),
-            mappingTitle: ({mappingName}: IntacctMappingTitleParams): string => {
+            mappingTitle: ({mappingName}: IntacctMappingTitleParams) => {
                 switch (mappingName) {
                     case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.DEPARTMENTS:
                         return 'departamentos';
@@ -4070,7 +4067,7 @@ const translations = {
             }
             return {
                 one: `te eliminó del flujo de trabajo de aprobaciones y del chat del espacio de trabajo de ${joinedNames}. Los informes enviados anteriormente seguirán estando disponibles para su aprobación en tu bandeja de entrada.`,
-                other: `te eliminó de los flujos de trabajo de aprobaciones y de los chats del espacio de trabajo de ${joinedNames}. Los informes enviados anteriormente seguirán estando disponibles para su aprobación en tu bandeja de entrada.`
+                other: `te eliminó de los flujos de trabajo de aprobaciones y de los chats del espacio de trabajo de ${joinedNames}. Los informes enviados anteriormente seguirán estando disponibles para su aprobación en tu bandeja de entrada.`,
             };
         },
     },

diff --git a/src/languages/params.ts b/src/languages/params.ts
@@ -279,12 +279,8 @@ type LogSizeAndDateParams = {size: number; date: string};
 
 type HeldRequestParams = {comment: string};
 
-type DistanceRateOperationsParams = {count: number};
-
 type ReimbursementRateParams = {unit: Unit};
 
-type ConfirmHoldExpenseParams = {transactionCount: number};
-
 type ChangeFieldParams = {oldValue?: string; newValue: string; fieldName: string};
 
 type ChangePolicyParams = {fromPolicy: string; toPolicy: string};
@@ -331,10 +327,6 @@ type RemoveMemberPromptParams = {
     memberName: string;
 };
 
-type DeleteExpenseTranslationParams = {
-    count: number;
-};
-
 type IssueVirtualCardParams = {
     assignee: string;
     link: string;
@@ -384,8 +376,6 @@ type DisconnectTitleParams = {integration?: ConnectionName} | undefined;
 
 type AmountWithCurrencyParams = {amountWithCurrency: string};
 
-type SelectedNumberParams = {selectedNumber: number};
-
 type LowerUpperParams = {lower: string; upper: string};
 
 type CategoryNameParams = {categoryName: string};
@@ -454,12 +444,8 @@ type RequiredFieldParams = {fieldName: string};
 
 type ImportFieldParams = {importField: string};
 
-type DimensionsCountParams = {dimensionsCount: number};
-
 type IntacctMappingTitleParams = {mappingName: SageIntacctMappingName};
 
-type AgeParams = {age: number};
-
 type LastSyncAccountingParams = {relativeDate: string};
 
 type SyncStageNameConnectionsParams = {stage: PolicyConnectionSyncStage};
@@ -570,9 +556,7 @@ export type {
     ReconciliationWorksParams,
     LastSyncAccountingParams,
     SyncStageNameConnectionsParams,
-    AgeParams,
     RequiredFieldParams,
-    DimensionsCountParams,
     IntacctMappingTitleParams,
     ImportFieldParams,
     AssigneeParams,
@@ -608,7 +592,6 @@ export type {
     SecondaryLoginParams,
     TaxAmountParams,
     CategoryNameParams,
-    SelectedNumberParams,
     AmountWithCurrencyParams,
     LowerUpperParams,
     LogSizeAndDateParams,
@@ -622,15 +605,13 @@ export type {
     BeginningOfChatHistoryDomainRoomPartOneParams,
     CanceledRequestParams,
     CharacterLimitParams,
-    ConfirmHoldExpenseParams,
     ConfirmThatParams,
     CompanyCardFeedNameParams,
     DateShouldBeAfterParams,
     DateShouldBeBeforeParams,
     DeleteActionParams,
     DeleteConfirmationParams,
     DidSplitAmountMessageParams,
-    DistanceRateOperationsParams,
     EditActionParams,
     ElectronicFundsParams,
     EnterMagicCodeParams,
@@ -732,7 +713,6 @@ export type {
     StripePaidParams,
     UnapprovedParams,
     RemoveMembersWarningPrompt,
-    DeleteExpenseTranslationParams,
     ApprovalWorkflowErrorParams,
     ConnectionNameParams,
     LastSyncDateParams,