Changed "exponents" to "decimals"

18 for adv4tnt, 6 for uusdc
Bump localStorage version to wipe EvmDerivedAddresses (#79 )
2023-10-17 15:35:57 -07:00 · 2023-10-17 14:52:39 -07:00 · 2023-10-17 14:49:51 -07:00 · 2023-10-17 17:42:41 -04:00 · 2023-10-17 17:12:50 -04:00 · 2023-10-17 13:37:26 -04:00
9 changed files with 100 additions and 104 deletions
@@ -42,12 +42,14 @@
            "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"
            }
         },
@@ -77,9 +79,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -103,12 +102,14 @@
            "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"
            }
         },
@@ -137,9 +138,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -163,12 +161,14 @@
            "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,9 +197,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -223,12 +220,14 @@
            "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"
            }
         },
@@ -257,9 +256,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -283,12 +279,14 @@
            "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"
            }
         },
@@ -321,9 +319,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -347,12 +342,14 @@
            "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"
            }
         },
@@ -385,9 +382,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -411,12 +405,14 @@
            "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"
            }
         },
@@ -451,9 +447,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -462,7 +455,7 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX V4 Onboarding",
+            "signTypedDataAction": "dYdX Chain Onboarding",
            "signTypedDataDomainName": "dYdX V4"
         }
      },
@@ -477,12 +470,14 @@
            "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"
            }
         },
@@ -516,9 +511,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -527,7 +519,7 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX V4 Onboarding",
+            "signTypedDataAction": "dYdX Chain Onboarding",
            "signTypedDataDomainName": "dYdX V4"
         }
      },
@@ -542,12 +534,14 @@
            "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"
            }
         },
@@ -581,9 +575,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -592,7 +583,7 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX V4 Onboarding",
+            "signTypedDataAction": "dYdX Chain Onboarding",
            "signTypedDataDomainName": "dYdX V4"
         }
      },
@@ -607,12 +598,14 @@
            "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"
            }
         },
@@ -646,9 +639,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -657,7 +647,7 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX V4 Onboarding",
+            "signTypedDataAction": "dYdX Chain Onboarding",
            "signTypedDataDomainName": "dYdX V4"
         }
      },
@@ -672,12 +662,14 @@
            "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"
            }
         },
@@ -711,9 +703,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -722,7 +711,7 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX V4 Onboarding",
+            "signTypedDataAction": "dYdX Chain Onboarding",
            "signTypedDataDomainName": "dYdX V4"
         }
      },
@@ -737,12 +726,14 @@
            "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"
            }
         },
@@ -776,9 +767,6 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
-               "v1": {
-                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
-               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -787,11 +775,11 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX V4 Onboarding",
+            "signTypedDataAction": "dYdX Chain Onboarding",
            "signTypedDataDomainName": "dYdX V4"
         }
      },
-      "dydxprotocol-mainet": {
+      "dydxprotocol-mainnet": {
         "name": "v4",
         "ethereumChainId": "1",
         "dydxChainId": "[mainnet chain id]",
@@ -803,12 +791,14 @@
            "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"
            }
         },
@@ -841,9 +831,6 @@
                  "description": "[Description of the app]",
                  "iconUrl": "[Relative URL of the icon URL]"
               },
-               "v1": {
-                  "bridgeUrl": "[Bridge URL]"
-               },
               "v2": {
                  "projectId": "[Project ID]"
               }
@@ -24,6 +24,6 @@ export enum LocalStorageKey {
 }

 export const LOCAL_STORAGE_VERSIONS = {
-  [LocalStorageKey.EvmDerivedAddresses]: 'v1',
+  [LocalStorageKey.EvmDerivedAddresses]: 'v2',
  // TODO: version all localStorage keys
 };
@@ -92,6 +92,24 @@ 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;
@@ -125,7 +143,6 @@ 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,
@@ -158,7 +175,6 @@ export const wallets: Record<WalletType, WalletConfig> = {
    icon: Coin98Icon,
    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
    matchesInjectedEip1193: (provider) => provider.isCoin98,
-    walletconnect2Id: '2a3c89040ac3b723a1972a33a125b1db11e258a6975d3a61252cd64e6ea5ea01',
  },
  [WalletType.HuobiWallet]: {
    type: WalletType.HuobiWallet,
@@ -166,7 +182,6 @@ export const wallets: Record<WalletType, WalletConfig> = {
    icon: HuobiIcon,
    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
    matchesInjectedEip1193: (provider) => provider.isHbWallet,
-    walletconnect2Id: '797c615e2c556b610c048eb35535f212c0dd58de5d03e763120e90a7d1350a77',
  },
  [WalletType.ImToken]: {
    type: WalletType.ImToken,
@@ -174,7 +189,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
    icon: ImTokenIcon,
    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
    matchesInjectedEip1193: (provider) => provider.isImToken,
-    walletconnect2Id: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
+    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.imToken,
  },
  [WalletType.MathWallet]: {
    type: WalletType.MathWallet,
@@ -190,7 +205,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
    icon: MetaMaskIcon,
    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
    matchesInjectedEip1193: isMetaMask,
-    walletconnect2Id: 'c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96',
+    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Metamask,
  },
  [WalletType.Rainbow]: {
    type: WalletType.Rainbow,
@@ -198,7 +213,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
    icon: RainbowIcon,
    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
    matchesInjectedEip1193: (provider) => provider.isRainbowWallet,
-    walletconnect2Id: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
+    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Rainbow,
  },
  [WalletType.TokenPocket]: {
    type: WalletType.TokenPocket,
@@ -206,7 +221,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
    icon: TokenPocketIcon,
    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
    matchesInjectedEip1193: (provider) => provider.isTokenPocket,
-    walletconnect2Id: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
+    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.TokenPocket,
  },
  [WalletType.TrustWallet]: {
    type: WalletType.TrustWallet,
@@ -214,7 +229,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
    icon: TrustWalletIcon,
    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
    matchesInjectedEip1193: (provider) => provider.isTrust,
-    walletconnect2Id: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
+    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Trust,
  },
  [WalletType.WalletConnect2]: {
    type: WalletType.WalletConnect2,
@@ -287,10 +302,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-3',
+  chainId: 'dydx-testnet-4',
  chainName: 'dYdX Public Testnet',
  chainSymbolImageUrl:
-    'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-3/chain.png',
+    'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-4/chain.png',
  bech32Config: {
    bech32PrefixAccPub: 'dydxpub',
    bech32PrefixValPub: 'dydxvaloperpub',
@@ -304,26 +319,31 @@ export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
  },
  stakeCurrency: {
    coinDenom: 'DV4TNT',
-    coinDecimals: 6,
-    coinMinimalDenom: 'dv4tnt',
+    coinDecimals: 18,
+    coinMinimalDenom: 'adv4tnt',
  },
  currencies: [
    {
      coinDenom: 'DV4TNT',
-      coinDecimals: 6,
-      coinMinimalDenom: 'dv4tnt',
+      coinDecimals: 18,
+      coinMinimalDenom: 'adv4tnt',
    },
    {
      coinDenom: 'USDC',
-      coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
      coinDecimals: 6,
+      coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
    },
  ],
  feeCurrencies: [
    {
      coinDenom: 'DV4TNT',
+      coinDecimals: 18,
+      coinMinimalDenom: 'adv4tnt',
+    },
+    {
+      coinDenom: 'USDC',
      coinDecimals: 6,
-      coinMinimalDenom: 'dv4tnt',
+      coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
    },
  ],
  features: [],
@@ -110,18 +110,18 @@ export const notificationTypes = [
      const stringGetter = useStringGetter();
      const { transferNotifications } = useLocalNotifications();

-      const getTitleStringKey = useCallback((type: 'deposit' | 'withdraw', finished: boolean) => {
+      const getTitleStringKey = useCallback((type: 'deposit' | 'withdrawal', finished: boolean) => {
        if (type === 'deposit' && !finished) return STRING_KEYS.DEPOSIT_IN_PROGRESS;
        if (type === 'deposit' && finished) return STRING_KEYS.DEPOSIT;
-        if (type === 'withdraw' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
+        if (type === 'withdrawal' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
        return STRING_KEYS.WITHDRAW;
      }, []);

      useEffect(() => {
        for (const transfer of transferNotifications) {
-          const { toChainId, status, txHash, toAmount } = transfer;
+          const { fromChainId, status, txHash, toAmount } = transfer;
          const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
-          const type = toChainId === TESTNET_CHAIN_ID ? 'deposit' : 'withdraw';
+          const type = fromChainId === TESTNET_CHAIN_ID ? 'withdrawal' : 'deposit';
          // @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,6 +154,7 @@ export const notificationTypes = [
              description: description,
              customContent: (
                <TransferStatusToast
+                  type={type}
                  toAmount={transfer.toAmount}
                  triggeredAt={transfer.triggeredAt}
                  status={transfer.status}
@@ -162,7 +163,7 @@ export const notificationTypes = [
              customMenuContent: !finished && (
                <div>
                  {description}
-                  <TransferStatusSteps status={transfer.status} />
+                  <TransferStatusSteps status={transfer.status} type={type} />
                </div>
              ),
              toastSensitivity: 'foreground',
@@ -30,7 +30,7 @@ export const useSelectedNetwork = (): {
  useEffect(() => {
    if (
      import.meta.env.MODE === 'production' &&
-      ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-3'
+      ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-4'
    ) {
      dispatch(
        openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } })
@@ -36,7 +36,15 @@ 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 { WalletConnectLegacyConnector } from 'wagmi/connectors/walletConnectLegacy';
+
+import {
+  type WalletConnection,
+  WalletConnectionType,
+  type WalletType,
+  walletConnectionTypes,
+  wallets,
+  WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
+} from '@/constants/wallets';

 // Config

@@ -101,20 +109,10 @@ const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnect
    qrModalOptions: {
      themeMode: 'dark' as const,
      themeVariables: {
-        '--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',
+        '--wcm-accent-color': '#5973fe',
+        '--wcm-font-family': 'var(--fontFamily-base)',
      },
-      enableExplorer: true,
-      explorerAllowList: [],
-      explorerDenyList: [],
-      chainImages: {},
+      explorerRecommendedWalletIds: WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
    },
  },
 };
@@ -124,7 +122,6 @@ const connectors = [
    chains,
    options: {
      shimDisconnect: true,
-      shimChainChangedDisconnect: false,
    },
  }),
  new CoinbaseWalletConnector({
@@ -165,19 +162,11 @@ 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,
@@ -1,6 +1,5 @@
 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';

@@ -21,12 +20,14 @@ 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,
@@ -38,11 +39,6 @@ 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;
@@ -69,7 +65,7 @@ export const TransferStatusToast = ({
        side="bottom"
        slotReceipt={
          <Styled.Receipt>
-            <TransferStatusSteps status={status} />
+            <TransferStatusSteps status={status} type={type} />
          </Styled.Receipt>
        }
      >
@@ -1,7 +1,6 @@
 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';

@@ -15,6 +14,7 @@ import { STRING_KEYS } from '@/constants/localization';

 type ElementProps = {
  status?: StatusResponse;
+  type: 'withdrawal' | 'deposit';
 };

 enum TransferStatusStep {
@@ -24,14 +24,13 @@ enum TransferStatusStep {
  Complete,
 }

-export const TransferStatusSteps = ({ status }: ElementProps) => {
+export const TransferStatusSteps = ({ status, type }: ElementProps) => {
  const stringGetter = useStringGetter();

-  const { currentStep, steps, type } = useMemo(() => {
+  const { currentStep, steps } = 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 = [
      {
@@ -74,6 +73,10 @@ export const TransferStatusSteps = ({ status }: ElementProps) => {
      currentStep = TransferStatusStep.FromChain;
    }

+    if (status?.squidTransactionStatus === 'success') {
+      currentStep = TransferStatusStep.Complete;
+    }
+
    return {
      currentStep,
      steps,
@@ -34,7 +34,7 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps)

  const showOfflineMessage =
    import.meta.env.MODE === 'production' &&
-    ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-3';
+    ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId === 'dydx-testnet-4';

  useEffect(() => {
    if (
Author	SHA1	Message	Date
John Huang	2e04ef2ef5	Changed "exponents" to "decimals"	2023-10-17 15:35:57 -07:00
John Huang	b0263c0658	18 for adv4tnt, 6 for uusdc	2023-10-17 14:52:39 -07:00
Jared Vu	ea58b55152	Bump localStorage version to wipe EvmDerivedAddresses (#79 )	2023-10-17 14:49:51 -07:00
aleka	54d65bb81c	override walletconnect explorer recs (#81 )	2023-10-17 17:42:41 -04:00
aleka	e047a49bbc	remove wc1 support and fix typo in env.json (#82 )	2023-10-17 17:12:50 -04:00
aleka	14316163e4	Revert "remove offline message for testnet4 (#76 )" (#78 ) This reverts commit `ac619a9da1`.	2023-10-17 13:37:26 -04:00
aleka	ac619a9da1	remove offline message for testnet4 (#76 )	2023-10-17 13:03:50 -04:00
Bill	cb7f542a99	Onboarding status do not rely on squidAPI to determine if deposit/withdraw (#73 )	2023-10-16 17:35:07 -07:00
aleka	bc5569c4c9	testnet4 followup, switch offline msg (#75 )	2023-10-16 17:26:29 -04:00
John Huang	dd087ae786	TRCL-3010 Change test net chain ID and token denom (#74 )	2023-10-16 17:26:21 -04:00
aleka	eb023ff0ff	update signing message for testnet for reset (#72 )	2023-10-16 16:44:29 -04:00