Repository navigation
[Payment due @mkhutornyi] Sage Intacct: Default vendor as navigable arrow row with updated copy - #97016
Conversation
…copy Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>
This comment has been minimized.
This comment has been minimized.
|
@MelvinBot apply the polyglot parrot fix |
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>
|
Fixed the failing Root cause: The PR added the Fix: Added The |
Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>
|
🦜 Applied the Polyglot Parrot translations in The only remaining un-applied part of the parrot patch was the I intentionally skipped the patch's Note: |
|
The only failing check is Why it's failing: the check reports Why I'm not "fixing" it by pushing: the PR Author Checklist boxes attest to manual testing (running the flow on all platforms, verifying no console errors, etc.) that a human must actually perform and confirm. The PR body still has the Check results at time of analysisAll code-related checks passed:
Only Next steps: fill out the |
|
Re-checked — the state is unchanged. The only failing check is still There's nothing for me to fix in code, and I won't tick the author-checklist boxes on your behalf — they attest to manual cross-platform testing you ( To clear this check: fill out the |
|
@codex review |
|
Codex Review: Didn't find any major issues. 👍 Reviewed commit: ℹ️ About Codex in GitHubCodex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
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". |
|
Re-checked after the The only failing check is Next step (yours): fill out the |
Introduce two connection-agnostic strings under `workspace.accounting`:
- `defaultVendorHelperText({connectionName, isSet})` for the muted description below the "Default vendor" row on export pages.
- `defaultVendorSelectHeader({connectionName})` for the "Choose a default … vendor" header above the vendor select list.
Both take the integration display name as a parameter so QBO, Sage Intacct, Xero, etc. can share the copy while rendering their own name.
- Non-reimbursable default vendor row no longer falls back to a "Not set" title. When no vendor is picked, the row title is empty and the muted helper text carries the meaning. - The helper text below the row now reads: "Expenses that don't auto-match will default to this Sage Intacct vendor." When no vendor is set, it appends "Otherwise, they'll export as Credit Card Misc." so admins understand the fallback behavior. - The default vendor select page header (non-reimbursable path) now reads "Choose a default Sage Intacct vendor for expenses that don't match automatically." The reimbursable-path header is unchanged. Both new strings live under `workspace.accounting` and receive the connection display name as a parameter, so QBO and Xero can reuse them later. Removes the now-unused `defaultVendorNotSet` key from all language files.
This comment has been minimized.
This comment has been minimized.
Squawk! Translates the new defaultVendorHelperText and defaultVendorSelectHeader strings into all supported languages, and refines the existing sageIntacct.defaultVendorDescription translations while we are here.
|
Still the same situation — nothing to push. Your latest commit ( The only red check is To make it pass: fill out the |
|
Re-checked — nothing to fix in code. Every check is green except This one's on you ( |
|
@parasharrajat 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] |
When SageIntacctNonReimbursableExpensesPage was reshaped from the toggle + accordion pattern into a plain MenuItemWithTopDescription arrow row, the wrapping OfflineWithFeedback was left with only pendingAction wired. The default vendor field's error stopped rendering as text and the user lost the ability to dismiss it, leaving only a non-dismissable brickRoadIndicator red dot when a SetSageIntacctDefaultVendor write failed. Thread optional errors and onCloseError through MenuItemToRender and renderDefault, and wire them on the Default vendor row using getLatestErrorField and clearSageIntacctErrorField against the export-mode-specific settingName (NON_REIMBURSABLE_VENDOR for Vendor Bill, NON_REIMBURSABLE_CREDIT_CARD_VENDOR for Credit card charge).
…sify/App into claude-sageIntacctDefaultVendorRow
|
Pulled main to hopefully fix eslint & typescript checks - also sliiiightly changed the copy so that we'll show:
|
|
Ready again 🙏 |
|
@codex review |
|
@MelvinBot review |
|
@Beamanator since you're co-authored, we might need another engineer to merge this PR. |
|
Codex Review: Didn't find any major issues. Breezy! Reviewed commit: ℹ️ About Codex in GitHubCodex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
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". |
ReviewNice cleanup — collapsing the toggle + accordion into a single always-visible arrow row reads much better, and pulling the Sage-specific One thing that should be fixed before merge, plus a couple of nits. 🔴
|
| Locale | Rendering | Vendor name |
|---|---|---|
| en / fr / nl | Credit Card Misc (kept English) |
✅ literal |
| es | Tarjeta de crédito (Varios) |
❌ translated |
| de | Kreditkarte – Verschiedenes |
❌ translated |
| it | Varie carta di credito |
❌ translated |
| pt-BR | Diversos de Cartão de Crédito |
❌ translated |
| pl | Różne wydatki karty kredytowej |
❌ translated |
| ja | クレジットカードその他 |
❌ translated |
| zh-hans | 信用卡杂项 |
❌ translated |
A Spanish/German/etc. user is told their expenses export as a vendor that, in Sage Intacct, is literally named Credit Card Misc. — they'll go looking for a translated name that doesn't exist. The surrounding sentence should stay localized, but the vendor name itself should remain the literal Credit Card Misc. in every locale, matching the QBO precedent.
🟡 Nits (non-blocking)
SageIntacctNonReimbursableExpensesPage.tsx:44:!!(defaultVendorName && defaultVendorName !== '')— an empty string is already falsy, so!!defaultVendorNameis equivalent. The rowtitlea few lines down repeats the samedefaultVendorName && defaultVendorName !== ''check; it can reuseisDefaultVendorSet.ExtendedMenuItemWithSubscribedSettingsis no longer imported by this page after the refactor — worth a quick check that it's still referenced somewhere, otherwise the type/ToggleItemWithKeyplumbing inintacct/types.tsis now dead.
Everything else looks good. Once the vendor-name literal is consistent across locales this is good to go.
…name
Refactors workspace.accounting.defaultVendorHelperText from a
connection-name-parameterized string ({connectionName}) into a
connection-name-free variant that toggles the "Credit Card Misc"
fallback sentence based on whether a default vendor is set:
isSet=true -> "Expenses that don't auto-match will default to this vendor."
isSet=false -> "Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc."
This lets all three integrations (Sage Intacct, QBO, Xero) render
the same copy under the Default vendor row instead of each carrying
its own connection-specific phrasing.
Sage Intacct's NonReimbursableExpensesPage now uses the shared string
directly and no longer appends the sageIntacct.creditCardMiscFallback
key, which is deleted. The workspace.accounting.defaultVendorSelectHeader
page-header string keeps its {connectionName} parameter for now since
it is only used from the Sage Intacct select page.
QBO and Xero rows are not wired up in this commit and continue to
render without the muted helper text; that normalization is tracked in
Expensify/Expensify#664722.
🦜 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 c0315633d4b..a85d1704edb 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -5072,8 +5072,8 @@ ${amount} für ${merchant} – ${date}`,
defaultVendor: 'Standardanbieter',
defaultVendorDescription: (isReimbursable: boolean) =>
isReimbursable
- ? `Legen Sie einen Standardlieferanten fest, der auf erstattungsfähige Ausgaben angewendet wird, für die es in Sage Intacct keinen passenden Lieferanten gibt.`
- : `Ausgaben, die keinem Ihrer Sage Intacct-Lieferanten zugeordnet werden können, werden standardmäßig diesem Lieferanten zugewiesen.`,
+ ? `Legen Sie einen Standardlieferanten fest, der auf erstattungsfähige Ausgaben angewendet wird, für die es keinen passenden Lieferanten in Sage Intacct gibt.`
+ : `Ausgaben, die keinen Ihrer Sage Intacct-Lieferanten zugeordnet werden können, werden standardmäßig diesem Lieferanten zugewiesen.`,
exportDescription: 'Konfigurieren Sie, wie Expensify Daten nach Sage Intacct exportiert.',
exportPreferredExporterNote:
'Der bevorzugte Exporteur kann jede Workspace-Adminperson sein, muss jedoch auch Domain-Admin sein, wenn du in den Domaineinstellungen unterschiedliche Exportkonten für einzelne Firmenkarten festlegst.',
@@ -6972,10 +6972,10 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
defaultVendor: 'Standardanbieter',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
+ ? `Spesen, die nicht automatisch abgeglichen werden, werden standardmäßig diesem Anbieter zugeordnet.`
+ : `Ausgaben, die nicht automatisch abgeglichen werden, werden standardmäßig diesem Lieferanten zugeordnet. Andernfalls werden sie als „Credit Card Misc.“ exportiert.`,
defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) =>
- `Wählen Sie einen Standard-${connectionName}-Anbieter für Ausgaben, die nicht automatisch zugeordnet werden.`,
+ `Wählen Sie einen Standard-${connectionName}-Lieferanten für Ausgaben, die nicht automatisch zugeordnet werden.`,
defaultAccount: 'Standardkonto',
autoSync: 'Automatische Synchronisierung',
autoSyncDescription: 'NetSuite und Expensify automatisch jeden Tag synchronisieren. Finalisierte Berichte in Echtzeit exportieren',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 9d2f50216d3..f521b9f0fd0 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -4967,7 +4967,7 @@ ${amount} para ${merchant} - ${date}`,
defaultVendorDescription: (isReimbursable: boolean) =>
isReimbursable
? `Establece un proveedor predeterminado que se aplicará a los gastos reembolsables que no tengan un proveedor coincidente en Sage Intacct.`
- : `Los gastos que no se puedan asociar a tus proveedores de Sage Intacct se asignarán a este proveedor de forma predeterminada.`,
+ : `Los gastos que no se puedan conciliar con tus proveedores de Sage Intacct se asignarán por defecto a este proveedor.`,
exportDescription: 'Configure cómo se exportan los datos de Expensify a Sage Intacct.',
exportPreferredExporterNote:
'El exportador preferido puede ser cualquier administrador del área de trabajo, pero también debe ser un administrador del dominio si establece diferentes cuentas de exportación para tarjetas de empresa individuales en Configuración del dominio.',
@@ -6758,8 +6758,8 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
defaultVendor: 'Proveedor predeterminado',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
+ ? `Los gastos que no se asignen automáticamente se asociarán por defecto a este proveedor.`
+ : `Los gastos que no se concilien automáticamente se asignarán a este proveedor de forma predeterminada. En caso contrario, se exportarán como Credit Card Misc.`,
defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) =>
`Elige un proveedor predeterminado de ${connectionName} para los gastos que no se asignen automáticamente.`,
defaultAccount: 'Cuenta predeterminada',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 7fd73a6f024..f2be49975a1 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -5082,8 +5082,8 @@ ${amount} pour ${merchant} - ${date}`,
defaultVendor: 'Fournisseur par défaut',
defaultVendorDescription: (isReimbursable: boolean) =>
isReimbursable
- ? `Définissez un fournisseur par défaut qui sera appliqué aux dépenses remboursables ne disposant pas d’un fournisseur correspondant dans Sage Intacct.`
- : `Les dépenses qui ne peuvent pas être rapprochées de vos fournisseurs Sage Intacct seront par défaut attribuées à ce fournisseur.`,
+ ? `Définissez un fournisseur par défaut qui s’appliquera aux dépenses remboursables n’ayant pas de fournisseur correspondant dans Sage Intacct.`
+ : `Les dépenses qui ne peuvent pas être associées à vos fournisseurs Sage Intacct seront, par défaut, affectées à ce fournisseur.`,
exportDescription: 'Configurez comment les données Expensify sont exportées vers Sage Intacct.',
exportPreferredExporterNote:
'L’exportateur préféré peut être n’importe quel administrateur d’espace de travail, mais doit également être un administrateur de domaine si vous définissez des comptes d’exportation différents pour chaque carte d’entreprise individuelle dans les paramètres de domaine.',
@@ -6999,8 +6999,8 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
defaultVendor: 'Fournisseur par défaut',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
+ ? `Les dépenses qui ne sont pas automatiquement rapprochées seront, par défaut, associées à ce fournisseur.`
+ : `Les dépenses qui ne sont pas associées automatiquement seront attribuées par défaut à ce fournisseur. Sinon, elles seront exportées sous Crédit carte diverse.`,
defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) =>
`Choisissez un fournisseur ${connectionName} par défaut pour les dépenses qui ne correspondent pas automatiquement.`,
defaultAccount: 'Compte par défaut',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 551fa8a1347..166d45713b6 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -5052,7 +5052,7 @@ ${amount} per ${merchant} - ${date}`,
defaultVendorDescription: (isReimbursable: boolean) =>
isReimbursable
? `Imposta un fornitore predefinito che verrà applicato alle spese rimborsabili che non hanno un fornitore corrispondente in Sage Intacct.`
- : `Le spese che non possono essere abbinate ai tuoi fornitori Sage Intacct verranno assegnate a questo fornitore per impostazione predefinita.`,
+ : `Le spese che non possono essere abbinate ai tuoi fornitori Sage Intacct verranno associate per impostazione predefinita a questo fornitore.`,
exportDescription: 'Configura come i dati di Expensify vengono esportati in Sage Intacct.',
exportPreferredExporterNote:
'L’esportatore preferito può essere qualsiasi amministratore dello spazio di lavoro, ma deve anche essere un Amministratore del dominio se imposti conti di esportazione diversi per le singole carte aziendali nelle Impostazioni del dominio.',
@@ -6953,8 +6953,8 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
defaultVendor: 'Fornitore predefinito',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
+ ? `Le spese che non vengono abbinate automaticamente verranno assegnate per impostazione predefinita a questo fornitore.`
+ : `Le spese che non vengono abbinate automaticamente useranno questo fornitore per impostazione predefinita. In caso contrario, saranno esportate come Varie carta di credito.`,
defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) =>
`Scegli un fornitore predefinito ${connectionName} per le spese che non vengono abbinate automaticamente.`,
defaultAccount: 'Conto predefinito',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 8fecf0e8df3..294b078b7dd 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5006,8 +5006,8 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
defaultVendor: 'デフォルトのベンダー',
defaultVendorDescription: (isReimbursable: boolean) =>
isReimbursable
- ? `Sage Intacct で一致するベンダーがない立替経費に適用するデフォルトのベンダーを設定します。`
- : `Sage Intacct の取引先に照合できない経費は、デフォルトでこの取引先に紐づけられます。`,
+ ? `Sage Intacct で一致する仕入先がない立替経費に適用するデフォルトの仕入先を設定します。`
+ : `Sage Intacct の仕入先に照合できない経費は、デフォルトでこの仕入先に紐づけられます。`,
exportDescription: 'Expensify のデータを Sage Intacct へエクスポートする方法を設定します。',
exportPreferredExporterNote:
'優先されるエクスポーターは任意のワークスペース管理者にできますが、ドメイン設定で会社カードごとに別々のエクスポート先口座を設定している場合は、ドメイン管理者である必要もあります。',
@@ -6873,9 +6873,9 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
defaultVendor: 'デフォルトのベンダー',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
- defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) => `自動的に照合されない経費に使用する、デフォルトの ${connectionName} 取引先を選択します。`,
+ ? `自動照合されない経費は、デフォルトでこのベンダーに割り当てられます。`
+ : `自動照合されない経費は、デフォルトでこのベンダーに割り当てられます。それ以外は「Credit Card Misc」としてエクスポートされます。`,
+ defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) => `自動的に照合されない経費に対して使用する、デフォルトの ${connectionName} 仕入先を選択します。`,
defaultAccount: 'デフォルトのアカウント',
autoSync: '自動同期',
autoSyncDescription: 'NetSuite と Expensify を毎日自動で同期。確定したレポートをリアルタイムでエクスポート',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 6a5ac82dfa4..0d6dbda5318 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5045,8 +5045,8 @@ ${amount} voor ${merchant} - ${date}`,
defaultVendor: 'Standaardleverancier',
defaultVendorDescription: (isReimbursable: boolean) =>
isReimbursable
- ? `Stel een standaardleverancier in die wordt toegepast op declarabele uitgaven waarvoor geen overeenkomende leverancier in Sage Intacct is.`
- : `Uitgaven die niet aan je Sage Intacct-leveranciers kunnen worden gekoppeld, worden standaard aan deze leverancier toegewezen.`,
+ ? `Stel een standaardleverancier in die wordt toegepast op vergoedbare uitgaven waarvoor geen overeenkomende leverancier in Sage Intacct is.`
+ : `Declaraties die niet overeenkomen met je Sage Intacct-leveranciers worden standaard aan deze leverancier toegewezen.`,
exportDescription: 'Configureer hoe Expensify-gegevens worden geëxporteerd naar Sage Intacct.',
exportPreferredExporterNote:
'De voorkeurs-exporteur kan elke werkruimtebeheerder zijn, maar moet ook een domeinbeheerder zijn als je in Domeininstellingen verschillende exportrekeningen instelt voor individuele bedrijfskaarten.',
@@ -6939,10 +6939,10 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
defaultVendor: 'Standaardleverancier',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
+ ? `Declaraties die niet automatisch worden gematcht, worden standaard aan deze leverancier gekoppeld.`
+ : `Bonnetjes die niet automatisch worden gekoppeld, worden standaard aan deze leverancier toegewezen. Anders worden ze geëxporteerd als Credit Card Misc.`,
defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) =>
- `Kies een standaard ${connectionName}-leverancier voor uitgaven die niet automatisch worden gekoppeld.`,
+ `Kies een standaard ${connectionName}-leverancier voor uitgaven die niet automatisch worden gematcht.`,
defaultAccount: 'Standaardrekening',
autoSync: 'Automatisch synchroniseren',
autoSyncDescription: 'Synchroniseer NetSuite en Expensify automatisch, elke dag. Exporteer een afgerond rapport in realtime',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 72b0d50c9af..dcd91868f7f 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -5031,8 +5031,8 @@ ${amount} dla ${merchant} - ${date}`,
defaultVendor: 'Domyślny dostawca',
defaultVendorDescription: (isReimbursable: boolean) =>
isReimbursable
- ? `Ustaw domyślnego dostawcę, który będzie stosowany do wydatków podlegających zwrotowi, jeśli nie mają pasującego dostawcy w Sage Intacct.`
- : `Wydatki, których nie da się dopasować do kontrahentów w Sage Intacct, zostaną domyślnie przypisane do tego kontrahenta.`,
+ ? `Ustaw domyślnego dostawcę, który zostanie zastosowany do wydatków podlegających zwrotowi, niemających pasującego dostawcy w Sage Intacct.`
+ : `Wydatki, których nie da się dopasować do Twoich dostawców Sage Intacct, zostaną domyślnie przypisane do tego dostawcy.`,
exportDescription: 'Skonfiguruj sposób eksportu danych z Expensify do Sage Intacct.',
exportPreferredExporterNote:
'Preferowanym eksporterem może być dowolny administrator przestrzeni roboczej, ale musi on również być administratorem domeny, jeśli w Ustawieniach domeny ustawisz różne konta eksportu dla poszczególnych kart firmowych.',
@@ -6920,9 +6920,10 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
defaultVendor: 'Domyślny dostawca',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
- defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) => `Wybierz domyślnego dostawcę ${connectionName} dla wydatków, które nie pasują automatycznie.`,
+ ? `Wydatki, które nie dopasują się automatycznie, będą domyślnie przypisane do tego dostawcy.`
+ : `Wydatki, które nie dopasują się automatycznie, zostaną domyślnie przypisane do tego dostawcy. W przeciwnym razie zostaną wyeksportowane jako Credit Card Misc.`,
+ defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) =>
+ `Wybierz domyślnego dostawcę ${connectionName} dla wydatków, które nie zostaną dopasowane automatycznie.`,
defaultAccount: 'Domyślne konto',
autoSync: 'Automatyczna synchronizacja',
autoSyncDescription: 'Synchronizuj NetSuite i Expensify automatycznie, każdego dnia. Eksportuj sfinalizowany raport w czasie rzeczywistym',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index ee5534fa27d..87535086800 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5038,7 +5038,7 @@ ${amount} para ${merchant} - ${date}`,
defaultVendorDescription: (isReimbursable: boolean) =>
isReimbursable
? `Defina um fornecedor padrão que será aplicado às despesas reembolsáveis que não tiverem um fornecedor correspondente no Sage Intacct.`
- : `Despesas que não puderem ser associadas aos seus fornecedores do Sage Intacct serão atribuídas a este fornecedor por padrão.`,
+ : `As despesas que não puderem ser associadas aos seus fornecedores do Sage Intacct serão atribuídas a este fornecedor por padrão.`,
exportDescription: 'Configure como os dados do Expensify são exportados para o Sage Intacct.',
exportPreferredExporterNote:
'O exportador preferencial pode ser qualquer administrador do espaço de trabalho, mas também deve ser um Administrador de Domínio se você definir diferentes contas de exportação para cartões corporativos individuais em Configurações de Domínio.',
@@ -6932,8 +6932,8 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
defaultVendor: 'Fornecedor padrão',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
+ ? `Despesas que não forem correspondidas automaticamente terão este fornecedor como padrão.`
+ : `Despesas que não forem conciliadas automaticamente serão atribuídas a este fornecedor por padrão. Caso contrário, serão exportadas como Credit Card Misc.`,
defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) =>
`Escolha um fornecedor padrão do ${connectionName} para despesas que não sejam correspondidas automaticamente.`,
defaultAccount: 'Conta padrão',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 0020eee7346..6b7b1f36582 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -4889,7 +4889,7 @@ ${amount},商户:${merchant} - 日期:${date}`,
creditCardAccount: '信用卡账户',
defaultVendor: '默认供应商',
defaultVendorDescription: (isReimbursable: boolean) =>
- isReimbursable ? `为可报销但在 Sage Intacct 中没有匹配供应商的报销费用设置一个默认供应商。` : `无法与 Sage Intacct 供应商匹配的报销将默认归入此供应商。`,
+ isReimbursable ? `为可报销但在 Sage Intacct 中没有匹配供应商的报销费用设置一个默认供应商。` : `无法与 Sage Intacct 供应商匹配的报销将默认归到此供应商名下。`,
exportDescription: '配置 Expensify 数据导出到 Sage Intacct 的方式。',
exportPreferredExporterNote: '首选导出人可以是任意工作区管理员,但如果你在“域设置”中为各个公司卡设置了不同的导出账户,则该导出人还必须是域管理员。',
exportPreferredExporterSubNote: '设置完成后,首选导出人将在其账户中看到可供导出的报表。',
@@ -6715,10 +6715,8 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM
exportDate: '导出日期',
defaultVendor: '默认供应商',
defaultVendorHelperText: ({isSet}: DefaultVendorHelperTextParams) =>
- isSet
- ? `Expenses that don't auto-match will default to this vendor.`
- : `Expenses that don't auto-match will default to this vendor. Otherwise, they'll export as Credit Card Misc.`,
- defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) => `为未自动匹配的报销选择一个默认的 ${connectionName} 供应商。`,
+ isSet ? `未自动匹配的报销将默认归属到此供应商。` : `未自动匹配的报销将默认为此供应商,否则将以“信用卡杂项”导出。`,
+ defaultVendorSelectHeader: ({connectionName}: ConnectionDisplayNameParams) => `为未能自动匹配的报销选择一个默认的 ${connectionName} 供应商。`,
defaultAccount: '默认账户',
autoSync: '自动同步',
autoSyncDescription: '每天自动同步 NetSuite 和 Expensify。实时导出已完成报表',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
The "Otherwise, they'll export as Credit Card Misc." fallback sentence only applies to the credit-card-charge non-reimbursable export path. On Vendor Bill export mode, no such fallback exists, so rendering the same copy there would mislead admins about how unmatched expenses are handled. Gate the helper text on nonReimbursable === CREDIT_CARD_CHARGE so Vendor Bill mode falls back to no helper text.
Squawk! Translates the connection-name-free defaultVendorHelperText variants into all supported languages, and refines a handful of adjacent sageIntacct.defaultVendorDescription and defaultVendorSelectHeader translations while we are here.
|
🚧 mollfpr has triggered a test Expensify/App build. You can view the workflow run here. |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
🚀 Deployed to staging by https://github.com/mollfpr in version: 9.4.46-0 🚀
|
Help site review — no changes requiredI reviewed the changes in this PR against the help site articles under Why: This PR is a UI-presentation + microcopy change to the Sage Intacct Default vendor row (toggle/accordion → always-visible arrow row) plus updated in-app helper/select-page copy. It does not change any capability that the help site documents. The one article that covers this flow —
That statement remains true after this PR. The article never described the old toggle, so nothing is now stale, and the exact in-app strings ( What I checked
Optional (not required): if you'd like, the article could add a one-line note that unmatched credit-card-charge expenses export as Credit Card Misc. when no default vendor is set — this fallback is newly surfaced in the app copy but isn't documented today. Reply and I'll open that draft PR. Since no help-site PR was created, there's nothing linked to review. If you'd like the optional enhancement above, just say the word and I'll open a draft PR (titled per your format, labeled |
|
🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.46-10 🚀
Bundle Size Analysis (Sentry): |
|
🤖 Payment issue created: #97533 |
Explanation of Change
The Sage Intacct Default vendor row on the credit-card-charge (non-reimbursable) export path used to be a toggle that expanded an accordion holding a nested select row. This PR reshapes it into a single, always-visible arrow row that navigates straight to the existing vendor select page.
The vendor now starts empty. When nothing is picked, the row title is blank and a muted line below the row explains what will happen:
Expenses that don't auto-match will default to this Sage Intacct vendor. Otherwise, they'll export as Credit Card Misc.Once a vendor is chosen, the title shows the vendor's name and the muted line drops the fallback sentence.The vendor select page's header text was also updated. Above the search bar, on the non-reimbursable path, it now reads:
Choose a default Sage Intacct vendor for expenses that don't match automatically.The reimbursable path's header is unchanged.The helper text and select-page header both live under
workspace.accountingand take the integration display name as a parameter, so QBO, Xero, and other connections can reuse the same copy while rendering their own name. Polyglot Parrot translations were applied for all supported languages.Behavior preserved: the row stays hidden until a non-reimbursable export type is chosen; the Vendor Bill path continues to render its existing arrow row (no muted helper text); the vendor list source is unchanged; no Auth/PHP changes.
Fixed Issues
$ https://github.com/Expensify/Expensify/issues/664271
PROPOSAL: https://github.com/Expensify/Expensify/issues/664271#issuecomment-5075633547
Tests
Expenses that don't auto-match will default to this Sage Intacct vendor. Otherwise, they'll export as Credit Card Misc.Choose a default Sage Intacct vendor for expenses that don't match automatically.Expenses that don't auto-match will default to this Sage Intacct vendor.(the "Otherwise, they'll export as Credit Card Misc." fallback sentence is gone).Credit Card Miscfallback.Offline tests
Credit Card Miscfallback).QA Steps
Ping me & @heyjennahay to test
Same as Tests above. Run the flow on a Sage Intacct-connected workspace on the staging environment and verify each expected outcome.
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
No default vendor set:
Selecting a default vendor:
Yes default vendor set (hovered too):