Lock workspace Travel toggle while Travel Invoicing is enabled#92116
Open
blimpich wants to merge 3 commits into
Open
Lock workspace Travel toggle while Travel Invoicing is enabled#92116blimpich wants to merge 3 commits into
blimpich wants to merge 3 commits into
Conversation
Contributor
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 0ee96e9b5f5..be42824abae 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -5633,8 +5633,8 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
title: 'Reisen',
subtitle: 'Buchen, verwalten und abstimmen Sie all Ihre Geschäftsreisen.',
disableTravelTitle: 'Deaktivieren Sie zuerst die Reiseabrechnung',
- disableTravelPrompt: 'Die Reiseabrechnung ist für diesen Arbeitsbereich aktiviert. Deaktivieren Sie sie, bevor Sie Reisen deaktivieren können.',
- disableTravelButton: 'Zu den Reiseeinstellungen',
+ disableTravelPrompt: 'Reiseabrechnung ist für diesen Workspace aktiviert. Schalten Sie sie aus, bevor Sie Reisen deaktivieren können.',
+ disableTravelButton: 'Zu den Reiseeinstellungen gehen',
getStarted: {
title: 'Los geht’s mit Expensify Travel',
subtitle: 'Wir brauchen nur noch ein paar weitere Informationen zu deinem Unternehmen, dann bist du startklar.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 876ac9d33be..985d0f022c8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -5466,8 +5466,8 @@ ${amount} para ${merchant} - ${date}`,
title: 'Viajes',
subtitle: 'Reserva, gestiona y concilia todos tus viajes de negocios.',
disableTravelTitle: 'Desactiva primero la facturación de viajes',
- disableTravelPrompt: 'La facturación de viajes está activada para este espacio de trabajo. Desactívala antes de poder desactivar Viajes.',
- disableTravelButton: 'Ir a la configuración de Viajes',
+ disableTravelPrompt: 'La facturación de viajes está habilitada para este espacio de trabajo. Desactívala antes de poder deshabilitar Viajes.',
+ disableTravelButton: 'Ve a la configuración de Viajes',
getStarted: {
title: 'Comienza con Expensify Travel',
subtitle: 'Solo necesitamos algunos datos más sobre tu empresa y estarás listo para despegar.',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 0c79e98d83c..40a977a071e 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -2976,7 +2976,7 @@ ${amount} pour ${merchant} - ${date}`,
phoneOrEmail: 'Téléphone ou e-mail',
error: {
agentSignInBlocked:
- 'Les comptes d\u2019agent ne permettent pas de se connecter directement. Pour utiliser un agent, connectez-vous avec votre propre compte et accédez-y via Copilot.',
+ 'Les comptes d’agent ne permettent pas de se connecter directement. Pour utiliser un agent, connectez-vous avec votre propre compte et accédez-y via Copilot.',
invalidFormatEmailLogin: 'L’adresse e-mail saisie est invalide. Veuillez corriger le format et réessayer.',
},
cannotGetAccountDetails: 'Impossible de récupérer les détails du compte. Veuillez essayer de vous reconnecter.',
@@ -5644,9 +5644,9 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
travel: {
title: 'Déplacements',
subtitle: 'Réservez, gérez et rapprochez tous vos déplacements professionnels.',
- disableTravelTitle: "Désactivez d'abord la facturation des déplacements",
- disableTravelPrompt: 'La facturation des déplacements est activée pour cet espace de travail. Désactivez-la avant de pouvoir désactiver Déplacements.',
- disableTravelButton: 'Aller aux paramètres de déplacement',
+ disableTravelTitle: 'Désactivez d’abord la facturation des déplacements',
+ disableTravelPrompt: 'La facturation de voyage est activée pour cet espace de travail. Désactivez-la avant de pouvoir désactiver Travel.',
+ disableTravelButton: 'Accéder aux paramètres de voyage',
getStarted: {
title: 'Commencez avec Expensify Travel',
subtitle: 'Nous avons simplement besoin de quelques informations supplémentaires sur votre entreprise, puis vous serez prêt à décoller.',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index b074d28414b..dfb0adb25a6 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -5614,8 +5614,8 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
title: 'Viaggi',
subtitle: 'Prenota, gestisci e riconcilia tutti i viaggi di lavoro.',
disableTravelTitle: 'Disattiva prima la fatturazione viaggi',
- disableTravelPrompt: 'La fatturazione viaggi è attiva per questo spazio di lavoro. Disattivala prima di poter disattivare Viaggi.',
- disableTravelButton: 'Vai alle impostazioni di Viaggi',
+ disableTravelPrompt: 'La fatturazione Viaggi è abilitata per questo spazio di lavoro. Disattivala prima di poter disabilitare Viaggi.',
+ disableTravelButton: 'Vai alle impostazioni Viaggio',
getStarted: {
title: 'Inizia con Expensify Travel',
subtitle: 'Ci servono solo ancora alcune informazioni sulla tua attività, poi sarai pronto al decollo.',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 15c6f3ce488..79876ab4131 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5564,9 +5564,9 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
travel: {
title: '出張',
subtitle: '出張の予約、管理、精算をすべて一元管理。',
- disableTravelTitle: '先に出張請求をオフにしてください',
- disableTravelPrompt: 'このワークスペースでは出張請求が有効になっています。出張をオフにする前に、出張請求をオフにしてください。',
- disableTravelButton: '出張設定に移動',
+ disableTravelTitle: '先に Travel Invoicing をオフにしてください',
+ disableTravelPrompt: 'このワークスペースでは旅行請求書作成が有効になっています。Travel を無効にする前にオフにしてください。',
+ disableTravelButton: '出張設定に移動します',
getStarted: {
title: 'Expensify Travel を使い始める',
subtitle: 'ビジネスについてあと少しだけ情報を教えてください。準備が整い次第、すぐに開始できます。',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 62475ad5626..fa4b720a703 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5602,9 +5602,9 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
travel: {
title: 'Reizen',
subtitle: 'Boek, beheer en reconcilieer al je zakelijke reizen.',
- disableTravelTitle: 'Schakel eerst reisfacturering uit',
- disableTravelPrompt: 'Reisfacturering is ingeschakeld voor deze werkruimte. Schakel het uit voordat je Reizen kunt uitschakelen.',
- disableTravelButton: 'Ga naar reisinstellingen',
+ disableTravelTitle: 'Schakel eerst Reisfacturatie uit',
+ disableTravelPrompt: 'Reisfacturatie is ingeschakeld voor deze workspace. Schakel dit uit voordat je Reis kunt uitschakelen.',
+ disableTravelButton: 'Ga naar Reisinstellingen',
getStarted: {
title: 'Aan de slag met Expensify Travel',
subtitle: 'We hebben nog maar een paar extra gegevens over je bedrijf nodig, dan ben je klaar voor vertrek.',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 3e33a593554..e795407db7d 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -5591,8 +5591,8 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
title: 'Podróże',
subtitle: 'Rezerwuj, zarządzaj i uzgadniaj wszystkie wyjazdy służbowe.',
disableTravelTitle: 'Najpierw wyłącz fakturowanie podróży',
- disableTravelPrompt: 'Fakturowanie podróży jest włączone dla tego obszaru roboczego. Wyłącz je, zanim będzie można wyłączyć Podróże.',
- disableTravelButton: 'Przejdź do ustawień podróży',
+ disableTravelPrompt: 'Fakturowanie podróży jest włączone dla tego obszaru roboczego. Wyłącz je, zanim będziesz mógł wyłączyć funkcję Podróże.',
+ disableTravelButton: 'Przejdź do ustawień Podróży',
getStarted: {
title: 'Pierwsze kroki z Expensify Travel',
subtitle: 'Potrzebujemy jeszcze tylko kilku informacji o Twojej firmie, a potem będziesz gotowy do startu.',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index c675e0d93e8..47411989db5 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5595,8 +5595,8 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
title: 'Viagens',
subtitle: 'Reserve, gerencie e reconcilie todas as viagens de negócios da sua empresa.',
disableTravelTitle: 'Desative primeiro o faturamento de viagens',
- disableTravelPrompt: 'O faturamento de viagens está ativado para este espaço de trabalho. Desative-o antes de poder desativar Viagens.',
- disableTravelButton: 'Ir para as configurações de Viagens',
+ disableTravelPrompt: 'O faturamento de viagens está ativado para este workspace. Desative-o antes de desativar o Travel.',
+ disableTravelButton: 'Ir para as configurações de Viagem',
getStarted: {
title: 'Comece a usar o Expensify Travel',
subtitle: 'Só precisamos de mais algumas informações sobre sua empresa e você estará pronto para decolar.',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 937455e5ab3..13871547b63 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -5467,7 +5467,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
title: '差旅',
subtitle: '预订、管理并对账您所有的商务差旅。',
disableTravelTitle: '请先关闭差旅开票',
- disableTravelPrompt: '此工作区已启用差旅开票。请先将其关闭，然后才能关闭差旅功能。',
+ disableTravelPrompt: '此工作区已启用差旅开票。要禁用差旅功能，请先将其关闭。',
disableTravelButton: '前往差旅设置',
getStarted: {
title: '开始使用 Expensify Travel',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
melvin-bot
Bot
requested review from
heyjennahay and
truph01
and removed request for
a team
Contributor
Author
|
@truph01 if you aren't able to enable travel invoicing locally feel free to login to my local backend on user |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b8fa6c820d
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Travel Invoicing depends on the workspace Travel feature being on. Previously, an admin could turn Travel off in Workspace → More features while Travel Invoicing was still enabled, leaving the workspace in an inconsistent state.
This locks the Travel toggle whenever Travel Invoicing is enabled for the workspace. Pressing the locked toggle opens a modal explaining that Travel Invoicing must be turned off first, with a button that takes the admin to the Travel settings page where they can do so. The enforcement also exists server-side (sibling Auth PR: https://github.com/Expensify/Auth/pull/21947); they ship together.
Fixed Issues
$ https://github.com/Expensify/Expensify/issues/642820
PROPOSAL:
Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Screen.Recording.2026-05-29.at.2.22.02.PM.mov
– written by Claude on Ben's behalf