Show Consolidated Travel Billing copy when workspace deletion is blocked by CTB#96090
Show Consolidated Travel Billing copy when workspace deletion is blocked by CTB#96090MelvinBot wants to merge 3 commits into
Conversation
…ed by CTB Co-authored-by: Benjamin Limpich <blimpich@users.noreply.github.com>
🦜 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 12d74fbe5d6..fff51333812 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -4478,7 +4478,7 @@ ${amount} für ${merchant} – ${date}`,
deleteConfirmation: 'Möchten Sie diesen Workspace wirklich löschen?',
deleteWithCardsConfirmation: 'Möchtest du diesen Workspace wirklich löschen? Dadurch werden alle Kartenfeeds und zugewiesenen Karten entfernt.',
deleteOpenExpensifyCardsError: 'Ihre Firma hat noch Expensify Karten. Bitte <concierge-link>wenden Sie sich an Concierge</concierge-link>, um sie zu entfernen.',
- deleteTravelInvoicingError: 'Ihre Firma hat noch die Konsolidierte Reiseabrechnung aktiviert.',
+ deleteTravelInvoicingError: 'Ihr Unternehmen hat die Konsolidierte Reiseabrechnung noch aktiviert.',
outstandingBalanceWarning:
'Sie haben einen offenen Saldo, der beglichen werden muss, bevor Sie Ihren letzten Workspace löschen können. Bitte gehen Sie zu Ihren Abonnementeinstellungen, um die Zahlung abzuschließen.',
settleBalance: 'Zu Abo wechseln',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1dc02e64936..a9ec2e30667 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -4357,7 +4357,7 @@ ${amount} para ${merchant} - ${date}`,
deleteConfirmation: '¿Estás seguro de que quieres eliminar este espacio de trabajo?',
deleteWithCardsConfirmation: '¿Estás seguro de que quieres eliminar este espacio de trabajo? Se eliminarán todos los datos de las tarjetas y las tarjetas asignadas.',
deleteOpenExpensifyCardsError: 'Tu empresa todavía tiene Tarjetas Expensify. Por favor, <concierge-link>contacta con Concierge</concierge-link> para eliminarlas.',
- deleteTravelInvoicingError: 'Tu empresa todavía tiene habilitada la Facturación consolidada de viajes.',
+ deleteTravelInvoicingError: 'Tu empresa todavía tiene habilitada la Facturación Consolidada de Viajes.',
outstandingBalanceWarning:
'Tienes un saldo pendiente que debe liquidarse antes de eliminar tu último espacio de trabajo. Por favor, ve a la configuración de tu suscripción para resolver el pago.',
settleBalance: 'Ir a Suscripción',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 5c3bf99acd8..434af314bec 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -4488,7 +4488,7 @@ ${amount} pour ${merchant} - ${date}`,
deleteConfirmation: 'Voulez-vous vraiment supprimer cet espace de travail ?',
deleteWithCardsConfirmation: 'Voulez-vous vraiment supprimer cet espace de travail ? Cela supprimera tous les flux de cartes et les cartes assignées.',
deleteOpenExpensifyCardsError: 'Votre entreprise a encore des Cartes Expensify. Veuillez <concierge-link>contacter Concierge</concierge-link> pour les supprimer.',
- deleteTravelInvoicingError: 'Votre entreprise a encore la Facturation de voyages consolidée activée.',
+ deleteTravelInvoicingError: 'Votre entreprise a toujours la facturation de voyages consolidée activée.',
outstandingBalanceWarning:
'Vous avez un solde impayé qui doit être réglé avant de supprimer votre dernier espace de travail. Veuillez accéder à vos paramètres d’abonnement pour résoudre le paiement.',
settleBalance: 'Aller à l’abonnement',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 4373c7e2fe5..a6187102ef2 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -4463,7 +4463,7 @@ ${amount} per ${merchant} - ${date}`,
deleteConfirmation: 'Sei sicuro di voler eliminare questo spazio di lavoro?',
deleteWithCardsConfirmation: 'Sei sicuro di voler eliminare questo spazio di lavoro? Questa azione rimuoverà tutti i feed delle carte e le carte assegnate.',
deleteOpenExpensifyCardsError: 'La tua azienda ha ancora delle Carte Expensify. Per favore, <concierge-link>contatta Concierge</concierge-link> per rimuoverle.',
- deleteTravelInvoicingError: 'La tua azienda ha ancora la Fatturazione viaggio consolidata abilitata.',
+ deleteTravelInvoicingError: 'La tua azienda ha ancora la Fatturazione Viaggi Consolidata attivata.',
outstandingBalanceWarning:
'Hai un saldo in sospeso che deve essere saldato prima di eliminare il tuo ultimo workspace. Vai alle impostazioni dell’abbonamento per risolvere il pagamento.',
settleBalance: 'Vai all’abbonamento',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index df02cd88471..c63e7d375f5 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -4427,7 +4427,7 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
deleteConfirmation: 'このワークスペースを削除してもよろしいですか？',
deleteWithCardsConfirmation: 'このワークスペースを削除してもよろしいですか？ すべてのカードフィードと割り当て済みカードが削除されます。',
deleteOpenExpensifyCardsError: '御社にはまだ Expensify カードが残っています。削除するには、<concierge-link>Concierge までお問い合わせください</concierge-link>。',
- deleteTravelInvoicingError: '御社ではまだ出張費の一括請求が有効になっています。',
+ deleteTravelInvoicingError: 'お客様の会社では、統合トラベル請求がまだ有効になっています。',
outstandingBalanceWarning: '最後のワークスペースを削除する前に精算する必要がある未払残高があります。支払いを解決するには、サブスクリプション設定に移動してください。',
settleBalance: 'サブスクリプションに移動',
unavailable: '利用できないワークスペース',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index edef2f0c3d0..8f6d2f0af72 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -4458,7 +4458,7 @@ ${amount} voor ${merchant} - ${date}`,
deleteConfirmation: 'Weet je zeker dat je deze werkruimte wilt verwijderen?',
deleteWithCardsConfirmation: 'Weet je zeker dat je deze werkruimte wilt verwijderen? Hiermee worden alle kaartfeeds en toegewezen kaarten verwijderd.',
deleteOpenExpensifyCardsError: 'Je bedrijf heeft nog Expensify Kaarten. <concierge-link>Neem contact op met Concierge</concierge-link> om ze te verwijderen.',
- deleteTravelInvoicingError: 'Je bedrijf heeft nog Geconsolideerde reisfacturatie ingeschakeld.',
+ deleteTravelInvoicingError: 'Je bedrijf heeft nog steeds Geconsolideerde Reisfacturering ingeschakeld.',
outstandingBalanceWarning:
'Je hebt een openstaand saldo dat moet worden vereffend voordat je je laatste werkruimte kunt verwijderen. Ga naar je abonnementsinstellingen om de betaling af te ronden.',
settleBalance: 'Ga naar abonnement',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 0d010167964..32d0572a840 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -4444,7 +4444,7 @@ ${amount} dla ${merchant} - ${date}`,
deleteConfirmation: 'Czy na pewno chcesz usunąć tę przestrzeń roboczą?',
deleteWithCardsConfirmation: 'Na pewno chcesz usunąć tę przestrzeń roboczą? Spowoduje to usunięcie wszystkich źródeł kart i przypisanych kart.',
deleteOpenExpensifyCardsError: 'Twoja firma wciąż ma Karty Expensify. Prosimy, <concierge-link>skontaktuj się z Concierge</concierge-link>, aby je usunąć.',
- deleteTravelInvoicingError: 'Twoja firma nadal ma włączone Zbiorcze rozliczanie podróży.',
+ deleteTravelInvoicingError: 'Twoja firma nadal ma włączone Skonsolidowane Rozliczanie Podróży.',
outstandingBalanceWarning:
'Masz zaległe saldo, które musi zostać uregulowane przed usunięciem ostatniego miejsca pracy. Przejdź do ustawień subskrypcji, aby uregulować płatność.',
settleBalance: 'Przejdź do subskrypcji',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index ef4e5b8d0d1..cbfeea6e9be 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -4448,7 +4448,7 @@ ${amount} para ${merchant} - ${date}`,
deleteConfirmation: 'Tem certeza de que deseja excluir este workspace?',
deleteWithCardsConfirmation: 'Tem certeza de que deseja excluir este workspace? Isso removerá todos os feeds de cartão e cartões atribuídos.',
deleteOpenExpensifyCardsError: 'Sua empresa ainda tem Cartões Expensify. Por favor, <concierge-link>fale com o Concierge</concierge-link> para removê-los.',
- deleteTravelInvoicingError: 'Sua empresa ainda tem o Faturamento de Viagens Consolidado ativado.',
+ deleteTravelInvoicingError: 'Sua empresa ainda está com a Faturação Consolidada de Viagens ativada.',
outstandingBalanceWarning:
'Você tem um saldo pendente que precisa ser quitado antes de excluir seu último espaço de trabalho. Acesse as configurações de assinatura para resolver o pagamento.',
settleBalance: 'Ir para a assinatura',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index bc8887b1c94..43e4239bce7 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -4336,7 +4336,7 @@ ${amount}，商户：${merchant} - 日期：${date}`,
deleteConfirmation: '确定要删除此工作区吗？',
deleteWithCardsConfirmation: '确定要删除此工作区吗？这将移除所有卡片数据源和已分配的卡片。',
deleteOpenExpensifyCardsError: '您的公司仍在使用 Expensify 卡。请<concierge-link>联系 Concierge</concierge-link>以停用它们。',
- deleteTravelInvoicingError: '您的公司仍启用了合并差旅账单。',
+ deleteTravelInvoicingError: '您的公司仍然启用了合并差旅账单。',
outstandingBalanceWarning: '您有一笔未结清的余额，必须在删除最后一个工作区之前结清。请前往订阅设置以解决付款问题。',
settleBalance: '前往订阅',
unavailable: '工作区不可用',
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!
|
|
Nothing to fix here in code — all CI checks are green. ✅ The only red check is PR Author Checklist / checklist, and it's failing for a non-code reason:
That check just verifies the author has ticked the boxes in the PR description's PR Author Checklist section. It'll go green once you fill out the checklist (and the Every functional check — |
|
@MelvinBot can you replace your translation strings with the one from this comment/patch? #96090 (comment) |
Co-authored-by: Benjamin Limpich <blimpich@users.noreply.github.com>
|
Done ✅ Applied the Polyglot Parrot translation updates from that patch to Only the string content for that key changed — 8 lines, one per locale, matching the patch byte-for-byte. |
melvin-bot
Bot
requested review from
blimpich and
joekaufmanexpensify
and removed request for
a team
|
All checks are passing now — nothing to fix. ✅ The previously-red PR Author Checklist / checklist went green on its latest run once the checklist was filled out. Every other check ( |
![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: f7f13eb666
ℹ️ 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".
|
Nothing to fix in code — the only red check is PR Reviewer Checklist / checklist, and it's failing for a non-code reason:
This isn't something I can push a fix for. As Status of the two checklist checks:
Every functional check — |
|
Still nothing to fix in code — all functional CI checks are green. ✅ The only red check now is PR Reviewer Checklist / checklist. That one isn't an author/code concern at all: it goes green once the assigned reviewer completes their checklist during review. There's no code change that can clear it, so I haven't pushed anything. (The PR Author Checklist that was failing earlier is now passing.) |
Co-authored-by: {"message":"Not Found","documentation_url":"https://docs.github.com/rest/issues/comments#get-an-issue-comment","status":"404"} <{"message":"Not Found","documentation_url":"https://docs.github.com/rest/issues/comments#get-an-issue-comment","status":"404"}@users.noreply.github.com>
|
Still nothing to fix in code — all functional checks are green on the latest commit ( The PR Author Checklist now passes. The only remaining red check is PR Reviewer Checklist / checklist, which fails simply because no reviewer has filled out the reviewer checklist yet — it clears once a reviewer completes their review. That's not an author task and not a code defect, so I haven't pushed anything. Everything else — |
3 participants
Explanation of Change
When a workspace deletion is blocked, the delete-workspace flow always rendered the Expensify Cards warning (
workspace.common.deleteOpenExpensifyCardsError— "Your company still has Expensify Cards."), even when the real blocker was Consolidated Travel Billing (CTB) being enabled. This produced the wrong warning for workspaces with Travel Invoicing enabled.This PR makes the warning copy match the actual blocking condition:
workspace.common.deleteTravelInvoicingError— "Your company still has Consolidated Travel Billing enabled." — across all locales.getIsTravelInvoicingEnabled(getCardSettings(...))(the same helper used by the More Features page).Fixed Issues
$ #90407
PROPOSAL: #90407 (comment)
Tests
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Preconditions: Use the Expensifail account and enable Consolidated Travel Billing (formerly known as Travel Invoicing) in the Workspace features
Confirm the copy talks about Travel Billing and not Expensify cards.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, 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.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari