diff --git a/.env.base b/.env.base index b02e21f17ce..d454c30b731 100644 --- a/.env.base +++ b/.env.base @@ -23,7 +23,7 @@ REACT_APP_FEATURE_NFT_METADATA=false REACT_APP_FEATURE_CHATWOOT=false REACT_APP_FEATURE_COINBASE_WALLET=true REACT_APP_FEATURE_ADVANCED_SLIPPAGE=true -REACT_APP_FEATURE_WALLET_CONNECT_V2=false +REACT_APP_FEATURE_WALLET_CONNECT_V2=true REACT_APP_FEATURE_FOX_DISCOUNTS=false # absolute URL prefix diff --git a/.env.dev b/.env.dev index 6390ddd9516..59f5992e840 100644 --- a/.env.dev +++ b/.env.dev @@ -1,6 +1,5 @@ # feature flags REACT_APP_FEATURE_NFT_METADATA=true -REACT_APP_FEATURE_WALLET_CONNECT_V2=true REACT_APP_FEATURE_FOX_DISCOUNTS=true # logging diff --git a/.env.develop b/.env.develop index 640e88b9218..a6d48f1d562 100644 --- a/.env.develop +++ b/.env.develop @@ -1,7 +1,6 @@ # feature flags REACT_APP_FEATURE_NFT_METADATA=true REACT_APP_FEATURE_CHATWOOT=true -REACT_APP_FEATURE_WALLET_CONNECT_V2=true # mixpanel REACT_APP_MIXPANEL_TOKEN=1c1369f6ea23a6404bac41b42817cc4b diff --git a/src/context/WalletProvider/WalletConnectV2/config.ts b/src/context/WalletProvider/WalletConnectV2/config.ts index 956d0e1968e..baa0910759f 100644 --- a/src/context/WalletProvider/WalletConnectV2/config.ts +++ b/src/context/WalletProvider/WalletConnectV2/config.ts @@ -10,7 +10,7 @@ export const WalletConnectV2Config: Omit = { adapters: [WalletConnectV2Adapter], supportsMobile: 'both', icon: WalletConnectIcon, - name: 'WalletConnectV2', + name: 'WalletConnect', description: 'v2', } diff --git a/src/plugins/walletConnectToDapps/WalletConnectV2Provider.tsx b/src/plugins/walletConnectToDapps/WalletConnectV2Provider.tsx index 3e93681480d..c7895e9ef99 100644 --- a/src/plugins/walletConnectToDapps/WalletConnectV2Provider.tsx +++ b/src/plugins/walletConnectToDapps/WalletConnectV2Provider.tsx @@ -59,7 +59,7 @@ export const WalletConnectV2Provider: FC = ({ children }) => useEffect(() => { // If we are connected to a wallet via wallet connect then this logic does not apply. - if (walletInfo?.name === 'WalletConnectV2') return + if (walletInfo?.name === 'WalletConnect') return // NOTE: don't use `useAppSelector(selectWalletId)` because it introduces a race condition const deviceId = walletInfo?.deviceId