Skip to content

[Wave collect][Xero] - Show not imported as default. #41415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lakchote merged 2 commits into from
May 1, 2024
Merged

[Wave collect][Xero] - Show not imported as default. #41415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d77f5ca
show not imported as default
rushatgabhane May 1, 2024
b943839
Merge branch 'Expensify:main' into xero-taxes
rushatgabhane May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1995,6 +1995,7 @@ export default {
trackingCategories: 'Tracking categories',
customers: 'Re-bill customers',
taxesDescription: 'Choose whether to import tax rates and tax defaults from your accounting integration.',
notImported: 'Not imported',
},
type: {
free: 'Free',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2022,6 +2022,7 @@ export default {
trackingCategories: 'Categorías de seguimiento',
customers: 'Volver a facturar a los clientes',
taxesDescription: 'Elige si quires importar las tasas de impuestos y los impuestos por defecto de tu integración de contaduría.',
notImported: 'No importado',
},
type: {
free: 'Gratis',
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/accounting/xero/XeroImportPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@ function XeroImportPage({policy}: WithPolicyProps) {
description: translate('workspace.xero.trackingCategories'),
action: () => {},
hasError: !!policy?.errors?.importTrackingCategories,
title: importTrackingCategories ? translate('workspace.accounting.importedAsTags') : '',
title: importTrackingCategories ? translate('workspace.accounting.importedAsTags') : translate('workspace.xero.notImported'),
pendingAction: pendingFields?.importTrackingCategories,
},
{
description: translate('workspace.xero.customers'),
action: () => {},
hasError: !!policy?.errors?.importCustomers,
title: importCustomers ? translate('workspace.accounting.importedAsTags') : '',
title: importCustomers ? translate('workspace.accounting.importedAsTags') : translate('workspace.xero.notImported'),
pendingAction: pendingFields?.importCustomers,
},
{
description: translate('workspace.accounting.taxes'),
action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_TAXES.getRoute(policyID)),
hasError: !!policy?.errors?.importTaxes,
title: importTaxRates ? translate('workspace.accounting.imported') : '',
title: importTaxRates ? translate('workspace.accounting.imported') : translate('workspace.xero.notImported'),
pendingAction: pendingFields?.importTaxRates,
},
],
Expand Down