Skip to content

Collect legal entity tax ID before enabling Travel on non-USD workspaces - #94604

Merged
rlinoz merged 16 commits into
mainfrom
blimpich-travelTaxId
Jul 8, 2026
Merged

rlinoz merged 16 commits into
mainfrom
blimpich-travelTaxId

Conversation

@blimpich

@blimpich blimpich commented Jun 25, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

When an admin enables Expensify Travel on a workspace that bills in a non-USD currency, our travel partner (Solutions) needs the legal entity's tax ID to provision a DK number. Today we never ask for it, so the workspace is silently billed in USD and an account manager has to chase the customer for the number by hand.

This adds a step to the Travel enablement flow: right before accepting the Spotnana terms, a non-USD workspace that hasn't been provisioned yet is asked for its legal entity tax ID. The value is carried into terms acceptance and stored on the workspace's travel settings so it can be sent to Solutions automatically. USD workspaces and already-provisioned workspaces are unaffected — they go straight to the terms page as before.

This is the App half of the feature. The Auth and Web-Expensify PRs below persist the tax ID and forward it to Solutions.

💡 Note: we decided here that this flow will become a dynamic stepper. This PR does not make that happen. That will be in a follow up PR. This is so this PR doesn't get any bigger than it needs to be.

Fixed Issues

Part of https://github.com/Expensify/Expensify/issues/649813

Depends on (must deploy first):

PROPOSAL: N/A

Tests

Prerequisite: a Collect/Control workspace you admin, set to a non-USD output currency (e.g. GBP), with Travel not yet enabled/provisioned, on a private (non-public) email domain.

  1. Open the workspace and start the Travel enablement flow ("Book travel" / "Get started with Travel").
  2. Verify you are taken to a Tax ID page asking for the legal entity tax ID before the terms & conditions page.
  3. Leave the field blank and press Continue → verify the error "Please enter your legal entity tax ID." appears and you cannot proceed.
  4. Enter a tax ID and press Continue → verify you land on the Travel terms & conditions page.
  5. Accept the terms and continue → verify provisioning completes (and, with the backend PRs deployed, the tax ID is stored on the workspace's travel settings).
  6. Repeat with a USD workspace → verify the Tax ID page is skipped and you go straight to the terms page.
  7. Repeat with an already-provisioned non-USD workspace → verify the Tax ID page is skipped.

All paths into terms acceptance are gated. For a non-USD, unprovisioned workspace, verify the Tax ID page appears before terms in each:
8. Single admin domain, account already validated, workspace address already set → Book travel → Tax ID page → terms.
9. Single admin domain, workspace address NOT set → Book travel → company address page → Tax ID page → terms.
10. Account not yet validated → Book travel → verify-account (magic code) → Tax ID page → terms.
11. Multiple admin domains → Book travel → domain selector → Tax ID page → terms.

  • Verify that no errors appear in the JS console

Offline tests

The Tax ID page works offline: the value is held locally and submitted with the terms-acceptance request once back online.

QA Steps

Run on staging (https://staging.new.expensify.com) with a non-USD Collect/Control workspace you admin that has not yet enabled Travel.

  1. Start the Travel enablement flow and verify the Tax ID page appears before the terms page.
  2. Verify the blank-field error blocks progress, and a valid tax ID lets you continue to terms.
  3. Verify each entry path reaches the Tax ID page before terms: (a) validated admin + address set, (b) address not set (address page first), (c) unvalidated account (magic code first), (d) multiple admin domains (domain selector first).
  4. Verify the negative cases skip the Tax ID page: a USD workspace, and an already-provisioned non-USD workspace.
  • Verify that no errors appear in the JS console

Screenshots/Videos

Screen.Recording.2026-06-25.at.10.30.41.AM.mov

– written by Claude on Ben's behalf

@OSBotify

This comment has been minimized.

@codecov

codecov Bot commented Jun 25, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/ROUTES.ts 20.79% <100.00%> (+0.07%) ⬆️
src/SCREENS.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 76.92% <ø> (ø)
src/libs/PolicyUtils.ts 77.13% <100.00%> (-0.05%) ⬇️
src/libs/actions/Travel.ts 56.25% <100.00%> (+56.25%) ⬆️
src/libs/getTravelAcceptTermsRoute.ts 100.00% <100.00%> (ø)
src/pages/Travel/DynamicDomainSelectorPage.tsx 0.00% <ø> (ø)
src/pages/Travel/DynamicTravelTerms.tsx 0.00% <ø> (ø)
src/pages/Travel/TravelLegalEntityTaxIDPage.tsx 100.00% <100.00%> (ø)
... and 5 more
... and 11 files with indirect coverage changes

Comment thread src/libs/getTravelAcceptTermsRoute.ts Resolved
Comment thread src/libs/PolicyUtils.ts Resolved
@blimpich
blimpich marked this pull request as ready for review July 2, 2026 22:11
@blimpich
blimpich requested review from a team as code owners July 2, 2026 22:11
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and arosiclair and removed request for a team July 2, 2026 22:11
@melvin-bot

melvin-bot Bot commented Jul 2, 2026

Copy link
Copy Markdown

@arosiclair Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@blimpich
blimpich requested review from rlinoz and stitesExpensify and removed request for arosiclair July 2, 2026 22:12
@blimpich blimpich changed the title [HOLD] Collect legal entity tax ID before enabling Travel on non-USD workspaces Collect legal entity tax ID before enabling Travel on non-USD workspaces Jul 2, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b789210ddf

ℹ️ 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".

Comment thread src/pages/Travel/DynamicTravelTerms.tsx Resolved
Comment thread src/libs/Navigation/types.ts Resolved
JmillsExpensify
JmillsExpensify previously approved these changes Jul 7, 2026

@JmillsExpensify JmillsExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No product concerns on this one.

@OSBotify

OSBotify commented Jul 7, 2026

Copy link
Copy Markdown
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 diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index c6bf3e7b136..5968eb14681 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -1,13 +1,3 @@
-import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
-import StringUtils from '@libs/StringUtils';
-
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
-import type {ValueOf} from 'type-fest';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -19,6 +9,16 @@ import type {ValueOf} from 'type-fest';
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+import type {Country} from '@src/CONST';
+import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
+import type {ValueOf} from 'type-fest';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 import startCase from 'lodash/startCase';
 
@@ -63,7 +63,6 @@ import type {
     YourPlanPriceParams,
 } from './params';
 import type {TranslationDeepObject} from './types';
-
 type StateValue = {
     stateISO: string;
     stateName: string;
@@ -4403,9 +4402,9 @@ ${amount} für ${merchant} – ${date}`,
         nightsIn: 'Nächte in',
         taxID: {
             title: 'Steuer-ID',
-            subtitle: 'Geben Sie die Steuer-ID Ihrer juristischen Person ein, damit wir die Reisekostenabrechnung in Ihrer Landeswährung einrichten können.',
+            subtitle: 'Geben Sie Ihre Steuer-ID der juristischen Person ein, damit wir die Reiseabrechnung in Ihrer lokalen Währung einrichten können.',
             inputLabel: 'Steuer-ID der juristischen Person',
-            error: {required: 'Bitte geben Sie die Steuernummer Ihrer juristischen Person ein.'},
+            error: {required: 'Bitte geben Sie Ihre steuerliche Identifikationsnummer der juristischen Person ein.'},
         },
     },
     workspace: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index bdbf3f63a72..a91c43dfb2a 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1,6 +1,3 @@
-import CONST from '@src/CONST';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -12,12 +9,14 @@ import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import CONST from '@src/CONST';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 
 import type en from './en';
 import type {ConciergeBrokenCardConnectionParams, PaidElsewhereParams, RemoveCopilotAccessConfirmationParams, UnsupportedFormulaValueErrorParams} from './params';
 import type {TranslationDeepObject} from './types';
-
 const translations: TranslationDeepObject<typeof en> = {
     common: {
         count: 'Contar',
@@ -4218,7 +4217,7 @@ ${amount} para ${merchant} - ${date}`,
             title: 'ID fiscal',
             subtitle: 'Introduce el NIF de tu entidad legal para que podamos configurar la facturación de viajes en tu moneda local.',
             inputLabel: 'ID fiscal de la entidad jurídica',
-            error: {required: 'Introduce el NIF fiscal de tu entidad legal.'},
+            error: {required: 'Por favor, introduce el NIF fiscal de tu entidad legal.'},
         },
         domainPermissionInfo: {
             title: 'Dominio',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index a8f70a0fab7..d6d05b8a1b1 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -1,13 +1,3 @@
-import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
-import StringUtils from '@libs/StringUtils';
-
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
-import type {ValueOf} from 'type-fest';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -19,6 +9,16 @@ import type {ValueOf} from 'type-fest';
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+import type {Country} from '@src/CONST';
+import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
+import type {ValueOf} from 'type-fest';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 import startCase from 'lodash/startCase';
 
@@ -63,7 +63,6 @@ import type {
     YourPlanPriceParams,
 } from './params';
 import type {TranslationDeepObject} from './types';
-
 type StateValue = {
     stateISO: string;
     stateName: string;
@@ -4415,8 +4414,8 @@ ${amount} pour ${merchant} - ${date}`,
         taxID: {
             title: 'Identifiant fiscal',
             subtitle: 'Saisissez l’identifiant fiscal de votre entité légale afin que nous puissions configurer la facturation des déplacements dans votre devise locale.',
-            inputLabel: 'Identifiant fiscal de l’entité juridique',
-            error: {required: 'Veuillez saisir l’identifiant fiscal de votre entité légale.'},
+            inputLabel: 'Identifiant fiscal de la personne morale',
+            error: {required: 'Veuillez saisir le numéro d’identification fiscale de votre entité légale.'},
         },
     },
     workspace: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 6a6aa0b05dc..3b23dc0b6d7 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -1,13 +1,3 @@
-import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
-import StringUtils from '@libs/StringUtils';
-
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
-import type {ValueOf} from 'type-fest';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -19,6 +9,16 @@ import type {ValueOf} from 'type-fest';
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+import type {Country} from '@src/CONST';
+import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
+import type {ValueOf} from 'type-fest';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 import startCase from 'lodash/startCase';
 
@@ -63,7 +63,6 @@ import type {
     YourPlanPriceParams,
 } from './params';
 import type {TranslationDeepObject} from './types';
-
 type StateValue = {
     stateISO: string;
     stateName: string;
@@ -4390,8 +4389,8 @@ ${amount} per ${merchant} - ${date}`,
         taxID: {
             title: 'Codice fiscale',
             subtitle: 'Inserisci il codice fiscale della tua entità legale così possiamo configurare la fatturazione dei viaggi nella tua valuta locale.',
-            inputLabel: 'Partita IVA dell’entità legale',
-            error: {required: 'Inserisci il codice fiscale/partita IVA della tua entità legale.'},
+            inputLabel: 'Codice fiscale dell’entità legale',
+            error: {required: 'Inserisci il codice fiscale o la partita IVA della tua entità legale.'},
         },
     },
     workspace: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 5a231759b92..df82e6835d3 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -1,13 +1,3 @@
-import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
-import StringUtils from '@libs/StringUtils';
-
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
-import type {ValueOf} from 'type-fest';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -19,6 +9,16 @@ import type {ValueOf} from 'type-fest';
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+import type {Country} from '@src/CONST';
+import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
+import type {ValueOf} from 'type-fest';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 import startCase from 'lodash/startCase';
 
@@ -63,7 +63,6 @@ import type {
     YourPlanPriceParams,
 } from './params';
 import type {TranslationDeepObject} from './types';
-
 type StateValue = {
     stateISO: string;
     stateName: string;
@@ -4353,9 +4352,9 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
         nightsIn: '泊(滞在先)',
         taxID: {
             title: '納税者番号',
-            subtitle: '現地通貨での出張費の請求を設定できるように、法人の納税者番号を入力してください。',
+            subtitle: '現地通貨での出張請求を設定できるように、法人の納税者番号(税務登録番号)を入力してください。',
             inputLabel: '法人納税者番号',
-            error: {required: '法的事業体の納税者番号を入力してください。'},
+            error: {required: '法人の正式な納税者番号を入力してください。'},
         },
     },
     workspace: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 4a768179f14..9014d379818 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -1,13 +1,3 @@
-import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
-import StringUtils from '@libs/StringUtils';
-
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
-import type {ValueOf} from 'type-fest';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -19,6 +9,16 @@ import type {ValueOf} from 'type-fest';
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+import type {Country} from '@src/CONST';
+import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
+import type {ValueOf} from 'type-fest';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 import startCase from 'lodash/startCase';
 
@@ -63,7 +63,6 @@ import type {
     YourPlanPriceParams,
 } from './params';
 import type {TranslationDeepObject} from './types';
-
 type StateValue = {
     stateISO: string;
     stateName: string;
@@ -4384,9 +4383,9 @@ ${amount} voor ${merchant} - ${date}`,
         nightsIn: 'nachten in',
         taxID: {
             title: 'Belastingnummer',
-            subtitle: 'Voer het fiscale nummer van je rechtspersoon in zodat we reisfacturatie in je lokale valuta kunnen instellen.',
-            inputLabel: 'Belastingnummer rechtspersoon',
-            error: {required: 'Vul het fiscale identificatienummer van je rechtspersoon in.'},
+            subtitle: 'Voer het fiscale identificatienummer van je rechtspersoon in, zodat we reiskosten in je lokale valuta kunnen inrichten.',
+            inputLabel: 'RSIN / fiscaal nummer',
+            error: {required: 'Voer het fiscale nummer van je rechtspersoon in.'},
         },
     },
     workspace: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 3755dad0426..5c8a5770ab0 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -1,13 +1,3 @@
-import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
-import StringUtils from '@libs/StringUtils';
-
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
-import type {ValueOf} from 'type-fest';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -19,6 +9,16 @@ import type {ValueOf} from 'type-fest';
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+import type {Country} from '@src/CONST';
+import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
+import type {ValueOf} from 'type-fest';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 import startCase from 'lodash/startCase';
 
@@ -63,7 +63,6 @@ import type {
     YourPlanPriceParams,
 } from './params';
 import type {TranslationDeepObject} from './types';
-
 type StateValue = {
     stateISO: string;
     stateName: string;
@@ -4370,9 +4369,9 @@ ${amount} dla ${merchant} - ${date}`,
         nightsIn: 'noce w',
         taxID: {
             title: 'NIP',
-            subtitle: 'Podaj swój numer identyfikacji podatkowej podmiotu prawnego, żebyśmy mogli skonfigurować rozliczenia za podróże w twojej lokalnej walucie.',
+            subtitle: 'Wpisz swój identyfikator podatkowy podmiotu prawnego, żebyśmy mogli skonfigurować rozliczenia za podróże w twojej lokalnej walucie.',
             inputLabel: 'NIP podmiotu prawnego',
-            error: {required: 'Podaj swój identyfikator podatkowy podmiotu prawnego.'},
+            error: {required: 'Podaj swój podatkowy identyfikator prawnego podmiotu.'},
         },
     },
     workspace: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 7e432643bc3..766a7e193c6 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -1,13 +1,3 @@
-import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
-import StringUtils from '@libs/StringUtils';
-
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
-import type {ValueOf} from 'type-fest';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -19,6 +9,16 @@ import type {ValueOf} from 'type-fest';
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+import type {Country} from '@src/CONST';
+import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
+import type {ValueOf} from 'type-fest';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 import startCase from 'lodash/startCase';
 
@@ -63,7 +63,6 @@ import type {
     YourPlanPriceParams,
 } from './params';
 import type {TranslationDeepObject} from './types';
-
 type StateValue = {
     stateISO: string;
     stateName: string;
@@ -4374,9 +4373,9 @@ ${amount} para ${merchant} - ${date}`,
         nightsIn: 'noites em',
         taxID: {
             title: 'CPF/CNPJ',
-            subtitle: 'Insira o CNPJ da sua empresa para que possamos configurar a cobrança de viagens na sua moeda local.',
-            inputLabel: 'CNPJ da pessoa jurídica',
-            error: {required: 'Insira o CNPJ da sua entidade legal.'},
+            subtitle: 'Insira o CNPJ da sua pessoa jurídica para que possamos configurar a cobrança de viagens na sua moeda local.',
+            inputLabel: 'CNPJ da empresa',
+            error: {required: 'Insira o CNPJ da sua empresa.'},
         },
     },
     workspace: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 1072db87d27..56765a7622e 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -1,13 +1,3 @@
-import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
-import StringUtils from '@libs/StringUtils';
-
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
-import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
-
-import type {ValueOf} from 'type-fest';
-
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
@@ -19,6 +9,16 @@ import type {ValueOf} from 'type-fest';
  * - Improve the prompts in prompts/translation, or
  * - Improve context annotations in src/languages/en.ts
  */
+import type {OnboardingTask} from '@libs/actions/Welcome/OnboardingFlow';
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+import type {Country} from '@src/CONST';
+import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageSettlementAccountLocked, PersonalRulesModifiedFields, PolicyRulesModifiedFields} from '@src/types/onyx/OriginalMessage';
+
+import type {ValueOf} from 'type-fest';
+
 import {CONST as COMMON_CONST, Str} from 'expensify-common';
 import startCase from 'lodash/startCase';
 
@@ -63,7 +63,6 @@ import type {
     YourPlanPriceParams,
 } from './params';
 import type {TranslationDeepObject} from './types';
-
 type StateValue = {
     stateISO: string;
     stateName: string;
@@ -4265,7 +4264,7 @@ ${amount},商户:${merchant} - 日期:${date}`,
         carRental: '租车',
         nightIn: '夜宿',
         nightsIn: '入住晚数',
-        taxID: {title: '税号', subtitle: '请输入您法人的税号,以便我们以本地货币为您设置差旅结算。', inputLabel: '法人税号', error: {required: '请输入您的法人税号。'}},
+        taxID: {title: '税号', subtitle: '请输入您法人的纳税识别号,以便我们以您的本地货币设置差旅账单。', inputLabel: '法律实体税号', error: {required: '请输入您的法人税号。'}},
     },
     workspace: {
         common: {

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

View workflow run

@blimpich
blimpich requested a review from rlinoz July 7, 2026 21:59
@rlinoz

rlinoz commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@rlinoz
rlinoz merged commit 89bfa7e into main Jul 8, 2026
41 checks passed
@rlinoz
rlinoz deleted the blimpich-travelTaxId branch July 8, 2026 12:22
@github-actions

github-actions Bot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

🚧 rlinoz has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

OSBotify commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.4.32-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

📝 Help site review — changes required

This PR adds a Tax ID page to the Expensify Travel enablement flow: non-USD workspaces that aren't yet provisioned are now asked for their Legal entity tax ID before accepting the travel terms. That's a customer-facing step an admin will hit, so the help site should explain it.

What I found: The existing article Enable Expensify Travel on a workspace documents the enablement flow but doesn't mention the new Tax ID step. No other travel article covers it.

What I did: Added one FAQ entry to that article explaining when/why the Tax ID page appears and that it's skipped for USD and already-provisioned workspaces. UI labels (Tax ID, Legal entity tax ID, Continue) were verified against the strings in this PR.

Draft help site PR: #95685 (labeled HelpDot, assigned to blimpich)

@blimpich, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@m-natarajan

Copy link
Copy Markdown

@rlinoz @stitesExpensify @blimpich Can you please explain Step 3 (d) and step 4( already-provisioned non-USD workspace).

@rlinoz

rlinoz commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

I dont think you will be able to test 3d, for 4 I think

  1. Go to an old policy in a non USD that already has travel enabled
  2. Go to book travel
  3. Verify no Tax ID RHP shows up

@m-natarajan

Copy link
Copy Markdown

Will check with testers if they have a non USD that already has travel enabled. Will be a hard one.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.4.32-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants