remove wc1

package.json

@@ -40,7 +40,7 @@
     "@cosmjs/tendermint-rpc": "^0.31.0",
     "@dydxprotocol/v4-abacus": "^0.6.4",
     "@dydxprotocol/v4-client-js": "^0.36.1",
-    "@dydxprotocol/v4-localization": "^0.1.28",
+    "@dydxprotocol/v4-localization": "^0.1.24",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-collapsible": "^1.0.3",

pnpm-lock.yaml

@@ -1,5 +1,9 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 dependencies:
   '@0xsquid/sdk':
     specifier: ^1.10.0
@@ -29,8 +33,8 @@ dependencies:
     specifier: ^0.36.1
     version: 0.36.1
   '@dydxprotocol/v4-localization':
-    specifier: ^0.1.28
+    specifier: ^0.1.24
-    version: 0.1.28
+    version: 0.1.24
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -1006,8 +1010,8 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@0.1.28:
+  /@dydxprotocol/v4-localization@0.1.24:
-    resolution: {integrity: sha512-g6LwjX7EIRm9HISfSX0H6yhktBCZby5opP/yI2aIUvn2OYyB25WcjLEuEvzW5Bh9XXiLijgLf3Tk91wPKWuFbA==}
+    resolution: {integrity: sha512-zSiu8+/6BWNWZXxe73zUp/UjuLG1Cp5UuhXKtbATqqkeZyVCs01QxbBCTs1MLfgsLh02IrfhXCPHvXnzZyReEw==}
     dev: false
 
   /@dydxprotocol/v4-proto@0.2.1:
@@ -14095,7 +14099,3 @@ packages:
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: true
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false

public/configs/env.json

@@ -35,8 +35,6 @@
          "name": "v4 Dev",
          "ethereumChainId": "5",
          "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -96,8 +94,6 @@
          "name": "v4 Dev 2",
          "ethereumChainId": "5",
          "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -156,8 +152,6 @@
          "name": "v4 Dev 4",
          "ethereumChainId": "5",
          "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -216,8 +210,6 @@
          "name": "v4 Dev 5",
          "ethereumChainId": "5",
          "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -276,8 +268,6 @@
          "name": "v4 Staging",
          "ethereumChainId": "5",
          "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -340,8 +330,6 @@
          "name": "v4 Staging West",
          "ethereumChainId": "5",
          "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -404,8 +392,6 @@
          "name": "v4 Public Testnet",
          "ethereumChainId": "5",
          "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -470,8 +456,6 @@
          "name": "v4 Public Testnet/dYdX",
          "ethereumChainId": "5",
          "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -535,8 +519,6 @@
          "name": "v4 Public Testnet/DSRV",
          "ethereumChainId": "5",
          "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -600,8 +582,6 @@
          "name": "v4 Public Testnet/nodefleet",
          "ethereumChainId": "5",
          "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -665,8 +645,6 @@
          "name": "v4 Public Testnet/KingNodes",
          "ethereumChainId": "5",
          "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -730,8 +708,6 @@
          "name": "v4 Public Testnet/Liquify",
          "ethereumChainId": "5",
          "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -795,8 +771,6 @@
          "name": "v4",
          "ethereumChainId": "1",
          "dydxChainId": "[mainnet chain id]",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": true,
          "tokens": {
             "comment": "Change according to mainnet release",

public/configs/wallets.json

@@ -38,7 +38,8 @@
      "config":{
         "comment":"MetaMask",
         "iosMinVersion":"0",
-      "imageUrl": "",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/metamask.png",
+        "image":"metamask.png",
         "encoding":"=\"#%/<>?@\\^`{|}:&",
         "connections":[
            {
@@ -46,17 +47,10 @@
               "native":"metamask:",
               "universal":"https://metamask.app.link"
            }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData",
-        "wallet_addEthereumChain"
         ]
      },
      "userFields":{
-      "analyticEvent": "METAMASK",
+        "analyticEvent":"METAMASK"
-      "imageName": "metamask.png"
      }
   },
   {
@@ -96,7 +90,8 @@
      "config":{
         "comment":"Coinbase",
         "iosMinVersion":"1.8.0",
-      "imageUrl": "",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/coinbase-wallet.png",
+        "image":"coinbase-wallet.png",
         "encoding":"=\"#%/<>?@\\^`{|}:&",
         "connections":[
            {
@@ -104,17 +99,10 @@
               "native":"cbwallet:",
               "universal":""
            }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData",
-        "wallet_addEthereumChain"
         ]
      },
      "userFields":{
-      "analyticEvent": "COINBASE_WALLET",
+        "analyticEvent":"COINBASE_WALLET"
-      "imageName": "coinbase-wallet.png"
      }
   },
   {
@@ -154,23 +142,18 @@
      "config":{
         "comment":"imToken",
         "iosMinVersion":"0",
-      "imageUrl": "",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/imtoken.png",
+        "image":"imtoken.png",
         "connections":[
            {
-          "type": "walletConnectV2",
+              "type":"walletConnect",
               "native":"imtokenv2:",
               "universal":""
            }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
         ]
      },
      "userFields":{
-      "analyticEvent": "IMTOKEN",
+        "analyticEvent":"IMTOKEN"
-      "imageName": "imtoken.png"
      }
   },
   {
@@ -213,23 +196,18 @@
         "comment":"Trust Wallet",
         "iosMinVersion":"0",
         "encoding":"=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/trust-wallet.png",
+        "image":"trust-wallet.png",
         "connections":[
            {
               "type":"walletConnectV2",
               "native":"trust:",
               "universal":"https://link.trustwallet.com"
            }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
         ]
      },
      "userFields":{
-      "analyticEvent": "TRUST_WALLET",
+        "analyticEvent":"TRUST_WALLET"
-      "imageName": "trust-wallet.png"
      }
   },
   {
@@ -270,23 +248,18 @@
         "comment":"Zerion Wallet",
         "iosMinVersion":"0",
         "encoding":"=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/zerion.png",
+        "image":"zerion.png",
         "connections":[
            {
               "type":"walletConnectV2",
               "native":"zerion:",
               "universal":""
            }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
         ]
      },
      "userFields":{
-      "analyticEvent": "ZERION",
+        "analyticEvent":"ZERION"
-      "imageName": "zerion.png"
      }
   },
   {
@@ -326,23 +299,18 @@
      "config":{
         "comment":"TokenPocket",
         "iosMinVersion":"0",
-      "imageUrl": "",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/tokenpocket.png",
+        "image":"tokenpocket.png",
         "connections":[
            {
-          "type": "walletConnectV2",
+              "type":"walletConnect",
               "native":"tpoutside:",
               "universal":""
            }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
         ]
      },
      "userFields":{
-      "analyticEvent": "TOKEN_POCKET",
+        "analyticEvent":"TOKEN_POCKET"
-      "imageName": "tokenpocket.png"
      }
   },
   {
@@ -384,23 +352,18 @@
         "iosMinVersion":"0",
         "encoding":"=\"#%/<>?@\\^`{|}:&",
         "backlinked":true,
-      "imageUrl": "",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/rainbow-wallet.png",
+        "image":"rainbow-wallet.png",
         "connections":[
            {
               "type":"walletConnectV2",
               "native":"rainbow:",
               "universal":"https://rnbwapp.com"
            }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
         ]
      },
      "userFields":{
-      "analyticEvent": "RAINBOW_WALLET",
+        "analyticEvent":"RAINBOW_WALLET"
-      "imageName": "rainbow-wallet.png"
      }
   },
   {
@@ -442,23 +405,70 @@
         "comment":"1inch",
         "iosMinVersion":"0",
         "encoding":"=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/1inch.png",
+        "image":"1inch.png",
         "connections":[
            {
-          "type": "walletConnectV2",
+              "type":"walletConnect",
               "native":"oneinch:",
               "universal":"https://wallet.1inch.io"
            }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
         ]
      },
      "userFields":{
-      "analyticEvent": "1INCH",
+        "analyticEvent":"1INCH"
-      "imageName": "1inch.png"
+     }
+  },
+  {
+     "id":"bae74827272509a6d63ea25514d9c68ad235c14e45e183518c7ded4572a1b0c4",
+     "name":"Huobi Wallet",
+     "description":"",
+     "homepage":"https://huobiwallet.com/",
+     "chains":[
+        "eip155:1"
+     ],
+     "versions":[
+        "1"
+     ],
+     "app":{
+        "browser":"",
+        "ios":"https://apps.apple.com/us/app/id1433883012",
+        "android":"https://play.google.com/store/apps/details?id=com.huobionchainwallet.gp",
+        "mac":"",
+        "windows":"",
+        "linux":""
+     },
+     "mobile":{
+        "native":"huobiwallet:",
+        "universal":""
+     },
+     "desktop":{
+        "native":"",
+        "universal":""
+     },
+     "metadata":{
+        "shortName":"Huobi",
+        "colors":{
+           "primary":"rgb(45,101,248)",
+           "secondary":""
+        }
+     },
+     "config":{
+        "comment":"Huobi",
+        "iosMinVersion":"0",
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/huobi-wallet.png",
+        "image":"huobi-wallet.png",
+        "connections":[
+           {
+              "type":"walletConnect",
+              "native":"huobiwallet:",
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"HUOBI_WALLET"
      }
   }
 ]

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/lib/wagmi.ts

@@ -92,10 +92,11 @@ const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnect
   options: {
     projectId: import.meta.env.VITE_WALLETCONNECT2_PROJECT_ID,
     metadata: {
+      // TODO: update to local URLs/images
       name: 'dYdX',
       description: '',
-      url: import.meta.env.VITE_BASE_URL,
+      url: 'https://trade.dydx.exchange',
-      icons: [`${import.meta.env.VITE_BASE_URL}/cbw-image.png}`],
+      icons: ['https://trade.dydx.exchange/cbw-image.png'],
     },
     showQrModal: true,
     qrModalOptions: {

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/DisconnectDialog.tsx

@@ -27,9 +27,9 @@ export const DisconnectDialog = ({ setIsOpen }: ElementProps) => {
   };
 
   return (
-    <Dialog isOpen setIsOpen={setIsOpen} title={stringGetter({ key: STRING_KEYS.DISCONNECT })}>
+    <Dialog isOpen setIsOpen={setIsOpen} title="Disconnect">
       <Styled.Content>
-        <p>{stringGetter({ key: STRING_KEYS.DISCONNECT_CONFIRMATION })}</p>
+        <p>Are you sure you want to disconnect your account?</p>
         <Styled.ButtonRow>
           <Close asChild>
             <Button action={ButtonAction.Destroy} onClick={disconnect}>

src/views/dialogs/OnboardingDialog/ChooseWallet.tsx

@@ -19,7 +19,7 @@ import { useDisplayedWallets } from '@/hooks/useDisplayedWallets';
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
 
-const aboutWalletsLink = `https://www.dydx.academy/video/defi-wallet`;
+const aboutWalletsLink = `https://www.dydxacademy.info/educational-video-series/onboarding-to-defi-with-dydx`;
 
 export const ChooseWallet = () => {
   const stringGetter = useStringGetter();
@@ -34,14 +34,7 @@ export const ChooseWallet = () => {
         <Styled.AlertMessage type={AlertType.Error}>
           {
             <h4>
-              {stringGetter({
+              Couldn't connect to {stringGetter({ key: wallets[selectedWalletType].stringKey })}.
-                key: STRING_KEYS.COULD_NOT_CONNECT,
-                params: {
-                  WALLET: stringGetter({
-                    key: wallets[selectedWalletType].stringKey,
-                  }),
-                },
-              })}
             </h4>
           }
           {selectedWalletError}