Fix: a more accurate WC app detection (#3155)

safe-global · Jan 29, 2024 · d7e5365 · d7e5365
1 parent 4cd8a3d
commit d7e5365
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/pages/apps/open.tsx b/src/pages/apps/open.tsx
@@ -18,9 +18,7 @@ import { getOrigin } from '@/components/safe-apps/utils'
 import { useHasFeature } from '@/hooks/useChains'
 import { FEATURES } from '@/utils/chains'
 import { openWalletConnect } from '@/features/walletconnect/components'
-
-// TODO: Remove this once we properly deprecate the WC app
-const WC_SAFE_APP = /wallet-connect/
+import { isWalletConnectSafeApp } from '@/utils/gateway'
 
 const SafeApps: NextPage = () => {
   const chainId = useChainId()
@@ -60,7 +58,7 @@ const SafeApps: NextPage = () => {
   // appUrl is required to be present
   if (!isSafeAppsEnabled || !appUrl || !router.isReady) return null
 
-  if (isWalletConnectEnabled && WC_SAFE_APP.test(appUrl)) {
+  if (isWalletConnectEnabled && isWalletConnectSafeApp(appUrl)) {
     openWalletConnect()
     goToList()
     return null

diff --git a/src/services/analytics/__tests__/tx-tracking.test.ts b/src/services/analytics/__tests__/tx-tracking.test.ts
@@ -144,7 +144,7 @@ describe('getTransactionTrackingType', () => {
         type: TransactionInfoType.CUSTOM,
       },
       safeAppInfo: {
-        url: 'https://safe-apps.safe.global/wallet-connect',
+        url: 'https://apps-portal.safe.global/wallet-connect',
       },
     } as unknown)
 

diff --git a/src/utils/gateway.ts b/src/utils/gateway.ts
@@ -28,6 +28,9 @@ export const getExplorerLink = (
 }
 
 export const isWalletConnectSafeApp = (url: string): boolean => {
-  const WALLET_CONNECT = /wallet-connect/
-  return WALLET_CONNECT.test(url)
+  const WC_APP_URLS = [
+    'https://apps-portal.safe.global/wallet-connect',
+    'https://safe-apps.dev.5afe.dev/wallet-connect',
+  ]
+  return WC_APP_URLS.includes(url)
 }