pass integrationToDisconnect and shouldDisconnectIntegrationBeforeCon…

…necting to multi connection route
Expensify · Jan 21, 2025 · 580d6e4 · 580d6e4
1 parent 2de319c
commit 580d6e4
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -1029,8 +1029,25 @@ const ROUTES = {
     },
     WORKSPACE_ACCOUNTING_MULTI_CONNECTION_SELECTOR: {
         route: 'settings/workspaces/:policyID/accounting/:connection/connection-selector',
-        getRoute: (policyID: string, connection?: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>) =>
-            `settings/workspaces/${policyID}/accounting/${connection as string}/connection-selector` as const,
+        getRoute: (
+            policyID: string,
+            connection: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>,
+            integrationToDisconnect?: ConnectionName,
+            shouldDisconnectIntegrationBeforeConnecting?: boolean,
+        ) => {
+            const searchParams = new URLSearchParams();
+
+            if (integrationToDisconnect) {
+                searchParams.append('integrationToDisconnect', integrationToDisconnect);
+            }
+            if (shouldDisconnectIntegrationBeforeConnecting !== undefined) {
+                searchParams.append('shouldDisconnectIntegrationBeforeConnecting', shouldDisconnectIntegrationBeforeConnecting.toString());
+            }
+
+            const queryParams = searchParams.size ? `?${searchParams}` : '';
+
+            return `settings/workspaces/${policyID}/accounting/${connection}/connection-selector${queryParams}` as const;
+        },
     },
     WORKSPACE_CATEGORIES: {
         route: 'settings/workspaces/:policyID/categories',

diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
@@ -790,6 +790,8 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.MULTI_CONNECTION_SELECTOR]: {
         policyID: string;
         connection: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>;
+        integrationToDisconnect?: ConnectionName;
+        shouldDisconnectIntegrationBeforeConnecting?: boolean;
     };
     [SCREENS.GET_ASSISTANCE]: {
         backTo: Routes;

diff --git a/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx b/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx
@@ -11,6 +11,7 @@ import {getConnectionNameFromRouteParam} from '@libs/AccountingUtils';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
+import {ConnectionName} from '@src/types/onyx/Policy';
 import AccessOrNotFoundWrapper from '../AccessOrNotFoundWrapper';
 import {AccountingContextProvider, useAccountingContext} from './AccountingContext';
 import {MenuItemData} from './types';
@@ -20,13 +21,19 @@ type MultiConnectionSelectorPageProps = WithPolicyConnectionsProps & {
     route: {
         params: {
             connection: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>;
+            integrationToDisconnect?: ConnectionName;
+            shouldDisconnectIntegrationBeforeConnecting?: boolean;
         };
     };
 };
 
 function MultiConnectionSelectorPage({policy, route}: MultiConnectionSelectorPageProps) {
     const policyID = policy?.id ?? '-1';
+
     const multiConnectionName = getConnectionNameFromRouteParam(route.params.connection);
+    const integrationToDisconnect = route.params.integrationToDisconnect;
+    const shouldDisconnectIntegrationBeforeConnecting = route.params.shouldDisconnectIntegrationBeforeConnecting;
+
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
@@ -51,9 +58,8 @@ function MultiConnectionSelectorPage({policy, route}: MultiConnectionSelectorPag
                         onPress: () => {
                             startIntegrationFlow({
                                 name: integration,
-                                // s77rt
-                                //integrationToDisconnect: connectedIntegration,
-                                //shouldDisconnectIntegrationBeforeConnecting: true,
+                                integrationToDisconnect,
+                                shouldDisconnectIntegrationBeforeConnecting,
                             });
                         },
                         ref: (ref) => {

diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -456,14 +456,22 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                     rightComponent: (
                         <Button
                             onPress={() => {
+                                const shouldDisconnect = true;
                                 if (shouldUseMultiConnectionSelector) {
-                                    Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_MULTI_CONNECTION_SELECTOR.getRoute(policyID, getRouteParamForConnection(designatedDisplayConnection)));
+                                    Navigation.navigate(
+                                        ROUTES.WORKSPACE_ACCOUNTING_MULTI_CONNECTION_SELECTOR.getRoute(
+                                            policyID,
+                                            getRouteParamForConnection(designatedDisplayConnection),
+                                            connectedIntegration,
+                                            shouldDisconnect,
+                                        ),
+                                    );
                                     return;
                                 }
                                 startIntegrationFlow({
                                     name: integration,
                                     integrationToDisconnect: connectedIntegration,
-                                    shouldDisconnectIntegrationBeforeConnecting: true,
+                                    shouldDisconnectIntegrationBeforeConnecting: shouldDisconnect,
                                 });
                             }}
                             text={translate('workspace.accounting.setup')}

diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
@@ -42,6 +42,7 @@ function NetSuiteTokenInputPage({policy}: WithPolicyConnectionsProps) {
 
     const handleBackButtonPress = () => {
         if (screenIndex === 0) {
+            // s77rt use beta
             Navigation.goBack(
                 ROUTES.WORKSPACE_ACCOUNTING_MULTI_CONNECTION_SELECTOR.getRoute(policyID, CONST.POLICY.CONNECTIONS.MULTI_CONNECTIONS_MAPPING[CONST.POLICY.CONNECTIONS.NAME.NETSUITE]),
             );