From 0c293d2a5d65e7cf6fdce2d17d895465356394b3 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Thu, 22 Aug 2024 12:27:14 -0400 Subject: [PATCH 1/2] Make sure we do not show integration configurations menus if there is no lastSync object --- src/libs/actions/connections/index.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts index c47c57d57466..db5513cb05fc 100644 --- a/src/libs/actions/connections/index.ts +++ b/src/libs/actions/connections/index.ts @@ -11,6 +11,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type * as OnyxCommon from '@src/types/onyx/OnyxCommon'; import type {ConnectionName, Connections, PolicyConnectionName} from '@src/types/onyx/Policy'; import type Policy from '@src/types/onyx/Policy'; +import {isEmptyObject} from "@src/types/utils/EmptyObject"; type ConnectionNameExceptNetSuite = Exclude; @@ -379,7 +380,7 @@ function getSynchronizationErrorMessage(policy: OnyxEntry, connectionNam } const connection = policy?.connections?.[connectionName]; - if (isSyncInProgress || connection?.lastSync?.isSuccessful) { + if (isSyncInProgress || isEmptyObject(connection?.lastSync) || connection?.lastSync?.isSuccessful) { return; } return `${syncError} ("${connection?.lastSync?.errorMessage}")`; @@ -392,6 +393,12 @@ function isConnectionUnverified(policy: OnyxEntry, connectionName: Polic if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NETSUITE) { return !(policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE]?.verified ?? true); } + + // If the connection has no lastSync property, we'll consider it unverified + if (isEmptyObject(policy?.connections?.[connectionName]?.lastSync)) { + return true; + } + return !(policy?.connections?.[connectionName]?.lastSync?.isConnected ?? true); } From 46fbad420cdd2047f3b35e5d92e7d2b17ef4d675 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Thu, 22 Aug 2024 15:17:06 -0400 Subject: [PATCH 2/2] ESLint --- src/libs/actions/connections/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts index 9794922aafe5..fa2e274204a2 100644 --- a/src/libs/actions/connections/index.ts +++ b/src/libs/actions/connections/index.ts @@ -11,7 +11,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type * as OnyxCommon from '@src/types/onyx/OnyxCommon'; import type {ConnectionName, Connections, PolicyConnectionName} from '@src/types/onyx/Policy'; import type Policy from '@src/types/onyx/Policy'; -import {isEmptyObject} from "@src/types/utils/EmptyObject"; +import {isEmptyObject} from '@src/types/utils/EmptyObject'; type ConnectionNameExceptNetSuite = Exclude;