Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
362fd90
feat: add confirmation titles and descriptions for workspace settings…
fedirjh May 20, 2026
a6e2f3b
feat: centralize feature rows in CopyPolicySettingsUtils and update s…
fedirjh May 20, 2026
d95e19f
feat: implement CopyPolicySettingsConfirmPage with confirmation modal…
fedirjh May 20, 2026
bc6e4a1
feat: synchronize selected features and target policy IDs in CopyPoli…
fedirjh May 20, 2026
7b501ba
test: add unit test for centralized FEATURE_ROWS
fedirjh May 20, 2026
40d972b
fix: improve item selection logic in BaseSelectionList component
fedirjh May 21, 2026
5c630a0
refactor: enhance feature visibility and selection logic in CopyPolic…
fedirjh May 21, 2026
37e30b7
feat: show accounting mismatch explanation as alternate text for disa…
fedirjh May 21, 2026
269036e
fix: hide Copy Settings menu when no eligible target workspaces exist
fedirjh May 21, 2026
6199927
test: add unit tests for BaseSelectionList dataDetails selection logic
fedirjh May 21, 2026
27e92f2
feat: enhance accounting compatibility checks in CopyPolicySettings
fedirjh May 21, 2026
c0ae5c4
fix: correct comment formatting in CopyPolicySettingsUtils
fedirjh May 21, 2026
44c805d
Merge remote-tracking branch 'upstream' into copy-policy-settings-page-3
fedirjh May 21, 2026
a197caa
feat: restructure copy policy settings translations for improved clarity
fedirjh May 21, 2026
84291bc
feat: update copy policy settings UI for improved clarity and consist…
fedirjh May 21, 2026
485ca7a
feat: enhance CopyPolicySettingsConfirmPage UI with improved title ha…
fedirjh May 21, 2026
12930f0
style: format text in CopyPolicySettingsConfirmPage
fedirjh May 21, 2026
3e07553
feat: integrate RenderHTML component for enhanced description formatt…
fedirjh May 21, 2026
b442acd
feat: enhance Copy Policy Settings navigation by clearing settings be…
fedirjh May 21, 2026
c4e0657
fix(copy-policy-settings): drop incompatible parts from selection on …
fedirjh May 21, 2026
0c3555a
Merge branch 'copy-policy-settings-page-2' into copy-policy-settings-…
fedirjh May 21, 2026
d30eedd
fix(copy-policy-settings): address PR review feedback on #91241
fedirjh May 21, 2026
45ca5f5
Merge remote-tracking branch 'upstream' into copy-policy-settings-page-3
fedirjh May 26, 2026
e2ec347
Refactor CopyPolicySettingsConfirmPage to simplify handleCopyPolicySe…
fedirjh May 26, 2026
ffa7e9e
Merge remote-tracking branch 'upstream' into copy-policy-settings-page-3
fedirjh May 28, 2026
3768ca0
refactor(copy-policy-settings): rename sourcePolicyID to policyID for…
fedirjh May 21, 2026
9413c0f
fix(copy-policy-settings): avoid set-state effects and refine mismatc…
fedirjh May 28, 2026
1a28644
fix(copy-policy-settings): redirect confirm step when selections missing
fedirjh May 28, 2026
354eafc
fix(copy-policy-settings): avoid premature confirm redirect
fedirjh May 28, 2026
562af60
feat(copy-policy-settings): add effect to fetch policy data
fedirjh May 28, 2026
66d1610
fix(copy-policy-settings): fix import or deropenDuplicatePolicyPage
fedirjh May 28, 2026
fdd9dcd
fix(copy-policy-settings): show and copy merchant rules
fedirjh May 28, 2026
4ffec26
fix(copy-policy-settings): guard null feature data
fedirjh May 28, 2026
4d69509
fix(copy-policy-settings): hide failed accounting
fedirjh May 28, 2026
35b09c3
fix(copy-policy-settings): show invoice bank count
fedirjh May 28, 2026
89acdfc
fix(copy-policy-settings): show category auto-rules
fedirjh May 28, 2026
d3aaa07
Merge branch 'Expensify:main' into copy-policy-settings-page-3
fedirjh May 28, 2026
98c7a47
Merge branch 'Expensify:main' into copy-policy-settings-page-3
fedirjh May 28, 2026
65e9a8a
Merge branch 'Expensify:main' into copy-policy-settings-page-3
fedirjh May 29, 2026
d81d144
Fix: CopyPolicySettingsConfirmPage logic to ensure navigation only o…
fedirjh May 30, 2026
e9aee76
fix(copy-policy-settings): filter bank accounts by workspace
fedirjh May 30, 2026
07d3d6c
Merge branch 'Expensify:main' into copy-policy-settings-page-3
fedirjh May 30, 2026
c1964d7
style: format CopyPolicySettingsConfirmPage
fedirjh May 31, 2026
c1bbeae
Merge branch 'Expensify:main' into copy-policy-settings-page-3
fedirjh Jun 1, 2026
fba6f04
fix(copy-policy-settings): disable Next when no workspaces selected
fedirjh Jun 1, 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
32 changes: 21 additions & 11 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6065,18 +6065,28 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
error: 'Beim Duplizieren deines neuen Workspace ist ein Fehler aufgetreten. Bitte versuche es erneut.',
},
copyPolicySettings: {
error: 'Beim Kopieren der Arbeitsbereichseinstellungen ist ein Fehler aufgetreten. Bitte versuche es erneut.',
title: 'Einstellungen kopieren',
selectWorkspaces: 'Arbeitsbereiche auswählen',
description: 'Wählen Sie die Arbeitsbereiche, in die Sie Einstellungen kopieren möchten, und wählen Sie dann die Einstellungen aus, die Sie kopieren möchten.',
searchPlaceholder: 'Arbeitsbereiche suchen',
selectFeatures: 'Zu kopierende Funktionen auswählen',
whichFeatures: 'Wählen Sie die Einstellungen aus, die in Ihren bestehenden Arbeitsbereichen überschrieben werden sollen.',
workflowsWithoutMembersConfirm: 'Ohne Mitglieder fortfahren',
workflowsWithoutMembersPrompt:
'Beim Kopieren von Workflows ohne Mitglieder werden Genehmigungs-Workflows nicht kopiert. Einstellungen für Einreichung und Zahlung werden weiterhin kopiert.',
accountingMismatch: ({part}: {part: string}) =>
`Sie können ${part} nur kopieren, wenn alle Arbeitsbereiche dasselbe Buchhaltungssystem und dieselbe Unternehmensverbindung verwenden.`,
error: 'Beim Kopieren der Arbeitsbereichseinstellungen ist ein Fehler aufgetreten. Bitte versuche es erneut.',
selectWorkspaces: {
title: 'Arbeitsbereiche auswählen',
description: 'Wählen Sie die Arbeitsbereiche aus, in die Sie Einstellungen kopieren möchten, und wählen Sie dann die Einstellungen aus, die Sie kopieren möchten.',
searchPlaceholder: 'Workspaces durchsuchen',
},
selectSettings: {
title: 'Zu kopierende Funktionen auswählen',
description: 'Wählen Sie die Einstellungen aus, die in Ihren bestehenden Arbeitsbereichen überschrieben werden sollen.',
accountingMismatch: ({part}: {part: string}) =>
`Sie können ${part} nur kopieren, wenn alle Arbeitsbereiche dasselbe Buchhaltungssystem und dieselbe Unternehmensverbindung verwenden.`,
},
confirmSettings: {
title: 'Stellen wir sicher, dass alles richtig aussieht.',
description: ({workspaceName}: {workspaceName: string}) =>
`Wir kopieren die folgenden Einstellungen von <strong>${workspaceName}</strong> in die von Ihnen angegebenen Arbeitsbereiche`,
},
confirmWorkflows: {
continue: 'Ohne Mitglieder fortfahren',
description: 'Das Kopieren von Workflows ohne Mitglieder kopiert keine Genehmigungs-Workflows. Einreichungs- und Zahlungseinstellungen werden trotzdem kopiert.',
},
},
emptyWorkspace: {
title: 'Du hast keine Arbeitsbereiche',
Expand Down
28 changes: 19 additions & 9 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6098,16 +6098,26 @@ const translations = {
error: 'An error occurred while duplicating your new workspace. Please try again.',
},
copyPolicySettings: {
error: 'An error occurred while copying workspace settings. Please try again.',
title: 'Copy settings',
selectWorkspaces: 'Select workspaces',
description: 'Choose the workspaces you want to copy settings to, then select the settings you’d like to copy.',
searchPlaceholder: 'Search workspaces',
selectFeatures: 'Select features to copy',
whichFeatures: 'Select the settings to overwrite on your existing workspaces.',
workflowsWithoutMembersConfirm: 'Continue without members',
workflowsWithoutMembersPrompt: 'Copying Workflows without Members will not copy approval workflows. Submission and payment settings will still be copied.',
accountingMismatch: ({part}: {part: string}) => `You can only copy ${part} if all workspaces use the same accounting system and company connection.`,
error: 'An error occurred while copying workspace settings. Please try again.',
selectWorkspaces: {
title: 'Select workspaces',
description: 'Choose the workspaces you want to copy settings to, then select the settings you’d like to copy.',
searchPlaceholder: 'Search workspaces',
},
selectSettings: {
title: 'Select settings',
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.`,
},
confirmSettings: {
title: 'Let’s make sure everything looks right.',
description: ({workspaceName}: {workspaceName: string}) => `We’ll copy the following settings from <strong>${workspaceName}</strong> to the workspaces you’ve specified.`,
},
confirmWorkflows: {
continue: 'Continue without members',
description: 'Copying Workflows without Members will not copy approval workflows. Submission and payment settings will still be copied.',
},
},
emptyWorkspace: {
title: 'No workspaces yet',
Expand Down
31 changes: 21 additions & 10 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5903,17 +5903,28 @@ ${amount} para ${merchant} - ${date}`,
error: 'Se produjo un error al duplicar tu nuevo espacio de trabajo. Inténtalo de nuevo.',
},
copyPolicySettings: {
error: 'Se produjo un error al copiar la configuración del espacio de trabajo. Por favor, inténtalo de nuevo.',
title: 'Copiar configuración',
selectWorkspaces: 'Selecciona espacios de trabajo',
description: 'Elige los espacios de trabajo a los que quieres copiar la configuración y luego selecciona los ajustes que quieras copiar.',
searchPlaceholder: 'Buscar espacios de trabajo',
selectFeatures: 'Selecciona las funciones que quieres copiar',
whichFeatures: 'Selecciona los ajustes que se sobrescribirán en tus espacios de trabajo existentes.',
workflowsWithoutMembersConfirm: 'Continuar sin miembros',
workflowsWithoutMembersPrompt: 'Copiar flujos de trabajo sin miembros no copiará los flujos de trabajo de aprobación. La configuración de envío y pago sí se copiará.',
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.`,
error: 'Se produjo un error al copiar la configuración del espacio de trabajo. Por favor, inténtalo de nuevo.',
selectWorkspaces: {
title: 'Selecciona espacios de trabajo',
description: 'Elige los espacios de trabajo a los que quieres copiar la configuración y luego selecciona los ajustes que quieras copiar.',
searchPlaceholder: 'Buscar espacios de trabajo',
},
selectSettings: {
title: 'Selecciona las funciones que quieres copiar',
description: 'Selecciona los ajustes que se sobrescribirán en tus espacios de trabajo existentes.',
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.`,
},
confirmSettings: {
title: 'Vamos a asegurarnos de que todo se vea bien.',
description: ({workspaceName}: {workspaceName: string}) =>
`Copiaríamos los siguientes ajustes de <strong>${workspaceName}</strong> a los espacios de trabajo que has especificado`,
},
confirmWorkflows: {
continue: 'Continuar sin miembros',
description: 'Copiar flujos de trabajo sin miembros no copiará los flujos de aprobación. La configuración de envío y pago sí se copiará.',
},
},
emptyWorkspace: {
title: 'Aún no hay espacios de trabajo',
Expand Down
32 changes: 21 additions & 11 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6090,18 +6090,28 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
error: 'Une erreur s’est produite lors de la duplication de votre nouvel espace de travail. Veuillez réessayer.',
},
copyPolicySettings: {
error: 'Une erreur s’est produite lors de la copie des paramètres de l’espace de travail. Veuillez réessayer.',
title: 'Copier les paramètres',
selectWorkspaces: 'Sélectionner des espaces de travail',
description: 'Choisissez les espaces de travail vers lesquels vous souhaitez copier les paramètres, puis sélectionnez les paramètres que vous souhaitez copier.',
searchPlaceholder: 'Rechercher des espaces de travail',
selectFeatures: 'Sélectionner les fonctionnalités à copier',
whichFeatures: 'Sélectionnez les paramètres à écraser sur vos espaces de travail existants.',
workflowsWithoutMembersConfirm: 'Continuer sans membres',
workflowsWithoutMembersPrompt:
'La copie d’espaces de travail sans membres ne copiera pas les workflows d’approbation. Les paramètres de soumission et de paiement seront néanmoins copiés.',
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.`,
error: 'Une erreur s’est produite lors de la copie des paramètres de l’espace de travail. Veuillez réessayer.',
selectWorkspaces: {
title: 'Sélectionner des espaces de travail',
description: 'Choisissez les espaces de travail vers lesquels vous souhaitez copier les paramètres, puis sélectionnez les paramètres que vous souhaitez copier.',
searchPlaceholder: 'Rechercher des espaces de travail',
},
selectSettings: {
title: 'Sélectionner les fonctionnalités à copier',
description: 'Sélectionnez les paramètres à écraser sur vos espaces de travail existants.',
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.`,
},
confirmSettings: {
title: 'Assurons-nous que tout est correct.',
description: ({workspaceName}: {workspaceName: string}) =>
`Nous copierons les paramètres suivants de <strong>${workspaceName}</strong> vers les espaces de travail que vous avez indiqués`,
},
confirmWorkflows: {
continue: 'Continuer sans membres',
description: 'La copie d’espaces de travail sans membres ne copiera pas les workflows d’approbation. Les paramètres de soumission et de paiement seront tout de même copiés.',
},
},
emptyWorkspace: {
title: 'Vous n’avez aucun espace de travail',
Expand Down
30 changes: 20 additions & 10 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6054,17 +6054,27 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
error: 'Si è verificato un errore durante la duplicazione del tuo nuovo workspace. Riprova.',
},
copyPolicySettings: {
error: 'Si è verificato un errore durante la copia delle impostazioni dello spazio di lavoro. Riprova.',
title: 'Copia impostazioni',
selectWorkspaces: 'Seleziona gli spazi di lavoro',
description: 'Scegli gli spazi di lavoro a cui vuoi copiare le impostazioni, poi seleziona le impostazioni che desideri copiare.',
searchPlaceholder: 'Cerca spazio di lavoro',
selectFeatures: 'Seleziona le funzionalità da copiare',
whichFeatures: 'Seleziona le impostazioni da sovrascrivere nei tuoi workspace esistenti.',
workflowsWithoutMembersConfirm: 'Continua senza membri',
workflowsWithoutMembersPrompt: 'La copia dei workflow senza membri non copierà i workflow di approvazione. Le impostazioni di invio e pagamento verranno comunque copiate.',
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.`,
error: 'Si è verificato un errore durante la copia delle impostazioni dello spazio di lavoro. Riprova.',
selectWorkspaces: {
title: 'Seleziona gli spazi di lavoro',
description: 'Scegli gli spazi di lavoro a cui vuoi copiare le impostazioni, poi seleziona le impostazioni che desideri copiare.',
searchPlaceholder: 'Cerca spazio di lavoro',
},
selectSettings: {
title: 'Seleziona le funzionalità da copiare',
description: 'Seleziona le impostazioni da sovrascrivere nei tuoi workspace esistenti.',
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.`,
},
confirmSettings: {
title: 'Assicuriamoci che sia tutto corretto.',
description: ({workspaceName}: {workspaceName: string}) => `Copieremo le seguenti impostazioni da <strong>${workspaceName}</strong> agli spazi di lavoro che hai specificato`,
},
confirmWorkflows: {
continue: 'Continua senza membri',
description: 'Copiare Flussi di lavoro senza Membri non copierà i flussi di lavoro di approvazione. Le impostazioni di invio e pagamento verranno comunque copiate.',
},
},
emptyWorkspace: {
title: 'Non hai nessuna area di lavoro',
Expand Down
28 changes: 19 additions & 9 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5987,16 +5987,26 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
error: '新しいワークスペースの複製中にエラーが発生しました。もう一度お試しください。',
},
copyPolicySettings: {
error: 'ワークスペース設定のコピー中にエラーが発生しました。もう一度お試しください。',
title: '設定をコピー',
selectWorkspaces: 'ワークスペースを選択',
description: '設定をコピーしたいワークスペースを選択し、その後、コピーしたい設定を選びます。',
searchPlaceholder: 'ワークスペースを検索',
selectFeatures: 'コピーする機能を選択します',
whichFeatures: '既存のワークスペースで上書きする設定を選択します。',
workflowsWithoutMembersConfirm: 'メンバーなしで続行',
workflowsWithoutMembersPrompt: 'メンバーのいないワークフローをコピーしても、承認ワークフローはコピーされません。申請および支払い設定は引き続きコピーされます。',
accountingMismatch: ({part}: {part: string}) => `すべてのワークスペースが同じ会計システムと会社接続を使用している場合にのみ、${part} をコピーできます。`,
error: 'ワークスペース設定のコピー中にエラーが発生しました。もう一度お試しください。',
selectWorkspaces: {
title: 'ワークスペースを選択',
description: '設定をコピーしたいワークスペースを選択し、その後、コピーしたい設定を選びます。',
searchPlaceholder: 'ワークスペースを検索',
},
selectSettings: {
title: 'コピーする機能を選択します',
description: '既存のワークスペースで上書きする設定を選択します。',
accountingMismatch: ({part}: {part: string}) => `すべてのワークスペースが同じ会計システムと会社接続を使用している場合にのみ、${part} をコピーできます。`,
},
confirmSettings: {
title: 'すべて正しく表示されているか確認しましょう。',
description: ({workspaceName}: {workspaceName: string}) => `次の設定を<strong>${workspaceName}</strong>から指定したワークスペースにコピーします`,
},
confirmWorkflows: {
continue: 'メンバーなしで続行',
description: 'メンバーなしでワークフローをコピーすると、承認ワークフローはコピーされません。提出と支払いの設定は引き続きコピーされます。',
},
},
emptyWorkspace: {
title: 'ワークスペースがありません',
Expand Down
Loading
Loading