TRCL-3010 Change test net chain ID and token denom

public/configs/env.json

@@ -42,14 +42,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -79,6 +77,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -102,14 +103,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -138,6 +137,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -161,14 +163,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -197,6 +197,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -220,14 +223,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -256,6 +257,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -279,14 +283,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -319,6 +321,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -342,14 +347,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -382,6 +385,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -405,14 +411,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -447,6 +451,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -455,7 +462,7 @@
                "callbackUrl": "/walletsegue"
             },
             "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
             "signTypedDataDomainName": "dYdX V4"
          }
       },
@@ -470,14 +477,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -511,6 +516,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -519,7 +527,7 @@
                "callbackUrl": "/walletsegue"
             },
             "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
             "signTypedDataDomainName": "dYdX V4"
          }
       },
@@ -534,14 +542,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -575,6 +581,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -583,7 +592,7 @@
                "callbackUrl": "/walletsegue"
             },
             "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
             "signTypedDataDomainName": "dYdX V4"
          }
       },
@@ -598,14 +607,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -639,6 +646,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -647,7 +657,7 @@
                "callbackUrl": "/walletsegue"
             },
             "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
             "signTypedDataDomainName": "dYdX V4"
          }
       },
@@ -662,14 +672,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -703,6 +711,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -711,7 +722,7 @@
                "callbackUrl": "/walletsegue"
             },
             "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
             "signTypedDataDomainName": "dYdX V4"
          }
       },
@@ -726,14 +737,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -767,6 +776,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -775,11 +787,11 @@
                "callbackUrl": "/walletsegue"
             },
             "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
             "signTypedDataDomainName": "dYdX V4"
          }
       },
-      "dydxprotocol-mainnet": {
+      "dydxprotocol-mainet": {
          "name": "v4",
          "ethereumChainId": "1",
          "dydxChainId": "[mainnet chain id]",
@@ -791,14 +803,12 @@
             "chain": {
                "name": "DYDX",
                "denom": "adv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -831,6 +841,9 @@
                   "description": "[Description of the app]",
                   "iconUrl": "[Relative URL of the icon URL]"
                },
+               "v1": {
+                  "bridgeUrl": "[Bridge URL]"
+               },
                "v2": {
                   "projectId": "[Project ID]"
                }

src/constants/localStorage.ts

@@ -24,6 +24,6 @@ export enum LocalStorageKey {
 }
 
 export const LOCAL_STORAGE_VERSIONS = {
-  [LocalStorageKey.EvmDerivedAddresses]: 'v2',
+  [LocalStorageKey.EvmDerivedAddresses]: 'v1',
   // TODO: version all localStorage keys
 };

src/constants/wallets.ts

@@ -92,24 +92,6 @@ export enum WalletType {
   OtherWallet = 'OTHER_WALLET',
 }
 
-const WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS = {
-  Metamask: 'c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96',
-  imToken: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
-  TokenPocket: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
-  Trust: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
-  Rainbow: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
-  Zerion: 'ecc4036f814562b41a5268adc86270fba1365471402006302e70169465b7ac18',
-  Ledger: '19177a98252e07ddfc9af2083ba8e07ef627cb6103467ffebb3f8f4205fd7927',
-  Fireblocks: '5864e2ced7c293ed18ac35e0db085c09ed567d67346ccb6f58a0327a75137489',
-  Uniswap: 'c03dfee351b6fcc421b4494ea33b9d4b92a984f87aa76d1663bb28705e95034a',
-  Robinhood: '8837dd9413b1d9b585ee937d27a816590248386d9dbf59f5cd3422dbbb65683e',
-  '1inch': 'c286eebc742a537cd1d6818363e9dc53b21759a1e8e5d9b263d0c03ec7703576',
-};
-
-export const WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS = Object.values(
-  WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS
-);
-
 type WalletConfig = {
   type: WalletType;
   stringKey: string;
@@ -143,6 +125,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: BitkeepIcon,
     connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
     matchesInjectedEip1193: (provider) => provider.isBitKeep, // isBitKeepChrome, isBitEthereum
+    walletconnect2Id: '38f5d18bd8522c244bdd70cb4a68e0e718865155811c043f052fb9f1c51de662',
   },
   [WalletType.BitPie]: {
     type: WalletType.BitPie,
@@ -175,6 +158,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: Coin98Icon,
     connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
     matchesInjectedEip1193: (provider) => provider.isCoin98,
+    walletconnect2Id: '2a3c89040ac3b723a1972a33a125b1db11e258a6975d3a61252cd64e6ea5ea01',
   },
   [WalletType.HuobiWallet]: {
     type: WalletType.HuobiWallet,
@@ -182,6 +166,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: HuobiIcon,
     connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
     matchesInjectedEip1193: (provider) => provider.isHbWallet,
+    walletconnect2Id: '797c615e2c556b610c048eb35535f212c0dd58de5d03e763120e90a7d1350a77',
   },
   [WalletType.ImToken]: {
     type: WalletType.ImToken,
@@ -189,7 +174,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: ImTokenIcon,
     connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
     matchesInjectedEip1193: (provider) => provider.isImToken,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.imToken,
+    walletconnect2Id: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
   },
   [WalletType.MathWallet]: {
     type: WalletType.MathWallet,
@@ -205,7 +190,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: MetaMaskIcon,
     connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
     matchesInjectedEip1193: isMetaMask,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Metamask,
+    walletconnect2Id: 'c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96',
   },
   [WalletType.Rainbow]: {
     type: WalletType.Rainbow,
@@ -213,7 +198,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: RainbowIcon,
     connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
     matchesInjectedEip1193: (provider) => provider.isRainbowWallet,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Rainbow,
+    walletconnect2Id: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
   },
   [WalletType.TokenPocket]: {
     type: WalletType.TokenPocket,
@@ -221,7 +206,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: TokenPocketIcon,
     connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
     matchesInjectedEip1193: (provider) => provider.isTokenPocket,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.TokenPocket,
+    walletconnect2Id: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
   },
   [WalletType.TrustWallet]: {
     type: WalletType.TrustWallet,
@@ -229,7 +214,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: TrustWalletIcon,
     connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
     matchesInjectedEip1193: (provider) => provider.isTrust,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Trust,
+    walletconnect2Id: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
   },
   [WalletType.WalletConnect2]: {
     type: WalletType.WalletConnect2,
@@ -302,10 +287,10 @@ export type DydxAddress = `dydx${string}`;
 export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
   rpc: 'https://dydx-testnet-archive.allthatnode.com:26657',
   rest: 'https://dydx-testnet-archive.allthatnode.com:1317',
-  chainId: 'dydx-testnet-4',
+  chainId: 'dydx-testnet-3',
   chainName: 'dYdX Public Testnet',
   chainSymbolImageUrl:
-    'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-4/chain.png',
+    'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-3/chain.png',
   bech32Config: {
     bech32PrefixAccPub: 'dydxpub',
     bech32PrefixValPub: 'dydxvaloperpub',
@@ -319,31 +304,26 @@ export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
   },
   stakeCurrency: {
     coinDenom: 'DV4TNT',
-    coinDecimals: 18,
-    coinMinimalDenom: 'adv4tnt',
+    coinDecimals: 6,
+    coinMinimalDenom: 'dv4tnt',
   },
   currencies: [
     {
       coinDenom: 'DV4TNT',
-      coinDecimals: 18,
-      coinMinimalDenom: 'adv4tnt',
+      coinDecimals: 6,
+      coinMinimalDenom: 'dv4tnt',
     },
     {
       coinDenom: 'USDC',
-      coinDecimals: 6,
       coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
+      coinDecimals: 6,
     },
   ],
   feeCurrencies: [
     {
       coinDenom: 'DV4TNT',
-      coinDecimals: 18,
-      coinMinimalDenom: 'adv4tnt',
-    },
-    {
-      coinDenom: 'USDC',
       coinDecimals: 6,
-      coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
+      coinMinimalDenom: 'dv4tnt',
     },
   ],
   features: [],

src/hooks/useNotificationTypes.tsx

@@ -110,18 +110,18 @@ export const notificationTypes = [
       const stringGetter = useStringGetter();
       const { transferNotifications } = useLocalNotifications();
 
-      const getTitleStringKey = useCallback((type: 'deposit' | 'withdrawal', finished: boolean) => {
+      const getTitleStringKey = useCallback((type: 'deposit' | 'withdraw', finished: boolean) => {
         if (type === 'deposit' && !finished) return STRING_KEYS.DEPOSIT_IN_PROGRESS;
         if (type === 'deposit' && finished) return STRING_KEYS.DEPOSIT;
-        if (type === 'withdrawal' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
+        if (type === 'withdraw' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
         return STRING_KEYS.WITHDRAW;
       }, []);
 
       useEffect(() => {
         for (const transfer of transferNotifications) {
-          const { fromChainId, status, txHash, toAmount } = transfer;
+          const { toChainId, status, txHash, toAmount } = transfer;
           const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
-          const type = fromChainId === TESTNET_CHAIN_ID ? 'withdrawal' : 'deposit';
+          const type = toChainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdraw';
           // @ts-ignore status.errors is not in the type definition but can be returned
           const error = status?.errors?.length ? status?.errors[0] : status?.error;
 
@@ -154,7 +154,6 @@ export const notificationTypes = [
               description: description,
               customContent: (
                 <TransferStatusToast
-                  type={type}
                   toAmount={transfer.toAmount}
                   triggeredAt={transfer.triggeredAt}
                   status={transfer.status}
@@ -163,7 +162,7 @@ export const notificationTypes = [
               customMenuContent: !finished && (
                 <div>
                   {description}
-                  <TransferStatusSteps status={transfer.status} type={type} />
+                  <TransferStatusSteps status={transfer.status} />
                 </div>
               ),
               toastSensitivity: 'foreground',

src/hooks/useSelectedNetwork.ts

@@ -30,7 +30,7 @@ export const useSelectedNetwork = (): {
   useEffect(() => {
     if (
       import.meta.env.MODE === 'production' &&
-      ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-4'
+      ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-3'
     ) {
       dispatch(
         openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } })

src/lib/wagmi.ts

@@ -36,15 +36,7 @@ import { CoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet';
 import { InjectedConnector } from 'wagmi/connectors/injected';
 import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
 import { WalletConnectConnector } from 'wagmi/connectors/walletConnect';
-
-import {
-  type WalletConnection,
-  WalletConnectionType,
-  type WalletType,
-  walletConnectionTypes,
-  wallets,
-  WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
-} from '@/constants/wallets';
+import { WalletConnectLegacyConnector } from 'wagmi/connectors/walletConnectLegacy';
 
 // Config
 
@@ -109,10 +101,20 @@ const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnect
     qrModalOptions: {
       themeMode: 'dark' as const,
       themeVariables: {
-        '--wcm-accent-color': '#5973fe',
-        '--wcm-font-family': 'var(--fontFamily-base)',
+        '--w3m-accent-color': '#5973fe',
+        '--w3m-background-color': '#5973fe',
+        '--w3m-color-bg-1': 'var(--color-layer-3)',
+        '--w3m-color-bg-2': 'var(--color-layer-4)',
+        '--w3m-color-bg-3': 'var(--color-layer-5)',
+        '--w3m-font-family': 'var(--fontFamily-base)',
+        '--w3m-font-feature-settings': 'none',
+        '--w3m-overlay-backdrop-filter': 'blur(6px)',
+        // '--w3m-logo-image-url': 'https://trade.dydx.exchange/cbw-image.png',
       },
-      explorerRecommendedWalletIds: WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
+      enableExplorer: true,
+      explorerAllowList: [],
+      explorerDenyList: [],
+      chainImages: {},
     },
   },
 };
@@ -122,6 +124,7 @@ const connectors = [
     chains,
     options: {
       shimDisconnect: true,
+      shimChainChangedDisconnect: false,
     },
   }),
   new CoinbaseWalletConnector({
@@ -162,11 +165,19 @@ const createWalletConnect2ConnectorWithId = (walletconnect2Id: string) =>
         ...walletconnect2ConnectorOptions.options.qrModalOptions,
         explorerRecommendedWalletIds: [walletconnect2Id],
         explorerExcludedWalletIds: 'ALL',
+        chainImages: {},
       },
     },
   });
 
 // Custom connector from wallet selection
+import {
+  type WalletConnection,
+  WalletConnectionType,
+  type WalletType,
+  walletConnectionTypes,
+  wallets,
+} from '@/constants/wallets';
 
 export const resolveWagmiConnector = ({
   walletType,

src/views/TransferStatus.tsx

@@ -1,5 +1,6 @@
 import { useCallback, useState, useMemo } from 'react';
 import styled, { type AnyStyledComponent } from 'styled-components';
+import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
 import { Root, Trigger, Content } from '@radix-ui/react-collapsible';
 import { StatusResponse } from '@0xsquid/sdk';
 
@@ -20,14 +21,12 @@ import { LoadingDots } from '@/components/Loading/LoadingDots';
 import { layoutMixins } from '@/styles/layoutMixins';
 
 type ElementProps = {
-  type: 'withdrawal' | 'deposit';
   toAmount?: number;
   triggeredAt?: number;
   status?: StatusResponse;
 };
 
 export const TransferStatusToast = ({
-  type,
   toAmount,
   triggeredAt = Date.now(),
   status,
@@ -39,6 +38,11 @@ export const TransferStatusToast = ({
   // @ts-ignore status.errors is not in the type definition but can be returned
   const error = status?.errors?.length ? status?.errors[0] : status?.error;
 
+  const type = useMemo(
+    () => (status?.toChain?.chainData?.chainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdrawal'),
+    [status]
+  );
+
   const updateSecondsLeft = useCallback(() => {
     const fromChainEta = (status?.fromChain?.chainData?.estimatedRouteDuration || 0) * 1000;
     const toChainEta = (status?.toChain?.chainData?.estimatedRouteDuration || 0) * 1000;
@@ -65,7 +69,7 @@ export const TransferStatusToast = ({
         side="bottom"
         slotReceipt={
           <Styled.Receipt>
-            <TransferStatusSteps status={status} type={type} />
+            <TransferStatusSteps status={status} />
           </Styled.Receipt>
         }
       >

src/views/TransferStatusSteps.tsx

@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components';
 import { StatusResponse } from '@0xsquid/sdk';
+import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
 
 import { useStringGetter } from '@/hooks';
 
@@ -14,7 +15,6 @@ import { STRING_KEYS } from '@/constants/localization';
 
 type ElementProps = {
   status?: StatusResponse;
-  type: 'withdrawal' | 'deposit';
 };
 
 enum TransferStatusStep {
@@ -24,13 +24,14 @@ enum TransferStatusStep {
   Complete,
 }
 
-export const TransferStatusSteps = ({ status, type }: ElementProps) => {
+export const TransferStatusSteps = ({ status }: ElementProps) => {
   const stringGetter = useStringGetter();
 
-  const { currentStep, steps } = useMemo(() => {
+  const { currentStep, steps, type } = useMemo(() => {
     const routeStatus = status?.routeStatus;
     const fromChain = status?.fromChain?.chainData?.chainId;
     const toChain = status?.toChain?.chainData?.chainId;
+    const type = toChain === TESTNET_CHAIN_ID ? 'deposit' : 'withdrawal';
 
     const steps = [
       {
@@ -73,10 +74,6 @@ export const TransferStatusSteps = ({ status, type }: ElementProps) => {
       currentStep = TransferStatusStep.FromChain;
     }
 
-    if (status?.squidTransactionStatus === 'success') {
-      currentStep = TransferStatusStep.Complete;
-    }
-
     return {
       currentStep,
       steps,

src/views/dialogs/ExchangeOfflineDialog.tsx

@@ -34,7 +34,7 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps)
 
   const showOfflineMessage =
     import.meta.env.MODE === 'production' &&
-    ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-4';
+    ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-3';
 
   useEffect(() => {
     if (