diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 31739ac8c1f4..e32c217036f5 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -1778,6 +1778,7 @@ const CONST = { CORPORATE_FORCE_UPGRADE: 'POLICYCHANGELOG_CORPORATE_FORCE_UPGRADE', TEAM_DOWNGRADE: 'POLICYCHANGELOG_TEAM_DOWNGRADE', COPY_OVERVIEW: 'POLICYCHANGELOG_COPY_OVERVIEW', + COPY_CURRENCY: 'POLICYCHANGELOG_COPY_CURRENCY', COPY_EMPLOYEES: 'POLICYCHANGELOG_COPY_EMPLOYEES', COPY_REPORT_FIELDS: 'POLICYCHANGELOG_COPY_REPORT_FIELDS', COPY_ACCOUNTING: 'POLICYCHANGELOG_COPY_ACCOUNTING', diff --git a/src/languages/de.ts b/src/languages/de.ts index c110961a0805..3a4ecce5de65 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -6493,6 +6493,8 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU accountingMismatch: ({part}: {part: string}) => `Sie können ${part} nur kopieren, wenn alle Arbeitsbereiche dasselbe Buchhaltungssystem und dieselbe Unternehmensverbindung verwenden.`, travelAddressMismatch: 'Sie können Reisen nur kopieren, wenn jeder ausgewählte Arbeitsbereich eine Unternehmensadresse hat.', + currencyBlockedByBankAccount: + 'Sie können die Währung nur kopieren, wenn jeder ausgewählte Workspace mit einem verbundenen Bankkonto die Währung des Quell-Workspace verwendet.', }, confirmSettings: { title: 'Stellen wir sicher, dass alles richtig aussieht.', @@ -8671,6 +8673,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc customUnitRateDateRangeAllDates: () => `für alle Daten`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `Übersicht von ${sourcePolicyName} kopiert`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `Währung von ${sourcePolicyName} kopiert`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `Mitglieder von ${sourcePolicyName} kopiert`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `1 Berichtsfeld von ${sourcePolicyName} kopiert`, diff --git a/src/languages/en.ts b/src/languages/en.ts index 0d4e4099719a..de88505538ad 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -6578,6 +6578,7 @@ const translations = { description: 'Select the settings to overwrite on your existing workspaces.', accountingMismatch: ({part}: {part: string}) => `You can only copy ${part} if all workspaces use the same accounting system and company connection.`, travelAddressMismatch: 'You can only copy travel if every selected workspace has a company address.', + currencyBlockedByBankAccount: "You can only copy currency if every selected workspace with a connected bank account uses the source workspace's currency.", }, confirmSettings: { title: 'Let’s make sure everything looks right.', @@ -8767,6 +8768,7 @@ const translations = { removedMaxExpenseAge: (oldValue: string) => `removed max expense age (previously "${oldValue}" days)`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `copied overview from ${sourcePolicyName}`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `copied currency from ${sourcePolicyName}`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `copied members from ${sourcePolicyName}`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `copied 1 report field from ${sourcePolicyName}`, diff --git a/src/languages/es.ts b/src/languages/es.ts index af24e049ade2..573cf112f4fa 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -6317,6 +6317,8 @@ ${amount} para ${merchant} - ${date}`, accountingMismatch: ({part}: {part: string}) => `Solo puedes copiar ${part} si todos los espacios de trabajo usan el mismo sistema de contabilidad y la misma conexión de empresa.`, travelAddressMismatch: 'Solo puedes copiar los viajes si cada espacio de trabajo seleccionado tiene una dirección de empresa.', + currencyBlockedByBankAccount: + 'Solo puedes copiar la divisa si todos los espacios de trabajo seleccionados con una cuenta bancaria conectada usan la divisa del espacio de trabajo de origen.', }, confirmSettings: { title: 'Vamos a asegurarnos de que todo se vea bien.', @@ -8454,6 +8456,7 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`, customUnitRateDateRangeAllDates: () => `para todas las fechas`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `copió la descripción general de ${sourcePolicyName}`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `copió la divisa de ${sourcePolicyName}`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `copió miembros de ${sourcePolicyName}`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `se copió 1 campo de informe desde ${sourcePolicyName}`, diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 6932157482f5..0278151b59e3 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -6520,6 +6520,8 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. accountingMismatch: ({part}: {part: string}) => `Vous ne pouvez copier ${part} que si tous les espaces de travail utilisent le même système de comptabilité et la même connexion d’entreprise.`, travelAddressMismatch: 'Vous ne pouvez copier les voyages que si chaque espace de travail sélectionné dispose d’une adresse d’entreprise.', + currencyBlockedByBankAccount: + 'Vous ne pouvez copier la devise que si chaque espace de travail sélectionné avec un compte bancaire connecté utilise la devise de l’espace de travail source.', }, confirmSettings: { title: 'Assurons-nous que tout est correct.', @@ -8708,6 +8710,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e customUnitRateDateRangeAllDates: () => `pour toutes les dates`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `aperçu copié depuis ${sourcePolicyName}`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `devise copiée depuis ${sourcePolicyName}`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `a copié les membres depuis ${sourcePolicyName}`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `1 champ de note de frais copié depuis ${sourcePolicyName}`, diff --git a/src/languages/it.ts b/src/languages/it.ts index 9322f8fc22db..887108e34bb2 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -6480,6 +6480,8 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. accountingMismatch: ({part}: {part: string}) => `Puoi copiare ${part} solo se tutti gli spazi di lavoro usano lo stesso sistema di contabilità e la stessa connessione aziendale.`, travelAddressMismatch: 'Puoi copiare i viaggi solo se ogni spazio di lavoro selezionato ha un indirizzo aziendale.', + currencyBlockedByBankAccount: + 'Puoi copiare la valuta solo se ogni spazio di lavoro selezionato con un conto bancario collegato utilizza la valuta dello spazio di lavoro di origine.', }, confirmSettings: { title: 'Assicuriamoci che sia tutto corretto.', @@ -8654,6 +8656,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`, customUnitRateDateRangeAllDates: () => `per tutte le date`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `panoramica copiata da ${sourcePolicyName}`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `ha copiato la valuta da ${sourcePolicyName}`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `ha copiato i membri da ${sourcePolicyName}`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `copiato 1 campo del report da ${sourcePolicyName}`, diff --git a/src/languages/ja.ts b/src/languages/ja.ts index e75d7f4cd6c8..98b0fa71d88e 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -6399,6 +6399,8 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO description: '既存のワークスペースで上書きする設定を選択します。', accountingMismatch: ({part}: {part: string}) => `すべてのワークスペースが同じ会計システムと会社接続を使用している場合にのみ、${part} をコピーできます。`, travelAddressMismatch: '出張をコピーできるのは、選択したすべてのワークスペースに会社の住所がある場合のみです。', + currencyBlockedByBankAccount: + '通貨をコピーできるのは、選択したワークスペースのうち、銀行口座に接続されているすべてのワークスペースが、元のワークスペースと同じ通貨を使用している場合のみです。', }, confirmSettings: { title: 'すべて正しく表示されているか確認しましょう。', @@ -8544,6 +8546,7 @@ ${reportName}`, customUnitRateDateRangeAllDates: () => `すべての日付に対して`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `${sourcePolicyName} から概要をコピーしました`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `${sourcePolicyName} から通貨をコピーしました`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `${sourcePolicyName} からメンバーをコピーしました`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `${sourcePolicyName} からレポート項目を 1 件コピーしました`, diff --git a/src/languages/nl.ts b/src/languages/nl.ts index aca914b9942d..ba89d01c4ff1 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -6462,6 +6462,8 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_ description: 'Selecteer de instellingen die je wilt overschrijven in je bestaande werkruimtes.', accountingMismatch: ({part}: {part: string}) => `Je kunt ${part} alleen kopiëren als alle werkruimtes hetzelfde boekhoudsysteem en dezelfde bedrijfsverbinding gebruiken.`, travelAddressMismatch: 'Je kunt reizen alleen kopiëren als elke geselecteerde werkruimte een bedrijfsadres heeft.', + currencyBlockedByBankAccount: + 'Je kunt de valuta alleen kopiëren als elke geselecteerde workspace met een gekoppelde bankrekening dezelfde valuta gebruikt als de bron-workspace.', }, confirmSettings: { title: 'Laten we controleren of alles er goed uitziet.', @@ -8625,6 +8627,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`, customUnitRateDateRangeAllDates: () => `voor alle data`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `overzicht gekopieerd van ${sourcePolicyName}`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `valuta gekopieerd van ${sourcePolicyName}`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `leden gekopieerd van ${sourcePolicyName}`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `1 rapportveld gekopieerd van ${sourcePolicyName}`, diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 580ea54d8309..e4675ae635ac 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -6444,6 +6444,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy accountingMismatch: ({part}: {part: string}) => `Możesz skopiować ${part} tylko wtedy, gdy wszystkie przestrzenie robocze używają tego samego systemu księgowego i połączenia z firmą.`, travelAddressMismatch: 'Podróże możesz skopiować tylko wtedy, gdy każda wybrana przestrzeń robocza ma adres firmy.', + currencyBlockedByBankAccount: 'Możesz skopiować walutę tylko wtedy, gdy każde wybrane miejsce pracy z podłączonym kontem bankowym używa waluty miejsca pracy źródłowej.', }, confirmSettings: { title: 'Upewnijmy się, że wszystko wygląda poprawnie.', @@ -8606,6 +8607,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`, customUnitRateDateRangeAllDates: () => `dla wszystkich dat`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `skopiowano podsumowanie z ${sourcePolicyName}`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `skopiowano walutę z ${sourcePolicyName}`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `skopiowano członków z ${sourcePolicyName}`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `skopiowano 1 pole raportu z ${sourcePolicyName}`, diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index f22db024f424..a383e5b011d2 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -6455,6 +6455,8 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS description: 'Selecione as configurações que deseja sobrescrever nos seus espaços de trabalho existentes.', accountingMismatch: ({part}: {part: string}) => `Você só pode copiar ${part} se todos os espaços de trabalho usarem o mesmo sistema contábil e a mesma conexão da empresa.`, travelAddressMismatch: 'Você só pode copiar viagens se cada espaço de trabalho selecionado tiver um endereço da empresa.', + currencyBlockedByBankAccount: + 'Você só pode copiar a moeda se todos os espaços de trabalho selecionados com uma conta bancária conectada usarem a moeda do espaço de trabalho de origem.', }, confirmSettings: { title: 'Vamos garantir que está tudo certo.', @@ -8613,6 +8615,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`, customUnitRateDateRangeAllDates: () => `para todas as datas`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `visão geral copiada de ${sourcePolicyName}`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `copiou a moeda de ${sourcePolicyName}`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `copiou membros de ${sourcePolicyName}`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `copiou 1 campo de relatório de ${sourcePolicyName}`, diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index fbc864c8813e..a2bee0a352cd 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -6265,6 +6265,7 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM description: '选择要在现有工作区中覆盖的设置。', accountingMismatch: ({part}: {part: string}) => `仅当所有工作区使用相同的会计系统和公司连接时,您才能复制 ${part}。`, travelAddressMismatch: '仅当每个所选工作区都有公司地址时,您才能复制差旅。', + currencyBlockedByBankAccount: '只有当所有已选工作区中,已连接银行账户的货币都与源工作区的货币相同时,才能复制货币。', }, confirmSettings: { title: '让我们确认一切都正确无误。', @@ -8349,6 +8350,7 @@ ${reportName}`, customUnitRateDateRangeAllDates: () => `适用于所有日期`, policyCopy: { overview: (sourcePolicyName: string, sourcePolicyURL: string) => `已从 ${sourcePolicyName} 复制概览`, + currency: (sourcePolicyName: string, sourcePolicyURL: string) => `从 ${sourcePolicyName} 复制了货币设置`, employees: (sourcePolicyName: string, sourcePolicyURL: string) => `已从 ${sourcePolicyName} 复制成员`, reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({ one: `已从 ${sourcePolicyName} 复制 1 个报表字段`, diff --git a/src/libs/CopyPolicySettingsUtils.ts b/src/libs/CopyPolicySettingsUtils.ts index d0c7e323239a..fd51447591ed 100644 --- a/src/libs/CopyPolicySettingsUtils.ts +++ b/src/libs/CopyPolicySettingsUtils.ts @@ -18,6 +18,7 @@ type FeatureRow = { const FEATURE_ROWS = [ {part: 'overview', labelKey: 'workspace.common.profile'}, + {part: 'currency', labelKey: 'common.currency'}, {part: 'members', labelKey: 'workspace.common.members'}, {part: 'reports', labelKey: 'workspace.common.reports'}, {part: 'accounting', labelKey: 'workspace.common.accounting'}, @@ -37,6 +38,8 @@ const FEATURE_ROWS = [ type CopyPolicySettingsSourceFeatureContext = { policy: Policy | undefined; + hasOverviewContent: boolean; + shouldShowCurrency: boolean; memberCount: number; categoriesCount: number; totalTags: number; @@ -197,6 +200,59 @@ function areAllTargetsCompatibleForAccountingPart(source: Policy | undefined, ta return targets.every((target) => isTargetCompatibleForAccountingPart(source, target)); } +const DEFAULT_POLICY_CURRENCY = CONST.CURRENCY.USD; + +/** + * Whether a policy has a withdrawal (business) bank account attached - the condition that makes + * setCurrency reject a currency change and causes the copy deadlock. Mirrors Web-E + * Policy::isACHEnabled (a bankAccountID, or both a routing and account number). The backend's + * hasWithdrawalAccount also covers the AU reimbursement-country account, which the App's Policy type + * doesn't model - the backend stays the source of truth, this client check is the UX gate. + */ +function policyHasWithdrawalAccount(policy: Policy | undefined): boolean { + const achAccount = policy?.achAccount; + if ((achAccount?.bankAccountID ?? CONST.DEFAULT_NUMBER_ID) > 0) { + return true; + } + return !!achAccount?.routingNumber && !!achAccount?.accountNumber; +} + +function hasDifferentCurrency(source: Policy, target: Policy | undefined): boolean { + if (!target) { + return false; + } + const sourceCurrency = source.outputCurrency ?? DEFAULT_POLICY_CURRENCY; + const targetCurrency = target.outputCurrency ?? DEFAULT_POLICY_CURRENCY; + return sourceCurrency !== targetCurrency; +} + +/** + * Returns true when at least one target has a different currency from the source. The Currency menu + * item is shown in this case so the user can see whether currency will be copied (or why it can't). + */ +function hasCurrencyConflictWithAnyTarget(source: Policy | undefined, targets: ReadonlyArray): boolean { + return !!source && targets.some((target) => hasDifferentCurrency(source, target)); +} + +/** + * Returns true when at least one target has a bank account with a different currency than the source + * (Case 4 / Expensify#642646). Changing the target's currency while a BA is attached is blocked by + * setCurrency, so the Currency menu item must be disabled in this case. + */ +function isCurrencyBlockedByTargetBA(source: Policy | undefined, targets: ReadonlyArray): boolean { + return !!source && targets.some((target) => hasDifferentCurrency(source, target) && policyHasWithdrawalAccount(target)); +} + +/** + * Returns true when at least one target triggers "Case 6": the source has a bank account, the + * target has a different currency and no BA of its own. Copying workflows would attach the source's + * BA without updating currency, leaving the target in a deadlock. The Currency item is force-selected + * alongside workflows so the "currency" Part runs first and aligns the currencies (App#92397). + */ +function needsCurrencyForWorkflows(source: Policy | undefined, targets: ReadonlyArray): boolean { + return !!source && policyHasWithdrawalAccount(source) && targets.some((target) => hasDifferentCurrency(source, target) && !policyHasWithdrawalAccount(target)); +} + /** * Whether a copy-settings part should appear on the Select Features step for the source policy. * Matches WorkspaceDuplicateSelectFeaturesForm visibility rules. @@ -206,7 +262,9 @@ function isCopyPolicySettingsPartEnabledOnSource(part: Part, context: CopyPolicy switch (part) { case 'overview': - return true; + return context.hasOverviewContent; + case 'currency': + return context.shouldShowCurrency; case 'members': return context.memberCount > 1; case 'reports': @@ -313,6 +371,9 @@ export { areAllTargetsAccountingCompatible, isTargetCompatibleForAccountingPart, areAllTargetsCompatibleForAccountingPart, + hasCurrencyConflictWithAnyTarget, + isCurrencyBlockedByTargetBA, + needsCurrencyForWorkflows, isCopyPolicySettingsPartEnabledOnSource, getTimeTrackingCopySettingsDescription, isSourceProvisionedForTravel, diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index 712fba2a1784..ec2a3aa3dd39 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -4754,6 +4754,7 @@ function hasReasoning(action: OnyxInputOrEntry): boolean { function isPolicyCopyReportAction(action: OnyxInputOrEntry): action is ReportAction { return [ CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_OVERVIEW, + CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_CURRENCY, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_EMPLOYEES, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_REPORT_FIELDS, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_ACCOUNTING, diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 118f87cccf19..6b3342c66c1d 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -7232,6 +7232,9 @@ function getPolicyChangeLogCopyMessage(translate: LocalizedTranslate, action: Re case CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_OVERVIEW: message = translate('workspaceActions.policyCopy.overview', sourcePolicyName, sourcePolicyURL); break; + case CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_CURRENCY: + message = translate('workspaceActions.policyCopy.currency', sourcePolicyName, sourcePolicyURL); + break; case CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_EMPLOYEES: message = translate('workspaceActions.policyCopy.employees', sourcePolicyName, sourcePolicyURL); break; diff --git a/src/libs/actions/Policy/CopyPolicySettings.ts b/src/libs/actions/Policy/CopyPolicySettings.ts index 705c705e2717..866e28372e42 100644 --- a/src/libs/actions/Policy/CopyPolicySettings.ts +++ b/src/libs/actions/Policy/CopyPolicySettings.ts @@ -15,6 +15,7 @@ import Onyx from 'react-native-onyx'; type Part = | 'overview' + | 'currency' | 'members' | 'reports' | 'accounting' @@ -32,7 +33,8 @@ type Part = | 'receiptPartners'; const PARTS_TO_POLICY_FIELDS = { - overview: ['outputCurrency', 'address', 'description'], + overview: ['address', 'description'], + currency: ['outputCurrency'], members: ['employeeList'], reports: ['fieldList', 'areReportFieldsEnabled'], accounting: ['connections', 'areConnectionsEnabled'], diff --git a/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx b/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx index 165ca5bb71cd..b83427dc0059 100644 --- a/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx +++ b/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx @@ -230,6 +230,7 @@ const POLICY_CHANGE_LOG_RESOLVERS: Record = { // Policy copy settings [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_OVERVIEW]: copySettingsResolver, + [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_CURRENCY]: copySettingsResolver, [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_EMPLOYEES]: copySettingsResolver, [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_REPORT_FIELDS]: copySettingsResolver, [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_ACCOUNTING]: copySettingsResolver, diff --git a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx index 350092c84b3e..784a62b7a140 100644 --- a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx +++ b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx @@ -23,7 +23,10 @@ import { FEATURE_ROWS, getReceiptPartnersCopySettingsDescription, getTimeTrackingCopySettingsDescription, + hasCurrencyConflictWithAnyTarget, isCopyPolicySettingsPartEnabledOnSource, + isCurrencyBlockedByTargetBA, + needsCurrencyForWorkflows, shouldShowCopyPolicySettingsUpgradeStep, } from '@libs/CopyPolicySettingsUtils'; import Navigation from '@libs/Navigation/Navigation'; @@ -110,9 +113,15 @@ function CopyPolicySettingsSelectFeaturesPage() { const formattedAddress = !isEmptyObject(sourcePolicy) && !isEmptyObject(sourcePolicy.address) ? formatAddressToString(sourcePolicy.address) : ''; const workflows = getWorkflowRules(sourcePolicy, translate); const rules = getWorkspaceRules(sourcePolicy, translate); + const shouldShowCurrency = hasCurrencyConflictWithAnyTarget(sourcePolicy, targetPolicies); + const currencyBlockedByBA = isCurrencyBlockedByTargetBA(sourcePolicy, targetPolicies); + const currencyNeededForWorkflows = needsCurrencyForWorkflows(sourcePolicy, targetPolicies); + const hasOverviewContent = !!formattedAddress || !!sourcePolicy?.description; const sourceFeatureContext = { policy: sourcePolicy, + hasOverviewContent, + shouldShowCurrency, memberCount, categoriesCount, totalTags, @@ -147,6 +156,9 @@ function CopyPolicySettingsSelectFeaturesPage() { if (part === 'travel') { return hasTargetWithoutAddress && !sourceHasAddress; } + if (part === 'currency') { + return currencyBlockedByBA; + } return false; }; @@ -157,26 +169,33 @@ function CopyPolicySettingsSelectFeaturesPage() { const resolvedSelectedFeatures = selectedFeatures ?? copyPolicySettings?.parts ?? []; const selectedAvailableFeatures = resolvedSelectedFeatures.filter((part) => availablePartSet.has(part) && !isPartIncompatible(part)); const isAccountingSelected = selectedAvailableFeatures.includes(CONST.POLICY.POLICY_FEATURE.ACCOUNTING); + const isWorkflowsSelected = selectedAvailableFeatures.includes(CONST.POLICY.POLICY_FEATURE.WORKFLOWS); + const isOverviewSelected = selectedAvailableFeatures.includes(CONST.POLICY.POLICY_FEATURE.OVERVIEW); const effectiveSelectedFeatures = isAccountingSelected ? Array.from(new Set([...selectedAvailableFeatures, ...CODING_PARTS_TIED_TO_CONNECTION.filter((part) => availablePartSet.has(part))])) : selectedAvailableFeatures; - const isOverviewSelected = selectedAvailableFeatures.includes(CONST.POLICY.POLICY_FEATURE.OVERVIEW); + const shouldIncludeCurrency = effectiveSelectedFeatures.length > 0 && !isPartIncompatible('currency') && (!shouldShowCurrency || (isWorkflowsSelected && currencyNeededForWorkflows)); + if (shouldIncludeCurrency && !effectiveSelectedFeatures.includes('currency')) { + effectiveSelectedFeatures.push('currency'); + } // Travel needs every target to have a company address. The source address only reaches a target // when "overview" is copied, so when a target lacks one require overview (and a source address to // copy). isPartIncompatible already hard-disables the case where the source has no address. const isTravelAddressMismatch = (part: Part): boolean => part === 'travel' && hasTargetWithoutAddress && !(isOverviewSelected && sourceHasAddress); - const isFeatureDisabled = (part: Part): boolean => isPartIncompatible(part) || (isAccountingSelected && isCodingPart(part)) || isTravelAddressMismatch(part); + const shouldSelectCurrency = (part: Part): boolean => part === 'currency' && isWorkflowsSelected && currencyNeededForWorkflows && !currencyBlockedByBA; + const isFeatureDisabled = (part: Part): boolean => + isPartIncompatible(part) || (isAccountingSelected && isCodingPart(part)) || isTravelAddressMismatch(part) || shouldSelectCurrency(part); const getSourceDescription = (part: Part): string | undefined => { switch (part) { - case CONST.POLICY.POLICY_FEATURE.OVERVIEW: { - const currencyText = sourcePolicy?.outputCurrency ? `${sourcePolicy.outputCurrency} ${translate('common.currency')}` : ''; - return [currencyText, formattedAddress].filter(Boolean).join(', ') || undefined; - } + case 'currency': + return sourcePolicy?.outputCurrency ?? undefined; + case CONST.POLICY.POLICY_FEATURE.OVERVIEW: + return formattedAddress || undefined; case CONST.POLICY.POLICY_FEATURE.MEMBERS: return memberCount > 1 ? `${memberCount} ${translate('workspace.common.members').toLowerCase()}` : undefined; case 'reports': @@ -227,6 +246,9 @@ function CopyPolicySettingsSelectFeaturesPage() { if (isTravelAddressMismatch(part)) { return translate('workspace.copyPolicySettings.selectSettings.travelAddressMismatch'); } + if (part === 'currency' && currencyBlockedByBA) { + return translate('workspace.copyPolicySettings.selectSettings.currencyBlockedByBankAccount'); + } if (isAccountingMismatch(part)) { return translate('workspace.copyPolicySettings.selectSettings.accountingMismatch', { part: translate(FEATURE_ROWS.find((row) => row.part === part)?.labelKey ?? 'workspace.common.accounting').toLowerCase(), @@ -291,7 +313,6 @@ function CopyPolicySettingsSelectFeaturesPage() { }; const onConfirm = () => { - const isWorkflowsSelected = effectiveSelectedFeatures.includes(CONST.POLICY.POLICY_FEATURE.WORKFLOWS); const isMembersSelected = effectiveSelectedFeatures.includes(CONST.POLICY.POLICY_FEATURE.MEMBERS); const isMembersPartAvailable = availablePartSet.has(CONST.POLICY.POLICY_FEATURE.MEMBERS); diff --git a/src/types/onyx/ReportAction.ts b/src/types/onyx/ReportAction.ts index ba1652f800d0..18fa6f0c3c7b 100644 --- a/src/types/onyx/ReportAction.ts +++ b/src/types/onyx/ReportAction.ts @@ -320,6 +320,7 @@ type ReportActionsCollectionDataSet = CollectionDataSet { describe('buildCopyPolicySettingsData', () => { describe('per-part field patches and pendingFields', () => { it.each<[Part, ReadonlyArray]>([ - ['overview', ['outputCurrency', 'address', 'description']], + ['overview', ['address', 'description']], + ['currency', ['outputCurrency']], ['members', ['employeeList']], ['reports', ['fieldList', 'areReportFieldsEnabled']], ['accounting', ['connections', 'areConnectionsEnabled']], @@ -599,7 +600,7 @@ describe('actions/Policy/CopyPolicySettings', () => { it('successData clears errors on target policies after retry-success', () => { const targetPolicy = makeTargetPolicy(); - const {successData} = buildCopyPolicySettingsData(makeSourcePolicy(), [targetPolicy], ['overview'], {}, {}); + const {successData} = buildCopyPolicySettingsData(makeSourcePolicy(), [targetPolicy], ['overview', 'currency'], {}, {}); const targetSuccess = successData.find((entry) => entry.key === POLICY_KEY && entry.onyxMethod === Onyx.METHOD.MERGE); const successPatch = getMergedPolicyPatch(targetSuccess); diff --git a/tests/unit/CopyPolicySettingsUtilsTest.ts b/tests/unit/CopyPolicySettingsUtilsTest.ts index 352871ce997d..c112f8013860 100644 --- a/tests/unit/CopyPolicySettingsUtilsTest.ts +++ b/tests/unit/CopyPolicySettingsUtilsTest.ts @@ -10,8 +10,11 @@ import { getControlOnlySelectedParts, getReceiptPartnersCopySettingsDescription, getTimeTrackingCopySettingsDescription, + hasCurrencyConflictWithAnyTarget, isCopyPolicySettingsPartEnabledOnSource, + isCurrencyBlockedByTargetBA, isTargetCompatibleForAccountingPart, + needsCurrencyForWorkflows, shouldShowCopyPolicySettingsUpgradeStep, } from '@libs/CopyPolicySettingsUtils'; import type {CopyPolicySettingsSourceFeatureContext} from '@libs/CopyPolicySettingsUtils'; @@ -34,6 +37,13 @@ function makePolicyWithConnection(connectionName: ConnectionName, connectionPayl } as Policy; } +function makePolicyWithCurrency(id: number, outputCurrency: string, hasBankAccount: boolean): Policy { + const policy = createRandomPolicy(id, CONST.POLICY.TYPE.CORPORATE); + policy.outputCurrency = outputCurrency; + policy.achAccount = hasBankAccount ? {bankAccountID: 123, accountNumber: '', routingNumber: '', addressName: '', bankName: '', reimburser: ''} : undefined; + return policy; +} + describe('CopyPolicySettingsUtils', () => { beforeAll(() => IntlStore.load(CONST.LOCALES.EN)); @@ -150,6 +160,8 @@ describe('CopyPolicySettingsUtils', () => { describe('isCopyPolicySettingsPartEnabledOnSource', () => { const baseContext: CopyPolicySettingsSourceFeatureContext = { policy: createRandomPolicy(0), + hasOverviewContent: true, + shouldShowCurrency: false, memberCount: 2, categoriesCount: 1, totalTags: 1, @@ -165,10 +177,16 @@ describe('CopyPolicySettingsUtils', () => { isCollectPolicy: false, }; - it('always shows overview', () => { + it('shows overview only when it has content', () => { + expect(isCopyPolicySettingsPartEnabledOnSource('overview', {...baseContext, hasOverviewContent: false})).toBe(false); expect(isCopyPolicySettingsPartEnabledOnSource('overview', baseContext)).toBe(true); }); + it('shows currency only when it has a target conflict', () => { + expect(isCopyPolicySettingsPartEnabledOnSource('currency', baseContext)).toBe(false); + expect(isCopyPolicySettingsPartEnabledOnSource('currency', {...baseContext, shouldShowCurrency: true})).toBe(true); + }); + it('shows members only when there is more than one member', () => { expect(isCopyPolicySettingsPartEnabledOnSource('members', {...baseContext, memberCount: 1})).toBe(false); expect(isCopyPolicySettingsPartEnabledOnSource('members', baseContext)).toBe(true); @@ -322,10 +340,77 @@ describe('CopyPolicySettingsUtils', () => { }); }); + describe('hasCurrencyConflictWithAnyTarget', () => { + it('returns true when any target has a different currency', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, false); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.EUR, false); + expect(hasCurrencyConflictWithAnyTarget(source, [target])).toBe(true); + }); + + it('returns true when source and target both have bank accounts with different currencies', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, true); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.EUR, true); + expect(hasCurrencyConflictWithAnyTarget(source, [target])).toBe(true); + }); + + it('returns false when all targets share the source currency', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, false); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.USD, true); + expect(hasCurrencyConflictWithAnyTarget(source, [target])).toBe(false); + }); + }); + + describe('isCurrencyBlockedByTargetBA', () => { + it('returns true when a target has a BA with a different currency (Case 4)', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, false); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.EUR, true); + expect(isCurrencyBlockedByTargetBA(source, [target])).toBe(true); + }); + + it('returns true when source and target both have bank accounts with different currencies', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, true); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.EUR, true); + expect(isCurrencyBlockedByTargetBA(source, [target])).toBe(true); + }); + + it('returns false when a mismatched target has no bank account', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, false); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.EUR, false); + expect(isCurrencyBlockedByTargetBA(source, [target])).toBe(false); + }); + + it('returns false when currencies match even if target has a BA', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, true); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.USD, true); + expect(isCurrencyBlockedByTargetBA(source, [target])).toBe(false); + }); + }); + + describe('needsCurrencyForWorkflows', () => { + it('returns true when source has BA and target has no BA with different currency (Case 6)', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, true); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.EUR, false); + expect(needsCurrencyForWorkflows(source, [target])).toBe(true); + }); + + it('returns false when source has no bank account', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, false); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.EUR, false); + expect(needsCurrencyForWorkflows(source, [target])).toBe(false); + }); + + it('returns false when target also has a bank account (Case 4)', () => { + const source = makePolicyWithCurrency(0, CONST.CURRENCY.USD, true); + const target = makePolicyWithCurrency(1, CONST.CURRENCY.EUR, true); + expect(needsCurrencyForWorkflows(source, [target])).toBe(false); + }); + }); + describe('FEATURE_ROWS', () => { it('has all copy-settings parts mapped to their respective translation keys', () => { const parts = FEATURE_ROWS.map((row) => row.part); expect(parts).toContain('overview'); + expect(parts).toContain('currency'); expect(parts).toContain('members'); expect(parts).toContain('reports'); expect(parts).toContain('accounting'); diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts index 83e297edf3c9..cab5318ba083 100644 --- a/tests/unit/ReportActionsUtilsTest.ts +++ b/tests/unit/ReportActionsUtilsTest.ts @@ -6020,6 +6020,7 @@ describe('ReportActionsUtils', () => { it.each([ CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_OVERVIEW, + CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_CURRENCY, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_EMPLOYEES, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_REPORT_FIELDS, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_ACCOUNTING, diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts index f0f1f6234e1b..0ecf353fcfb8 100644 --- a/tests/unit/ReportUtilsTest.ts +++ b/tests/unit/ReportUtilsTest.ts @@ -8301,6 +8301,7 @@ describe('ReportUtils', () => { it.each([ [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_OVERVIEW, 'copied overview from'], + [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_CURRENCY, 'copied currency from'], [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_EMPLOYEES, 'copied members from'], [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_ACCOUNTING, 'copied accounting settings from'], [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.COPY_RECEIPT_PARTNERS, 'copied receipt partner settings from'],