From 30fae8a0695d16cc6832aef4c510526fd18c0b5f Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 9 Jul 2024 11:10:36 +0700
Subject: [PATCH 1/2] fix: add description when connecting QBO

---
 src/languages/en.ts                                     | 2 ++
 src/languages/es.ts                                     | 2 ++
 src/pages/workspace/accounting/PolicyAccountingPage.tsx | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 543dfbf5e541..4dfd985f7456 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2886,6 +2886,8 @@ export default {
                             return 'Updating people list';
                         case 'quickbooksOnlineSyncApplyClassesLocations':
                             return 'Updating report fields';
+                        case 'jobDone':
+                            return 'Waiting for imported data to load';
                         case 'xeroSyncImportChartOfAccounts':
                             return 'Syncing chart of accounts';
                         case 'xeroSyncImportCategories':
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e7f4faab2725..1470dbef20fc 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2867,6 +2867,8 @@ export default {
                             return 'Actualizando empleados';
                         case 'quickbooksOnlineSyncApplyClassesLocations':
                             return 'Actualizando clases';
+                        case 'jobDone':
+                            return 'Esperando a que se carguen los datos importados';
                         case 'xeroSyncImportChartOfAccounts':
                             return 'Sincronizando plan de cuentas';
                         case 'xeroSyncImportCategories':
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index ca4c990aea2a..5cc8b0f67ed9 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -152,7 +152,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     const lastSyncProgressDate = parseISO(connectionSyncProgress?.timestamp ?? '');
     const isSyncInProgress =
         !!connectionSyncProgress?.stageInProgress &&
-        connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE &&
+        (connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE || !policy.connections?.[connectionSyncProgress.connectionName]) &&
         isValid(lastSyncProgressDate) &&
         differenceInMinutes(new Date(), lastSyncProgressDate) < CONST.POLICY.CONNECTIONS.SYNC_STAGE_TIMEOUT_MINUTES;
 

From f641f09cdf4507ba1ecd51d036866745df634253 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 9 Jul 2024 11:43:44 +0700
Subject: [PATCH 2/2] fix lint

---
 src/languages/es.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1470dbef20fc..492878bdbb25 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2924,6 +2924,7 @@ export default {
                         case 'intacctImportTitle':
                             return 'Importando datos desde Sage Intacct';
                         default: {
+                            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                             return `Translation missing for stage: ${stage}`;
                         }
                     }