From d9000bcbc988ee171b53ec7e8d253db7ba9294fb Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 25 Apr 2024 13:40:36 -0400 Subject: [PATCH 1/4] fix: only show the tax option if the country is not US --- .../accounting/qbo/import/QuickbooksImportPage.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx index f579ca94e1c..28ad3746808 100644 --- a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx +++ b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx @@ -58,14 +58,17 @@ function QuickbooksImportPage({policy}: WithPolicyProps) { title: syncLocations, pendingAction: pendingFields?.syncLocations, }, - { + ]; + + if (policy?.connections?.quickbooksOnline.data.country === 'US') { + sections.push({ description: translate('workspace.qbo.taxes'), action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.getRoute(policyID)), hasError: Boolean(policy?.errors?.syncTaxes), title: syncTaxes, pendingAction: pendingFields?.syncTaxes, - }, - ]; + }); + } return ( From addc9f7e7868c7dc079512fa8ea1c30a3b8aef94 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 25 Apr 2024 13:41:03 -0400 Subject: [PATCH 2/4] fix: conditional statement --- .../workspace/accounting/qbo/import/QuickbooksImportPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx index 28ad3746808..cf3770b5610 100644 --- a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx +++ b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx @@ -60,7 +60,7 @@ function QuickbooksImportPage({policy}: WithPolicyProps) { }, ]; - if (policy?.connections?.quickbooksOnline.data.country === 'US') { + if (policy?.connections?.quickbooksOnline.data.country !== 'US') { sections.push({ description: translate('workspace.qbo.taxes'), action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.getRoute(policyID)), From 83dacbd767c3bf47d5948eec268e34bd4adbc79b Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 25 Apr 2024 14:06:25 -0400 Subject: [PATCH 3/4] fix: use const instead --- .../workspace/accounting/qbo/import/QuickbooksImportPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx index cf3770b5610..d9457a2f567 100644 --- a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx +++ b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx @@ -60,7 +60,7 @@ function QuickbooksImportPage({policy}: WithPolicyProps) { }, ]; - if (policy?.connections?.quickbooksOnline.data.country !== 'US') { + if (policy?.connections?.quickbooksOnline.data.country !== CONST.COUNTRY.US) { sections.push({ description: translate('workspace.qbo.taxes'), action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.getRoute(policyID)), From 81622263c3d79f527580cbefbcd1e09b471c6140 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 25 Apr 2024 14:17:35 -0400 Subject: [PATCH 4/4] fix: disable toggle button when us qbo is connected --- src/pages/workspace/WorkspaceMoreFeaturesPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx index 66e6b87d79d..c3515c39312 100644 --- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx +++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx @@ -1,5 +1,6 @@ import {useFocusEffect} from '@react-navigation/native'; import type {StackScreenProps} from '@react-navigation/stack'; +import {CONST} from 'expensify-common/lib/CONST'; import React, {useCallback} from 'react'; import {View} from 'react-native'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -101,7 +102,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro titleTranslationKey: 'workspace.moreFeatures.taxes.title', subtitleTranslationKey: 'workspace.moreFeatures.taxes.subtitle', isActive: (policy?.tax?.trackingEnabled ?? false) || isSyncTaxEnabled, - disabled: isSyncTaxEnabled, + disabled: isSyncTaxEnabled || policy?.connections?.quickbooksOnline.data.country === CONST.COUNTRY.US, pendingAction: policy?.pendingFields?.tax, action: (isEnabled: boolean) => { Policy.enablePolicyTaxes(policy?.id ?? '', isEnabled);