revert: unsupported connection name

Expensify · Oct 16, 2024 · 908e6d2 · 908e6d2
1 parent 25c00a1
commit 908e6d2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -2435,11 +2435,6 @@ const CONST = {
             },
             SYNC_STAGE_TIMEOUT_MINUTES: 20,
         },
-        UNSUPPORTED_CONNECTIONS: {
-            NAME: {
-                QBO: 'quickbooksDesktop',
-            },
-        },
         ACCESS_VARIANTS: {
             PAID: 'paid',
             ADMIN: 'admin',

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
@@ -985,13 +985,10 @@ function hasUnsupportedIntegration(policy: Policy | undefined, accountingIntegra
     return !(accountingIntegrations ?? Object.values(CONST.POLICY.CONNECTIONS.NAME)).some((integration) => !!policy?.connections?.[integration]);
 }
 
-function getCurrentConnectionName(policy: Policy | undefined, includeUnsupportedConnection = false): string | undefined {
-    const accountingIntegrations: string[] = [...Object.values(CONST.POLICY.CONNECTIONS.NAME)];
-    if (includeUnsupportedConnection) {
-        accountingIntegrations.push(...Object.values(CONST.POLICY.UNSUPPORTED_CONNECTIONS.NAME));
-    }
-    const connectionKey = accountingIntegrations.find((integration) => policy?.connections && integration in policy.connections);
-    return connectionKey ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionKey as keyof typeof CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY] : undefined;
+function getCurrentConnectionName(policy: Policy | undefined): string | undefined {
+    const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME);
+    const connectionKey = accountingIntegrations.find((integration) => !!policy?.connections?.[integration]);
+    return connectionKey ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionKey] : undefined;
 }
 
 /**

diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -78,7 +78,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
     const isSyncInProgress = isConnectionInProgress(connectionSyncProgress, policy);
     const hasSyncError = PolicyUtils.hasSyncError(policy, isSyncInProgress);
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
-    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy, true);
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
 
     const canSelectMultiple = shouldUseNarrowLayout ? selectionMode?.isEnabled : true;
 

diff --git a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
@@ -83,7 +83,7 @@ function WorkspaceReportFieldsPage({
     const isSyncInProgress = isConnectionInProgress(connectionSyncProgress, policy);
     const hasSyncError = PolicyUtils.hasSyncError(policy, isSyncInProgress);
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
-    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy, true);
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
 
     const canSelectMultiple = !hasAccountingConnections && (isSmallScreenWidth ? selectionMode?.isEnabled : true);
 

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -71,7 +71,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
     const isSyncInProgress = isConnectionInProgress(connectionSyncProgress, policy);
     const hasSyncError = PolicyUtils.hasSyncError(policy, isSyncInProgress);
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
-    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy, true);
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
     const [policyTagLists, isMultiLevelTags] = useMemo(() => [PolicyUtils.getTagLists(policyTags), PolicyUtils.isMultiLevelTags(policyTags)], [policyTags]);
     const canSelectMultiple = !isMultiLevelTags && (shouldUseNarrowLayout ? selectionMode?.isEnabled : true);
 

diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -67,7 +67,7 @@ function WorkspaceTaxesPage({
     const hasSyncError = PolicyUtils.hasSyncError(policy, isSyncInProgress);
 
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
-    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy, true);
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
     const canSelectMultiple = shouldUseNarrowLayout ? selectionMode?.isEnabled : true;
 
     const fetchTaxes = useCallback(() => {