Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
90fb18e
Add currency to copy policy settings parts
fedirjh Jun 25, 2026
7a3addc
Add currency compatibility helpers for copy policy settings
fedirjh Jun 25, 2026
6d1e3e4
Gate currency selection in copy policy settings UI
fedirjh Jun 25, 2026
df3ebe1
Add tests for copy settings currency gating
fedirjh Jun 25, 2026
aefd368
Add tests for currency conflict detection in bank accounts
fedirjh Jun 25, 2026
5f13000
Merge remote-tracking branch 'upstream' into fix/copy-settings-curren…
fedirjh Jun 30, 2026
8831250
Merge branch 'Expensify:main' into fix/copy-settings-currency-ba
fedirjh Jun 30, 2026
ab78220
Merge branch 'Expensify:main' into fix/copy-settings-currency-ba
fedirjh Jul 1, 2026
ad3ef18
Merge branch 'Expensify:main' into fix/copy-settings-currency-ba
fedirjh Jul 6, 2026
436e6e5
Refactor CopyPolicySettings: Export Part type and update test cases f…
fedirjh Jun 30, 2026
76a2234
Merge remote-tracking branch 'upstream' into fix/copy-settings-curren…
fedirjh Jul 14, 2026
4638239
Merge remote-tracking branch 'upstream' into fix/copy-settings-curren…
fedirjh Jul 16, 2026
56b87cd
Merge branch 'Expensify:main' into fix/copy-settings-currency-ba
fedirjh Jul 16, 2026
859189f
Fix copy policy settings type export lint
fedirjh Jul 16, 2026
4887a9d
Merge branch 'Expensify:main' into fix/copy-settings-currency-ba
fedirjh Jul 16, 2026
b938d0e
Deduplicate copy settings currency comparison
fedirjh Jul 16, 2026
ac79450
fix: render copied currency actions
fedirjh Jul 22, 2026
a0b9c5b
Merge branch 'Expensify:main' into fix/copy-settings-currency-ba
fedirjh Jul 22, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 3 additions & 0 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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 <a href="${sourcePolicyURL}">${sourcePolicyName}</a> kopiert`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `Währung von <a href="${sourcePolicyURL}">${sourcePolicyName}</a> kopiert`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `Mitglieder von <a href="${sourcePolicyURL}">${sourcePolicyName}</a> kopiert`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `1 Berichtsfeld von <a href="${sourcePolicyURL}">${sourcePolicyName}</a> kopiert`,
Expand Down
2 changes: 2 additions & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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 <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `copied currency from <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `copied members from <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `copied 1 report field from <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
Expand Down
3 changes: 3 additions & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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 <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `copió la divisa de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `copió miembros de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `se copió 1 campo de informe desde <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
Expand Down
3 changes: 3 additions & 0 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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 <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `devise copiée depuis <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `a copié les membres depuis <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `1 champ de note de frais copié depuis <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
Expand Down
3 changes: 3 additions & 0 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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 <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `ha copiato la valuta da <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `ha copiato i membri da <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `copiato 1 campo del report da <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
Expand Down
3 changes: 3 additions & 0 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6399,6 +6399,8 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
description: '既存のワークスペースで上書きする設定を選択します。',
accountingMismatch: ({part}: {part: string}) => `すべてのワークスペースが同じ会計システムと会社接続を使用している場合にのみ、${part} をコピーできます。`,
travelAddressMismatch: '出張をコピーできるのは、選択したすべてのワークスペースに会社の住所がある場合のみです。',
currencyBlockedByBankAccount:
'通貨をコピーできるのは、選択したワークスペースのうち、銀行口座に接続されているすべてのワークスペースが、元のワークスペースと同じ通貨を使用している場合のみです。',
},
confirmSettings: {
title: 'すべて正しく表示されているか確認しましょう。',
Expand Down Expand Up @@ -8544,6 +8546,7 @@ ${reportName}`,
customUnitRateDateRangeAllDates: () => `すべての日付に対して`,
policyCopy: {
overview: (sourcePolicyName: string, sourcePolicyURL: string) => `<a href="${sourcePolicyURL}">${sourcePolicyName}</a> から概要をコピーしました`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `<a href="${sourcePolicyURL}">${sourcePolicyName}</a> から通貨をコピーしました`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `<a href="${sourcePolicyURL}">${sourcePolicyName}</a> からメンバーをコピーしました`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `<a href="${sourcePolicyURL}">${sourcePolicyName}</a> からレポート項目を 1 件コピーしました`,
Expand Down
3 changes: 3 additions & 0 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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 <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `valuta gekopieerd van <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `leden gekopieerd van <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `1 rapportveld gekopieerd van <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
Expand Down
2 changes: 2 additions & 0 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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 <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `skopiowano walutę z <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `skopiowano członków z <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `skopiowano 1 pole raportu z <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
Expand Down
3 changes: 3 additions & 0 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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 <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `copiou a moeda de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `copiou membros de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `copiou 1 campo de relatório de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
Expand Down
2 changes: 2 additions & 0 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6265,6 +6265,7 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM
description: '选择要在现有工作区中覆盖的设置。',
accountingMismatch: ({part}: {part: string}) => `仅当所有工作区使用相同的会计系统和公司连接时,您才能复制 ${part}。`,
travelAddressMismatch: '仅当每个所选工作区都有公司地址时,您才能复制差旅。',
currencyBlockedByBankAccount: '只有当所有已选工作区中,已连接银行账户的货币都与源工作区的货币相同时,才能复制货币。',
},
confirmSettings: {
title: '让我们确认一切都正确无误。',
Expand Down Expand Up @@ -8349,6 +8350,7 @@ ${reportName}`,
customUnitRateDateRangeAllDates: () => `适用于所有日期`,
policyCopy: {
overview: (sourcePolicyName: string, sourcePolicyURL: string) => `已从 <a href="${sourcePolicyURL}">${sourcePolicyName}</a> 复制概览`,
currency: (sourcePolicyName: string, sourcePolicyURL: string) => `从 <a href="${sourcePolicyURL}">${sourcePolicyName}</a> 复制了货币设置`,
employees: (sourcePolicyName: string, sourcePolicyURL: string) => `已从 <a href="${sourcePolicyURL}">${sourcePolicyName}</a> 复制成员`,
reportFields: ({sourcePolicyName, sourcePolicyURL}: {sourcePolicyName: string; sourcePolicyURL: string}) => ({
one: `已从 <a href="${sourcePolicyURL}">${sourcePolicyName}</a> 复制 1 个报表字段`,
Expand Down
Loading
Loading