Skip to content

Commit 46fc95a

Browse files
aldo-expensifyaldo-expensify
authored
Merge pull request #41283 from Expensify/aldo_fix-taxes
Fix Taxes and encode as json all setting values
2 parents b3945b2 + 1a86745 commit 46fc95a

File tree

8 files changed

+18
-27
lines changed

8 files changed

+18
-27
lines changed

‎src/CONST.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ const CONST = {
12491249
ENABLE_NEW_CATEGORIES: 'enableNewCategories',
12501250
SYNC_CUSTOMERS: 'syncCustomers',
12511251
SYNC_LOCATIONS: 'syncLocations',
1252-
SYNC_TAXES: 'syncTaxes',
1252+
SYNC_TAX: 'syncTax',
12531253
PREFERRED_EXPORTER: 'exporter',
12541254
EXPORT_DATE: 'exportDate',
12551255
OUT_OF_POCKET_EXPENSES: 'outOfPocketExpenses',
@@ -1260,7 +1260,7 @@ const CONST = {
12601260
EXPORT_COMPANY_CARD_ACCOUNT: 'exportCompanyCardAccount',
12611261
EXPORT_COMPANY_CARD: 'exportCompanyCard',
12621262
AUTO_SYNC: 'autoSync',
1263-
SYNCE_PEOPLE: 'syncPeople',
1263+
SYNC_PEOPLE: 'syncPeople',
12641264
AUTO_CREATE_VENDOR: 'autoCreateVendor',
12651265
REIMBURSEMENT_ACCOUNT_ID: 'reimbursementAccountID',
12661266
COLLECTION_ACCOUNT_ID: 'collectionAccountID',

‎src/libs/actions/connections/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
118118
policyID,
119119
connectionName,
120120
settingName: String(settingName),
121-
settingValue: typeof settingValue === 'object' ? JSON.stringify(settingValue) : settingValue,
121+
settingValue: JSON.stringify(settingValue),
122122
idempotencyKey: String(settingName),
123123
};
124124
API.write(WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG, parameters, {optimisticData, failureData, successData});

‎src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
8787
title: translate('workspace.qbo.advancedConfig.inviteEmployees'),
8888
subtitle: translate('workspace.qbo.advancedConfig.inviteEmployeesDescription'),
8989
isActive: Boolean(syncPeople),
90-
onToggle: () => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.SYNCE_PEOPLE, !syncPeople),
90+
onToggle: () => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.SYNC_PEOPLE, !syncPeople),
9191
pendingAction: pendingFields?.syncPeople,
92-
errors: ErrorUtils.getLatestErrorField(qboConfig ?? {}, CONST.QUICK_BOOKS_CONFIG.SYNCE_PEOPLE),
93-
onCloseError: () => Policy.clearQBOErrorField(policyID, CONST.QUICK_BOOKS_CONFIG.SYNCE_PEOPLE),
92+
errors: ErrorUtils.getLatestErrorField(qboConfig ?? {}, CONST.QUICK_BOOKS_CONFIG.SYNC_PEOPLE),
93+
onCloseError: () => Policy.clearQBOErrorField(policyID, CONST.QUICK_BOOKS_CONFIG.SYNC_PEOPLE),
9494
wrapperStyle: styles.mv3,
9595
},
9696
{

‎src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ function QuickbooksOutOfPocketExpenseConfigurationPage({policy}: WithPolicyConne
1818
const {translate} = useLocalize();
1919
const styles = useThemeStyles();
2020
const policyID = policy?.id ?? '';
21-
const {syncLocations, exportAccount, exportEntity, errorFields, syncTaxes, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
21+
const {syncLocations, exportAccount, exportEntity, errorFields, syncTax, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
2222
const isLocationEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
23-
const isTaxesEnabled = Boolean(syncTaxes && syncTaxes !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
23+
const isTaxesEnabled = Boolean(syncTax);
2424
const shouldShowTaxError = isTaxesEnabled && exportEntity === CONST.QUICKBOOKS_EXPORT_ENTITY.JOURNAL_ENTRY;
2525
const shouldShowLocationError = isLocationEnabled && exportEntity !== CONST.QUICKBOOKS_EXPORT_ENTITY.JOURNAL_ENTRY;
2626
const hasErrors = Boolean(errorFields?.exportEntity) || shouldShowTaxError || shouldShowLocationError;

‎src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ type CardsSection = SectionListData<CardListItem, Section<CardListItem>>;
2727
function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnectionsProps) {
2828
const {translate} = useLocalize();
2929
const styles = useThemeStyles();
30-
const {exportEntity, syncTaxes, syncLocations} = policy?.connections?.quickbooksOnline?.config ?? {};
30+
const {exportEntity, syncTax, syncLocations} = policy?.connections?.quickbooksOnline?.config ?? {};
3131
const isLocationsEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
32-
const isTaxesEnabled = Boolean(syncTaxes && syncTaxes !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
32+
const isTaxesEnabled = Boolean(syncTax);
3333
const isTaxError = isTaxesEnabled && exportEntity === CONST.QUICKBOOKS_EXPORT_ENTITY.JOURNAL_ENTRY;
3434
const isLocationError = isLocationsEnabled && exportEntity !== CONST.QUICKBOOKS_EXPORT_ENTITY.JOURNAL_ENTRY;
3535
const policyID = policy?.id ?? '';

‎src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function QuickbooksImportPage({policy}: WithPolicyProps) {
2626
[CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: translate('workspace.qbo.importedAsReportFields'),
2727
};
2828
const policyID = policy?.id ?? '';
29-
const {syncClasses, syncCustomers, syncLocations, syncTaxes, enableNewCategories, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
29+
const {syncClasses, syncCustomers, syncLocations, syncTax, enableNewCategories, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
3030

3131
const sections = [
3232
{
@@ -63,9 +63,9 @@ function QuickbooksImportPage({policy}: WithPolicyProps) {
6363
sections.push({
6464
description: translate('workspace.accounting.taxes'),
6565
action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.getRoute(policyID)),
66-
hasError: Boolean(policy?.errors?.syncTaxes),
67-
title: syncTaxes,
68-
pendingAction: pendingFields?.syncTaxes,
66+
hasError: Boolean(policy?.errors?.syncTax),
67+
title: syncTax ? CONST.INTEGRATION_ENTITY_MAP_TYPES.IMPORTED : CONST.INTEGRATION_ENTITY_MAP_TYPES.NOT_IMPORTED,
68+
pendingAction: pendingFields?.syncTax,
6969
});
7070
}
7171

‎src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ function QuickbooksTaxesPage({policy}: WithPolicyProps) {
1919
const {translate} = useLocalize();
2020
const styles = useThemeStyles();
2121
const policyID = policy?.id ?? '';
22-
const {syncTaxes, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
23-
const isSwitchOn = Boolean(syncTaxes && syncTaxes !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
22+
const {syncTax, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
2423
return (
2524
<AccessOrNotFoundWrapper
2625
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
@@ -39,19 +38,12 @@ function QuickbooksTaxesPage({policy}: WithPolicyProps) {
3938
<View style={styles.flex1}>
4039
<Text fontSize={variables.fontSizeNormal}>{translate('workspace.accounting.import')}</Text>
4140
</View>
42-
<OfflineWithFeedback pendingAction={pendingFields?.syncTaxes}>
41+
<OfflineWithFeedback pendingAction={pendingFields?.syncTax}>
4342
<View style={[styles.flex1, styles.alignItemsEnd, styles.pl3]}>
4443
<Switch
4544
accessibilityLabel={translate('workspace.accounting.taxes')}
46-
isOn={isSwitchOn}
47-
onToggle={() =>
48-
Connections.updatePolicyConnectionConfig(
49-
policyID,
50-
CONST.POLICY.CONNECTIONS.NAME.QBO,
51-
CONST.QUICK_BOOKS_CONFIG.SYNC_TAXES,
52-
isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
53-
)
54-
}
45+
isOn={!!syncTax}
46+
onToggle={() => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.SYNC_TAX, !syncTax)}
5547
/>
5648
</View>
5749
</OfflineWithFeedback>

‎src/types/onyx/Policy.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ type QBOConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
178178
syncCustomers: IntegrationEntityMap;
179179
syncLocations: IntegrationEntityMap;
180180
syncAccounts: IntegrationEntityMap;
181-
syncTaxes: IntegrationEntityMap;
182181
lastConfigurationTime: number;
183182
exportCompanyCardAccount?: string;
184183
syncTax: boolean;

0 commit comments

Comments
 (0)