Merge branch 'refs/heads/war-in/sage-intacct-export-config' into war-…

…in/sage-intacct-export-config-offline-error # Conflicts: # src/libs/actions/connections/SageIntacct.ts # src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx # src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx # src/types/onyx/Policy.ts
software-mansion-labs · Jul 9, 2024 · 759c350 · 759c350
2 parents 452d279 + 4f62db5
commit 759c350
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/...ters/UpdateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendorParams.ts b/...ters/UpdateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendorParams.ts
@@ -1,6 +1,6 @@
 type UpdateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendorParams = {
     policyID: string;
-    vendorID: string | null;
+    vendorID: string;
 };
 
 export default UpdateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendorParams;
diff --git a/src/libs/API/parameters/UpdateSageIntacctNonreimbursableExpensesExportVendorParams.ts b/src/libs/API/parameters/UpdateSageIntacctNonreimbursableExpensesExportVendorParams.ts
@@ -1,6 +1,6 @@
 type UpdateSageIntacctNonreimbursableExpensesExportVendorParams = {
     policyID: string;
-    vendorID: string | null;
+    vendorID: string;
 };
 
 export default UpdateSageIntacctNonreimbursableExpensesExportVendorParams;
diff --git a/...bs/API/parameters/UpdateSageIntacctReimbursableExpensesReportExportDefaultVendorParams.ts b/...bs/API/parameters/UpdateSageIntacctReimbursableExpensesReportExportDefaultVendorParams.ts
@@ -1,6 +1,6 @@
 type UpdateSageIntacctReimbursableExpensesReportExportDefaultVendorParams = {
     policyID: string;
-    vendorID: string | null;
+    vendorID: string;
 };
 
 export default UpdateSageIntacctReimbursableExpensesReportExportDefaultVendorParams;
diff --git a/src/libs/actions/connections/SageIntacct.ts b/src/libs/actions/connections/SageIntacct.ts
@@ -141,7 +141,7 @@ function updateSageIntacctNonreimbursableExpensesExportDestination(policyID: str
     API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, parameters, {optimisticData, failureData, successData});
 }
 
-function updateSageIntacctReimbursableExpensesReportExportDefaultVendor(policyID: string, vendor: string | null) {
+function updateSageIntacctReimbursableExpensesReportExportDefaultVendor(policyID: string, vendor: string) {
     const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR, vendor);
     const parameters: UpdateSageIntacctReimbursableExpensesReportExportDefaultVendorParams = {
         policyID,
@@ -151,7 +151,7 @@ function updateSageIntacctReimbursableExpensesReportExportDefaultVendor(policyID
     API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_REPORT_EXPORT_DEFAULT_VENDOR, parameters, {optimisticData, failureData, successData});
 }
 
-function updateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendor(policyID: string, vendor: string | null) {
+function updateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendor(policyID: string, vendor: string) {
     const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR, vendor);
     const parameters: UpdateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendorParams = {
         policyID,
@@ -171,7 +171,7 @@ function updateSageIntacctNonreimbursableExpensesExportAccount(policyID: string,
     API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_ACCOUNT, parameters, {optimisticData, failureData, successData});
 }
 
-function updateSageIntacctNonreimbursableExpensesExportVendor(policyID: string, vendor: string | null) {
+function updateSageIntacctNonreimbursableExpensesExportVendor(policyID: string, vendor: string) {
     const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_VENDOR, vendor);
     const parameters: UpdateSageIntacctNonreimbursableExpensesExportVendorParams = {
         policyID,
@@ -181,7 +181,7 @@ function updateSageIntacctNonreimbursableExpensesExportVendor(policyID: string,
     API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_VENDOR, parameters, {optimisticData, failureData, successData});
 }
 
-function updateSageIntacctDefaultVendor(policyID: string, settingName: keyof SageIntacctExportConfig, vendor: string | null) {
+function updateSageIntacctDefaultVendor(policyID: string, settingName: keyof SageIntacctExportConfig, vendor: string) {
     if (settingName === CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR) {
         updateSageIntacctReimbursableExpensesReportExportDefaultVendor(policyID, vendor);
     } else if (settingName === CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR) {

diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
@@ -57,7 +57,6 @@ function SageIntacctReimbursableExpensesPage({policy}: WithPolicyProps) {
 
     const defaultVendor = useMemo(() => {
         const defaultVendorName = getDefaultVendorName(reimbursableExpenseReportDefaultVendor, intacctData?.vendors);
-
         const defaultVendorSection = {
             description: translate('workspace.sageIntacct.defaultVendor'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR.getRoute(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE)),