Code reverts

Author: chiragsalian

src/CONST/index.ts

@@ -2912,10 +2912,6 @@ const CONST = {
                 XERO: 'xero',
                 NETSUITE: 'netsuite',
                 SAGE_INTACCT: 'intacct',
-                ORACLE: 'oracle',
-                SAP: 'sap',
-                MICROSOFT_DYNAMICS: 'microsoftDynamics',
-                OTHER: 'other',
             },
             ROUTE: {
                 QBO: 'quickbooks-online',
@@ -2938,6 +2934,7 @@ const CONST = {
                 microsoftDynamics: 'Microsoft Dynamics',
                 other: 'Other',
             },
+            CORPORATE: ['quickbooksDesktop', 'netsuite', 'intacct', 'oracle', 'sap', 'microsoftDynamics', 'other'],
             AUTH_HELP_LINKS: {
                 intacct:
                     "https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting#:~:text=First%20make%20sure%20that%20you,your%20company's%20Web%20Services%20authorizations.",
@@ -3016,20 +3013,7 @@ const CONST = {
             },
             SYNC_STAGE_TIMEOUT_MINUTES: 20,
         },
-        get POLICY_CONNECTIONS_TYPE_CORPORATE() {
-            return [
-                this.CONNECTIONS.NAME.QBD,
-                this.CONNECTIONS.NAME.NETSUITE,
-                this.CONNECTIONS.NAME.SAGE_INTACCT,
-                this.CONNECTIONS.NAME.ORACLE,
-                this.CONNECTIONS.NAME.SAP,
-                this.CONNECTIONS.NAME.MICROSOFT_DYNAMICS,
-                this.CONNECTIONS.NAME.OTHER,
-            ];
-        },
-        get POLICY_CONNECTIONS_SUPPORTED() {
-            return [this.CONNECTIONS.NAME.QBO, this.CONNECTIONS.NAME.XERO, this.CONNECTIONS.NAME.NETSUITE, this.CONNECTIONS.NAME.SAGE_INTACCT, this.CONNECTIONS.NAME.QBD];
-        },
+
         ACCESS_VARIANTS: {
             PAID: 'paid',
             ADMIN: 'admin',

src/libs/actions/Policy/Policy.ts

@@ -1900,9 +1900,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) {
 
     // Determine workspace type based on user reported integration
     const workspaceType =
-        userReportedIntegration && (CONST.POLICY.POLICY_CONNECTIONS_TYPE_CORPORATE as readonly string[]).includes(userReportedIntegration)
-            ? CONST.POLICY.TYPE.CORPORATE
-            : CONST.POLICY.TYPE.TEAM;
+        userReportedIntegration && (CONST.POLICY.CONNECTIONS.CORPORATE as readonly string[]).includes(userReportedIntegration) ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;
 
     // WARNING: The data below should be kept in sync with the API so we create the policy with the correct configuration.
     const optimisticData: OnyxUpdate[] = [

src/pages/workspace/accounting/PolicyAccountingPage.tsx

@@ -91,16 +91,9 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
     const allCardSettings = useExpensifyCardFeeds(policyID);
     const isSyncInProgress = isConnectionInProgress(connectionSyncProgress, policy);
 
-    // Type guard to ensure we only use supported connections
-    const accountingIntegrations = CONST.POLICY.POLICY_CONNECTIONS_SUPPORTED;
-    const getSupportedConnection = (connectionName: string | undefined): ConnectionName | undefined => {
-        if (!connectionName || !(accountingIntegrations as readonly string[]).includes(connectionName)) {
-            return undefined;
-        }
-        return connectionName as ConnectionName;
-    };
-
-    const connectedIntegration = getSupportedConnection(getConnectedIntegration(policy, accountingIntegrations)) ?? getSupportedConnection(connectionSyncProgress?.connectionName);
+    const connectionNames = CONST.POLICY.CONNECTIONS.NAME;
+    const accountingIntegrations = Object.values(connectionNames);
+    const connectedIntegration = getConnectedIntegration(policy, accountingIntegrations) ?? connectionSyncProgress?.connectionName;
     const synchronizationError = connectedIntegration && getSynchronizationErrorMessage(policy, connectedIntegration, isSyncInProgress, translate, styles);
 
     const shouldShowEnterCredentials = connectedIntegration && !!synchronizationError && isAuthenticationError(policy, connectedIntegration);
@@ -109,7 +102,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
     const successfulDate = getIntegrationLastSuccessfulDate(
         getLocalDateFromDatetime,
         connectedIntegration ? policy?.connections?.[connectedIntegration] : undefined,
-        connectedIntegration === getSupportedConnection(connectionSyncProgress?.connectionName) ? connectionSyncProgress : undefined,
+        connectedIntegration === connectionSyncProgress?.connectionName ? connectionSyncProgress : undefined,
     );
 
     const hasSyncError = shouldShowSyncError(policy, isSyncInProgress);
@@ -521,7 +514,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
         }
         // Else, display the following and link to their Concierge DM.
         return [translate('workspace.accounting.talkToConcierge'), conciergeReportID];
-    }, [account, conciergeReportID, policy?.chatReportIDAdmins, translate]);
+    }, [account, conciergeReportID, translate]);
 
     return (
         <AccessOrNotFoundWrapper

src/pages/workspace/accounting/utils.tsx

@@ -337,12 +337,11 @@ function getSynchronizationErrorMessage(
     const syncError = translateLocal('workspace.accounting.syncError', {connectionName});
 
     const connection = policy?.connections?.[connectionName];
-    const lastSync = connection?.lastSync;
-    if (isSyncInProgress || isEmptyObject(lastSync) || lastSync?.isSuccessful !== false || !lastSync?.errorDate) {
+    if (isSyncInProgress || isEmptyObject(connection?.lastSync) || connection?.lastSync?.isSuccessful !== false || !connection?.lastSync?.errorDate) {
         return;
     }
 
-    return `${syncError} ("${lastSync?.errorMessage}")`;
+    return `${syncError} ("${connection?.lastSync?.errorMessage}")`;
 }
 
 function getQBDReimbursableAccounts(

src/types/onyx/Policy.ts

@@ -1384,31 +1384,20 @@ type Connections = {
 
     /** QuickBooks Desktop integration connection */
     [CONST.POLICY.CONNECTIONS.NAME.QBD]: Connection<QBDConnectionData, QBDConnectionConfig>;
+};
 
-    /** Other connection for onboarding flow */
-    other?: Connection<Record<string, unknown>, Record<string, unknown>>;
-
-    /** SAP connection for onboarding flow */
-    sap?: Connection<Record<string, unknown>, Record<string, unknown>>;
-
-    /** Oracle connection for onboarding flow */
-    oracle?: Connection<Record<string, unknown>, Record<string, unknown>>;
-
-    /** Microsoft Dynamics connection for onboarding flow */
-    microsoftDynamics?: Connection<Record<string, unknown>, Record<string, unknown>>;
-
-    /** Bill.com connection for onboarding flow */
-    billCom?: Connection<Record<string, unknown>, Record<string, unknown>>;
-
-    /** Zenefits connection for onboarding flow */
-    zenefits?: Connection<Record<string, unknown>, Record<string, unknown>>;
+/** All integration connections, including unsupported ones */
+type AllConnections = Connections & {
+    /** Quickbooks Desktop integration connection */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    quickbooksDesktop: any;
 };
 
-/** Names of officially supported integration connections */
-type ConnectionName = ValueOf<typeof CONST.POLICY.CONNECTIONS.NAME>;
+/** Names of integration connections */
+type ConnectionName = keyof Connections;
 
-/** Names of all integration connections including onboarding types */
-type AllConnectionName = ConnectionName | keyof typeof CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY;
+/** Names of all integration connections */
+type AllConnectionName = keyof AllConnections;
 
 /** Merchant Category Code. This is a way to identify the type of merchant (and type of spend) when a credit card is swiped.  */
 type MccGroup = {
@@ -1921,7 +1910,7 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
 type PolicyConnectionSyncStage = ValueOf<typeof CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME>;
 
 /** Names of policy connection services */
-type PolicyConnectionName = ValueOf<typeof CONST.POLICY.CONNECTIONS.NAME>;
+type PolicyConnectionName = ConnectionName;
 
 /** Policy connection sync progress state */
 type PolicyConnectionSyncProgress = {