Merge pull request #42383 from hungvu193/fix-42376

[Wave Collect] [Xero] Fix: When you click “Sync now” you see the Quickbooks Online text very briefly
Expensify · May 21, 2024 · 9d57ceb · 9d57ceb
2 parents 4059db3 + c444695
commit 9d57ceb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -1777,7 +1777,8 @@ const CONST = {
                 XERO: 'xero',
             },
             SYNC_STAGE_NAME: {
-                STARTING_IMPORT: 'startingImport',
+                STARTING_IMPORT_QBO: 'startingImportQBO',
+                STARTING_IMPORT_XERO: 'startingImportXero',
                 QBO_IMPORT_MAIN: 'quickbooksOnlineImportMain',
                 QBO_IMPORT_CUSTOMERS: 'quickbooksOnlineImportCustomers',
                 QBO_IMPORT_EMPLOYEES: 'quickbooksOnlineImportEmployees',

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -2396,7 +2396,9 @@ export default {
                             return 'Checking QuickBooks Online connection';
                         case 'quickbooksOnlineImportMain':
                             return 'Importing your QuickBooks Online data';
-                        case 'startingImport':
+                        case 'startingImportXero':
+                            return 'Importing your Xero data';
+                        case 'startingImportQBO':
                             return 'Importing your QuickBooks Online data';
                         case 'quickbooksOnlineSyncTitle':
                             return 'Synchronizing QuickBooks Online data';

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -2400,7 +2400,9 @@ export default {
                             return 'Revisando conexión a QuickBooks Online';
                         case 'quickbooksOnlineImportMain':
                             return 'Importando datos desde QuickBooks Online';
-                        case 'startingImport':
+                        case 'startingImportXero':
+                            return 'Importando datos desde Xero';
+                        case 'startingImportQBO':
                             return 'Importando datos desde QuickBooks Online';
                         case 'quickbooksOnlineSyncTitle':
                             return 'Sincronizando datos desde QuickBooks Online';

diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
@@ -128,12 +128,13 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
  * @param connectionName - Name of the connection, QBO/Xero
  */
 function syncConnection(policyID: string, connectionName: PolicyConnectionName | undefined) {
+    const isQBOConnection = connectionName === CONST.POLICY.CONNECTIONS.NAME.QBO;
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`,
             value: {
-                stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT,
+                stageInProgress: isQBOConnection ? CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_QBO : CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_XERO,
                 connectionName,
             },
         },
@@ -146,18 +147,17 @@ function syncConnection(policyID: string, connectionName: PolicyConnectionName |
         },
     ];
 
-    const parameters: SyncPolicyToQuickbooksOnlineParams | SyncPolicyToXeroParams =
-        connectionName === CONST.POLICY.CONNECTIONS.NAME.QBO
-            ? ({
-                  policyID,
-                  idempotencyKey: policyID,
-              } as SyncPolicyToQuickbooksOnlineParams)
-            : ({
-                  policyID,
-                  idempotencyKey: policyID,
-              } as SyncPolicyToXeroParams);
+    const parameters: SyncPolicyToQuickbooksOnlineParams | SyncPolicyToXeroParams = isQBOConnection
+        ? ({
+              policyID,
+              idempotencyKey: policyID,
+          } as SyncPolicyToQuickbooksOnlineParams)
+        : ({
+              policyID,
+              idempotencyKey: policyID,
+          } as SyncPolicyToXeroParams);
 
-    API.read(connectionName === CONST.POLICY.CONNECTIONS.NAME.QBO ? READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE : READ_COMMANDS.SYNC_POLICY_TO_XERO, parameters, {
+    API.read(isQBOConnection ? READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE : READ_COMMANDS.SYNC_POLICY_TO_XERO, parameters, {
         optimisticData,
         failureData,
     });