fix: route to bridge page when a HW is connected

MetaMask · Nov 20, 2024 · 345b024 · 345b024
1 parent 2dc61c6
commit 345b024
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/ui/hooks/bridge/useBridging.ts b/ui/hooks/bridge/useBridging.ts
@@ -32,6 +32,9 @@ import { isHardwareKeyring } from '../../helpers/utils/hardware';
 import { getPortfolioUrl } from '../../helpers/utils/portfolio';
 import { SwapsTokenObject } from '../../../shared/constants/swaps';
 import { getProviderConfig } from '../../ducks/metamask/metamask';
+// eslint-disable-next-line import/no-restricted-paths
+import { getEnvironmentType } from '../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../shared/constants/app';
 import { useCrossChainSwapsEvents } from './useCrossChainSwapsEvents';
 ///: END:ONLY_INCLUDE_IF
 
@@ -90,18 +93,18 @@ const useBridging = () => {
             chain_id: providerConfig.chainId,
           },
         });
-        if (usingHardwareWallet && global.platform.openExtensionInBrowser) {
-          global.platform.openExtensionInBrowser(
-            PREPARE_SWAP_ROUTE,
-            null,
-            false,
-          );
+        const environmentType = getEnvironmentType();
+        const environmentTypeIsFullScreen =
+          environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
+        const bridgeRoute = `${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}?token=${token.address.toLowerCase()}`;
+        if (
+          usingHardwareWallet &&
+          global.platform.openExtensionInBrowser &&
+          !environmentTypeIsFullScreen
+        ) {
+          global.platform.openExtensionInBrowser(bridgeRoute);
         } else {
-          history.push(
-            `${
-              CROSS_CHAIN_SWAP_ROUTE + PREPARE_SWAP_ROUTE
-            }?token=${token.address.toLowerCase()}`,
-          );
+          history.push(bridgeRoute);
         }
       } else {
         const portfolioUrl = getPortfolioUrl(