Repository navigation
Use provider terminology for accounting selectors - #103911
Merged
Merged
Conversation
59 tasks done
This comment has been minimized.
This comment has been minimized.
lakchote
marked this pull request as ready for review
October 13, 2026 15:39
melvin-bot
Bot
requested review from
trjExpensify
and removed request for
a team
October 13, 2026 15:39
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
melvin-bot
Bot
requested review from
NicolasBonet
and removed request for
a team
October 13, 2026 15:40
|
@NicolasBonet 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] |
![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: a3e46a9ad4
ℹ️ About Codex in GitHub
Your team has set up Codex to 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 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
NicolasBonet
requested changes
Oct 13, 2026
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 834ea234..58e8736e 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6019,7 +6019,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
entity: 'Entität',
entitySelectDescription: 'Wählen Sie die Entität in Rillet aus, aus der Sie Daten importieren möchten.',
noEntitiesFound: 'Keine Entitäten gefunden',
- noEntitiesFoundDescription: 'Bitte fügen Sie eine Entität in Rillet hinzu und synchronisieren Sie die Verbindung erneut.',
+ noEntitiesFoundDescription: 'Bitte fügen Sie eine Entität in Rillet hinzu und synchronisieren Sie die Verbindung erneut',
accountTypesDescription: 'Ihre Rillet-Konten werden als Kategorien importiert.',
enableNewAccountsTitle: 'Neu importierte Konten aktivieren',
enableNewAccountsDescription: 'Neue Rillet-Konten werden als Kategorien verfügbar sein.',
@@ -9046,7 +9046,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
howToFindAPIKey:
'<strong>So finden Sie Ihren API-Schlüssel.</strong><ol><li>Melden Sie sich bei Campfire an</li><li>Navigieren Sie zu Einstellungen -> API-Schlüssel</li><li>Erstellen Sie einen API-Schlüssel</li><li>Fügen Sie den API-Schlüssel unten ein</li></ol>',
entity: 'Entität',
- entitySelectDescription: 'Wählen Sie die Entität in Campfire aus, von der Sie Daten importieren möchten.',
+ entitySelectDescription: 'Wählen Sie die Einheit in Campfire aus, aus der Sie Daten importieren möchten.',
noEntitiesFound: 'Keine Entitäten gefunden',
noEntitiesFoundDescription: 'Bitte fügen Sie eine Entität in Campfire hinzu und synchronisieren Sie die Verbindung erneut',
noVendorsFound: 'Keine Anbieter gefunden',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1099d326..c3caa78b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -5894,9 +5894,9 @@ ${amount} para ${merchant} - ${date}`,
howToFindAPIKey:
'<strong>Encontrar tu clave API.</strong><ol><li>Inicia sesión en Rillet</li><li>Ve a [organization name] -> Configuración de la organización -> Acceso a la API</li><li>Crea una clave API</li><li>Pega la clave API abajo</li></ol>',
entity: 'Entidad',
- entitySelectDescription: 'Elige la entidad en Rillet desde la que te gustaría importar datos.',
- noEntitiesFound: 'No se han encontrado entidades',
- noEntitiesFoundDescription: 'Añade una entidad en Rillet y sincroniza la conexión de nuevo',
+ entitySelectDescription: 'Elige la entidad en Rillet de la que te gustaría importar datos.',
+ noEntitiesFound: 'No se encontraron entidades',
+ noEntitiesFoundDescription: 'Por favor, añade una entidad en Rillet y sincroniza la conexión de nuevo',
accountTypesDescription: 'Tus cuentas de Rillet se importarán como categorías.',
enableNewAccountsTitle: 'Habilitar cuentas recién importadas',
enableNewAccountsDescription: 'Las nuevas cuentas de Rillet estarán disponibles como categorías.',
@@ -8867,8 +8867,8 @@ ${reportName}`,
howToFindAPIKey:
'<strong>Encontrar tu clave de API.</strong><ol><li>Inicia sesión en Campfire</li><li>Ve a Configuración -> Claves de API</li><li>Crea una clave de API</li><li>Pega la clave de API abajo</li></ol>',
entity: 'Entidad',
- entitySelectDescription: 'Elige la entidad en Campfire de la que te gustaría importar datos.',
- noEntitiesFound: 'No se han encontrado entidades',
+ entitySelectDescription: 'Elige la entidad en Campfire desde la que te gustaría importar datos.',
+ noEntitiesFound: 'No se encontraron entidades',
noEntitiesFoundDescription: 'Por favor, añade una entidad en Campfire y sincroniza la conexión de nuevo',
noVendorsFound: 'No se encontraron proveedores',
noVendorsFoundDescription: 'Por favor, añade proveedores en Campfire y sincroniza la conexión de nuevo',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 08051d50..f12fc166 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6129,7 +6129,7 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
howToFindAPIKey:
'<strong>Recherche de votre clé API.</strong><ol><li>Connectez-vous à DualEntry</li><li>Accédez à [organization name] -> Paramètres -> Accès développeur -> Clés API</li><li>Créez une clé API</li><li>Collez la clé API ci-dessous</li></ol>',
company: 'Entreprise',
- companySelectDescription: 'Choisissez l’entreprise dans DualEntry depuis laquelle vous souhaitez importer des données.',
+ companySelectDescription: 'Choisissez l’entreprise dans DualEntry à partir de laquelle vous souhaitez importer des données.',
noCompaniesFound: 'Aucune entreprise trouvée',
noCompaniesFoundDescription: 'Veuillez ajouter une entreprise dans DualEntry et synchroniser à nouveau la connexion',
noVendorsFound: 'Aucun fournisseur trouvé',
@@ -9067,7 +9067,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
entity: 'Entité',
entitySelectDescription: 'Choisissez l’entité dans Campfire depuis laquelle vous souhaitez importer des données.',
noEntitiesFound: 'Aucune entité trouvée',
- noEntitiesFoundDescription: 'Veuillez ajouter une entité dans Campfire et synchroniser à nouveau la connexion',
+ noEntitiesFoundDescription: 'Veuillez ajouter une entité dans Campfire et synchroniser de nouveau la connexion',
noVendorsFound: 'Aucun fournisseur trouvé',
noVendorsFoundDescription: 'Veuillez ajouter des fournisseurs dans Campfire et synchroniser de nouveau la connexion',
importDescription: 'Choisissez les configurations de codage à importer depuis Campfire.',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 861cd70c..3b18337f 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6081,7 +6081,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
howToFindAPIKey:
'<strong>Trova la tua chiave API.</strong><ol><li>Accedi a DualEntry</li><li>Vai a [organization name] -> Impostazioni -> Accesso sviluppatore -> Chiavi API</li><li>Crea una chiave API</li><li>Incolla la chiave API qui sotto</li></ol>',
company: 'Azienda',
- companySelectDescription: "Scegli l'azienda in DualEntry da cui vuoi importare i dati.",
+ companySelectDescription: 'Scegli l’azienda in DualEntry da cui vuoi importare i dati.',
noCompaniesFound: 'Nessuna azienda trovata',
noCompaniesFoundDescription: 'Aggiungi un’azienda in DualEntry e sincronizza di nuovo la connessione',
noVendorsFound: 'Nessun fornitore trovato',
@@ -8989,9 +8989,9 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
howToFindAPIKey:
'<strong>Trova la tua chiave API.</strong><ol><li>Accedi a Campfire</li><li>Vai a Impostazioni -> Chiavi API</li><li>Crea una chiave API</li><li>Incolla la chiave API qui sotto</li></ol>',
entity: 'Entità',
- entitySelectDescription: 'Scegli l’entità in Campfire da cui vuoi importare i dati.',
+ entitySelectDescription: 'Scegli l’entità in Campfire da cui desideri importare i dati.',
noEntitiesFound: 'Nessuna entità trovata',
- noEntitiesFoundDescription: "Aggiungi un'entità in Campfire e sincronizza di nuovo la connessione",
+ noEntitiesFoundDescription: 'Aggiungi un’entità in Campfire e sincronizza di nuovo la connessione',
noVendorsFound: 'Nessun fornitore trovato',
noVendorsFoundDescription: 'Aggiungi fornitori in Campfire e sincronizza di nuovo la connessione',
importDescription: 'Scegli quali configurazioni di codifica importare da Campfire.',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 5f832fca..a67c3ff4 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5919,8 +5919,8 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
howToFindAPIKey:
'<strong>API キーの見つけ方</strong><ol><li>Rillet にログインします</li><li>[organization name] -> Organization settings -> API access に移動します</li><li>API キーを作成します</li><li>作成した API キーを下に貼り付けます</li></ol>',
entity: 'エンティティ',
- entitySelectDescription: 'Rillet でデータをインポートしたいエンティティを選択してください。',
- noEntitiesFound: 'エンティティが見つかりません',
+ entitySelectDescription: 'Rillet でデータをインポートしたい法人を選択してください。',
+ noEntitiesFound: 'エンティティが見つかりませんでした',
noEntitiesFoundDescription: 'Rillet にエンティティを追加して、もう一度接続を同期してください',
accountTypesDescription: 'Rillet の口座はカテゴリとしてインポートされます。',
enableNewAccountsTitle: '新しくインポートされた口座を有効にする',
@@ -6016,7 +6016,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
howToFindAPIKey:
'<strong>API キーの確認方法</strong><ol><li>DualEntry にログインします</li><li>[organization name] -> Settings -> Developer access -> API keys の順に移動します</li><li>API キーを作成します</li><li>作成した API キーを以下に貼り付けます</li></ol>',
company: '会社',
- companySelectDescription: 'DualEntry でデータを取り込みたい会社を選択してください。',
+ companySelectDescription: 'データを取り込みたい DualEntry 上の会社を選択してください。',
noCompaniesFound: '会社が見つかりません',
noCompaniesFoundDescription: 'DualEntry に会社を追加して、もう一度同期してください',
noVendorsFound: 'ベンダーが見つかりません',
@@ -8872,8 +8872,8 @@ ${reportName}`,
'<strong>APIキーの見つけ方</strong><ol><li>Campfire にログインします</li><li>［Settings］→［API Keys］に移動します</li><li>APIキーを作成します</li><li>作成したAPIキーを下に貼り付けます</li></ol>',
entity: 'エンティティ',
entitySelectDescription: 'データをインポートしたい Campfire 内のエンティティを選択してください。',
- noEntitiesFound: 'エンティティが見つかりません',
- noEntitiesFoundDescription: 'Campfire でエンティティを追加して、接続をもう一度同期してください',
+ noEntitiesFound: 'エンティティが見つかりませんでした',
+ noEntitiesFoundDescription: 'Campfire でエンティティを追加して、もう一度接続を同期してください',
noVendorsFound: '取引先が見つかりません',
noVendorsFoundDescription: 'Campfire にベンダーを追加して、もう一度接続を同期してください',
importDescription: 'Campfire からインポートするコーディング設定を選択してください。',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 02dafacb..ae47a127 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5978,7 +5978,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
entity: 'Entiteit',
entitySelectDescription: 'Kies de entiteit in Rillet waarvan je gegevens wilt importeren.',
noEntitiesFound: 'Geen entiteiten gevonden',
- noEntitiesFoundDescription: 'Voeg een entiteit toe in Rillet en synchroniseer de verbinding opnieuw',
+ noEntitiesFoundDescription: 'Voeg alsjeblieft een entiteit toe in Rillet en synchroniseer de verbinding opnieuw',
accountTypesDescription: 'Je Rillet-accounts worden geïmporteerd als categorieën.',
enableNewAccountsTitle: 'Nieuw geïmporteerde accounts inschakelen',
enableNewAccountsDescription: 'Nieuwe Rillet-rekeningen zijn beschikbaar als categorieën.',
@@ -8965,7 +8965,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
entity: 'Entiteit',
entitySelectDescription: 'Kies de entiteit in Campfire waarvan je gegevens wilt importeren.',
noEntitiesFound: 'Geen entiteiten gevonden',
- noEntitiesFoundDescription: 'Voeg alsjeblieft een entiteit toe in Campfire en synchroniseer de verbinding opnieuw',
+ noEntitiesFoundDescription: 'Voeg alsjeblieft een entiteit toe in Campfire en synchroniseer de verbinding daarna opnieuw',
noVendorsFound: 'Geen leveranciers gevonden',
noVendorsFoundDescription: 'Voeg leveranciers toe in Campfire en synchroniseer de verbinding opnieuw',
importDescription: 'Kies welke boekhoudconfiguraties je wilt importeren uit Campfire.',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f3da5825..4687732f 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6008,7 +6008,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
entity: 'Jednostka',
entitySelectDescription: 'Wybierz jednostkę w Rillet, z której chcesz zaimportować dane.',
noEntitiesFound: 'Nie znaleziono żadnych jednostek',
- noEntitiesFoundDescription: 'Dodaj proszę jednostkę w Rillet i zsynchronizuj połączenie ponownie',
+ noEntitiesFoundDescription: 'Dodaj proszę encję w Rillet i zsynchronizuj ponownie połączenie',
accountTypesDescription: 'Twoje konta Rillet zostaną zaimportowane jako kategorie.',
enableNewAccountsTitle: 'Włącz nowo zaimportowane konta',
enableNewAccountsDescription: 'Nowe konta Rillet będą dostępne jako kategorie.',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 403ae798..b79a5c61 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5968,7 +5968,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
howToFindAPIKey:
'<strong>Encontrando sua chave de API.</strong><ol><li>Faça login no Rillet</li><li>Navegue até [organization name] -> Configurações da organização -> Acesso à API</li><li>Crie a chave de API</li><li>Cole a chave de API abaixo</li></ol>',
entity: 'Entidade',
- entitySelectDescription: 'Escolha a entidade no Rillet da qual você gostaria de importar dados.',
+ entitySelectDescription: 'Escolha a entidade no Rillet da qual você quer importar dados.',
noEntitiesFound: 'Nenhuma entidade encontrada',
noEntitiesFoundDescription: 'Adicione uma entidade no Rillet e sincronize a conexão novamente',
accountTypesDescription: 'Suas contas Rillet serão importadas como categorias.',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 890381d0..542fbebe 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -5780,9 +5780,9 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
howToFindAPIKey:
'<strong>查找您的 API 密钥。</strong><ol><li>登录 Rillet</li><li>依次前往 [organization name] -> Organization settings -> API access</li><li>创建 API 密钥</li><li>将 API 密钥粘贴到下方</li></ol>',
entity: '实体',
- entitySelectDescription: '选择要从中导入数据的 Rillet 实体。',
+ entitySelectDescription: '选择要从 Rillet 导入数据的实体。',
noEntitiesFound: '未找到实体',
- noEntitiesFoundDescription: '请在 Rillet 中添加一个实体，然后再次同步连接',
+ noEntitiesFoundDescription: '请在 Rillet 中添加一个实体，然后重新同步连接',
accountTypesDescription: '您的 Rillet 账户将被导入为类别。',
enableNewAccountsTitle: '启用新导入的账户',
enableNewAccountsDescription: '新的 Rillet 账户将可作为类别使用。',
@@ -8629,7 +8629,7 @@ ${reportName}`,
enterCredentials: '输入你的 Campfire API 密钥',
howToFindAPIKey: '<strong>查找您的 API 密钥。</strong><ol><li>登录 Campfire</li><li>前往“设置” -> “API 密钥”</li><li>创建 API 密钥</li><li>将 API 密钥粘贴到下方</li></ol>',
entity: '实体',
- entitySelectDescription: '选择要从中导入数据的 Campfire 实体。',
+ entitySelectDescription: '选择要从 Campfire 导入数据的实体。',
noEntitiesFound: '未找到实体',
noEntitiesFoundDescription: '请在 Campfire 中添加一个实体，然后再次同步连接',
noVendorsFound: '未找到供应商',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Co-authored-by: Nicolás Bonet <[email protected]>
Co-authored-by: Nicolás Bonet <[email protected]>
Co-authored-by: Nicolás Bonet <[email protected]>
Co-authored-by: Nicolás Bonet <[email protected]>
lakchote
force-pushed
the
lucien/accounting-selector-terminology
branch
from
October 13, 2026 16:29
a45628f to
2cb66e7
Compare
NicolasBonet
approved these changes
Oct 13, 2026
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
Contributor
Author
|
cc @trjExpensify related to the specific integrations wording related to "Subsidiary" |
Contributor
Author
|
thanks for the review @NicolasBonet |
Contributor
|
🚧 NicolasBonet has triggered a test Expensify/App build. You can view the workflow run here. |
Contributor
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
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. |
92 tasks done
Contributor
|
🚀 Deployed to staging by https://github.com/NicolasBonet in version: 9.5.9-0 🚀
|
Contributor
|
A help site update is needed, but I didn't open a second docs PR. Your draft [HOLD App #103911] [No QA] Align accounting help with provider terminology already covers it. This PR renames the Subsidiary selector to Entity for Campfire and Rillet, and to Company for DualEntry. Existing articles still name Subsidiary. For example, Connect-to-Campfire.md says: "Subsidiary is only selectable when your Campfire organization has more than one eligible subsidiary." Coverage checkI checked every Campfire, Rillet, and DualEntry article on
The draft PR adds no new "subsidiary" wording. These integrations aren't gated by a beta, so the rename is visible to all users. |
Contributor
|
🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.9-4 🚀
Bundle Size Analysis (Sentry): |
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
5 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
Campfire and Rillet now use “Entity,” and DualEntry uses “Company,” in the connection row, selector title, guidance, and empty states.
Fixed Issues
For https://github.com/Expensify/Expensify/issues/691270
PROPOSAL:
Tests
Do the same for DualEntry and Campfire.
Offline tests
NA
QA Steps
Same as tests
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodWaiting for Copylabel for a copy review on the original GH to get the correct copy.STYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)/** comment above it */thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)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
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari