remove unneccesary custom types from translations batch15

src/components/AccountSwitcher.tsx

@@ -202,7 +202,7 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
                     const error = getLatestError(errorFields?.connect?.[email]);
                     const personalDetails = getPersonalDetailByEmail(email);
                     return createBaseMenuItem(personalDetails, error, {
-                        badgeText: translate('delegate.role', {role}),
+                        badgeText: translate('delegate.role', role),
                         onSelected: () => {
                             if (isOffline) {
                                 close(showOfflineModal);

src/components/AccountingConnectionConfirmationModal.tsx

@@ -17,11 +17,11 @@ function AccountingConnectionConfirmationModal({integrationToConnect, onCancel,
 
     return (
         <ConfirmModal
-            title={translate('workspace.accounting.connectTitle', {connectionName: integrationToConnect})}
+            title={translate('workspace.accounting.connectTitle', integrationToConnect)}
             isVisible
             onConfirm={onConfirm}
             onCancel={onCancel}
-            prompt={translate('workspace.accounting.connectPrompt', {connectionName: integrationToConnect})}
+            prompt={translate('workspace.accounting.connectPrompt', integrationToConnect)}
             confirmText={translate('workspace.accounting.setup')}
             cancelText={translate('common.cancel')}
             success

src/components/ArchivedReportFooter.tsx

@@ -58,14 +58,34 @@ function ArchivedReportFooter({reportID}: ArchivedReportFooterProps) {
         policyName = lodashEscape(policyName);
     }
 
-    const text = shouldRenderHTML
-        ? translate(`reportArchiveReasons.${archiveReason}`, {
-              displayName: `<strong>${displayName}</strong>`,
-              oldDisplayName: `<strong>${oldDisplayName}</strong>`,
-              policyName: `<strong>${policyName}</strong>`,
-              shouldUseYou: actorPersonalDetails?.accountID === currentUserAccountID,
-          })
-        : translate(`reportArchiveReasons.${archiveReason}`);
+    let text: string;
+    if (shouldRenderHTML) {
+        const displayNameHtml = `<strong>${displayName}</strong>`;
+        const oldDisplayNameHtml = `<strong>${oldDisplayName}</strong>`;
+        const policyNameHtml = `<strong>${policyName}</strong>`;
+        const shouldUseYou = actorPersonalDetails?.accountID === currentUserAccountID;
+        switch (archiveReason) {
+            case CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED:
+                text = translate('reportArchiveReasons.accountClosed', displayNameHtml);
+                break;
+            case CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED:
+                text = translate('reportArchiveReasons.accountMerged', displayNameHtml, oldDisplayNameHtml);
+                break;
+            case CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY:
+                text = translate('reportArchiveReasons.removedFromPolicy', displayNameHtml, policyNameHtml, shouldUseYou);
+                break;
+            case CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED:
+                text = translate('reportArchiveReasons.policyDeleted', policyNameHtml);
+                break;
+            case CONST.REPORT.ARCHIVE_REASON.INVOICE_RECEIVER_POLICY_DELETED:
+                text = translate('reportArchiveReasons.invoiceReceiverPolicyDeleted', policyNameHtml);
+                break;
+            default:
+                text = translate('reportArchiveReasons.default');
+        }
+    } else {
+        text = translate(`reportArchiveReasons.${archiveReason}`);
+    }
 
     return (
         <Banner

src/components/AvatarWithImagePicker.tsx

@@ -30,7 +30,7 @@
 
 type ErrorData = {
     validationError?: TranslationPaths | null | '';
-    phraseParam: Record<string, unknown>;
+    phraseArgs: unknown[];
 };
 
 type OpenPickerParams = {
@@ -113,16 +113,16 @@
     const isFocused = useIsFocused();
     const [popoverPosition, setPopoverPosition] = useState({horizontal: 0, vertical: 0});
     const [isMenuVisible, setIsMenuVisible] = useState(false);
     const [errorData, setErrorData] = useState<ErrorData>({validationError: null, phraseParam: {}});
     const {calculatePopoverPosition} = usePopoverPosition();
     const anchorRef = useRef<View>(null);
     const {translate} = useLocalize();
     const {openCropper} = useAvatarCrop({maskType: editorMaskImage ? 'square' : undefined, onCropped: onImageSelected});
 
-    const setError = (error: TranslationPaths | null, phraseParam: Record<string, unknown>) => {
+    const setError = (error: TranslationPaths | null, phraseArgs: unknown[] = []) => {
         setErrorData({
             validationError: error,
-            phraseParam,
+            phraseArgs,
         });
     };
 
@@ -132,11 +132,11 @@
         }
 
         // Reset the error if the component is no longer focused.
-        setError(null, {});
+        setError(null, []);
     }, [isFocused]);
 
     useEffect(() => {
-        setError(null, {});
+        setError(null, []);
     }, [source, avatarID]);
 
     /**
@@ -146,16 +146,16 @@
         validateAvatarImage(image)
             .then((validationResult) => {
                 if (!validationResult.isValid) {
-                    setError(validationResult.errorKey ?? null, validationResult.errorParams ?? {});
+                    setError(validationResult.errorKey ?? null, validationResult.errorArgs ?? []);
                     return;
                 }
 
                 setError(null, {});
                 setIsMenuVisible(false);
                 openCropper(image);
             })
             .catch(() => {
-                setError('attachmentPicker.errorWhileSelectingCorruptedAttachment', {});
+                setError('attachmentPicker.errorWhileSelectingCorruptedAttachment', []);
             });
     };
 
@@ -185,7 +185,7 @@
                 icon: icons.Trashcan,
                 text: translate('avatarWithImagePicker.removePhoto'),
                 onSelected: () => {
-                    setError(null, {});
+                    setError(null, []);
                     onImageRemoved();
                 },
             });
@@ -292,7 +292,7 @@
                 <DotIndicatorMessage
                     style={styles.mt6}
                     // eslint-disable-next-line @typescript-eslint/naming-convention
-                    messages={{0: translate(errorData.validationError, errorData.phraseParam as never)}}
+                    messages={{0: (translate as (key: TranslationPaths, ...args: unknown[]) => string)(errorData.validationError, ...errorData.phraseArgs)}}
                     type="error"
                 />
             )}

src/components/HeaderWithBackButton/index.tsx

@@ -116,7 +116,7 @@ function HeaderWithBackButton({
 
     const middleContent = useMemo(() => {
         if (progressBarPercentage) {
-            const progressBarLabel = stepCounter ? `${translate('common.progressBarLabel')}, ${translate('stepCounter', stepCounter)}` : undefined;
+            const progressBarLabel = stepCounter ? `${translate('common.progressBarLabel')}, ${translate('stepCounter', stepCounter.step, stepCounter.total, stepCounter.text)}` : undefined;
             return (
                 <>
                     {/* Reserves as much space for the middleContent as possible */}
@@ -154,7 +154,7 @@ function HeaderWithBackButton({
         return (
             <Header
                 title={title}
-                subtitle={stepCounter ? translate('stepCounter', stepCounter) : subtitle}
+                subtitle={stepCounter ? translate('stepCounter', stepCounter.step, stepCounter.total, stepCounter.text) : subtitle}
                 textStyles={[titleColor ? StyleUtils.getTextColorStyle(titleColor) : {}, shouldUseHeadlineHeader && styles.textHeadlineH2]}
                 subTitleLink={subTitleLink}
                 numberOfTitleLines={1}

src/components/MoneyReportHeaderPrimaryAction/ExportPrimaryAction.tsx

@@ -33,11 +33,7 @@
     return (
         <Button
             success
-            text={translate('workspace.common.exportIntegrationSelected', {
-                // connectedIntegration is guaranteed non-null when EXPORT_TO_ACCOUNTING is the primary action
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                connectionName: connectedIntegration!,
-            })}
+            text={translate('workspace.common.exportIntegrationSelected', connectedIntegration!)}
             onPress={() => {
                 if (!connectedIntegration || !moneyRequestReport) {
                     return;

src/components/ParentNavigationSubtitle.tsx

@@ -304,7 +304,7 @@ function ParentNavigationSubtitle({
                                 onMouseEnter={onMouseEnter}
                                 onMouseLeave={onMouseLeave}
                                 onPress={onPress}
-                                accessibilityLabel={translate('threads.parentNavigationSummary', {reportName, workspaceName})}
+                                accessibilityLabel={translate('threads.parentNavigationSummary', reportName, workspaceName)}
                                 style={[
                                     pressableStyles,
                                     styles.optionAlternateText,

src/components/ReportActionItem/ExportWithDropdownMenu.tsx

@@ -76,7 +76,7 @@ function ExportWithDropdownMenu({
         const options = [
             {
                 value: CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION,
-                text: translate('workspace.common.exportIntegrationSelected', {connectionName}),
+                text: translate('workspace.common.exportIntegrationSelected', connectionName),
                 ...optionTemplate,
             },
             {
@@ -122,7 +122,7 @@ function ExportWithDropdownMenu({
                 if (isExported) {
                     showConfirmModal({
                         title: translate('workspace.exportAgainModal.title'),
-                        prompt: translate('workspace.exportAgainModal.description', {connectionName, reportName: report?.reportName ?? ''}),
+                        prompt: translate('workspace.exportAgainModal.description', report?.reportName ?? '', connectionName),
                         confirmText: translate('workspace.exportAgainModal.confirmText'),
                         cancelText: translate('workspace.exportAgainModal.cancelText'),
                     }).then(({action}) => {

src/hooks/useExportActions.ts

@@ -155,10 +155,7 @@
             },
         },
         [CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION]: {
-            text: translate('workspace.common.exportIntegrationSelected', {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                connectionName: connectedIntegrationFallback!,
-            }),
+            text: translate('workspace.common.exportIntegrationSelected', connectedIntegrationFallback!),
             icon: getIntegrationIcon(connectedIntegration ?? connectedIntegrationFallback, expensifyIcons),
             displayInDefaultIconColor: true,
             additionalIconStyles: styles.integrationIcon,

src/hooks/useExportAgainModal.ts

@@ -32,10 +32,7 @@ function useExportAgainModal(reportID: string | undefined, policyID: string | un
 
         showConfirmModal({
             title: translate('workspace.exportAgainModal.title'),
-            prompt: translate('workspace.exportAgainModal.description', {
-                connectionName: integrationForExport,
-                reportName,
-            }),
+            prompt: translate('workspace.exportAgainModal.description', reportName, integrationForExport),
             confirmText: translate('workspace.exportAgainModal.confirmText'),
             cancelText: translate('workspace.exportAgainModal.cancelText'),
         }).then((result) => {

src/hooks/useLifecycleActions.tsx

@@ -152,11 +152,7 @@ function useLifecycleActions({reportID, startApprovedAnimation, startAnimation,
     const integrationNameFromExportMessage = isExported ? getIntegrationNameFromExportMessageUtils(reportActions) : null;
 
     const connectedIntegration = getValidConnectedIntegration(policy);
-    const connectedIntegrationName = connectedIntegration
-        ? translate('workspace.accounting.connectionName', {
-              connectionName: connectedIntegration,
-          })
-        : '';
+    const connectedIntegrationName = connectedIntegration ? translate('workspace.accounting.connectionName', connectedIntegration) : '';
 
     const isAnyTransactionOnHold = hasHeldExpensesReportUtils(transactions);
 

src/hooks/useSearchBulkActions.ts

@@ -1543,10 +1543,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                     if (areAnyReportsExported) {
                         showConfirmModal({
                             title: translate('workspace.exportAgainModal.title'),
-                            prompt: translate('workspace.exportAgainModal.description', {
-                                connectionName: connectedIntegration,
-                                reportName: exportedReportNames.join('\n'),
-                            }),
+                            prompt: translate('workspace.exportAgainModal.description', exportedReportNames.join('\n'), connectedIntegration),
                             confirmText: translate('workspace.exportAgainModal.confirmText'),
                             cancelText: translate('workspace.exportAgainModal.cancelText'),
                             shouldEnablePromptScroll: true,