address comments

Onboarding error handling
temp
2023-09-19 23:20:53 -07:00 · 2023-09-18 21:58:30 -07:00 · 2023-09-18 16:31:46 -07:00
136 changed files with 1541 additions and 4432 deletions
@@ -0,0 +1,6 @@
+VITE_BASE_URL=https://v4.testnet.dydx.exchange
+
+VITE_ALCHEMY_API_KEY=FP275q327Yh7qswtZWenbPXdZZdnAFmC
+
+VITE_WALLETCONNECT1_BRIDGE=wss://api.dydx.exchange/wc/
+VITE_WALLETCONNECT2_PROJECT_ID=fbe94eaa691fa8d929561f8567062b32
@@ -4,6 +4,5 @@ VITE_ALCHEMY_API_KEY=

 VITE_PK_ENCRYPTION_KEY=

+VITE_WALLETCONNECT1_BRIDGE=
 VITE_WALLETCONNECT2_PROJECT_ID=
-
-VITE_V3_TOKEN_ADDRESS=
@@ -33,13 +33,11 @@ jobs:
          AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
          BUGSNAG_API_KEY: ${{ secrets.BUGSNAG_API_KEY }}
          STATUS_PAGE_SCRIPT_URI: ${{ secrets.STATUS_PAGE_SCRIPT_URI }}
-          IOS_APP_ID: ${{ secrets.IOS_APP_ID }}
        run: |
          pnpm run build
          pnpm run build:inject-amplitude
          pnpm run build:inject-bugsnag
          pnpm run build:inject-statuspage
-          sh scripts/inject-app-deeplinks.sh

      - name: Upload to IPFS via web3.storage
        uses: dydxprotocol/add-to-web3@v1
@@ -13,7 +13,6 @@ dist
 dist-ssr
 *.local
 *.key
-.env

 # Editor directories and files
 .vscode/*
@@ -11,7 +11,6 @@
 ## Prerequisites

 - Node.js version 18 and `pnpm` installed on your system
- Wallet Connect account

 For deploying with Vercel, create an account with [Vercel](https://vercel.com/signup) if you don't have one already.

@@ -62,14 +61,7 @@ pnpm ladle

 This will automatically open your default browser at `http://localhost:61000`.

-## Part 3: Configuring environment
-
-Add or modify the relevant endpoints, links and options in `/public/configs/env.json`.
-You'll need to provide a Wallet Connect project id to enable onboarding and wallet connection:
- Create a project on https://cloud.walletconnect.com/app
- Copy over the project ID into this [field](https://github.com/dydxprotocol/v4-web/blob/67ecbd75b43e0c264b7b4d2d9b3d969830b0621c/public/configs/env.json#L822C33-L822C46)
-
-## Part 4: Deploying with Vercel
+## Part 3: Deploying with Vercel

 ### Step 1: Connect your repository to Vercel

@@ -86,7 +78,7 @@ If you wish to incorporate analytics via Amplitude and Bugsnag, you can use our

 For more details, check out Vercel's [official documentation](https://vercel.com/docs).

-## Part 5: Deploying to IPFS
+## Part 4: Deploying to IPFS

 ### web3.storage: deploy to IPFS via web3.storage using the provided script

@@ -10,7 +10,6 @@
  "scripts": {
    "dev": "vite",
    "build": "vite build",
-    "build:inject-app-deeplinks": "sh scripts/inject-app-deeplinks.sh",
    "build:inject-amplitude": "node scripts/inject-amplitude.js",
    "build:inject-bugsnag": "node scripts/inject-bugsnag.js",
    "build:inject-statuspage": "node scripts/inject-statuspage.js",
@@ -38,9 +37,9 @@
    "@cosmjs/proto-signing": "^0.31.0",
    "@cosmjs/stargate": "^0.31.0",
    "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^0.7.2",
-    "@dydxprotocol/v4-client-js": "^0.40.3",
-    "@dydxprotocol/v4-localization": "^0.1.32",
+    "@dydxprotocol/v4-abacus": "^0.4.28",
+    "@dydxprotocol/v4-client-js": "^0.36.1",
+    "@dydxprotocol/v4-localization": "^0.1.8",
    "@ethersproject/providers": "^5.7.2",
    "@js-joda/core": "^5.5.3",
    "@radix-ui/react-collapsible": "^1.0.3",
@@ -106,7 +105,7 @@
    "reselect": "^4.1.8",
    "styled-components": "^5.3.11",
    "use-latest": "^1.2.1",
-    "viem": "^1.12.2",
+    "viem": "^1.1.6",
    "wagmi": "^1.3.7"
  },
  "devDependencies": {
@@ -27,14 +27,14 @@ dependencies:
    specifier: ^0.31.0
    version: 0.31.0
  '@dydxprotocol/v4-abacus':
-    specifier: ^0.7.2
-    version: 0.7.2
+    specifier: ^0.4.28
+    version: 0.4.28
  '@dydxprotocol/v4-client-js':
-    specifier: ^0.40.3
-    version: 0.40.3
+    specifier: ^0.36.1
+    version: 0.36.1
  '@dydxprotocol/v4-localization':
-    specifier: ^0.1.32
-    version: 0.1.32
+    specifier: ^0.1.8
+    version: 0.1.8
  '@ethersproject/providers':
    specifier: ^5.7.2
    version: 5.7.2
@@ -231,11 +231,11 @@ dependencies:
    specifier: ^1.2.1
    version: 1.2.1(@types/react@18.2.14)(react@18.2.0)
  viem:
-    specifier: ^1.12.2
-    version: 1.12.2(typescript@5.1.3)
+    specifier: ^1.1.6
+    version: 1.1.6(typescript@5.1.3)
  wagmi:
    specifier: ^1.3.7
-    version: 1.3.7(@types/react@18.2.14)(react-dom@18.2.0)(react@18.2.0)(typescript@5.1.3)(viem@1.12.2)
+    version: 1.3.7(@types/react@18.2.14)(react-dom@18.2.0)(react@18.2.0)(typescript@5.1.3)(viem@1.1.6)

 devDependencies:
  '@babel/core':
@@ -380,12 +380,12 @@ packages:
    engines: {node: '>=0.10.0'}
    dev: true

-  /@adraffy/ens-normalize@1.9.2:
-    resolution: {integrity: sha512-0h+FrQDqe2Wn+IIGFkTCd4aAwTJ+7834Ek1COohCyV26AXhwQ7WQaz+4F/nLOeVl/3BtWHOHLPsq46V8YB46Eg==}
+  /@adraffy/ens-normalize@1.9.0:
+    resolution: {integrity: sha512-iowxq3U30sghZotgl4s/oJRci6WPBfNO5YYgk2cIOMCHr3LeGPcsZjCEr+33Q4N+oV3OABDAtA+pyvWjbvBifQ==}
    dev: false

-  /@adraffy/ens-normalize@1.9.4:
-    resolution: {integrity: sha512-UK0bHA7hh9cR39V+4gl2/NnBBjoXIxkuWAPCaY4X7fbH4L/azIi7ilWOCjMUYfpJgraLUAqkRi2BqrjME8Rynw==}
+  /@adraffy/ens-normalize@1.9.2:
+    resolution: {integrity: sha512-0h+FrQDqe2Wn+IIGFkTCd4aAwTJ+7834Ek1COohCyV26AXhwQ7WQaz+4F/nLOeVl/3BtWHOHLPsq46V8YB46Eg==}
    dev: false

  /@ampproject/remapping@2.2.1:
@@ -645,7 +645,7 @@ packages:
  /@confio/ics23@0.6.8:
    resolution: {integrity: sha512-wB6uo+3A50m0sW/EWcU64xpV/8wShZ6bMTa7pF8eYsTrSkQA7oLUIJcs/wb8g4y2Oyq701BaGiO6n/ak5WXO1w==}
    dependencies:
-      '@noble/hashes': 1.3.2
+      '@noble/hashes': 1.3.1
      protobufjs: 6.11.4
    dev: false

@@ -717,7 +717,7 @@ packages:
      '@cosmjs/encoding': 0.30.1
      '@cosmjs/math': 0.30.1
      '@cosmjs/utils': 0.30.1
-      '@noble/hashes': 1.3.2
+      '@noble/hashes': 1.3.1
      bn.js: 5.2.1
      elliptic: 6.5.4
      libsodium-wrappers: 0.7.11
@@ -979,12 +979,12 @@ packages:
    resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
    dev: true

-  /@dydxprotocol/v4-abacus@0.7.2:
-    resolution: {integrity: sha512-5foamomN82FH6ko3EuzwFlSoAEY6Sal8fDgvZo2RsB19Ks6SFgFDeeOcEDdfoa3DNwvl8yW0C9cfxeQ+BfU8uA==}
+  /@dydxprotocol/v4-abacus@0.4.28:
+    resolution: {integrity: sha512-RQGTXI7q4HAXDmlUpDhpJDLN8C0dFMgKHzFITK1Sz3KnLb3mkkpqEU1D8VIn/hB7ngt+equMsLFSkUwzXCzgdA==}
    dev: false

-  /@dydxprotocol/v4-client-js@0.40.3:
-    resolution: {integrity: sha512-nMQd6tYisKDKIbfx0BGJSYEOSt+I+t5SsaBSmlgTdso+w2rCRO9vyxS+u6MF9h4w5FsVRfhHo3e6uTWX48WpGQ==}
+  /@dydxprotocol/v4-client-js@0.36.1:
+    resolution: {integrity: sha512-KJ3MtWI61wmm+xZtXQd7/hYKIoVFG32TRdyyVaXXO8vpW9Oqd0JD8QSM/wuegkciAh5YmP/BrDzYuu77zHO6yg==}
    dependencies:
      '@cosmjs/amino': 0.30.1
      '@cosmjs/encoding': 0.31.1
@@ -993,15 +993,14 @@ packages:
      '@cosmjs/stargate': 0.30.1
      '@cosmjs/tendermint-rpc': 0.30.1
      '@cosmjs/utils': 0.31.1
-      '@dydxprotocol/v4-proto': 0.4.1
+      '@dydxprotocol/v4-proto': 0.2.1
      '@osmonauts/lcd': 0.6.0
-      '@scure/bip32': 1.3.2
+      '@scure/bip32': 1.3.1
      '@scure/bip39': 1.2.1
      axios: 1.1.3
      bech32: 1.1.4
      bignumber.js: 9.1.1
      ethereum-cryptography: 2.1.2
-      ethers: 6.6.1
      long: 4.0.0
      protobufjs: 6.11.4
      ws: 8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10)
@@ -1011,12 +1010,12 @@ packages:
      - utf-8-validate
    dev: false

-  /@dydxprotocol/v4-localization@0.1.32:
-    resolution: {integrity: sha512-ZtXScxgFLjUt0Ag52RyFnQe9aEl1Aky5fp+vMGOBduVkFiCEMRMkSsSgg6grMdyw/x0AbnxOTRkhYoX2MsK9Ow==}
+  /@dydxprotocol/v4-localization@0.1.8:
+    resolution: {integrity: sha512-ZuM/V2tLVSWyi9pDZLOu8h6HScrzKlFftQ/1iBPNIOU4bBMx83vYgokm0X9hzueWzz0PJ2pzT+EoN81sPlN2bg==}
    dev: false

-  /@dydxprotocol/v4-proto@0.4.1:
-    resolution: {integrity: sha512-2pBkokufWcxfIpiXE6QuQOBXUe154OTp6ojCIdOPW9TFLxzchoygxXnb5dL6rAQVNj9Qbg+hhXBllutt4m99dw==}
+  /@dydxprotocol/v4-proto@0.2.1:
+    resolution: {integrity: sha512-Q5b/g331DoyMjBpO2/jtrxUX3WF5UaIKZp/unK332xuefHNFnkMYtZ05p0V71iSdO35tBdz8yt0VYP2WtUsp+w==}
    dependencies:
      protobufjs: 6.11.4
    dev: false
@@ -2033,12 +2032,6 @@ packages:
      '@noble/hashes': 1.3.1
    dev: false

-  /@noble/curves@1.2.0:
-    resolution: {integrity: sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==}
-    dependencies:
-      '@noble/hashes': 1.3.2
-    dev: false
-
  /@noble/ed25519@1.7.3:
    resolution: {integrity: sha512-iR8GBkDt0Q3GyaVcIu7mSsVIqnFbkbRzGLWlvhwunacoLwt4J3swfKhfaM6rN6WY+TBGoYT1GtT1mIh2/jGbRQ==}
    dev: true
@@ -2056,11 +2049,6 @@ packages:
    engines: {node: '>= 16'}
    dev: false

-  /@noble/hashes@1.3.2:
-    resolution: {integrity: sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==}
-    engines: {node: '>= 16'}
-    dev: false
-
  /@noble/secp256k1@1.7.1:
    resolution: {integrity: sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==}

@@ -4659,7 +4647,7 @@ packages:
    resolution: {integrity: sha512-gYw0ki/EAuV1oSyMxpqandHjnthZjYYy+YWpTAzf8BqfXM3ItcZLpjxfg+3+mXW8HIO+3jw6T9iiqEXsqHaMMw==}
    dependencies:
      '@safe-global/safe-gateway-typescript-sdk': 3.9.0
-      viem: 1.12.2(typescript@5.1.3)
+      viem: 1.1.6(typescript@5.1.3)
    transitivePeerDependencies:
      - bufferutil
      - encoding
@@ -4672,7 +4660,7 @@ packages:
    resolution: {integrity: sha512-XJbEPuaVc7b9n23MqlF6c+ToYIS3f7P2Sel8f3cSBQ9WORE4xrSuvhMpK9fDSFqJ7by/brc+rmJR/5HViRr0/w==}
    dependencies:
      '@safe-global/safe-gateway-typescript-sdk': 3.9.0
-      viem: 1.12.2(typescript@5.1.3)
+      viem: 1.1.6(typescript@5.1.3)
    transitivePeerDependencies:
      - bufferutil
      - encoding
@@ -4693,10 +4681,6 @@ packages:
    resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
    dev: false

-  /@scure/base@1.1.3:
-    resolution: {integrity: sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q==}
-    dev: false
-
  /@scure/bip32@1.3.0:
    resolution: {integrity: sha512-bcKpo1oj54hGholplGLpqPHRbIsnbixFtc06nwuNM5/dwSXOq/AAYoIBRsBmnZJSdfeNW5rnff7NTAz3ZCqR9Q==}
    dependencies:
@@ -4709,16 +4693,8 @@ packages:
    resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==}
    dependencies:
      '@noble/curves': 1.1.0
-      '@noble/hashes': 1.3.2
-      '@scure/base': 1.1.3
-    dev: false
-
-  /@scure/bip32@1.3.2:
-    resolution: {integrity: sha512-N1ZhksgwD3OBlwTv3R6KFEcPojl/W4ElJOeCZdi+vuI5QmTFwLq3OFf2zd2ROpKvxFdgZ6hUpb0dx9bVNEwYCA==}
-    dependencies:
-      '@noble/curves': 1.2.0
-      '@noble/hashes': 1.3.2
-      '@scure/base': 1.1.3
+      '@noble/hashes': 1.3.1
+      '@scure/base': 1.1.1
    dev: false

  /@scure/bip39@1.2.0:
@@ -4731,8 +4707,8 @@ packages:
  /@scure/bip39@1.2.1:
    resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==}
    dependencies:
-      '@noble/hashes': 1.3.2
-      '@scure/base': 1.1.3
+      '@noble/hashes': 1.3.1
+      '@scure/base': 1.1.1
    dev: false

  /@solana/buffer-layout@4.0.1:
@@ -4746,8 +4722,8 @@ packages:
    resolution: {integrity: sha512-up5VG1dK+GPhykmuMIozJZBbVqpm77vbOG6/r5dS7NBGZonwHfTLdBbsYc3rjmaQ4DpCXUa3tUc4RZHRORvZrw==}
    dependencies:
      '@babel/runtime': 7.22.10
-      '@noble/curves': 1.2.0
-      '@noble/hashes': 1.3.2
+      '@noble/curves': 1.1.0
+      '@noble/hashes': 1.3.1
      '@solana/buffer-layout': 4.0.1
      agentkeepalive: 4.5.0
      bigint-buffer: 1.1.5
@@ -5432,12 +5408,6 @@ packages:
      '@types/node': 20.3.1
    dev: false

-  /@types/ws@8.5.6:
-    resolution: {integrity: sha512-8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg==}
-    dependencies:
-      '@types/node': 20.3.1
-    dev: false
-
  /@typescript-eslint/eslint-plugin@5.60.0(@typescript-eslint/parser@5.60.0)(eslint@8.43.0)(typescript@5.1.3):
    resolution: {integrity: sha512-78B+anHLF1TI8Jn/cD0Q00TBYdMgjdOn980JfAVa9yw5sop8nyTfVOQAv6LWywkOGLclDBtv5z3oxN4w7jxyNg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5934,6 +5904,17 @@ packages:
      pretty-format: 27.5.1
    dev: true

+  /@wagmi/chains@1.2.0(typescript@5.1.3):
+    resolution: {integrity: sha512-dmDRipsE54JfyudOBkuhEexqQWcrZqxn/qiujG8SBzMh/az/AH5xlJSA+j1CPWTx9+QofSMF3B7A4gb6XRmSaQ==}
+    peerDependencies:
+      typescript: '>=5.0.4'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      typescript: 5.1.3
+    dev: false
+
  /@wagmi/chains@1.4.0(typescript@5.1.3):
    resolution: {integrity: sha512-9HwJrhcZ1TxyrCbE10y7s1eSiSiyfGam7AHIOLYExaOX+vpOZ+MNTt4orFEDbEpz1fxwJDPPI38lanAUix1OSA==}
    peerDependencies:
@@ -5945,7 +5926,7 @@ packages:
      typescript: 5.1.3
    dev: false

-  /@wagmi/connectors@2.6.5(@wagmi/chains@1.4.0)(react@18.2.0)(typescript@5.1.3)(viem@1.12.2):
+  /@wagmi/connectors@2.6.5(@wagmi/chains@1.4.0)(react@18.2.0)(typescript@5.1.3)(viem@1.1.6):
    resolution: {integrity: sha512-klF31togMDd0qQqEcLl5cCGxjMbL0RRXQ8I1vxmEa3KdGzw6Z3ICVzX7/bDfnNEZcOW7BKyAnZDq7rCt5jTOiw==}
    peerDependencies:
      '@wagmi/chains': '>=1.3.0'
@@ -5969,7 +5950,7 @@ packages:
      abitype: 0.8.7(typescript@5.1.3)
      eventemitter3: 4.0.7
      typescript: 5.1.3
-      viem: 1.12.2(typescript@5.1.3)
+      viem: 1.1.6(typescript@5.1.3)
    transitivePeerDependencies:
      - '@react-native-async-storage/async-storage'
      - bufferutil
@@ -5981,7 +5962,7 @@ packages:
      - zod
    dev: false

-  /@wagmi/core@1.3.6(@types/react@18.2.14)(react@18.2.0)(typescript@5.1.3)(viem@1.12.2):
+  /@wagmi/core@1.3.6(@types/react@18.2.14)(react@18.2.0)(typescript@5.1.3)(viem@1.1.6):
    resolution: {integrity: sha512-TXv9ZlRR5aySfERFuWMuo+lKXC/CoqtxVJZVHPqhK1jY+nldMx3AvrWzzF4CccRaMYcVdvPFepvmxzq2A2VvWg==}
    peerDependencies:
      typescript: '>=5.0.4'
@@ -5991,11 +5972,11 @@ packages:
        optional: true
    dependencies:
      '@wagmi/chains': 1.4.0(typescript@5.1.3)
-      '@wagmi/connectors': 2.6.5(@wagmi/chains@1.4.0)(react@18.2.0)(typescript@5.1.3)(viem@1.12.2)
+      '@wagmi/connectors': 2.6.5(@wagmi/chains@1.4.0)(react@18.2.0)(typescript@5.1.3)(viem@1.1.6)
      abitype: 0.8.7(typescript@5.1.3)
      eventemitter3: 4.0.7
      typescript: 5.1.3
-      viem: 1.12.2(typescript@5.1.3)
+      viem: 1.1.6(typescript@5.1.3)
      zustand: 4.4.1(@types/react@18.2.14)(react@18.2.0)
    transitivePeerDependencies:
      - '@react-native-async-storage/async-storage'
@@ -6696,20 +6677,6 @@ packages:
      typescript: 5.1.3
    dev: false

-  /abitype@0.9.8(typescript@5.1.3):
-    resolution: {integrity: sha512-puLifILdm+8sjyss4S+fsUN09obiT1g2YW6CtcQF+QDzxR0euzgEB29MZujC6zMk2a6SVmtttq1fc6+YFA7WYQ==}
-    peerDependencies:
-      typescript: '>=5.0.4'
-      zod: ^3 >=3.19.1
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-      zod:
-        optional: true
-    dependencies:
-      typescript: 5.1.3
-    dev: false
-
  /abort-controller@3.0.0:
    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
    engines: {node: '>=6.5'}
@@ -7145,7 +7112,7 @@ packages:
  /bip39@3.1.0:
    resolution: {integrity: sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==}
    dependencies:
-      '@noble/hashes': 1.3.2
+      '@noble/hashes': 1.3.1
    dev: false

  /bl@5.1.0:
@@ -10019,12 +9986,12 @@ packages:
      ws: 7.5.9
    dev: false

-  /isomorphic-ws@5.0.0(ws@8.13.0):
+  /isomorphic-ws@5.0.0(ws@8.12.0):
    resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
    peerDependencies:
      ws: '*'
    dependencies:
-      ws: 8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10)
+      ws: 8.12.0
    dev: false

  /it-all@1.0.6:
@@ -13553,24 +13520,21 @@ packages:
      vfile-message: 3.1.4
    dev: true

-  /viem@1.12.2(typescript@5.1.3):
-    resolution: {integrity: sha512-aCaUCyg72ES+jK4s6tVYOMnOt4if71RwzgiUAUpAuaCgvHFfh9DCnwuEfwkxEZLE2vafOsirgJ3fcn7nsDVQoQ==}
+  /viem@1.1.6(typescript@5.1.3):
+    resolution: {integrity: sha512-7nK3HMucLr1Yz0QnDXiD6viigKS6QeYD/YhRHpi3Bby/g0hCyZqK8+YJNtp3/Ri64tpl4kaTIeCScJWV2jqXHQ==}
    peerDependencies:
      typescript: '>=5.0.4'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
    dependencies:
-      '@adraffy/ens-normalize': 1.9.4
-      '@noble/curves': 1.2.0
-      '@noble/hashes': 1.3.2
-      '@scure/bip32': 1.3.2
-      '@scure/bip39': 1.2.1
-      '@types/ws': 8.5.6
-      abitype: 0.9.8(typescript@5.1.3)
-      isomorphic-ws: 5.0.0(ws@8.13.0)
+      '@adraffy/ens-normalize': 1.9.0
+      '@noble/curves': 1.0.0
+      '@noble/hashes': 1.3.0
+      '@scure/bip32': 1.3.0
+      '@scure/bip39': 1.2.0
+      '@wagmi/chains': 1.2.0(typescript@5.1.3)
+      abitype: 0.8.7(typescript@5.1.3)
+      isomorphic-ws: 5.0.0(ws@8.12.0)
      typescript: 5.1.3
-      ws: 8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10)
+      ws: 8.12.0
    transitivePeerDependencies:
      - bufferutil
      - utf-8-validate
@@ -13738,7 +13702,7 @@ packages:
      - supports-color
    dev: true

-  /wagmi@1.3.7(@types/react@18.2.14)(react-dom@18.2.0)(react@18.2.0)(typescript@5.1.3)(viem@1.12.2):
+  /wagmi@1.3.7(@types/react@18.2.14)(react-dom@18.2.0)(react@18.2.0)(typescript@5.1.3)(viem@1.1.6):
    resolution: {integrity: sha512-n4Qwby0QB8/JSGjc0gGn4MWZ0BT229agEg6saPGS6VswmPjJLdkLq9qxKn1JptXxPREmb/ZvwHxU++3Z+gQJVA==}
    peerDependencies:
      react: '>=17.0.0'
@@ -13751,12 +13715,12 @@ packages:
      '@tanstack/query-sync-storage-persister': 4.32.6
      '@tanstack/react-query': 4.32.6(react-dom@18.2.0)(react@18.2.0)
      '@tanstack/react-query-persist-client': 4.32.6(@tanstack/react-query@4.32.6)
-      '@wagmi/core': 1.3.6(@types/react@18.2.14)(react@18.2.0)(typescript@5.1.3)(viem@1.12.2)
+      '@wagmi/core': 1.3.6(@types/react@18.2.14)(react@18.2.0)(typescript@5.1.3)(viem@1.1.6)
      abitype: 0.8.7(typescript@5.1.3)
      react: 18.2.0
      typescript: 5.1.3
      use-sync-external-store: 1.2.0(react@18.2.0)
-      viem: 1.12.2(typescript@5.1.3)
+      viem: 1.1.6(typescript@5.1.3)
    transitivePeerDependencies:
      - '@react-native-async-storage/async-storage'
      - '@types/react'
@@ -13981,6 +13945,19 @@ packages:
        optional: true
    dev: false

+  /ws@8.12.0:
+    resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+    dev: false
+
  /ws@8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10):
    resolution: {integrity: sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==}
    engines: {node: '>=10.0.0'}
@@ -4,7 +4,7 @@
        "details": [
            {
                "appIDs": [
-                    "{PLACE_YOUR_APP_ID_HERE}"
+                    "75C6UARB5H.exchangeV4.dydx.trading"
                ],
                "components": [
                    {
@@ -1,847 +0,0 @@
-{
-   "deployments": {
-      "MAINNET": {
-         "environments": [
-            "dydxprotocol-mainnet"
-         ],
-         "default": "dydxprotocol-mainnet"
-      },
-      "TESTNET": {
-         "environments": [
-            "dydxprotocol-testnet"
-         ],
-         "default": "dydxprotocol-testnet"
-      },
-      "DEV": {
-         "environments": [
-            "dydxprotocol-dev",
-            "dydxprotocol-dev-2",
-            "dydxprotocol-dev-4",
-            "dydxprotocol-dev-5",
-            "dydxprotocol-staging",
-            "dydxprotocol-staging-west",
-            "dydxprotocol-testnet",
-            "dydxprotocol-testnet-dydx",
-            "dydxprotocol-testnet-dsrv",
-            "dydxprotocol-testnet-nodefleet",
-            "dydxprotocol-testnet-kingnodes",
-            "dydxprotocol-testnet-liquify"
-         ],
-         "default": "dydxprotocol-testnet"
-      }
-   },
-   "environments": {
-      "dydxprotocol-dev": {
-         "name": "v4 Dev",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "http://indexer.v4dev.dydx.exchange",
-                  "socket": "wss://indexer.v4dev.dydx.exchange"
-               }
-            ],
-            "validators": [
-               "http://validator.v4dev.dydx.exchange"
-            ],
-            "0xsquid": "https://testnet.api.0xsquid.com",
-            "faucet": "http://faucet.v4dev.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX Chain"
-         }
-      },
-      "dydxprotocol-dev-2": {
-         "name": "v4 Dev 2",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "http://dev2-indexer-apne1-lb-public-2076363889.ap-northeast-1.elb.amazonaws.com",
-                  "socket": "ws://dev2-indexer-apne1-lb-public-2076363889.ap-northeast-1.elb.amazonaws.com"
-               }
-            ],
-            "validators": [
-               "http://54.92.118.111"
-            ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX Chain"
-         }
-      },
-      "dydxprotocol-dev-4": {
-         "name": "v4 Dev 4",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "http://indexer.v4dev4.dydx.exchange",
-                  "socket": "ws://indexer.v4dev4.dydx.exchange"
-               }
-            ],
-            "validators": [
-               "http://validator.v4dev4.dydx.exchange"
-            ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX Chain"
-         }
-      },
-      "dydxprotocol-dev-5": {
-         "name": "v4 Dev 5",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "http://dev5-indexer-apne1-lb-public-1721328151.ap-northeast-1.elb.amazonaws.com",
-                  "socket": "ws://dev5-indexer-apne1-lb-public-1721328151.ap-northeast-1.elb.amazonaws.com"
-               }
-            ],
-            "validators": [
-               "http://18.223.78.50"
-            ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX Chain"
-         }
-      },
-      "dydxprotocol-staging": {
-         "name": "v4 Staging",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://indexer.v4staging.dydx.exchange",
-                  "socket": "wss://indexer.v4staging.dydx.exchange"
-               }
-            ],
-            "faucet": "https://faucet.v4staging.dydx.exchange",
-            "validators": [
-               "https://validator.v4staging.dydx.exchange"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX Chain"
-         }
-      },
-      "dydxprotocol-staging-west": {
-         "name": "v4 Staging West",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://indexer.v4staging.dydx.exchange",
-                  "socket": "wss://indexer.v4staging.dydx.exchange"
-               }
-            ],
-            "faucet": "https://faucet.v4staging.dydx.exchange",
-            "validators": [
-               "https://validator-uswest1.v4staging.dydx.exchange"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX Chain"
-         }
-      },
-      "dydxprotocol-testnet": {
-         "name": "v4 Public Testnet",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
-               }
-            ],
-            "validators": [
-               "https://dydx-testnet.nodefleet.org",
-               "https://test-dydx.kingnodes.com",
-               "https://dydx-rpc.liquify.com/api=8878132/dydx"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com",
-            "faucet": "https://faucet.v4testnet.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX V4"
-         }
-      },
-      "dydxprotocol-testnet-dydx": {
-         "name": "v4 Public Testnet/dYdX",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://indexer.v4testnet.dydx.exchange"
-               }
-            ],
-            "validators": [
-               "https://validator.v4testnet.dydx.exchange"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com",
-            "faucet": "https://faucet.v4testnet.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "statusPage": "https://status.v4testnet.dydx.exchange/",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX V4"
-         }
-      },
-      "dydxprotocol-testnet-dsrv": {
-         "name": "v4 Public Testnet/DSRV",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
-               }
-            ],
-            "validators": [
-               "https://dydx-testnet-archive.allthatnode.com:26657/XZvMM41hESf8PJrEQiTzbCOMVyFca79R"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com",
-            "faucet": "https://faucet.v4testnet.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "statusPage": "https://status.v4testnet.dydx.exchange/",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX V4"
-         }
-      },
-      "dydxprotocol-testnet-nodefleet": {
-         "name": "v4 Public Testnet/nodefleet",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
-               }
-            ],
-            "validators": [
-               "https://dydx-testnet.nodefleet.org"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com",
-            "faucet": "https://faucet.v4testnet.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "statusPage": "https://status.v4testnet.dydx.exchange/",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX V4"
-         }
-      },
-      "dydxprotocol-testnet-kingnodes": {
-         "name": "v4 Public Testnet/KingNodes",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
-               }
-            ],
-            "validators": [
-               "https://test-dydx.kingnodes.com"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com",
-            "faucet": "https://faucet.v4testnet.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "statusPage": "https://status.v4testnet.dydx.exchange/",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX V4"
-         }
-      },
-      "dydxprotocol-testnet-liquify": {
-         "name": "v4 Public Testnet/Liquify",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
-               }
-            ],
-            "validators": [
-               "https://dydx-rpc.liquify.com/api=8878132/dydx"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com",
-            "faucet": "https://faucet.v4testnet.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "statusPage": "https://status.v4testnet.dydx.exchange/",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX V4"
-         }
-      },
-      "dydxprotocol-mainnet": {
-         "name": "v4",
-         "ethereumChainId": "1",
-         "dydxChainId": "[mainnet chain id]",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": true,
-         "tokens": {
-            "comment": "Change according to mainnet release",
-            "chain": {
-               "name": "TokenName",
-               "denom": "tokenDenom",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "[REST endpoint]",
-                  "socket": "[Websocket endpoint]"
-               }
-            ],
-            "validators": [
-               "[Validator endpoint 1",
-               "[Validator endpoint n]"
-            ],
-            "0xsquid": "[0xSquid endpoint for mainnet]"
-         },
-         "links": {
-            "tos": "[HTTP link to TOS]",
-            "privacy": "[HTTP link to Privacy Policy]",
-            "mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]",
-            "documentation": "[HTTP link to documentation, can be null]",
-            "community": "[HTTP link to community, can be null]",
-            "feedback": "[HTTP link to feedback form, can be null]",
-            "blogs": "[HTTP link to blogs, can be null]"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "[Name of the app]",
-                  "description": "[Description of the app]",
-                  "iconUrl": "[Relative URL of the icon URL]"
-               },
-               "v2": {
-                  "projectId": "[Project ID]"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "[Relative callback URL for WalletSegue, should match apple-app-site-association]"
-            },
-            "images": "[Relative URL for wallet images]",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX Chain"
-         }
-      }
-   }
-}
@@ -1,454 +0,0 @@
-{
-    "1INCH-USD":{
-       "name":"1inch",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://1inch.io/",
-       "whitepaperLink":"https://github.com/1inch",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/1inch/"
-    },
-    "AAVE-USD":{
-       "name":"Aave",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://aave.com/",
-       "whitepaperLink":"https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aave/"
-    },
-    "ADA-USD":{
-       "name":"Cardano",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://cardano.org/",
-       "whitepaperLink":"https://why.cardano.org/en/introduction/motivation/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cardano/"
-    },
-    "ALGO-USD":{
-       "name":"Algorand",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://algorand.com/",
-       "whitepaperLink":"https://algorand.com/technology/white-papers",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/algorand/"
-    },
-    "APE-USD":{
-       "name":"ApeCoin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://apecoin.com/",
-       "whitepaperLink":"https://apecoin.com/about",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/apecoin-ape/"
-    },
-    "APT-USD":{
-       "name":"Aptos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://aptoslabs.com/",
-       "whitepaperLink":"https://aptos.dev/aptos-white-paper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aptos/"
-    },
-    "ARB-USD":{
-       "name":"Arbitrum",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://arbitrum.io/",
-       "whitepaperLink":"https://github.com/OffchainLabs/nitro",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/arbitrum/"
-    },
-    "ATOM-USD":{
-       "name":"Cosmos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://cosmos.network/",
-       "whitepaperLink":"https://v1.cosmos.network/resources/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cosmos/"
-    },
-    "AVAX-USD":{
-       "name":"Avalanche",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.avalabs.org/",
-       "whitepaperLink":"https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/avalanche/"
-    },
-    "BCH-USD":{
-       "name":"Bitcoin Cash",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://bitcoincash.org/",
-       "whitepaperLink":"https://bitcoincash.org/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin-cash/"
-    },
-    "BLUR-USD":{
-       "name":"Blur",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://blur.io/",
-       "whitepaperLink":"https://docs.blur.foundation/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/blur-token/"
-    },
-    "CELO-USD":{
-       "name":"Celo",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://celo.org",
-       "whitepaperLink":"https://docs.celo.org",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/celo/"
-    },
-    "BTC-USD":{
-       "name":"Bitcoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://bitcoin.org/",
-       "whitepaperLink":"https://bitcoin.org/bitcoin.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin/"
-    },
-    "COMP-USD":{
-       "name":"Compound",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://compound.finance/",
-       "whitepaperLink":"https://compound.finance/documents/Compound.Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/compound/"
-    },
-    "CRV-USD":{
-       "name":"Curve",
-       "tags":[
-          "Governance"
-       ],
-       "websiteLink":"https://curve.fi/",
-       "whitepaperLink":"https://curve.fi/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/curve-dao-token/"
-    },
-    "DOGE-USD":{
-       "name":"Dogecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://dogecoin.com/",
-       "whitepaperLink":"https://github.com/dogecoin/dogecoin",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/dogecoin/"
-    },
-    "DOT-USD":{
-       "name":"Polkadot",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://polkadot.network/",
-       "whitepaperLink":"https://polkadot.network/PolkaDotPaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polkadot-new/"
-    },
-    "ENJ-USD":{
-       "name":"Enjin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://enjin.io/",
-       "whitepaperLink":"https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/enjin-coin/"
-    },
-    "EOS-USD":{
-       "name":"EOS",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://eos.io/",
-       "whitepaperLink":"https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/eos/"
-    },
-    "ETC-USD":{
-       "name":"Ethereum Classic",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ethereumclassic.org/",
-       "whitepaperLink":"https://ethereumclassic.org/why-classic",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum-classic/"
-    },
-    "ETH-USD":{
-       "name":"Ethereum",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ethereum.org/",
-       "whitepaperLink":"https://ethereum.org/whitepaper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum/",
-       "displayStepSize":"0.001",
-       "displayTickSize":"0.1"
-    },
-    "FIL-USD":{
-       "name":"Filecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://filecoin.io/",
-       "whitepaperLink":"https://filecoin.io/filecoin.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/filecoin/"
-    },
-    "HNT-USD":{
-       "name":"Helium",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.helium.com",
-       "whitepaperLink":"http://whitepaper.helium.com",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/helium/"
-    },
-    "ICP-USD":{
-       "name":"Internet Computer",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://dfinity.org",
-       "whitepaperLink":"https://dfinity.org/whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/internet-computer/"
-    },
-    "LDO-USD":{
-       "name":"Lido DAO",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://lido.fi/",
-       "whitepaperLink":"https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/lido-dao/"
-    },
-    "LINK-USD":{
-       "name":"Chainlink",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://chain.link/",
-       "whitepaperLink":"https://link.smartcontract.com/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/chainlink/"
-    },
-    "LTC-USD":{
-       "name":"Litecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://litecoin.org/",
-       "whitepaperLink":"https://litecoin.info/index.php/Main_Page",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/litecoin/"
-    },
-    "MATIC-USD":{
-       "name":"Polygon",
-       "tags":[
-          "Layer 2"
-       ],
-       "websiteLink":"https://polygon.technology/",
-       "whitepaperLink":"https://polygon.technology/lightpaper-polygon.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polygon/"
-    },
-    "MKR-USD":{
-       "name":"Maker",
-       "tags":[
-          "Governance"
-       ],
-       "websiteLink":"https://makerdao.com",
-       "whitepaperLink":"https://makerdao.com/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/maker/"
-    },
-    "NEAR-USD":{
-       "name":"NEAR Protocol",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://near.org",
-       "whitepaperLink":"https://near.org/papers/the-official-near-white-paper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/near-protocol/"
-    },
-    "OP-USD":{
-       "name":"Optimism",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://www.optimism.io/",
-       "whitepaperLink":"https://github.com/ethereum-optimism",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/optimism-ethereum/"
-    },
-    "PEPE-USD":{
-       "name":"Pepe",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://www.pepe.vip/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/pepe/"
-    },
-    "RUNE-USD":{
-       "name":"THORChain",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://thorchain.org",
-       "whitepaperLink":"https://whitepaper.io/document/709/thorchain-whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/thorchain/"
-    },
-    "SEI-USD":{
-       "name":"Sei",
-       "tags":[
-          "Layer 1",
-          "Defi"
-       ],
-       "websiteLink":"https://www.sei.io/",
-       "whitepaperLink":"https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sei/"
-    },
-    "SHIB-USD":{
-       "name":"Shiba Inu",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://shibatoken.com/",
-       "whitepaperLink":"https://docs.shibatoken.com/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/shiba-inu/"
-    },
-    "SNX-USD":{
-       "name":"Synthetix",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://synthetix.io/",
-       "whitepaperLink":"https://docs.synthetix.io/litepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/synthetix-network-token/"
-    },
-    "SOL-USD":{
-       "name":"Solana",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://solana.com/",
-       "whitepaperLink":"https://solana.com/solana-whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/solana/"
-    },
-    "SUI-USD":{
-       "name":"Sui",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://sui.io/",
-       "whitepaperLink":"https://github.com/MystenLabs",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sui/"
-    },
-    "SUSHI-USD":{
-       "name":"Sushi",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://sushi.com/",
-       "whitepaperLink":"https://docs.sushi.com/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sushiswap/"
-    },
-    "TRX-USD":{
-       "name":"TRON",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://tron.network/",
-       "whitepaperLink":"https://tron.network/static/doc/white_paper_v_2_0.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/tron/"
-    },
-    "UMA-USD":{
-       "name":"UMA",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://umaproject.org/",
-       "whitepaperLink":"https://github.com/UMAprotocol/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/uma/"
-    },
-    "UNI-USD":{
-       "name":"Uniswap",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://uniswap.org/",
-       "whitepaperLink":"https://uniswap.org/whitepaper-v3.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/uniswap/"
-    },
-    "WLD-USD":{
-       "name":"Worldcoin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://worldcoin.org/",
-       "whitepaperLink":"https://whitepaper.worldcoin.org/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/worldcoin-org/"
-    },
-    "XLM-USD":{
-       "name":"Stellar",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.stellar.org/",
-       "whitepaperLink":"https://www.stellar.org/papers/stellar-consensus-protocol",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/stellar/"
-    },
-    "XMR-USD":{
-       "name":"Monero",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.getmonero.org/",
-       "whitepaperLink":"https://www.getmonero.org/resources/research-lab/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/monero/"
-    },
-    "XRP-USD":{
-       "name":"Ripple",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ripple.com/currency/",
-       "whitepaperLink":"https://github.com/ripple",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/xrp/"
-    },
-    "XTZ-USD":{
-       "name":"Tezos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://tezos.com",
-       "whitepaperLink":"https://tezos.com/whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/tezos/"
-    },
-    "YFI-USD":{
-       "name":"Yearn",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://yearn.finance/",
-       "whitepaperLink":"https://docs.yearn.finance/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/yearn-finance/"
-    },
-    "ZEC-USD":{
-       "name":"Zcash",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://z.cash/",
-       "whitepaperLink":"https://z.cash/technology/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/zcash/"
-    },
-    "ZRX-USD":{
-       "name":"0x",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://0x.org/",
-       "whitepaperLink":"https://0x.org/pdfs/0x_white_paper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/0x/"
-    }
- }
@@ -1,464 +0,0 @@
-[
-  {
-    "id": "c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96",
-    "name": "MetaMask",
-    "description": "",
-    "homepage": "https://metamask.io/",
-    "chains": [
-      "eip155:1",
-      "eip155:42161",
-      "eip155:43114"
-    ],
-    "versions": [
-      "1"
-    ],
-    "app": {
-      "browser": "",
-      "ios": "https://apps.apple.com/us/app/metamask/id1438144202",
-      "android": "https://play.google.com/store/apps/details?id=io.metamask",
-      "mac": "",
-      "windows": "",
-      "linux": ""
-    },
-    "mobile": {
-      "native": "metamask:",
-      "universal": "https://metamask.app.link"
-    },
-    "desktop": {
-      "native": "",
-      "universal": ""
-    },
-    "metadata": {
-      "shortName": "MetaMask",
-      "colors": {
-        "primary": "rgb(255, 255, 255)",
-        "secondary": ""
-      }
-    },
-    "config": {
-      "comment": "MetaMask",
-      "iosMinVersion": "0",
-      "imageUrl": "",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "metamask:",
-          "universal": "https://metamask.app.link"
-        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData",
-        "wallet_addEthereumChain"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "METAMASK",
-      "imageName": "metamask.png"
-    }
-  },
-  {
-    "id": "coinbase-wallet",
-    "name": "Coinbase Wallet",
-    "description": "",
-    "homepage": "https://www.coinbase.com/wallet",
-    "chains": [
-      "eip155:1"
-    ],
-    "versions": [
-      "1"
-    ],
-    "app": {
-      "browser": "",
-      "ios": "https://apps.apple.com/us/app/coinbase-wallet-nfts-crypto/id1278383455",
-      "android": "https://play.google.com/store/apps/details?id=org.toshi",
-      "mac": "",
-      "windows": "",
-      "linux": ""
-    },
-    "mobile": {
-      "native": "cbwallet:",
-      "universal": ""
-    },
-    "desktop": {
-      "native": "",
-      "universal": ""
-    },
-    "metadata": {
-      "shortName": "Coinbase",
-      "colors": {
-        "primary": "rgb(255, 255, 255)",
-        "secondary": ""
-      }
-    },
-    "config": {
-      "comment": "Coinbase",
-      "iosMinVersion": "1.8.0",
-      "imageUrl": "",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "connections": [
-        {
-          "type": "walletSegue",
-          "native": "cbwallet:",
-          "universal": ""
-        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData",
-        "wallet_addEthereumChain"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "COINBASE_WALLET",
-      "imageName": "coinbase-wallet.png"
-    }
-  },
-  {
-    "id": "9d373b43ad4d2cf190fb1a774ec964a1addf406d6fd24af94ab7596e58c291b2",
-    "name": "imToken",
-    "description": "",
-    "homepage": "https://token.im/",
-    "chains": [
-      "eip155:1"
-    ],
-    "versions": [
-      "1"
-    ],
-    "app": {
-      "browser": "",
-      "ios": "https://itunes.apple.com/us/app/imtoken2/id1384798940",
-      "android": "https://play.google.com/store/apps/details?id=im.token.app",
-      "mac": "",
-      "windows": "",
-      "linux": ""
-    },
-    "mobile": {
-      "native": "imtokenv2:",
-      "universal": ""
-    },
-    "desktop": {
-      "native": "",
-      "universal": ""
-    },
-    "metadata": {
-      "shortName": "imToken",
-      "colors": {
-        "primary": "rgb(255, 255, 255)",
-        "secondary": ""
-      }
-    },
-    "config": {
-      "comment": "imToken",
-      "iosMinVersion": "0",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "imtokenv2:",
-          "universal": ""
-        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "IMTOKEN",
-      "imageName": "imtoken.png"
-    }
-  },
-  {
-    "id": "4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0",
-    "name": "Trust Wallet",
-    "description": "",
-    "homepage": "https://trustwallet.com/",
-    "chains": [
-      "eip155:1",
-      "eip155:42161",
-      "eip155:43114"
-    ],
-    "versions": [
-      "1"
-    ],
-    "app": {
-      "browser": "",
-      "ios": "https://apps.apple.com/app/apple-store/id1288339409",
-      "android": "https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp",
-      "mac": "",
-      "windows": "",
-      "linux": ""
-    },
-    "mobile": {
-      "native": "trust:",
-      "universal": "https://link.trustwallet.com"
-    },
-    "desktop": {
-      "native": "",
-      "universal": ""
-    },
-    "metadata": {
-      "shortName": "Trust",
-      "colors": {
-        "primary": "rgb(51, 117, 187)",
-        "secondary": ""
-      }
-    },
-    "config": {
-      "comment": "Trust Wallet",
-      "iosMinVersion": "0",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "trust:",
-          "universal": "https://link.trustwallet.com"
-        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "TRUST_WALLET",
-      "imageName": "trust-wallet.png"
-    }
-  },
-  {
-    "id": "Zerion",
-    "name": "Zerion",
-    "description": "",
-    "homepage": "https://zerion.io/",
-    "chains": [
-      "eip155:1"
-    ],
-    "versions": [
-      "1"
-    ],
-    "app": {
-      "browser": "",
-      "ios": "https://apps.apple.com/app/apple-store/id1456732565",
-      "android": "https://play.google.com/store/apps/details?id=io.zerion.android",
-      "mac": "",
-      "windows": "",
-      "linux": ""
-    },
-    "mobile": {
-      "native": "zerion:",
-      "universal": ""
-    },
-    "desktop": {
-      "native": "",
-      "universal": ""
-    },
-    "metadata": {
-      "shortName": "Zerion",
-      "colors": {
-        "primary": "rgb(51, 117, 187)",
-        "secondary": ""
-      }
-    },
-    "config": {
-      "comment": "Zerion Wallet",
-      "iosMinVersion": "0",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "zerion:",
-          "universal": ""
-        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "ZERION",
-      "imageName": "zerion.png"
-    }
-  },
-  {
-    "id": "20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66",
-    "name": "TokenPocket",
-    "description": "",
-    "homepage": "https://tokenpocket.pro/",
-    "chains": [
-      "eip155:1"
-    ],
-    "versions": [
-      "1"
-    ],
-    "app": {
-      "browser": "",
-      "ios": "https://apps.apple.com/us/app/tokenpocket-trusted-wallet/id1436028697",
-      "android": "https://play.google.com/store/apps/details?id=vip.mytokenpocket",
-      "mac": "",
-      "windows": "",
-      "linux": ""
-    },
-    "mobile": {
-      "native": "tpoutside:",
-      "universal": ""
-    },
-    "desktop": {
-      "native": "",
-      "universal": ""
-    },
-    "metadata": {
-      "shortName": "TokenPocket",
-      "colors": {
-        "primary": "rgb(41, 128, 254)",
-        "secondary": ""
-      }
-    },
-    "config": {
-      "comment": "TokenPocket",
-      "iosMinVersion": "0",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "tpoutside:",
-          "universal": ""
-        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "TOKEN_POCKET",
-      "imageName": "tokenpocket.png"
-    }
-  },
-  {
-    "id": "1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369",
-    "name": "Rainbow",
-    "description": "",
-    "homepage": "https://rainbow.me/",
-    "chains": [
-      "eip155:1"
-    ],
-    "versions": [
-      "1"
-    ],
-    "app": {
-      "browser": "",
-      "ios": "https://apps.apple.com/us/app/rainbow-ethereum-wallet/id1457119021",
-      "android": "",
-      "mac": "",
-      "windows": "",
-      "linux": ""
-    },
-    "mobile": {
-      "native": "rainbow:",
-      "universal": "https://rnbwapp.com"
-    },
-    "desktop": {
-      "native": "",
-      "universal": ""
-    },
-    "metadata": {
-      "shortName": "Rainbow",
-      "colors": {
-        "primary": "rgb(0, 30, 89)",
-        "secondary": ""
-      }
-    },
-    "config": {
-      "comment": "Rainbow",
-      "iosMinVersion": "0",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "backlinked": true,
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "rainbow:",
-          "universal": "https://rnbwapp.com"
-        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "RAINBOW_WALLET",
-      "imageName": "rainbow-wallet.png"
-    }
-  },
-  {
-    "id": "09102e7bbbd3f92001eda104abe23803181629f695e8f1b95af96d88ff7d5890",
-    "name": "1inch Wallet",
-    "description": "",
-    "homepage": "https://1inch.io/wallet/",
-    "chains": [
-      "eip155:1",
-      "eip155:56"
-    ],
-    "versions": [
-      "1"
-    ],
-    "app": {
-      "browser": "",
-      "ios": "https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391",
-      "android": "",
-      "mac": "",
-      "windows": "",
-      "linux": ""
-    },
-    "mobile": {
-      "native": "oneinch:",
-      "universal": "https://wallet.1inch.io"
-    },
-    "desktop": {
-      "native": "",
-      "universal": ""
-    },
-    "metadata": {
-      "shortName": "1inch",
-      "colors": {
-        "primary": "rgb(31, 36, 46)",
-        "secondary": ""
-      }
-    },
-    "config": {
-      "comment": "1inch",
-      "iosMinVersion": "0",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "oneinch:",
-          "universal": "https://wallet.1inch.io"
-        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "1INCH",
-      "imageName": "1inch.png"
-    }
-  }
-]
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-source="dist/.well-known/apple-app-site-association"
-if [ ! -f "$source" ]; then
-  echo "Error: $source file not found"
-  exit 1
-fi
-
-app_id=$IOS_APP_ID
-if [ -z "$app_id" ]; then
-  echo "Error: IOS_APP_ID is empty"
-  exit 1
-fi
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    sed -i '' "s/{PLACE_YOUR_APP_ID_HERE}/$app_id/g" $source
-else
-    sed -i "s/{PLACE_YOUR_APP_ID_HERE}/$app_id/g" $source
-fi
@@ -7,20 +7,13 @@ import { GrazProvider } from 'graz';

 import { AppRoute, DEFAULT_TRADE_ROUTE } from '@/constants/routes';

-import {
-  useBreakpoints,
-  useTokenConfigs,
-  useInitializePage,
-  useShouldShowFooter,
-  useAnalytics,
-} from '@/hooks';
+import { useBreakpoints, useInitializePage, useShouldShowFooter, useAnalytics } from '@/hooks';
 import { DydxProvider } from '@/hooks/useDydxClient';
 import { AccountsProvider } from '@/hooks/useAccounts';
 import { DialogAreaProvider, useDialogArea } from '@/hooks/useDialogArea';
 import { LocaleProvider } from '@/hooks/useLocaleSeparators';
 import { NotificationsProvider } from '@/hooks/useNotifications';
 import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
-import { RestrictionProvider } from '@/hooks/useRestrictions';
 import { SubaccountProvider } from '@/hooks/useSubaccount';
 import { SquidProvider } from '@/hooks/useSquid';

@@ -33,8 +26,6 @@ import ProfilePage from '@/pages/Profile';
 import { SettingsPage } from '@/pages/settings/Settings';
 import TradePage from '@/pages/trade/Trade';
 import { RewardsPage } from '@/pages/rewards/RewardsPage';
-import { TermsOfUsePage } from '@/pages/TermsOfUsePage';
-import { PrivacyPolicyPage } from '@/pages/PrivacyPolicyPage';

 import { HeaderDesktop } from '@/layout/Header/HeaderDesktop';
 import { FooterDesktop } from '@/layout/Footer/FooterDesktop';
@@ -63,7 +54,6 @@ const Content = () => {
  const { isTablet, isNotTablet } = useBreakpoints();
  const isShowingHeader = isNotTablet;
  const isShowingFooter = useShouldShowFooter();
-  const { chainTokenLabel } = useTokenConfigs();

  return (
    <Styled.Content isShowingHeader={isShowingHeader} isShowingFooter={isShowingFooter}>
@@ -76,9 +66,10 @@ const Content = () => {
              <Route path=":market" element={<TradePage />} />
              <Route path={AppRoute.Trade} element={<TradePage />} />
            </Route>
-
            <Route path={AppRoute.Markets} element={<MarketsPage />} />
-            <Route path={`/${chainTokenLabel}`} element={<RewardsPage />} />
+            {import.meta.env.MODE !== 'production' && (
+              <Route path={AppRoute.Rewards} element={<RewardsPage />} />
+            )}
            {isTablet && (
              <>
                <Route path={AppRoute.Alerts} element={<AlertsPage />} />
@@ -90,10 +81,6 @@ const Content = () => {
            <Route element={<GuardedMobileRoute />}>
              <Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
            </Route>
-
-            <Route path={AppRoute.Terms} element={<TermsOfUsePage />} />
-            <Route path={AppRoute.Privacy} element={<PrivacyPolicyPage />} />
-
            <Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
          </Routes>
        </Suspense>
@@ -124,7 +111,6 @@ const providers = [
  wrapProvider(GrazProvider),
  wrapProvider(WagmiConfig, { config }),
  wrapProvider(LocaleProvider),
-  wrapProvider(RestrictionProvider),
  wrapProvider(DydxProvider),
  wrapProvider(AccountsProvider),
  wrapProvider(SubaccountProvider),
@@ -211,7 +197,7 @@ Styled.NotificationsToastArea = styled(NotificationsToastArea)`

 Styled.DialogArea = styled.aside`
  position: fixed;
-  height: 100%;
+  height: 100vh;
  z-index: 1;
  inset: 0;
  overflow: clip;
@@ -6,8 +6,6 @@ import {
  AddressConnectorIcon,
  ArrowIcon,
  Bar3Icon,
-  BellIcon,
-  BellStrokeIcon,
  BoxCloseIcon,
  CalculatorIcon,
  CaretIcon,
@@ -73,8 +71,6 @@ export enum IconName {
  AddressConnector = 'AddressConnector',
  Arrow = 'Arrow',
  Bar3 = 'Bar3',
-  Bell = 'Bell',
-  BellStroked = 'BellStroked',
  BoxClose = 'BoxClose',
  Calculator = 'Calculator',
  Caret = 'Caret',
@@ -141,8 +137,6 @@ const icons = {
  [IconName.AddressConnector]: AddressConnectorIcon,
  [IconName.Arrow]: ArrowIcon,
  [IconName.Bar3]: Bar3Icon,
-  [IconName.Bell]: BellIcon,
-  [IconName.BellStroked]: BellStrokeIcon,
  [IconName.BoxClose]: BoxCloseIcon,
  [IconName.Calculator]: CalculatorIcon,
  [IconName.Caret]: CaretIcon,
@@ -219,8 +213,7 @@ export const Icon = styled(
    iconComponent: Component = iconName && icons[iconName],
    className,
    ...props
-  }: ElementProps & StyleProps) =>
-    Component ? <Component className={className} {...props} /> : null
+  }: ElementProps & StyleProps) => (Component ? <Component className={className} {...props} /> : null)
 )`
  width: 1em;
  height: 1em;
@@ -207,16 +207,6 @@ const InputStyle = css`
    color: var(--color-text-0);
    opacity: 1;
  }
-
-  // Input autofill Styles
-  &:-webkit-autofill,
-  &:-webkit-autofill:focus {
-    transition: background-color 600000s 0s, color 600000s 0s;
-  }
-
-  &[data-autocompleted] {
-    background-color: var(--input-backgroundColor) !important;
-  }
 `;

 Styled.NumericFormat = styled(NumericFormat)`
@@ -12,7 +12,7 @@ type ElementProps = {
  };
  children: React.ReactNode;
  href?: string;
-  onClick?: (e: MouseEvent) => void;
+  onClick?: () => void;
  withIcon?: boolean;
 };

@@ -37,12 +37,12 @@ export const Link = forwardRef<HTMLAnchorElement, ElementProps & StyleProps>(
      ref={ref}
      className={className}
      href={href}
-      onClick={(e: MouseEvent) => {
+      onClick={() => {
        if (analyticsConfig) {
          console.log(analyticsConfig);
        }

-        onClick?.(e);
+        onClick?.();
      }}
      rel="noopener noreferrer"
      target="_blank"
@@ -11,7 +11,6 @@ type PanelProps = {
  children?: React.ReactNode;
  href?: string;
  onHeaderClick?: () => void;
-  onClick?: () => void;
 };

 type PanelStyleProps = {
@@ -25,11 +24,10 @@ export const Panel = ({
  children,
  href,
  onHeaderClick,
-  onClick,
  hasSeparator,
  className,
 }: PanelProps & PanelStyleProps) => (
-  <Styled.Panel onClick={onClick}>
+  <Styled.Panel>
    {href ? (
      <Link to={href}>
        {slotHeader ? (
@@ -24,7 +24,7 @@ export const MarketTableCell = ({
    slotLeft={
      <>
        {showFavorite && <Icon iconName={IconName.Star} />}
-        <Styled.AssetIcon symbol={asset?.id} />
+        <Styled.AssetIcon symbol={asset?.symbol} />
      </>
    }
  >
@@ -6,7 +6,6 @@ import { STRING_KEYS } from './localization';
 export type Nullable<T> = T | null | undefined;

 // ------ V4 Protocols ------ //
-export const AbacusAppConfig = Abacus.exchange.dydx.abacus.state.manager.AppConfigs;
 export const IOImplementations = Abacus.exchange.dydx.abacus.utils.IOImplementations;
 export const UIImplementations = Abacus.exchange.dydx.abacus.utils.UIImplementations;
 export type AbacusDYDXChainTransactionsProtocol = Omit<
@@ -41,10 +40,6 @@ export type AbacusFileSystemProtocol = Omit<
  Abacus.exchange.dydx.abacus.protocols.FileSystemProtocol,
  '__doNotUseOrImplementIt'
 >;
-export type AbacusTrackingProtocol = Omit<
-  Abacus.exchange.dydx.abacus.protocols.TrackingProtocol,
-  '__doNotUseOrImplementIt'
->;

 export type FileLocation = Abacus.exchange.dydx.abacus.protocols.FileLocation;
 export type ThreadingType = Abacus.exchange.dydx.abacus.protocols.ThreadingType;
@@ -59,22 +54,27 @@ export const TransactionType = Abacus.exchange.dydx.abacus.protocols.Transaction
 const transactionTypes = [...TransactionType.values()] as const;
 export type TransactionTypes = (typeof transactionTypes)[number];

+export type NetworkConfig = {
+  chainId: string;
+  indexerUrl: string;
+  indexerSocketUrl: string;
+  validatorUrl: string;
+  faucetUrl?: string | null;
+};
+
+export type ConnectNetworkEvent = CustomEvent<Partial<NetworkConfig>>;
+
 // ------ State ------
-export type AbacusApiState = Abacus.exchange.dydx.abacus.state.manager.ApiState;
-export const AbacusApiStatus = Abacus.exchange.dydx.abacus.state.manager.ApiStatus;
+export type AbacusApiState = Abacus.exchange.dydx.abacus.state.app.ApiState;
+export const AbacusApiStatus = Abacus.exchange.dydx.abacus.state.app.ApiStatus;
 const abacusApiStatuses = [...AbacusApiStatus.values()];
 export type AbacusApiStatuses = (typeof abacusApiStatuses)[number];
 export const Changes = Abacus.exchange.dydx.abacus.state.changes.Changes;
 export type PerpetualStateChanges = Abacus.exchange.dydx.abacus.state.changes.StateChanges;
 export const AsyncAbacusStateManager =
  Abacus.exchange.dydx.abacus.state.manager.AsyncAbacusStateManager;
-
-// ------ Parsing Errors ------ //
 export type ParsingError = Abacus.exchange.dydx.abacus.responses.ParsingError;
 export type ParsingErrors = kollections.List<ParsingError>;
-export const ParsingErrorType = Abacus.exchange.dydx.abacus.responses.ParsingErrorType;
-const parsingErrorTypes = [...ParsingErrorType.values()] as const;
-export type ParsingErrorTypes = (typeof parsingErrorTypes)[number];

 // ------ Perpetuals/Markets ------ //
 export type PerpetualState = Abacus.exchange.dydx.abacus.output.PerpetualState;
@@ -118,7 +118,6 @@ export const InputSelectionOption = Abacus.exchange.dydx.abacus.output.input.Sel

 // ------ Wallet ------ //
 export type Wallet = Abacus.exchange.dydx.abacus.output.Wallet;
-export type AccountBalance = Abacus.exchange.dydx.abacus.output.AccountBalance;
 export type Subaccount = Abacus.exchange.dydx.abacus.output.Subaccount;
 export type SubaccountPosition = Abacus.exchange.dydx.abacus.output.SubaccountPosition;
 export type SubaccountOrder = Abacus.exchange.dydx.abacus.output.SubaccountOrder;
@@ -135,7 +134,7 @@ export type SubaccountTransfers = Abacus.exchange.dydx.abacus.output.SubaccountT
 // ------ Historical PnL ------ //
 export type SubAccountHistoricalPNL = Abacus.exchange.dydx.abacus.output.SubaccountHistoricalPNL;
 export type SubAccountHistoricalPNLs = Abacus.exchange.dydx.abacus.output.SubaccountHistoricalPNL[];
-export const HistoricalPnlPeriod = Abacus.exchange.dydx.abacus.protocols.HistoricalPnlPeriod;
+export const HistoricalPnlPeriod = Abacus.exchange.dydx.abacus.state.app.HistoricalPnlPeriod;
 const historicalPnlPeriod = [...HistoricalPnlPeriod.values()] as const;
 export type HistoricalPnlPeriods = (typeof historicalPnlPeriod)[number];

@@ -175,14 +174,16 @@ export const AbacusOrderSide = Abacus.exchange.dydx.abacus.output.input.OrderSid
 export const AbacusPositionSide = Abacus.exchange.dydx.abacus.output.PositionSide;
 export type AbacusPositionSides = Abacus.exchange.dydx.abacus.output.PositionSide;

+export type SubaccountPlaceOrderPayload =
+  Abacus.exchange.dydx.abacus.state.app.V4SubaccountPlaceOrderPayload2;
+
+export type SubaccountCancelOrderPayload =
+  Abacus.exchange.dydx.abacus.state.app.V4SubaccountCancelOrderPayload2;
+
 export type HumanReadablePlaceOrderPayload =
  Abacus.exchange.dydx.abacus.state.manager.HumanReadablePlaceOrderPayload;
 export type HumanReadableCancelOrderPayload =
  Abacus.exchange.dydx.abacus.state.manager.HumanReadableCancelOrderPayload;
-export type HumanReadableWithdrawPayload =
-  Abacus.exchange.dydx.abacus.state.manager.HumanReadableWithdrawPayload;
-export type HumanReadableTransferPayload =
-  Abacus.exchange.dydx.abacus.state.manager.HumanReadableTransferPayload;

 // ------ Helpers ------ //
 export const AbacusHelper = Abacus.exchange.dydx.abacus.utils.AbacusHelper;
@@ -194,12 +195,6 @@ export type RiskLevels = (typeof riskLevels)[number];
 // ------ Notifications ------ //
 export type AbacusNotification = Abacus.exchange.dydx.abacus.output.Notification;

-// ------ Restrictions ------ //
-export type UsageRestriction = Abacus.exchange.dydx.abacus.output.UsageRestriction;
-export const RestrictionType = Abacus.exchange.dydx.abacus.output.Restriction;
-const restrictionTypes = [...RestrictionType.values()] as const;
-export type RestrictionTypes = (typeof restrictionTypes)[number];
-
 // ------ Enum Conversions ------ //
 type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2
  ? A
@@ -257,20 +252,3 @@ export const TRADE_TYPES: Record<
  [AbacusOrderType.liquidation.name]: null,
  [AbacusOrderType.trailingStop.name]: null,
 };
-
-// Custom types involving Abacus
-
-export type NetworkConfig = Partial<{
-  indexerUrl: Nullable<string>;
-  websocketUrl: Nullable<string>;
-  validatorUrl: Nullable<string>;
-  chainId: Nullable<string>;
-  faucetUrl: Nullable<string>;
-  USDC_DENOM: Nullable<string>;
-  USDC_DECIMALS: Nullable<number>;
-  USDC_GAS_DENOM: Nullable<string>;
-  CHAINTOKEN_DENOM: Nullable<string>;
-  CHAINTOKEN_DECIMALS: Nullable<number>;
-}>;
-
-export type ConnectNetworkEvent = CustomEvent<Partial<NetworkConfig>>;
@@ -71,7 +71,6 @@ export enum AnalyticsEvent {

  // Transfers
  TransferFaucet = 'TransferFaucet',
-  TransferFaucetConfirmed = 'TransferFaucetConfirmed',
  TransferDeposit = 'TransferDeposit',
  TransferWithdraw = 'TransferWithdraw',

@@ -79,7 +78,6 @@ export enum AnalyticsEvent {
  TradeOrderTypeSelected = 'TradeOrderTypeSelected',
  TradePlaceOrder = 'TradePlaceOrder',
  TradePlaceOrderConfirmed = 'TradePlaceOrderConfirmed',
-  TradeCancelOrder = 'TradeCancelOrder',
  TradeCancelOrderConfirmed = 'TradeCancelOrderConfirmed',
 }

@@ -135,13 +133,6 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
    : // Transfers
    T extends AnalyticsEvent.TransferFaucet
    ? {}
-    : T extends AnalyticsEvent.TransferFaucetConfirmed
-    ? {
-        /** roundtrip time between user placing an order and confirmation from indexer (client → validator → indexer → client) */
-        roundtripMs: number;
-        /** URL/IP of node the order was sent to */
-        validatorUrl: string;
-      }
    : T extends AnalyticsEvent.TransferDeposit
    ? {}
    : T extends AnalyticsEvent.TransferWithdraw
@@ -160,15 +151,13 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
        /** roundtrip time between user placing an order and confirmation from indexer (client → validator → indexer → client) */
        roundtripMs: number;
        /** URL/IP of node the order was sent to */
-        validatorUrl: string;
+        validator: string;
      }
-    : T extends AnalyticsEvent.TradeCancelOrder
-    ? {}
    : T extends AnalyticsEvent.TradeCancelOrderConfirmed
    ? {
        /** roundtrip time between user canceling an order and confirmation from indexer (client → validator → indexer → client) */
        roundtripMs: number;
        /** URL/IP of node the order was sent to */
-        validatorUrl: string;
+        validator: string;
      }
    : never;
@@ -5,15 +5,11 @@ export enum DialogTypes {
  ExchangeOffline = 'ExchangeOffline',
  FillDetails = 'FillDetails',
  Help = 'Help',
-  ExternalNavKeplr = 'ExternalNavKeplr',
  MnemonicExport = 'MnemonicExport',
  MobileSignIn = 'MobileSignIn',
  Onboarding = 'Onboarding',
  OrderDetails = 'OrderDetails',
-  RateLimit = 'RateLimit',
  Receive = 'Receive',
-  RestrictedGeo = 'RestrictedGeo',
-  RestrictedWallet = 'RestrictedWallet',
  Trade = 'Trade',
  Transfer = 'Transfer',
  Withdraw = 'Withdraw',
@@ -24,6 +24,6 @@ export enum LocalStorageKey {
 }

 export const LOCAL_STORAGE_VERSIONS = {
-  [LocalStorageKey.EvmDerivedAddresses]: 'v2',
+  [LocalStorageKey.EvmDerivedAddresses]: 'v1',
  // TODO: version all localStorage keys
 };
@@ -88,3 +88,19 @@ export type TooltipStrings = {
    learnMoreLink?: string;
  };
 };
+
+export const ORDER_ERROR_CODE_MAP: { [key: number]: string } = {
+  2000: STRING_KEYS['2000_FILL_OR_KILL_ORDER_COULD_NOT_BE_FULLY_FILLED'],
+  2001: STRING_KEYS['2001_REDUCE_ONLY_WOULD_INCREASE_POSITION_SIZE'],
+  2002: STRING_KEYS['2002_REDUCE_ONLY_WOULD_CHANGE_POSITION_SIDE'],
+  2003: STRING_KEYS['2003_POST_ONLY_WOULD_CROSS_MAKER_ORDER'],
+  3000: STRING_KEYS['3000_INVALID_ORDER_FLAGS'],
+  3001: STRING_KEYS['3001_INVALID_STATEFUL_ORDER_GOOD_TIL_BLOCK_TIME'],
+  3002: STRING_KEYS['3002_STATEFUL_ORDERS_CANNOT_REQUIRE_IMMEDIATE_EXECUTION'],
+  3003: STRING_KEYS['3003_TIME_EXCEEDS_GOOD_TIL_BLOCK_TIME'],
+  3004: STRING_KEYS['3004_GOOD_TIL_BLOCK_TIME_EXCEEDS_STATEFUL_ORDER_TIME_WINDOW'],
+  3005: STRING_KEYS['3005_STATEFUL_ORDER_ALREADY_EXISTS'],
+  3006: STRING_KEYS['3006_STATEFUL_ORDER_DOES_NOT_EXIST'],
+  3007: STRING_KEYS['3007_STATEFUL_ORDER_COLLATERALIZATION_CHECK_FAILED'],
+  3008: STRING_KEYS['3008_STATEFUL_ORDER_PREVIOUSLY_CANCELLED'],
+};
@@ -1,12 +0,0 @@
-import environments from '../../public/configs/env.json';
-
-// TODO: Update for Mainnet deployment
-export const AVAILABLE_ENVIRONMENTS =
-  import.meta.env.MODE === 'production'
-    ? environments.deployments.TESTNET
-    : environments.deployments.DEV;
-
-export const CURRENT_ABACUS_DEPLOYMENT = import.meta.env.MODE === 'production' ? 'TESTNET' : 'DEV';
-export const ENVIRONMENT_CONFIG_MAP = environments.environments;
-export type DydxNetwork = keyof typeof ENVIRONMENT_CONFIG_MAP;
-export const DEFAULT_APP_ENVIRONMENT = AVAILABLE_ENVIRONMENTS.default as DydxNetwork;
@@ -0,0 +1,29 @@
+import { ENDPOINTS, DEV_ENDPOINTS } from '@dydxprotocol/v4-localization';
+
+export const NETWORK_ENDPOINTS = import.meta.env.MODE === 'production' ? ENDPOINTS : DEV_ENDPOINTS;
+
+export const CLIENT_NETWORK_CONFIGS: Record<
+  string,
+  (typeof NETWORK_ENDPOINTS.environments)[number]
+> = Object.fromEntries(
+  NETWORK_ENDPOINTS.environments.map((environment) => [environment.environment, environment])
+);
+
+export const DEFAULT_APP_ENVIRONMENT = NETWORK_ENDPOINTS.defaultEnvironment;
+
+export enum DydxV4Network {
+  V4Mainnet = 'dydxprotocol-mainnet',
+  V4Staging = 'dydxprotocol-staging',
+  V4Testnet2 = 'dydxprotocol-testnet',
+  V4Local = 'dydxprotocol-dev',
+}
+
+export type DydxNetwork = keyof typeof CLIENT_NETWORK_CONFIGS;
+
+export function isDydxV4Network(network: any): boolean {
+  return CLIENT_NETWORK_CONFIGS[network]?.version === 'v4';
+}
+
+export function isValidDydxNetwork(network: any): boolean {
+  return Object.keys(CLIENT_NETWORK_CONFIGS).includes(network);
+}
@@ -7,8 +7,7 @@ export enum AppRoute {
  Profile = '/profile',
  Alerts = '/alerts',
  Settings = '/settings',
-  Terms = '/terms',
-  Privacy = '/privacy',
+  Rewards = '/DV4TNT',
 }

 export enum PortfolioRoute {
@@ -94,10 +94,6 @@ export const tradeTooltips: TooltipStrings = {
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.MAINTENANCE_MARGIN_FRACTION_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.MAINTENANCE_MARGIN_FRACTION_BODY }),
  }),
-  'max-reward': ({ stringGetter }) => ({
-    title: stringGetter({ key: TOOLTIP_STRING_KEYS.MAXIMUM_REWARDS_TITLE }),
-    body: stringGetter({ key: TOOLTIP_STRING_KEYS.MAXIMUM_REWARDS_BODY }),
-  }),
  'max-withdraw': ({ stringGetter }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.MAX_WITHDRAW_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.MAX_WITHDRAW_BODY }),
@@ -27,7 +27,7 @@ export enum PositionSide {
  Short = 'SHORT',
 }

-export const UNCOMMITTED_ORDER_TIMEOUT_MS = 10_000;
+export const UNCOMMITTED_ORDER_TIMEOUT = 10_000;

 export const ORDER_SIDE_STRINGS = {
  [OrderSide.BUY]: STRING_KEYS.BUY,
@@ -1,5 +1,5 @@
 import type { ExternalProvider } from '@ethersproject/providers';
-import { type onboarding } from '@dydxprotocol/v4-client-js';
+import { USDC_DENOM, type onboarding, DYDX_DENOM } from '@dydxprotocol/v4-client-js';
 import type { suggestChain } from 'graz';

 import { STRING_KEYS } from '@/constants/localization';
@@ -24,14 +24,13 @@ import {

 import { isMetaMask } from '@/lib/wallet/providers';

-import { DydxNetwork, ENVIRONMENT_CONFIG_MAP } from './networks';
-
 // Wallet connection types

 export enum WalletConnectionType {
  CoinbaseWalletSdk = 'coinbaseWalletSdk',
  CosmosSigner = 'CosmosSigner',
  InjectedEip1193 = 'injectedEip1193',
+  WalletConnect1 = 'walletConnect1',
  WalletConnect2 = 'walletConnect2',
 }

@@ -61,6 +60,10 @@ export const walletConnectionTypes: Record<WalletConnectionType, WalletConnectio
    name: 'injected EIP-1193 provider',
    wagmiConnectorId: 'injected',
  },
+  [WalletConnectionType.WalletConnect1]: {
+    name: 'WalletConnect 1.0',
+    wagmiConnectorId: 'walletConnectLegacy',
+  },
  [WalletConnectionType.WalletConnect2]: {
    name: 'WalletConnect 2.0',
    wagmiConnectorId: 'walletConnect',
@@ -87,35 +90,19 @@ export enum WalletType {
  Rainbow = 'RAINBOW_WALLET',
  TokenPocket = 'TOKEN_POCKET',
  TrustWallet = 'TRUST_WALLET',
+  WalletConnect = 'WALLETCONNECT',
  WalletConnect2 = 'WALLETCONNECT_2',
  // TestWallet = 'TEST_WALLET',
  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;
  icon: string;
  connectionTypes: WalletConnectionType[];
  matchesInjectedEip1193?: (provider: ExternalProvider & any) => boolean;
+  walletconnect1Name?: string;
  walletconnect2Id?: string;
 };

@@ -128,6 +115,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
      WalletConnectionType.InjectedEip1193,
      // WalletConnectionType.CoinbaseWalletSdk,
      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
    ],
    matchesInjectedEip1193: (provider) =>
      Object.entries(wallets).every(
@@ -141,22 +129,30 @@ export const wallets: Record<WalletType, WalletConfig> = {
    type: WalletType.BitKeep,
    stringKey: STRING_KEYS.BITKEEP,
    icon: BitkeepIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [
+      WalletConnectionType.InjectedEip1193,
+      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
+    ],
    matchesInjectedEip1193: (provider) => provider.isBitKeep, // isBitKeepChrome, isBitEthereum
+    walletconnect1Name: 'bitkeep',
+    walletconnect2Id: '38f5d18bd8522c244bdd70cb4a68e0e718865155811c043f052fb9f1c51de662',
  },
  [WalletType.BitPie]: {
    type: WalletType.BitPie,
    stringKey: STRING_KEYS.BITPIE,
    icon: BitpieIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193],
+    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1],
    matchesInjectedEip1193: (provider) => provider.isBitpie,
+    walletconnect1Name: 'bitpie',
  },
  [WalletType.CloverWallet]: {
    type: WalletType.CloverWallet,
    stringKey: STRING_KEYS.CLOVER_WALLET,
    icon: CloverWalletIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193],
+    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1],
    matchesInjectedEip1193: (provider) => provider.isClover,
+    // walletconnect1Name: 'clover',
  },
  [WalletType.CoinbaseWallet]: {
    type: WalletType.CoinbaseWallet,
@@ -165,78 +161,122 @@ export const wallets: Record<WalletType, WalletConfig> = {
    connectionTypes: [
      WalletConnectionType.CoinbaseWalletSdk,
      WalletConnectionType.InjectedEip1193,
-      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
    ],
    matchesInjectedEip1193: (provider) => provider.isCoinbaseWallet, // provider.selectedProvider?.isCoinbaseWallet,
+    walletconnect1Name: 'coinbase',
  },
  [WalletType.Coin98]: {
    type: WalletType.Coin98,
    stringKey: STRING_KEYS.COIN98,
    icon: Coin98Icon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [
+      WalletConnectionType.InjectedEip1193,
+      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
+    ],
    matchesInjectedEip1193: (provider) => provider.isCoin98,
+    walletconnect1Name: 'coin98',
+    walletconnect2Id: '2a3c89040ac3b723a1972a33a125b1db11e258a6975d3a61252cd64e6ea5ea01',
  },
  [WalletType.HuobiWallet]: {
    type: WalletType.HuobiWallet,
    stringKey: STRING_KEYS.HUOBI_WALLET,
    icon: HuobiIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [
+      WalletConnectionType.InjectedEip1193,
+      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
+    ],
    matchesInjectedEip1193: (provider) => provider.isHbWallet,
+    walletconnect2Id: '797c615e2c556b610c048eb35535f212c0dd58de5d03e763120e90a7d1350a77',
  },
  [WalletType.ImToken]: {
    type: WalletType.ImToken,
    stringKey: STRING_KEYS.IMTOKEN,
    icon: ImTokenIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [
+      WalletConnectionType.InjectedEip1193,
+      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
+    ],
    matchesInjectedEip1193: (provider) => provider.isImToken,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.imToken,
+    walletconnect1Name: 'imtoken',
+    walletconnect2Id: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
  },
  [WalletType.MathWallet]: {
    type: WalletType.MathWallet,
    stringKey: STRING_KEYS.MATH_WALLET,
    icon: MathWalletIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193],
+    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect1],
    matchesInjectedEip1193: (provider) => provider.isMathWallet,
+    walletconnect1Name: 'math',
    walletconnect2Id: '7674bb4e353bf52886768a3ddc2a4562ce2f4191c80831291218ebd90f5f5e26',
  },
  [WalletType.MetaMask]: {
    type: WalletType.MetaMask,
    stringKey: STRING_KEYS.METAMASK,
    icon: MetaMaskIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [
+      WalletConnectionType.InjectedEip1193,
+      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
+    ],
    matchesInjectedEip1193: isMetaMask,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Metamask,
+    walletconnect1Name: 'metamask',
+    walletconnect2Id: 'c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96',
  },
  [WalletType.Rainbow]: {
    type: WalletType.Rainbow,
    stringKey: STRING_KEYS.RAINBOW_WALLET,
    icon: RainbowIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [
+      WalletConnectionType.InjectedEip1193,
+      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
+    ],
    matchesInjectedEip1193: (provider) => provider.isRainbowWallet,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Rainbow,
+    walletconnect1Name: 'rainbow',
+    walletconnect2Id: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
  },
  [WalletType.TokenPocket]: {
    type: WalletType.TokenPocket,
    stringKey: STRING_KEYS.TOKEN_POCKET,
    icon: TokenPocketIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [
+      WalletConnectionType.InjectedEip1193,
+      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
+    ],
    matchesInjectedEip1193: (provider) => provider.isTokenPocket,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.TokenPocket,
+    walletconnect1Name: 'tokenpocket',
+    walletconnect2Id: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
  },
  [WalletType.TrustWallet]: {
    type: WalletType.TrustWallet,
    stringKey: STRING_KEYS.TRUST_WALLET,
    icon: TrustWalletIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [
+      WalletConnectionType.InjectedEip1193,
+      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
+    ],
    matchesInjectedEip1193: (provider) => provider.isTrust,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Trust,
+    walletconnect1Name: 'trust',
+    walletconnect2Id: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
  },
  [WalletType.WalletConnect2]: {
-    type: WalletType.WalletConnect2,
+    type: WalletType.WalletConnect,
    stringKey: STRING_KEYS.WALLET_CONNECT_2,
    icon: WalletConnectIcon,
    connectionTypes: [WalletConnectionType.WalletConnect2],
  },
+  [WalletType.WalletConnect]: {
+    type: WalletType.WalletConnect,
+    stringKey: STRING_KEYS.WALLET_CONNECT,
+    icon: WalletConnectIcon,
+    connectionTypes: [WalletConnectionType.WalletConnect1],
+  },
  [WalletType.Keplr]: {
    type: WalletType.Keplr,
    stringKey: STRING_KEYS.KEPLR,
@@ -278,21 +318,20 @@ export type WalletConnection = {
 export const COSMOS_DERIVATION_PATH = "m/44'/118'/0'/0/0";

 /**
- * @description typed data to sign for dYdX Chain onboarding
+ * @description typed data to sign for v4 onboarding
 */
-export const getSignTypedData = (selectedNetwork: DydxNetwork) =>
-  ({
-    primaryType: 'dYdX',
-    domain: {
-      name: ENVIRONMENT_CONFIG_MAP[selectedNetwork].wallets.signTypedDataDomainName,
-    },
-    types: {
-      dYdX: [{ name: 'action', type: 'string' }],
-    },
-    message: {
-      action: ENVIRONMENT_CONFIG_MAP[selectedNetwork].wallets.signTypedDataAction,
-    },
-  } as const);
+export const SIGN_TYPED_DATA = {
+  primaryType: 'dYdX',
+  domain: {
+    name: 'dYdX V4',
+  },
+  types: {
+    dYdX: [{ name: 'action', type: 'string' }],
+  },
+  message: {
+    action: 'dYdX V4 Onboarding',
+  },
+} as const;

 export type PrivateInformation = ReturnType<typeof onboarding.deriveHDKeyFromEthereumSignature>;

@@ -302,10 +341,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,38 +358,37 @@ 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: [],
 };

-// TODO: export this type from abacus instead
 export enum DydxChainAsset {
-  USDC = 'usdc',
-  CHAINTOKEN = 'chain',
+  USDC = 'USDC',
+  DYDX = 'Dv4TNT',
 }
+
+export const DYDX_CHAIN_ASSET_COIN_DENOM: Record<DydxChainAsset, string> = {
+  [DydxChainAsset.USDC]: USDC_DENOM,
+  [DydxChainAsset.DYDX]: DYDX_DENOM,
+};
@@ -1,6 +1,5 @@
 import { useApiState } from './useApiState';
 import { useBreakpoints } from './useBreakpoints';
-import { useTokenConfigs } from './useTokenConfigs';
 import { useCommandMenu } from './useCommandMenu';
 import { useCurrentMarketId } from './useCurrentMarketId';
 import { useDebounce } from './useDebounce';
@@ -17,7 +16,6 @@ import { useLocalStorage } from './useLocalStorage';
 import { useNow } from './useNow';
 import { useOnClickOutside } from './useOnClickOutside';
 import { usePageTitlePriceUpdates } from './usePageTitlePriceUpdates';
-import { useRestrictions } from './useRestrictions';
 import { useShouldShowFooter } from './useShouldShowFooter';
 import { useSelectedNetwork } from './useSelectedNetwork';
 import { useStringGetter } from './useStringGetter';
@@ -26,7 +24,6 @@ import { useSubaccount } from './useSubaccount';
 export {
  useApiState,
  useBreakpoints,
-  useTokenConfigs,
  useCommandMenu,
  useCurrentMarketId,
  useDebounce,
@@ -43,7 +40,6 @@ export {
  useNow,
  useOnClickOutside,
  usePageTitlePriceUpdates,
-  useRestrictions,
  useShouldShowFooter,
  useSelectedNetwork,
  useStringGetter,
@@ -33,7 +33,7 @@ export const useTradingView = ({
  const marketIds = useSelector(getMarketIds, shallowEqual);
  const selectedLocale = useSelector(getSelectedLocale);
  const selectedNetwork = useSelector(getSelectedNetwork);
-  const { getCandlesForDatafeed, isConnected: isClientConnected } = useDydxClient();
+  const { getCandlesForDatafeed } = useDydxClient();

  const [savedTvChartConfig, setTvChartConfig] = useLocalStorage<object | undefined>({
    key: LocalStorageKey.TradingViewChartConfig,
@@ -44,7 +44,7 @@ export const useTradingView = ({
  const hasMarkets = marketIds.length > 0;

  useEffect(() => {
-    if (hasMarkets && isClientConnected) {
+    if (hasMarkets) {
      const widgetOptions = getWidgetOptions();
      const widgetOverrides = getWidgetOverrides(appTheme);
      const options = {
@@ -75,7 +75,7 @@ export const useTradingView = ({
      tvWidgetRef.current = null;
      setIsChartReady(false);
    };
-  }, [getCandlesForDatafeed, isClientConnected, hasMarkets, selectedLocale, selectedNetwork]);
+  }, [getCandlesForDatafeed, hasMarkets, selectedLocale, selectedNetwork]);

  return { savedResolution };
 };
@@ -1,22 +1,22 @@
 import { useCallback } from 'react';
-import { shallowEqual, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { useBalance } from 'wagmi';
 import { StargateClient } from '@cosmjs/stargate';
 import { useQuery } from 'react-query';
 import { formatUnits } from 'viem';

-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { CLIENT_NETWORK_CONFIGS } from '@/constants/networks';
 import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
 import { EvmAddress } from '@/constants/wallets';

 import { convertBech32Address } from '@/lib/addressUtils';
 import { MustBigNumber } from '@/lib/numbers';

-import { getBalances, getStakingBalances } from '@/state/accountSelectors';
 import { getSelectedNetwork } from '@/state/appSelectors';

 import { useAccounts } from './useAccounts';
-import { useTokenConfigs } from './useTokenConfigs';
+import { usePollNativeTokenBalance } from './usePollNativeTokenBalance';
+import { usePollUSDCBalance } from './usePollUSDCBalance';

 type UseAccountBalanceProps = {
  // Token Items
@@ -36,10 +36,10 @@ type UseAccountBalanceProps = {
 * 0xSquid uses this 0x address as the chain's default token.
 * @todo We will need to add additional logic here if we 'useAccountBalance' on non-Squid related forms.
 */
-export const CHAIN_DEFAULT_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
+const CHAIN_DEFAULT_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';

 export const useAccountBalance = ({
-  addressOrDenom,
+  addressOrDenom = CHAIN_DEFAULT_TOKEN_ADDRESS,
  assetSymbol,
  bech32AddrPrefix,
  chainId,
@@ -50,17 +50,16 @@ export const useAccountBalance = ({
  const { evmAddress, dydxAddress } = useAccounts();

  const selectedNetwork = useSelector(getSelectedNetwork);
-  const balances = useSelector(getBalances, shallowEqual);
-  const { chainTokenDenom, usdcDenom } = useTokenConfigs();
-  const evmChainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId);
-  const stakingBalances = useSelector(getStakingBalances, shallowEqual);
+  const evmChainId = Number(CLIENT_NETWORK_CONFIGS[selectedNetwork].ethereumChainId);

  const evmQuery = useBalance({
    enabled: Boolean(!isCosmosChain && addressOrDenom?.startsWith('0x')),
    address: evmAddress,
    chainId: typeof chainId === 'number' ? chainId : Number(evmChainId),
    token:
-      addressOrDenom === CHAIN_DEFAULT_TOKEN_ADDRESS ? undefined : (addressOrDenom as EvmAddress),
+      addressOrDenom === CHAIN_DEFAULT_TOKEN_ADDRESS
+        ? undefined
+        : (addressOrDenom as EvmAddress),
    watch: true,
  });

@@ -93,19 +92,17 @@ export const useAccountBalance = ({
  const { formatted: evmBalance } = evmQuery.data || {};
  const balance = !assetSymbol ? '0' : isCosmosChain ? cosmosQuery.data : evmBalance;

-  const nativeTokenCoinBalance = balances?.[chainTokenDenom];
-  const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount);
+  const nativeTokenCoinBalance = usePollNativeTokenBalance({ dydxAddress });
+  const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount)
+    .div(QUANTUM_MULTIPLIER)
+    .toNumber();

-  const usdcCoinBalance = balances?.[usdcDenom];
-  const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).toNumber();
-
-  const nativeStakingCoinBalanace = stakingBalances?.[chainTokenDenom];
-  const nativeStakingBalance = MustBigNumber(nativeStakingCoinBalanace?.amount).toNumber();
+  const usdcCoinBalance = usePollUSDCBalance({ dydxAddress });
+  const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).div(QUANTUM_MULTIPLIER).toNumber();

  return {
    balance,
    nativeTokenBalance,
-    nativeStakingBalance,
    usdcBalance,
    queryStatus: isCosmosChain ? cosmosQuery.status : evmQuery.status,
    isQueryFetching: isCosmosChain ? cosmosQuery.isFetching : evmQuery.fetchStatus === 'fetching',
@@ -2,23 +2,24 @@ import { useCallback, useContext, createContext, useEffect, useState, useMemo }

 import { useDispatch } from 'react-redux';
 import { AES, enc } from 'crypto-js';
-import { LocalWallet, type Subaccount } from '@dydxprotocol/v4-client-js';
+import { LocalWallet, USDC_DENOM, type Subaccount } from '@dydxprotocol/v4-client-js';

 import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/constants/account';
-import { DialogTypes } from '@/constants/dialogs';
 import { LocalStorageKey, LOCAL_STORAGE_VERSIONS } from '@/constants/localStorage';
 import { DydxAddress, EvmAddress, PrivateInformation } from '@/constants/wallets';

-import { setOnboardingState, setOnboardingGuard } from '@/state/account';
-import { forceOpenDialog } from '@/state/dialogs';
+import {
+  setOnboardingState,
+  setOnboardingGuard,
+} from '@/state/account';

 import abacusStateManager from '@/lib/abacus';
 import { log } from '@/lib/telemetry';

-import { useDydxClient } from './useDydxClient';
 import { useLocalStorage } from './useLocalStorage';
-import { useRestrictions } from './useRestrictions';
+
 import { useWalletConnection } from './useWalletConnection';
+import { useDydxClient } from './useDydxClient';

 const AccountsContext = createContext<ReturnType<typeof useAccountsContext> | undefined>(undefined);

@@ -59,9 +60,7 @@ const useAccountsContext = () => {
      forgetEvmSignature(previousEvmAddress);
    }

-    if (evmAddress) {
-      abacusStateManager.setTransfersSourceAddress(evmAddress);
-    }
+    if (evmAddress) abacusStateManager.setTransfersSourceAddress(evmAddress);

    setPreviousEvmAddress(evmAddress);
  }, [evmAddress]);
@@ -130,8 +129,16 @@ const useAccountsContext = () => {
  // dYdX subaccounts
  const [dydxSubaccounts, setDydxSubaccounts] = useState<Subaccount[] | undefined>();

-  const { getSubaccounts } = useMemo(
+  const { getAccountBalance, getSubaccounts } = useMemo(
    () => ({
+      getAccountBalance: async ({
+        dydxAddress,
+        denom = USDC_DENOM,
+      }: {
+        dydxAddress: DydxAddress;
+        denom?: string;
+      }) => await compositeClient?.validatorClient.get.getAccountBalance(dydxAddress, denom),
+
      getSubaccounts: async ({ dydxAddress }: { dydxAddress: DydxAddress }) => {
        try {
          const response = await compositeClient?.indexerClient.account.getSubaccounts(dydxAddress);
@@ -213,10 +220,11 @@ const useAccountsContext = () => {
  }, [evmAddress, evmDerivedAddresses, signerWagmi, connectedDydxAddress, signerGraz]);

  // abacus
+  // TODO: useAbacus({ dydxAddress })
  useEffect(() => {
-    if (dydxAddress) abacusStateManager.setAccount(localDydxWallet);
+    if (dydxAddress) abacusStateManager.setAccount(dydxAddress);
    else abacusStateManager.attemptDisconnectAccount();
-  }, [localDydxWallet]);
+  }, [dydxAddress]);

  // clear subaccounts when no dydxAddress is set
  useEffect(() => {
@@ -253,21 +261,6 @@ const useAccountsContext = () => {
    );
  }, [dydxSubaccounts]);

-  // Restrictions
-  const { isBadActor, sanctionedAddresses } = useRestrictions();
-
-  useEffect(() => {
-    if (
-      dydxAddress &&
-      (isBadActor ||
-        sanctionedAddresses.has(dydxAddress) ||
-        (evmAddress && sanctionedAddresses.has(evmAddress)))
-    ) {
-      dispatch(forceOpenDialog({ type: DialogTypes.RestrictedWallet }));
-      disconnect();
-    }
-  }, [isBadActor, evmAddress, dydxAddress, sanctionedAddresses]);
-
  // Disconnect wallet / accounts
  const disconnectLocalDydxWallet = () => {
    setLocalDydxWallet(undefined);
@@ -318,6 +311,7 @@ const useAccountsContext = () => {
    disconnect,

    // dydxClient Account methods
+    getAccountBalance,
    getSubaccounts,
  };
 };
@@ -44,9 +44,6 @@ export const useCurrentMarketId = () => {
  }, [validId]);

  useEffect(() => {
-    // Check for marketIds otherwise Abacus will silently fail its isMarketValid check
-    if (marketIds) {
-      abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
-    }
-  }, [selectedNetwork, marketIds, marketId]);
+    abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
+  }, [selectedNetwork, marketId]);
 };
@@ -1,24 +1,29 @@
+import { isDydxV4Network } from '@/constants/networks';
 import { WalletType } from '@/constants/wallets';

 import { isTruthy } from '@/lib/isTruthy';

+import { useSelectedNetwork } from './useSelectedNetwork';
+
 export const useDisplayedWallets = () => {
+  const { selectedNetwork } = useSelectedNetwork();
+
  return [
    WalletType.MetaMask,

-    import.meta.env.MODE !== 'production' && WalletType.Keplr,
+    import.meta.env.MODE !== 'production' && isDydxV4Network(selectedNetwork) && WalletType.Keplr,

    WalletType.WalletConnect2,
-    
+    WalletType.WalletConnect,
+
    WalletType.CoinbaseWallet,
-    
-    // Hide these wallet options until they can be properly tested on mainnet
-    // WalletType.ImToken,
-    // WalletType.Rainbow,
-    // WalletType.TrustWallet,
-    // WalletType.HuobiWallet,
-    // WalletType.BitKeep,
-    // WalletType.Coin98,
+
+    WalletType.ImToken,
+    WalletType.Rainbow,
+    WalletType.TrustWallet,
+    WalletType.HuobiWallet,
+    WalletType.BitKeep,
+    WalletType.Coin98,

    WalletType.OtherWallet,
  ].filter(isTruthy);
@@ -13,17 +13,12 @@ import {

 import type { ResolutionString } from 'public/tradingview/charting_library';

-import type { ConnectNetworkEvent, NetworkConfig } from '@/constants/abacus';
+import type { NetworkConfig, ConnectNetworkEvent } from '@/constants/abacus';
 import { type Candle, RESOLUTION_MAP } from '@/constants/candles';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-import { DydxChainAsset } from '@/constants/wallets';

 import { getSelectedNetwork } from '@/state/appSelectors';
-
 import { log } from '@/lib/telemetry';

-import { useRestrictions } from './useRestrictions';
-
 type DydxContextType = ReturnType<typeof useDydxClientContext>;
 const DydxContext = createContext<DydxContextType>({} as DydxContextType);
 DydxContext.displayName = 'dYdXClient';
@@ -38,9 +33,8 @@ const useDydxClientContext = () => {
  // ------ Network ------ //

  const selectedNetwork = useSelector(getSelectedNetwork);
-  const tokensConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].tokens;

-  const [networkConfig, setNetworkConfig] = useState<NetworkConfig>();
+  const [networkConfig, setNetworkConfig] = useState<Partial<NetworkConfig>>();

  useEffect(() => {
    const onConnectNetwork = (event: ConnectNetworkEvent) => setNetworkConfig(event.detail);
@@ -60,22 +54,15 @@ const useDydxClientContext = () => {
      if (
        networkConfig?.chainId &&
        networkConfig?.indexerUrl &&
-        networkConfig?.websocketUrl &&
+        networkConfig?.indexerSocketUrl &&
        networkConfig?.validatorUrl
      ) {
        try {
          const initializedClient = await CompositeClient.connect(
            new Network(
              selectedNetwork,
-              new IndexerConfig(networkConfig.indexerUrl, networkConfig.websocketUrl),
-              new ValidatorConfig(networkConfig.validatorUrl, networkConfig.chainId,
-                {
-                  USDC_DENOM: tokensConfigs[DydxChainAsset.USDC].denom,
-                  USDC_DECIMALS: tokensConfigs[DydxChainAsset.USDC].decimals,
-                  USDC_GAS_DENOM: tokensConfigs[DydxChainAsset.USDC].gasDenom,
-                  CHAINTOKEN_DENOM: tokensConfigs[DydxChainAsset.CHAINTOKEN].denom,
-                  CHAINTOKEN_DECIMALS: tokensConfigs[DydxChainAsset.CHAINTOKEN].decimals,
-                }, {
+              new IndexerConfig(networkConfig.indexerUrl, networkConfig.indexerSocketUrl),
+              new ValidatorConfig(networkConfig.validatorUrl, networkConfig.chainId, {
                broadcastPollIntervalMs: 3_000,
                broadcastTimeoutMs: 60_000,
              })
@@ -191,27 +178,7 @@ const useDydxClientContext = () => {
    [requestCandles]
  );

-  const { updateSanctionedAddresses } = useRestrictions();
-
-  const screenAddresses = useCallback(
-    async ({ addresses }: { addresses: string[] }) => {
-      if (compositeClient) {
-        const promises = addresses.map((address) =>
-          compositeClient.indexerClient.utility.screen(address)
-        );
-
-        const results = await Promise.all(promises);
-
-        const screenedAddresses = Object.fromEntries(
-          addresses.map((address, index) => [address, results[index]?.restricted])
-        );
-
-        updateSanctionedAddresses(screenedAddresses);
-        return screenedAddresses;
-      }
-    },
-    [compositeClient]
-  );
+  // ------ Subacount Methods ------ //

  return {
    // Client initialization
@@ -219,13 +186,11 @@ const useDydxClientContext = () => {
    networkConfig,
    compositeClient,
    faucetClient,
-    isConnected: !!compositeClient,

    // Wallet Methods
    getWalletFromEvmSignature,

    // Public Methods
    getCandlesForDatafeed,
-    screenAddresses,
  };
 };
@@ -3,14 +3,13 @@ import { useDispatch } from 'react-redux';

 import { LocalStorageKey } from '@/constants/localStorage';

-import { DEFAULT_APP_ENVIRONMENT, type DydxNetwork } from '@/constants/networks';
+import { DEFAULT_APP_ENVIRONMENT, DydxNetwork, isValidDydxNetwork } from '@/constants/networks';

 import { useLocalStorage } from '@/hooks';

 import { initializeLocalization } from '@/state/app';

 import abacusStateManager from '@/lib/abacus';
-import { validateAgainstAvailableEnvironments } from '@/lib/network';

 export const useInitializePage = () => {
  const dispatch = useDispatch();
@@ -19,7 +18,7 @@ export const useInitializePage = () => {
  const [localStorageNetwork] = useLocalStorage<DydxNetwork>({
    key: LocalStorageKey.SelectedNetwork,
    defaultValue: DEFAULT_APP_ENVIRONMENT,
-    validateFn: validateAgainstAvailableEnvironments,
+    validateFn: isValidDydxNetwork, // backwards compatibility
  });

  useEffect(() => {
@@ -6,7 +6,7 @@ import { LocalStorageKey } from '@/constants/localStorage';
 import { type TransferNotifcation } from '@/constants/notifications';

 import { useAccounts } from '@/hooks/useAccounts';
-import { STATUS_ERROR_GRACE_PERIOD, useSquid } from '@/hooks/useSquid';
+import { SQUID_ERROR_TYPES, useSquid } from '@/hooks/useSquid';
 import { useLocalStorage } from './useLocalStorage';

 const LocalNotificationsContext = createContext<
@@ -62,7 +62,6 @@ const useLocalNotificationsContext = () => {
        txHash,
        toChainId,
        fromChainId,
-        triggeredAt,
        status: currentStatus,
      } of transferNotifications) {
        try {
@@ -71,8 +70,8 @@ const useLocalNotificationsContext = () => {
          const status = await squid?.getStatus({ transactionId: txHash, toChainId, fromChainId });
          if (status) statuses[txHash] = status;
        } catch (error) {
-          // ignore errors for the first 120s since the status might not be available yet
-          if (!triggeredAt || Date.now() - triggeredAt > STATUS_ERROR_GRACE_PERIOD) {
+          // ignore not found errors since the route might not be available yet
+          if (error?.errors?.length && error.errors[0].errorType !== SQUID_ERROR_TYPES.NotFoundError) {
            statuses[txHash] = error;
          }
        }
@@ -28,13 +28,15 @@ export const useMarketsData = (
  const allAssets = useSelector(getAssets, shallowEqual) || {};

  const markets = useMemo(() => {
-    return Object.values(allPerpetualMarkets).map((marketData) => ({
-      asset: allAssets[marketData.assetId],
-      tickSizeDecimals: marketData.configs?.tickSizeDecimals,
-      ...marketData,
-      ...marketData.perpetual,
-      ...marketData.configs,
-    })) as MarketData[];
+    return Object.values(allPerpetualMarkets)
+      .filter(({ assetId }) => allAssets[assetId]) // Filter out markets with no asset information
+      .map((marketData) => ({
+        asset: allAssets[marketData.assetId],
+        tickSizeDecimals: marketData.configs?.tickSizeDecimals,
+        ...marketData,
+        ...marketData.perpetual,
+        ...marketData.configs,
+      })) as MarketData[];
  }, [allPerpetualMarkets, allAssets]);

  const filteredMarkets = useMemo(() => {
@@ -43,8 +45,8 @@ export const useMarketsData = (
    if (searchFilter) {
      return filtered.filter(
        ({ asset }) =>
-          asset?.name?.toLocaleLowerCase().includes(searchFilter.toLowerCase()) ||
-          asset?.id?.toLocaleLowerCase().includes(searchFilter.toLowerCase())
+          asset.name?.toLocaleLowerCase().includes(searchFilter.toLowerCase()) ||
+          asset.symbol?.toLocaleLowerCase().includes(searchFilter.toLowerCase())
      );
    }
    return filtered;
@@ -4,14 +4,15 @@ import { useSelector, shallowEqual, useDispatch } from 'react-redux';
 import { groupBy } from 'lodash';

 import { AlertType } from '@/constants/alerts';
-import { AbacusOrderStatus, ORDER_SIDES } from '@/constants/abacus';
+import { AbacusOrderStatus, ORDER_SIDES, ORDER_STATUS_STRINGS } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
-import { STRING_KEYS, StringKey } from '@/constants/localization';
+import { STRING_KEYS } from '@/constants/localization';
 import { type NotificationTypeConfig, NotificationType } from '@/constants/notifications';
-import { ORDER_SIDE_STRINGS } from '@/constants/trade';
+import { ORDER_SIDE_STRINGS, TRADE_TYPE_STRINGS, TradeTypes } from '@/constants/trade';

 import { useLocalNotifications } from '@/hooks/useLocalNotifications';

+import { AlertMessage } from '@/components/AlertMessage';
 import { Icon, IconName } from '@/components/Icon';
 import { Output, OutputType } from '@/components/Output';
 import { TransferStatusToast } from '@/views/TransferStatus';
@@ -68,11 +69,11 @@ export const notificationTypes = [
                  <OrderStatusIcon status={order.status} totalFilled={order.totalFilled ?? 0} />
                ),
                title: `${stringGetter({
-                  key: order.resources.typeStringKey as StringKey,
+                  key: TRADE_TYPE_STRINGS[order.type.rawValue as TradeTypes].tradeTypeKey,
                })} ${
                  order.status === AbacusOrderStatus.open && (order?.totalFilled ?? 0) > 0
                    ? stringGetter({ key: STRING_KEYS.PARTIALLY_FILLED })
-                    : stringGetter({ key: order.resources.statusStringKey as StringKey })
+                    : stringGetter({ key: ORDER_STATUS_STRINGS[order.status.name] })
                }`,
                description: `${stringGetter({
                  key: ORDER_SIDE_STRINGS[ORDER_SIDES[order.side.name]],
@@ -90,34 +91,18 @@ export const notificationTypes = [
      }, [orderIds]);
    },

-    // useNotificationAction: () => {
-    //   const dispatch = useDispatch();
-    //   const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
-    //   const ordersByOrderId = Object.fromEntries(orders.map((order) => [order.id, order]));
+    useNotificationAction: () => {
+      const dispatch = useDispatch();

-    //   const fills = useSelector(getSubaccountFills, shallowEqual) || [];
-    //   const fillsByOrderId = groupBy(fills, (fill) => fill.orderId);
-
-    //   return (id) => {
-    //     if (ordersByOrderId[id]) {
-    //       dispatch(
-    //         openDialog({
-    //           type: DialogTypes.OrderDetails,
-    //           dialogProps: { orderId: id },
-    //         })
-    //       );
-    //     } else if (fillsByOrderId[id]) {
-    //       const fillId = fillsByOrderId[id][0].id;
-
-    //       dispatch(
-    //         openDialog({
-    //           type: DialogTypes.FillDetails,
-    //           dialogProps: { fillId },
-    //         })
-    //       );
-    //     }
-    //   };
-    // },
+      return (orderId) => {
+        dispatch(
+          openDialog({
+            type: DialogTypes.OrderDetails,
+            dialogProps: { orderId },
+          })
+        );
+      };
+    },
  } as NotificationTypeConfig<string, [string, number]>,
  {
    type: NotificationType.SquidTransfer,
@@ -125,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;

@@ -153,8 +138,7 @@ export const notificationTypes = [
                  {stringGetter({
                    key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
                    params: {
-                      ERROR_MESSAGE:
-                        error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
+                      ERROR_MESSAGE: error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
                    },
                  })}
                </Styled.ErrorMessage>
@@ -170,7 +154,6 @@ export const notificationTypes = [
              description: description,
              customContent: (
                <TransferStatusToast
-                  type={type}
                  toAmount={transfer.toAmount}
                  triggeredAt={transfer.triggeredAt}
                  status={transfer.status}
@@ -179,7 +162,7 @@ export const notificationTypes = [
              customMenuContent: !finished && (
                <div>
                  {description}
-                  <TransferStatusSteps status={transfer.status} type={type} />
+                  <TransferStatusSteps status={transfer.status} />
                </div>
              ),
              toastSensitivity: 'foreground',
@@ -198,8 +181,8 @@ Styled.TransferText = styled.span`
  display: inline-flex;
  align-items: center;
  gap: 0.5ch;
-`;
+`

 Styled.ErrorMessage = styled.div`
  max-width: 13rem;
-`;
+`;
@@ -1,26 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-
-import { getLatestOrderClientId } from '@/state/accountSelectors';
-
-/**
- * @description This hook will fire a callback when the latest order has been updated to a non-pending state from the Indexer.
- * @param { callback: () => void }
- */
-export const useOnLastOrderIndexed = ({ callback }: { callback: () => void }) => {
-  const [unIndexedClientId, setUnIndexedClientId] = useState<number | undefined>();
-  const latestOrderClientId = useSelector(getLatestOrderClientId);
-
-  useEffect(() => {
-    if (unIndexedClientId) {
-      if (unIndexedClientId === latestOrderClientId) {
-        callback();
-        setUnIndexedClientId(undefined);
-      }
-    }
-  }, [callback, latestOrderClientId, unIndexedClientId]);
-
-  return {
-    setUnIndexedClientId,
-  };
-};
@@ -0,0 +1,31 @@
+import { useQuery } from 'react-query';
+
+import { useAccounts } from '@/hooks';
+
+import { DydxAddress } from '@/constants/wallets';
+import { DYDX_DENOM } from '@dydxprotocol/v4-client-js';
+
+const ACCOUNT_BALANCE_POLLING_INTERVAL = 60_000;
+
+export const usePollNativeTokenBalance = ({
+  dydxAddress,
+  interval = ACCOUNT_BALANCE_POLLING_INTERVAL,
+}: {
+  dydxAddress?: DydxAddress;
+  interval?: number;
+}) => {
+  const { getAccountBalance } = useAccounts();
+
+  const { data } = useQuery({
+    enabled: dydxAddress !== undefined,
+    queryKey: ['usePollNativeTokenBalance', { dydxAddress }],
+    queryFn: async () => {
+      if (!dydxAddress) return;
+      return await getAccountBalance({ dydxAddress, denom: DYDX_DENOM });
+    },
+    refetchInterval: interval,
+    staleTime: interval,
+  });
+
+  return data;
+};
@@ -0,0 +1,30 @@
+import { useQuery } from 'react-query';
+
+import { useAccounts } from '@/hooks';
+
+import { DydxAddress } from '@/constants/wallets';
+
+const ACCOUNT_BALANCE_POLLING_INTERVAL = 60_000;
+
+export const usePollUSDCBalance = ({
+  dydxAddress,
+  interval = ACCOUNT_BALANCE_POLLING_INTERVAL,
+}: {
+  dydxAddress?: DydxAddress;
+  interval?: number;
+}) => {
+  const { getAccountBalance } = useAccounts();
+
+  const { data } = useQuery({
+    enabled: dydxAddress !== undefined,
+    queryKey: ['usePollUSDCBalance', { dydxAddress }],
+    queryFn: async () => {
+      if (!dydxAddress) return;
+      return await getAccountBalance({ dydxAddress });
+    },
+    refetchInterval: interval,
+    staleTime: interval,
+  });
+
+  return data;
+};
@@ -1,53 +0,0 @@
-import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-
-import { RestrictionType } from '@/constants/abacus';
-import { DialogTypes } from '@/constants/dialogs';
-
-import { getRestrictionType } from '@/state/accountSelectors';
-import { forceOpenDialog } from '@/state/dialogs';
-import { isTruthy } from '@/lib/isTruthy';
-
-const useRestrictionContext = () => {
-  const dispatch = useDispatch();
-  const restrictionType = useSelector(getRestrictionType, shallowEqual);
-  const [sanctionedAddresses, setSanctionedAddresses] = useState<string[]>([]);
-
-  useEffect(() => {
-    if (restrictionType === RestrictionType.GEO_RESTRICTED) {
-      dispatch(
-        forceOpenDialog({ type: DialogTypes.RestrictedGeo, dialogProps: { preventClose: true } })
-      );
-    }
-  }, [restrictionType, dispatch]);
-
-  const updateSanctionedAddresses = useCallback(
-    (screenedAddresses: { [address: string]: boolean }) => {
-      const toAdd = Object.entries(screenedAddresses)
-        .filter(([, isSanctioned]) => isSanctioned)
-        .map(([address]) => address);
-
-      if (toAdd.length) {
-        setSanctionedAddresses([...sanctionedAddresses, ...toAdd]);
-      }
-    },
-    [sanctionedAddresses]
-  );
-
-  return {
-    isBadActor: restrictionType === RestrictionType.USER_RESTRICTED,
-    isGeoRestricted: restrictionType === RestrictionType.GEO_RESTRICTED,
-    updateSanctionedAddresses,
-    sanctionedAddresses: useMemo(() => new Set(sanctionedAddresses), [sanctionedAddresses]),
-  };
-};
-
-type RestrictionContextType = ReturnType<typeof useRestrictionContext>;
-const RestrictionContext = createContext<RestrictionContextType>({} as RestrictionContextType);
-RestrictionContext.displayName = 'Restriction';
-
-export const RestrictionProvider = ({ ...props }) => (
-  <RestrictionContext.Provider value={useRestrictionContext()} {...props} />
-);
-
-export const useRestrictions = () => useContext(RestrictionContext);
@@ -2,15 +2,13 @@ import { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';

 import { LocalStorageKey } from '@/constants/localStorage';
-import { DEFAULT_APP_ENVIRONMENT, DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { DEFAULT_APP_ENVIRONMENT, DydxNetwork } from '@/constants/networks';

 import { useAccounts, useLocalStorage } from '@/hooks';

 import { setSelectedNetwork } from '@/state/app';
 import { getSelectedNetwork } from '@/state/appSelectors';

-import { validateAgainstAvailableEnvironments } from '@/lib/network';
-
 export const useSelectedNetwork = (): {
  switchNetwork: (network: DydxNetwork) => void;
  selectedNetwork: DydxNetwork;
@@ -22,7 +20,6 @@ export const useSelectedNetwork = (): {
  const [, setLocalStorageNetwork] = useLocalStorage<DydxNetwork>({
    key: LocalStorageKey.SelectedNetwork,
    defaultValue: DEFAULT_APP_ENVIRONMENT,
-    validateFn: validateAgainstAvailableEnvironments,
  });

  const switchNetwork = useCallback(
@@ -2,13 +2,15 @@ import { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { Squid } from '@0xsquid/sdk';

-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { CLIENT_NETWORK_CONFIGS, isDydxV4Network } from '@/constants/networks';

 import { getSelectedNetwork } from '@/state/appSelectors';

-export const NATIVE_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
+export const NATIVE_TOKEN_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";

-export const STATUS_ERROR_GRACE_PERIOD = 120_000;
+export enum SQUID_ERROR_TYPES {
+  NotFoundError = 'NotFoundError',
+}

 const useSquidContext = () => {
  const selectedNetwork = useSelector(getSelectedNetwork);
@@ -22,7 +24,10 @@ const useSquidContext = () => {
  };

  const squid = useMemo(
-    () => new Squid({ baseUrl: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.endpoints['0xsquid'] }),
+    () =>
+      isDydxV4Network(selectedNetwork)
+        ? new Squid({ baseUrl: CLIENT_NETWORK_CONFIGS[selectedNetwork]?.endpoints['0xsquid'] })
+        : undefined,
    [selectedNetwork]
  );

@@ -36,7 +41,7 @@ const useSquidContext = () => {
 };

 type SquidContextType = ReturnType<typeof useSquidContext>;
-const SquidContext = createContext<SquidContextType | undefined>(undefined);
+const SquidContext = createContext<SquidContextType>(undefined);
 SquidContext.displayName = '0xSquid';

 export const SquidProvider = ({ ...props }) => (
@@ -1,36 +1,53 @@
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { shallowEqual, useSelector, useDispatch } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import type { Nullable } from '@dydxprotocol/v4-abacus';
 import Long from 'long';
 import type { IndexedTx } from '@cosmjs/stargate';
-import type { EncodeObject } from '@cosmjs/proto-signing';
+import type { EncodeObject, Coin } from '@cosmjs/proto-signing';
 import { Method } from '@cosmjs/tendermint-rpc';

-import { type LocalWallet, SubaccountClient } from '@dydxprotocol/v4-client-js';
+import {
+  LocalWallet,
+  OrderExecution,
+  OrderFlags,
+  OrderSide,
+  OrderTimeInForce,
+  OrderType,
+  SubaccountClient,
+  DYDX_DENOM,
+  USDC_DENOM,
+  GAS_PRICE_DYDX_DENOM,
+} from '@dydxprotocol/v4-client-js';

 import type {
-  AccountBalance,
+  HumanReadableCancelOrderPayload,
  HumanReadablePlaceOrderPayload,
-  ParsingError,
  SubAccountHistoricalPNLs,
 } from '@/constants/abacus';

 import { AMOUNT_RESERVED_FOR_GAS_USDC } from '@/constants/account';
 import { AnalyticsEvent } from '@/constants/analytics';
+import { ORDER_ERROR_CODE_MAP } from '@/constants/localization';
 import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
+import { UNCOMMITTED_ORDER_TIMEOUT } from '@/constants/trade';
 import { DydxAddress } from '@/constants/wallets';

-import { setSubaccount, setHistoricalPnl, removeUncommittedOrderClientId } from '@/state/account';
-import { getBalances } from '@/state/accountSelectors';
+import {
+  addUncommittedOrderClientId,
+  removeUncommittedOrderClientId,
+  setSubaccount,
+  setHistoricalPnl,
+} from '@/state/account';

 import abacusStateManager from '@/lib/abacus';
 import { track } from '@/lib/analytics';
+import { StatefulOrderError } from '@/lib/errors';
 import { MustBigNumber } from '@/lib/numbers';
 import { log } from '@/lib/telemetry';

 import { useAccounts } from './useAccounts';
-import { useTokenConfigs } from './useTokenConfigs';
 import { useDydxClient } from './useDydxClient';
+import { usePollUSDCBalance } from './usePollUSDCBalance';

 type SubaccountContextType = ReturnType<typeof useSubaccountContext>;
 const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType);
@@ -48,7 +65,6 @@ export const useSubaccount = () => useContext(SubaccountContext);

 export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: LocalWallet }) => {
  const dispatch = useDispatch();
-  const { usdcDenom } = useTokenConfigs();
  const { compositeClient, faucetClient } = useDydxClient();

  const { getFaucetFunds } = useMemo(
@@ -67,8 +83,12 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
  const {
    depositToSubaccount,
    withdrawFromSubaccount,
+    simulateWithdrawFromSubaccount,
    transferFromSubaccountToAddress,
    transferNativeToken,
+    simulateTransferNativeToken,
+    placeOrderForSubaccount,
+    cancelOrderForSubaccount,
    sendSquidWithdrawFromSubaccount,
  } = useMemo(
    () => ({
@@ -88,7 +108,32 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
      }: {
        subaccountClient: SubaccountClient;
        amount: number;
-      }) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount.toString()),
+      }) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount),
+
+      simulateWithdrawFromSubaccount: async ({
+        subaccountClient,
+        amount,
+        recipient,
+      }: {
+        subaccountClient: SubaccountClient;
+        amount: number;
+        recipient?: string;
+      }) => {
+        return await compositeClient?.simulate(
+          subaccountClient?.wallet,
+          () =>
+            new Promise((resolve) => {
+              const msg = compositeClient?.withdrawFromSubaccountMessage(
+                subaccountClient,
+                amount,
+                recipient
+              );
+
+              resolve([msg]);
+            }),
+          undefined
+        );
+      },

      transferFromSubaccountToAddress: async ({
        subaccountClient,
@@ -131,24 +176,134 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
        amount: number;
        recipient: string;
      }) =>
-        await compositeClient?.validatorClient.post.send(
-          subaccountClient.wallet,
+        await compositeClient?.validatorClient.post.sendToken(
+          subaccountClient,
+          recipient,
+          DYDX_DENOM,
+          Long.fromNumber(amount * QUANTUM_MULTIPLIER),
+          false,
+          Method.BroadcastTxCommit
+        ),
+
+      simulateTransferNativeToken: async ({
+        subaccountClient,
+        amount,
+        recipient,
+      }: {
+        subaccountClient: SubaccountClient;
+        amount: number;
+        recipient: string;
+      }) =>
+        await compositeClient?.simulate(
+          subaccountClient?.wallet,
          () =>
            new Promise((resolve) => {
-              const msg = compositeClient?.sendTokenMessage(
-                subaccountClient.wallet,
-                amount.toString(),
+              const msg = compositeClient?.validatorClient.post.composer.composeMsgSendToken(
+                subaccountClient.address,
                recipient,
+                DYDX_DENOM,
+                Long.fromNumber(amount * QUANTUM_MULTIPLIER)
              );

              resolve([msg]);
            }),
-          false,
-          compositeClient?.validatorClient?.post.defaultDydxGasPrice,
-          undefined,
-          Method.BroadcastTxCommit
+          GAS_PRICE_DYDX_DENOM,
+          undefined
        ),

+      placeOrderForSubaccount: async ({
+        subaccount,
+        marketId,
+        type,
+        side,
+        price,
+        triggerPrice,
+        size,
+        clientId,
+        timeInForce,
+        goodTilTimeInSeconds,
+        execution,
+        postOnly,
+        reduceOnly,
+      }: {
+        subaccount: SubaccountClient;
+        marketId: string;
+        type: OrderType;
+        side: OrderSide;
+        price: number;
+        triggerPrice: Nullable<number>;
+        size: number;
+        clientId: number;
+        timeInForce: OrderTimeInForce;
+        goodTilTimeInSeconds: number;
+        execution: OrderExecution;
+        postOnly: boolean;
+        reduceOnly: boolean;
+      }) => {
+        const startTimestamp = performance.now();
+
+        const result = await compositeClient?.placeOrder(
+          subaccount,
+          marketId,
+          type,
+          side,
+          price,
+          size,
+          clientId,
+          timeInForce,
+          goodTilTimeInSeconds,
+          execution,
+          postOnly,
+          reduceOnly,
+          triggerPrice ?? undefined
+        );
+
+        const endTimestamp = performance.now();
+
+        track(AnalyticsEvent.TradePlaceOrderConfirmed, {
+          roundtripMs: endTimestamp - startTimestamp,
+          validator: compositeClient!.validatorClient.config.restEndpoint,
+        });
+
+        return result;
+      },
+
+      cancelOrderForSubaccount: async ({
+        subaccount,
+        clientId,
+        clobPairId,
+        orderFlags,
+        goodTilBlock,
+        goodTilBlockTime,
+      }: {
+        subaccount: SubaccountClient;
+        clientId: number;
+        orderFlags: OrderFlags;
+        clobPairId: number;
+        goodTilBlock?: number;
+        goodTilBlockTime?: number;
+      }) => {
+        const startTimestamp = performance.now();
+
+        const result = await compositeClient?.cancelOrder(
+          subaccount,
+          clientId,
+          orderFlags,
+          clobPairId,
+          goodTilBlock,
+          goodTilBlockTime
+        );
+
+        const endTimestamp = performance.now();
+
+        track(AnalyticsEvent.TradeCancelOrderConfirmed, {
+          roundtripMs: endTimestamp - startTimestamp,
+          validator: compositeClient!.validatorClient.config.restEndpoint,
+        });
+
+        return result;
+      },
+
      sendSquidWithdrawFromSubaccount: async ({
        subaccountClient,
        amount,
@@ -162,7 +317,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo

        const transaction = JSON.parse(payload);

-        const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount.toString());
+        const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount);
        const ibcMsg: EncodeObject = {
          typeUrl: transaction.msgTypeUrl,
          value: transaction.msg,
@@ -198,10 +353,10 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo

  // ------ Deposit/Withdraw Methods ------ //
  const depositFunds = useCallback(
-    async (balance: AccountBalance) => {
+    async (balance?: Coin) => {
      if (!localDydxWallet) return;

-      const amountAfterDust = MustBigNumber(balance.amount)
+      const amountAfterDust = MustBigNumber(balance?.amount)
        .minus(AMOUNT_RESERVED_FOR_GAS_USDC) // keep 0.1 USDC in user's wallet for gas
        .toString();

@@ -215,14 +370,11 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
    [localDydxWallet, depositToSubaccount]
  );

-  const balances = useSelector(getBalances, shallowEqual);
-  const usdcCoinBalance = balances?.[usdcDenom];
+  const balance = usePollUSDCBalance({ dydxAddress });

  useEffect(() => {
-    if (usdcCoinBalance) {
-      depositFunds(usdcCoinBalance);
-    }
-  }, [usdcCoinBalance]);
+    depositFunds(balance);
+  }, [balance]);

  const deposit = useCallback(
    async (amount: Long) => {
@@ -253,13 +405,38 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
      if (!subaccountClient) {
        return;
      }
-      return (await (coinDenom === usdcDenom
+
+      return (await (coinDenom === USDC_DENOM
        ? transferFromSubaccountToAddress
        : transferNativeToken)({ subaccountClient, amount, recipient })) as IndexedTx;
    },
    [subaccountClient, transferFromSubaccountToAddress, transferNativeToken]
  );

+  const simulateTransfer = useCallback(
+    async (amount: number, recipient: string, coinDenom: string) => {
+      if (!subaccountClient) {
+        return;
+      }
+
+      return await (coinDenom === USDC_DENOM
+        ? simulateWithdrawFromSubaccount
+        : simulateTransferNativeToken)({ subaccountClient, amount, recipient });
+    },
+    [subaccountClient, simulateWithdrawFromSubaccount, simulateTransferNativeToken]
+  );
+
+  const simulateWithdraw = useCallback(
+    async (amount: number) => {
+      if (!subaccountClient) {
+        return;
+      }
+
+      return await simulateWithdrawFromSubaccount({ subaccountClient, amount });
+    },
+    [subaccountClient, simulateWithdrawFromSubaccount]
+  );
+
  const sendSquidWithdraw = useCallback(
    async (amount: number, payload: string) => {
      if (!subaccountClient) {
@@ -279,7 +456,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
      await getFaucetFunds({ dydxAddress, subaccountNumber });
    } catch (error) {
      log('useSubaccount/getFaucetFunds', error);
-      throw error;
    }
  }, [dydxAddress, getFaucetFunds, subaccountNumber]);

@@ -291,41 +467,101 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
      onSuccess,
    }: {
      isClosePosition?: boolean;
-      onError?: (onErrorParams?: { errorStringKey?: Nullable<string> }) => void;
-      onSuccess?: (placeOrderPayload: Nullable<HumanReadablePlaceOrderPayload>) => void;
+      onError?: (onErrorParams?: { errorStringKey?: string }) => void;
+      onSuccess?: () => void;
    }) => {
-      const callback = (
-        success: boolean,
-        parsingError?: Nullable<ParsingError>,
-        data?: Nullable<HumanReadablePlaceOrderPayload>
-      ) => {
-        if (success) {
-          onSuccess?.(data);
-        } else {
-          onError?.({ errorStringKey: parsingError?.stringKey });
+      let orderParams: Nullable<HumanReadablePlaceOrderPayload>;

-          if (data?.clientId !== undefined) {
-            dispatch(removeUncommittedOrderClientId(data.clientId));
-          }
+      if (!subaccountClient) return;
+
+      try {
+        orderParams = isClosePosition
+          ? abacusStateManager.closePositionPayload()
+          : abacusStateManager.placeOrderPayload();
+
+        if (!orderParams) {
+          throw new Error('Missing order params');
        }
-      };

-      let placeOrderParams;
+        const {
+          marketId,
+          type,
+          side,
+          price,
+          triggerPrice,
+          size,
+          clientId,
+          timeInForce,
+          goodTilTimeInSeconds,
+          execution,
+          postOnly,
+          reduceOnly,
+        } = orderParams;

-      if (isClosePosition) {
-        placeOrderParams = abacusStateManager.closePosition(callback);
-      } else {
-        placeOrderParams = abacusStateManager.placeOrder(callback);
+        dispatch(addUncommittedOrderClientId(clientId));
+
+        // Remove uncommitted order after timeout if it hasn't already been removed
+        setTimeout(() => {
+          dispatch(removeUncommittedOrderClientId(clientId));
+        }, UNCOMMITTED_ORDER_TIMEOUT);
+
+        console.log('useSubaccount/placeOrder', {
+          ...orderParams,
+        });
+
+        const response = await placeOrderForSubaccount({
+          subaccount: subaccountClient,
+          marketId,
+          type: type as OrderType,
+          side: side as OrderSide,
+          price,
+          triggerPrice,
+          size,
+          clientId,
+          timeInForce: timeInForce as OrderTimeInForce,
+          goodTilTimeInSeconds: goodTilTimeInSeconds ?? 0,
+          execution: execution as OrderExecution,
+          postOnly,
+          reduceOnly,
+        });
+
+        // Handle Stateful orders
+        if ((response as IndexedTx)?.code !== 0) {
+          throw new StatefulOrderError('Stateful order has failed to commit.', response);
+        }
+
+        if (orderParams?.clientId) {
+          dispatch(removeUncommittedOrderClientId(orderParams.clientId));
+        }
+
+        if (response?.hash) {
+          console.log(
+            isClosePosition
+              ? 'useSubaccount/closePosition'
+              : 'useSubaccount/placeOrderForSubaccount',
+            {
+              txHash: Buffer.from(response.hash).toString('hex').toUpperCase(),
+            }
+          );
+        }
+
+        track(AnalyticsEvent.TradePlaceOrder, {
+          ...orderParams,
+          isClosePosition,
+        } as HumanReadablePlaceOrderPayload & { isClosePosition: boolean });
+        onSuccess?.();
+      } catch (error) {
+        const errorCode: number | undefined = error?.code;
+        const errorStringKey = errorCode ? ORDER_ERROR_CODE_MAP[errorCode] : undefined;
+        onError?.({ errorStringKey });
+
+        log('useSubaccount/placeOrder', error, {
+          orderParams,
+          isClosePosition,
+        });
      }
-
-      track(AnalyticsEvent.TradePlaceOrder, {
-        ...placeOrderParams,
-        isClosePosition,
-      } as HumanReadablePlaceOrderPayload & { isClosePosition: boolean });
-
-      return placeOrderParams;
    },
-    [subaccountClient]
+    [subaccountClient, placeOrderForSubaccount]
  );

  const closePosition = useCallback(
@@ -333,8 +569,8 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
      onError,
      onSuccess,
    }: {
-      onError: (onErrorParams?: { errorStringKey?: Nullable<string> }) => void;
-      onSuccess?: (placeOrderPayload: Nullable<HumanReadablePlaceOrderPayload>) => void;
+      onError: (onErrorParams?: { errorStringKey?: string }) => void;
+      onSuccess?: () => void;
    }) => await placeOrder({ isClosePosition: true, onError, onSuccess }),
    [placeOrder]
  );
@@ -346,21 +582,53 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
      onSuccess,
    }: {
      orderId: string;
-      onError?: ({ errorStringKey }?: { errorStringKey?: Nullable<string> }) => void;
+      onError?: ({ errorMsg }?: { errorMsg?: string }) => void;
      onSuccess?: () => void;
    }) => {
-      const callback = (success: boolean, parsingError?: Nullable<ParsingError>) => {
-        if (success) {
-          track(AnalyticsEvent.TradeCancelOrder);
-          onSuccess?.();
-        } else {
-          onError?.({ errorStringKey: parsingError?.stringKey });
-        }
-      };
+      let cancelOrderParams: Nullable<HumanReadableCancelOrderPayload>;

-      abacusStateManager.cancelOrder(orderId, callback);
+      if (!subaccountClient) return;
+
+      try {
+        cancelOrderParams = abacusStateManager.cancelOrderPayload(orderId);
+
+        if (!cancelOrderParams) {
+          throw new Error('Missing cancel order params');
+        }
+
+        const { clientId, clobPairId, goodTilBlock, goodTilBlockTime, orderFlags } =
+          cancelOrderParams;
+
+        // Keep for debugging
+        console.log('useSubaccount/cancelOrder', cancelOrderParams);
+
+        const response = await cancelOrderForSubaccount({
+          subaccount: subaccountClient,
+          clientId,
+          orderFlags,
+          clobPairId,
+          goodTilBlock: goodTilBlock || undefined,
+          goodTilBlockTime: goodTilBlockTime || undefined,
+        });
+
+        // Handle Stateful orders
+        if ((response as IndexedTx)?.code !== 0) {
+          throw new StatefulOrderError('Stateful cancel has failed to commit.', response);
+        }
+
+        if (response?.hash) {
+          console.log('useSubaccount/cancelOrderForSubaccount', {
+            txHash: Buffer.from(response.hash).toString('hex').toUpperCase(),
+          });
+        }
+
+        onSuccess?.();
+      } catch (error) {
+        onError?.();
+        log('useSubaccount/cancelOrder', error, cancelOrderParams);
+      }
    },
-    [subaccountClient]
+    [subaccountClient, cancelOrderForSubaccount]
  );

  return {
@@ -370,7 +638,9 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
    requestFaucetFunds,

    // Transfer Methods
+    simulateTransfer,
    transfer,
+    simulateWithdraw,
    sendSquidWithdraw,

    // Trading Methods
@@ -1,36 +0,0 @@
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-import { DydxChainAsset } from '@/constants/wallets';
-
-import { useSelectedNetwork } from '@/hooks';
-
-export const useTokenConfigs = (): {
-  tokensConfigs: {
-    [DydxChainAsset.USDC]: {
-      denom: string;
-      name: string;
-      decimals: number;
-      gasDenom?: string;
-    },
-    [DydxChainAsset.CHAINTOKEN]: {
-      denom: string;
-      name: string;
-      decimals: number;
-      gasDenom?: string;
-    },
-  };
-  usdcDenom: string;
-  usdcLabel: string;
-  chainTokenDenom: string;
-  chainTokenLabel: string;
-} => {
-  const { selectedNetwork } = useSelectedNetwork();
-  const tokensConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].tokens;
-
-  return { 
-    tokensConfigs,
-    usdcDenom: tokensConfigs[DydxChainAsset.USDC].denom, 
-    usdcLabel: tokensConfigs[DydxChainAsset.USDC].name,
-    chainTokenDenom: tokensConfigs[DydxChainAsset.CHAINTOKEN].denom,
-    chainTokenLabel: tokensConfigs[DydxChainAsset.CHAINTOKEN].name,
-  };
-};
@@ -1,8 +1,6 @@
 import { useCallback, useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';

 import { LocalStorageKey } from '@/constants/localStorage';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';

 import {
  type DydxAddress,
@@ -30,8 +28,6 @@ import {
  WalletType as CosmosWalletType,
 } from 'graz';

-import { getSelectedNetwork } from '@/state/appSelectors';
-
 import { resolveWagmiConnector } from '@/lib/wagmi';
 import { getWalletConnection, parseWalletError } from '@/lib/wallet';
 import { log } from '@/lib/telemetry';
@@ -88,9 +84,6 @@ export const useWalletConnection = () => {

  // Wallet connection

-  const selectedNetwork = useSelector(getSelectedNetwork);
-  const walletConnectConfig = ENVIRONMENT_CONFIG_MAP[selectedNetwork].wallets.walletconnect;
-
  const { connectAsync: connectWagmi } =
    walletType && walletConnectionType
      ? useConnectWagmi({
@@ -99,7 +92,6 @@ export const useWalletConnection = () => {
            walletConnection: {
              type: walletConnectionType,
            },
-            walletConnectConfig,
          }),
        })
      : useConnectWagmi();
@@ -135,7 +127,6 @@ export const useWalletConnection = () => {
              connector: resolveWagmiConnector({
                walletType,
                walletConnection,
-                walletConnectConfig,
              }),
            });
          }
@@ -226,7 +217,7 @@ export const useWalletConnection = () => {
    evmAddressWagmi,
    signerWagmi,
    publicClientWagmi,
-
+    
    // Wallet connection (Cosmos)
    dydxAddress,
    dydxAddressGraz,
@@ -1,3 +0,0 @@
-<svg width="16" height="18" viewBox="0 0 16 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.3811 13.235C11.9338 13.0512 13.4593 12.6847 14.9261 12.1433C13.6839 10.7673 12.9975 8.97875 13.0003 7.125V6.54167V6.5C13.0003 5.17392 12.4735 3.90215 11.5358 2.96447C10.5981 2.02678 9.32636 1.5 8.00028 1.5C6.67419 1.5 5.40242 2.02678 4.46474 2.96447C3.52706 3.90215 3.00028 5.17392 3.00028 6.5V7.125C3.00279 8.97886 2.3161 10.7675 1.07361 12.1433C2.51778 12.6767 4.04027 13.0475 5.61944 13.235M10.3811 13.235C8.79943 13.4226 7.20112 13.4226 5.61944 13.235M10.3811 13.235C10.5012 13.6099 10.5311 14.0078 10.4683 14.3964C10.4055 14.785 10.2518 15.1533 10.0198 15.4713C9.78772 15.7893 9.48386 16.048 9.13293 16.2263C8.78201 16.4047 8.39392 16.4976 8.00028 16.4976C7.60663 16.4976 7.21854 16.4047 6.86762 16.2263C6.51669 16.048 6.21283 15.7893 5.98079 15.4713C5.74875 15.1533 5.59508 14.785 5.53229 14.3964C5.46949 14.0078 5.49936 13.6099 5.61944 13.235" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 24"><path fill="currentColor" d="M11 0C8.5 0 6.101.948 4.333 2.636 2.565 4.324 1.57 6.613 1.57 9v5.379l-1.11 1.06c-.22.21-.37.477-.43.768-.061.291-.03.593.089.867s.32.508.578.673c.259.165.562.253.873.253h18.86c.31 0 .614-.088.873-.253.258-.165.46-.399.578-.673.12-.274.15-.576.09-.867a1.48 1.48 0 0 0-.43-.768l-1.111-1.06V9c0-2.387-.993-4.676-2.762-6.364C15.9.948 13.501 0 11 0Zm0 24a4.83 4.83 0 0 1-3.334-1.318 4.399 4.399 0 0 1-1.38-3.182h9.428a4.399 4.399 0 0 1-1.38 3.182A4.83 4.83 0 0 1 11 24Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 24"><path fill="currentColor" d="M11 0C8.5 0 6.101.948 4.333 2.636 2.565 4.324 1.57 6.613 1.57 9v5.379l-1.11 1.06c-.22.21-.37.477-.43.768-.061.291-.03.593.089.867s.32.508.578.673c.259.165.562.253.873.253h18.86c.31 0 .614-.088.873-.253.258-.165.46-.399.578-.673.12-.274.15-.576.09-.867a1.48 1.48 0 0 0-.43-.768l-1.111-1.06V9c0-2.387-.993-4.676-2.762-6.364C15.9.948 13.501 0 11 0Zm0 24a4.83 4.83 0 0 1-3.334-1.318 4.399 4.399 0 0 1-1.38-3.182h9.428a4.399 4.399 0 0 1-1.38 3.182A4.83 4.83 0 0 1 11 24Z"/></svg>
@@ -2,7 +2,6 @@ export { default as AddressConnectorIcon } from './address-connector.svg';
 export { default as ArrowIcon } from './arrow.svg';
 export { default as Bar3Icon } from './bar3.svg';
 export { default as BellIcon } from './bell.svg';
-export { default as BellStrokeIcon } from './bell-stroke.svg';
 export { default as BoxCloseIcon } from './box-close.svg';
 export { default as CalculatorIcon } from './calculator.svg';
 export { default as CaretIcon } from './caret-down.svg';
@@ -11,16 +11,12 @@ import { DepositDialog } from '@/views/dialogs/DepositDialog';
 import { DisconnectDialog } from '@/views/dialogs/DisconnectDialog';
 import { ExchangeOfflineDialog } from '@/views/dialogs/ExchangeOfflineDialog';
 import { HelpDialog } from '@/views/dialogs/HelpDialog';
-import { ExternalNavKeplrDialog } from '@/views/dialogs/ExternalNavKeplrDialog';
 import { MnemonicExportDialog } from '@/views/dialogs/MnemonicExportDialog';
 import { MobileSignInDialog } from '@/views/dialogs/MobileSignInDialog';
 import { OnboardingDialog } from '@/views/dialogs/OnboardingDialog';
-import { RateLimitDialog } from '@/views/dialogs/RateLimitDialog';
 import { ReceiveDialog } from '@/views/dialogs/ReceiveDialog';
-import { RestrictedGeoDialog } from '@/views/dialogs/RestrictedGeoDialog';
 import { TradeDialog } from '@/views/dialogs/TradeDialog';
 import { TransferDialog } from '@/views/dialogs/TransferDialog';
-import { RestrictedWalletDialog } from '@/views/dialogs/RestrictedWalletDialog';
 import { WithdrawDialog } from '@/views/dialogs/WithdrawDialog';

 import { OrderDetailsDialog } from '@/views/dialogs/DetailsDialog/OrderDetailsDialog';
@@ -51,15 +47,11 @@ export const DialogManager = () => {
    [DialogTypes.ExchangeOffline]: <ExchangeOfflineDialog {...modalProps} />,
    [DialogTypes.FillDetails]: <FillDetailsDialog {...modalProps} />,
    [DialogTypes.Help]: <HelpDialog {...modalProps} />,
-    [DialogTypes.ExternalNavKeplr]: <ExternalNavKeplrDialog {...modalProps} />,
    [DialogTypes.MnemonicExport]: <MnemonicExportDialog {...modalProps} />,
    [DialogTypes.MobileSignIn]: <MobileSignInDialog {...modalProps} />,
    [DialogTypes.Onboarding]: <OnboardingDialog {...modalProps} />,
    [DialogTypes.OrderDetails]: <OrderDetailsDialog {...modalProps} />,
-    [DialogTypes.RateLimit]: <RateLimitDialog {...modalProps} />,
    [DialogTypes.Receive]: <ReceiveDialog {...modalProps} />,
-    [DialogTypes.RestrictedGeo]: <RestrictedGeoDialog {...modalProps} />,
-    [DialogTypes.RestrictedWallet]: <RestrictedWalletDialog {...modalProps} />,
    [DialogTypes.Trade]: <TradeDialog {...modalProps} />,
    [DialogTypes.Transfer]: <TransferDialog {...modalProps} />,
    [DialogTypes.Withdraw]: <WithdrawDialog {...modalProps} />,
@@ -6,9 +6,8 @@ import { ButtonShape } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { AppRoute } from '@/constants/routes';
-import { LogoShortIcon, BellStrokeIcon } from '@/icons';
-
-import { useTokenConfigs, useStringGetter } from '@/hooks';
+import { useStringGetter } from '@/hooks';
+import { LogoShortIcon, BellIcon } from '@/icons';

 import { Icon, IconName } from '@/components/Icon';
 import { IconButton } from '@/components/IconButton';
@@ -28,7 +27,6 @@ import { layoutMixins } from '@/styles/layoutMixins';
 export const HeaderDesktop = () => {
  const stringGetter = useStringGetter();
  const dispatch = useDispatch();
-  const { chainTokenLabel } = useTokenConfigs();

  const navItems = [
    {
@@ -44,11 +42,6 @@ export const HeaderDesktop = () => {
          label: stringGetter({ key: STRING_KEYS.TRADE }),
          href: AppRoute.Trade,
        },
-        {
-          value: chainTokenLabel,
-          label: chainTokenLabel,
-          href: `/${chainTokenLabel}`,
-        },
        {
          value: 'PORTFOLIO',
          label: stringGetter({ key: STRING_KEYS.PORTFOLIO }),
@@ -80,13 +73,13 @@ export const HeaderDesktop = () => {
              value: 'TERMS_OF_USE',
              slotBefore: <Icon iconName={IconName.File} />,
              label: stringGetter({ key: STRING_KEYS.TERMS_OF_USE }),
-              href: AppRoute.Terms,
+              href: 'https://dydx.exchange/terms',
            },
            {
              value: 'PRIVACY_POLICY',
              slotBefore: <Icon iconName={IconName.Privacy} />,
              label: stringGetter({ key: STRING_KEYS.PRIVACY_POLICY }),
-              href: AppRoute.Privacy,
+              href: 'https://dydx.exchange/privacy',
            },
            {
              value: 'HELP',
@@ -133,9 +126,7 @@ export const HeaderDesktop = () => {
        <VerticalSeparator />

        <NotificationsMenu
-          slotTrigger={
-            <Styled.IconButton shape={ButtonShape.Rectangle} iconComponent={BellStrokeIcon} />
-          }
+          slotTrigger={<Styled.IconButton shape={ButtonShape.Rectangle} iconComponent={BellIcon} />}
        />

        <VerticalSeparator />
@@ -169,7 +160,7 @@ Styled.Header = styled.header`
    )
    var(--border-width) 1fr var(--border-width) auto;

-  font-size: 0.9375rem;
+  font-size: 0.9375em;

  :before {
    backdrop-filter: blur(10px);
@@ -218,8 +209,7 @@ Styled.NavAfter = styled.div`
  }
 `;

-Styled.IconButton = styled(IconButton)<{ size?: string }>`
+Styled.IconButton = styled(IconButton)`
  ${headerMixins.button}
  --button-border: none;
-  --button-icon-size: 1rem;
 `;
@@ -1,18 +0,0 @@
-import type { AbacusTrackingProtocol, Nullable } from '@/constants/abacus';
-import type { AnalyticsEvent } from '@/constants/analytics';
-
-import { track } from '../analytics';
-import { log as telemetryLog } from '../telemetry';
-
-class AbacusAnalytics implements AbacusTrackingProtocol {
-  log(event: string, data: Nullable<string>) {
-    try {
-      const parsedData = data ? JSON.parse(data) : {};
-      track(event as AnalyticsEvent, parsedData);
-    } catch (error) {
-      telemetryLog('AbacusAnalytics/log', error);
-    }
-  }
-}
-
-export default AbacusAnalytics;
@@ -1,49 +1,30 @@
-import Abacus, { type Nullable } from '@dydxprotocol/v4-abacus';
+import Abacus, { Nullable } from '@dydxprotocol/v4-abacus';
 import Long from 'long';
-import type { IndexedTx } from '@cosmjs/stargate';

 import {
  CompositeClient,
  IndexerConfig,
-  type LocalWallet,
  Network,
  NetworkOptimizer,
-  SubaccountClient,
  ValidatorConfig,
-  OrderType,
-  OrderSide,
-  OrderTimeInForce,
-  OrderExecution,
 } from '@dydxprotocol/v4-client-js';

 import {
  type AbacusDYDXChainTransactionsProtocol,
  QueryType,
  type QueryTypes,
-  TransactionType,
  type TransactionTypes,
-  type HumanReadablePlaceOrderPayload,
-  type HumanReadableCancelOrderPayload,
-  type HumanReadableWithdrawPayload,
-  type HumanReadableTransferPayload,
 } from '@/constants/abacus';
-
 import { DialogTypes } from '@/constants/dialogs';
-import { UNCOMMITTED_ORDER_TIMEOUT_MS } from '@/constants/trade';
-import { QUANTUM_MULTIPLIER } from '@/constants/numbers';

 import { RootStore } from '@/state/_store';
-import { addUncommittedOrderClientId, removeUncommittedOrderClientId } from '@/state/account';
 import { openDialog } from '@/state/dialogs';

-import { StatefulOrderError } from '../errors';
-import { bytesToBigInt } from '../numbers';
 import { log } from '../telemetry';

 class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
  private compositeClient: CompositeClient | undefined;
  private store: RootStore | undefined;
-  private localWallet: LocalWallet | undefined;

  constructor() {
    this.compositeClient = undefined;
@@ -54,47 +35,23 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    this.store = store;
  }

-  setLocalWallet(localWallet: LocalWallet) {
-    this.localWallet = localWallet;
-  }
-
  async connectNetwork(
-    paramsInJson: Nullable<string>,
+    indexerUrl: string,
+    indexerSocketUrl: string,
+    validatorUrl: string,
+    chainId: string,
+    faucetUrl: Nullable<string> | undefined,
    callback: (p0: Nullable<string>) => void
  ): Promise<void> {
    try {
-      const parsedParams = paramsInJson ? JSON.parse(paramsInJson) : {};
-      const {
-        indexerUrl,
-        websocketUrl,
-        validatorUrl,
-        chainId,
-        USDC_DENOM,
-        USDC_DECIMALS,
-        USDC_GAS_DENOM,
-        CHAINTOKEN_DENOM,
-        CHAINTOKEN_DECIMALS,
-      } = parsedParams;
-
      const compositeClient = await CompositeClient.connect(
        new Network(
          chainId,
-          new IndexerConfig(indexerUrl, websocketUrl),
-          new ValidatorConfig(
-            validatorUrl,
-            chainId,
-            {
-              USDC_DENOM,
-              USDC_DECIMALS,
-              USDC_GAS_DENOM,
-              CHAINTOKEN_DENOM,
-              CHAINTOKEN_DECIMALS,
-            },
-            {
-              broadcastPollIntervalMs: 3_000,
-              broadcastTimeoutMs: 60_000,
-            }
-          )
+          new IndexerConfig(indexerUrl, indexerSocketUrl),
+          new ValidatorConfig(validatorUrl, chainId, {
+            broadcastPollIntervalMs: 3_000,
+            broadcastTimeoutMs: 60_000,
+          })
        )
      );

@@ -102,7 +59,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {

      // Dispatch custom event to notify other parts of the app that the network has been connected
      const customEvent = new CustomEvent('abacus:connectNetwork', {
-        detail: parsedParams,
+        detail: {
+          indexerUrl,
+          indexerSocketUrl,
+          validatorUrl,
+          chainId,
+          faucetUrl,
+        },
      });

      globalThis.dispatchEvent(customEvent);
@@ -111,7 +74,9 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
      this.store?.dispatch(
        openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } })
      );
+
      log('DydxChainTransactions/connectNetwork', error);
+      return;
    }
  }

@@ -128,10 +93,6 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
      return x.toString() as T;
    }

-    if (x instanceof Uint8Array) {
-      return bytesToBigInt(x).toString() as T;
-    }
-
    if (typeof x === 'object') {
      const parsedObj: { [key: string]: any } = {};
      for (const key in x) {
@@ -145,222 +106,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    throw new Error(`Unsupported data type: ${typeof x}`);
  }

-  async placeOrderTransaction(params: HumanReadablePlaceOrderPayload): Promise<string> {
-    if (!this.compositeClient || !this.localWallet)
-      throw new Error('Missing compositeClient or localWallet');
-
-    try {
-      const {
-        subaccountNumber,
-        marketId,
-        type,
-        side,
-        price,
-        size,
-        clientId,
-        timeInForce,
-        goodTilTimeInSeconds,
-        execution,
-        postOnly,
-        reduceOnly,
-        triggerPrice,
-      } = params || {};
-
-      // Observe uncommitted order
-      this.store?.dispatch(addUncommittedOrderClientId(clientId));
-
-      setTimeout(() => {
-        this.store?.dispatch(removeUncommittedOrderClientId(clientId));
-      }, UNCOMMITTED_ORDER_TIMEOUT_MS);
-
-      // Place order
-      const tx = await this.compositeClient?.placeOrder(
-        new SubaccountClient(this.localWallet, subaccountNumber),
-        marketId,
-        type as OrderType,
-        side as OrderSide,
-        price,
-        size,
-        clientId,
-        timeInForce as OrderTimeInForce,
-        goodTilTimeInSeconds ?? 0,
-        execution as OrderExecution,
-        postOnly,
-        reduceOnly,
-        triggerPrice ?? undefined
-      );
-
-      // Handle stateful orders
-      if ((tx as IndexedTx)?.code !== 0) {
-        throw new StatefulOrderError('Stateful order has failed to commit.', tx);
-      }
-
-      const parsedTx = this.parseToPrimitives(tx);
-      const hash = parsedTx?.hash;
-
-      if (import.meta.env.MODE === 'production') {
-        console.log(`https://testnet.mintscan.io/dydx-testnet/txs/${hash}`);
-      } else console.log(`txHash: ${hash}`);
-
-      return JSON.stringify(parsedTx);
-    } catch (error) {
-      if (error?.name !== 'BroadcastError') {
-        log('DydxChainTransactions/placeOrderTransaction', error);
-      }
-
-      return JSON.stringify({
-        error,
-      });
-    }
-  }
-
-  async cancelOrderTransaction(params: HumanReadableCancelOrderPayload): Promise<string> {
-    if (!this.compositeClient || !this.localWallet) {
-      throw new Error('Missing compositeClient or localWallet');
-    }
-
-    const { subaccountNumber, clientId, orderFlags, clobPairId, goodTilBlock, goodTilBlockTime } =
-      params ?? {};
-
-    try {
-      const tx = await this.compositeClient?.cancelRawOrder(
-        new SubaccountClient(this.localWallet, subaccountNumber),
-        clientId,
-        orderFlags,
-        clobPairId,
-        goodTilBlock || undefined,
-        goodTilBlockTime || undefined,
-      );
-
-      const parsedTx = this.parseToPrimitives(tx);
-
-      return JSON.stringify(parsedTx);
-    } catch (error) {
-      log('DydxChainTransactions/cancelOrderTransaction', error);
-
-      return JSON.stringify({
-        error,
-      });
-    }
-  }
-
-  async simulateWithdrawTransaction(params: HumanReadableWithdrawPayload): Promise<string> {
-    if (!this.compositeClient || !this.localWallet) {
-      throw new Error('Missing compositeClient or localWallet');
-    }
-
-    const { subaccountNumber, amount } = params ?? {};
-    const compositeClient = this.compositeClient;
-    const subaccountClient = new SubaccountClient(this.localWallet, subaccountNumber);
-
-    try {
-      const tx = await compositeClient.simulate(
-        this.localWallet,
-        () =>
-          new Promise((resolve) => {
-            const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount);
-
-            resolve([msg]);
-          })
-      );
-
-      const parsedTx = this.parseToPrimitives(tx);
-
-      return JSON.stringify(parsedTx);
-    } catch (error) {
-      log('DydxChainTransactions/simulateWithdrawTransaction', error);
-
-      return JSON.stringify({
-        error,
-      });
-    }
-  }
-
-  async simulateTransferNativeTokenTransaction(
-    params: HumanReadableTransferPayload
-  ): Promise<string> {
-    if (!this.compositeClient || !this.localWallet) {
-      throw new Error('Missing compositeClient or localWallet');
-    }
-
-    const { subaccountNumber, amount, recipient } = params ?? {};
-    const compositeClient = this.compositeClient;
-    const subaccountClient = new SubaccountClient(this.localWallet, subaccountNumber);
-
-    try {
-      const tx = await compositeClient.simulate(
-        this.localWallet,
-        () =>
-          new Promise((resolve) => {
-            if (!this.localWallet) {
-              throw new Error('Missing compositeClient or localWallet');
-            }
-            const msg = compositeClient?.sendTokenMessage(
-              this.localWallet,
-              amount,
-              recipient,
-            );
-
-            resolve([msg]);
-          }),
-        this.compositeClient?.validatorClient?.post.defaultDydxGasPrice,
-      );
-
-      const parsedTx = this.parseToPrimitives(tx);
-
-      return JSON.stringify(parsedTx);
-    } catch (error) {
-      log('DydxChainTransactions/simulateTransferNativeTokenTransaction', error);
-
-      return JSON.stringify({
-        error,
-      });
-    }
-  }
-
  async transaction(
    type: TransactionTypes,
    paramsInJson: Abacus.Nullable<string>,
    callback: (p0: Abacus.Nullable<string>) => void
  ): Promise<void> {
-    try {
-      const params = paramsInJson ? JSON.parse(paramsInJson) : undefined;
-
-      switch (type) {
-        case TransactionType.PlaceOrder: {
-          const result = await this.placeOrderTransaction(params);
-          callback(result);
-          break;
-        }
-        case TransactionType.CancelOrder: {
-          const result = await this.cancelOrderTransaction(params);
-          callback(result);
-          break;
-        }
-        case TransactionType.simulateWithdraw: {
-          const result = await this.simulateWithdrawTransaction(params);
-          callback(result);
-          break;
-        }
-        case TransactionType.simulateTransferNativeToken: {
-          const result = await this.simulateTransferNativeTokenTransaction(params);
-          callback(result);
-          break;
-        }
-        default: {
-          break;
-        }
-      }
-    } catch (error) {
-      try {
-        const serializedError = JSON.stringify(error);
-        callback(serializedError);
-      } catch (parseError) {
-        log('DydxChainTransactions/transaction', parseError);
-      }
-
-      log('DydxChainTransactions/transaction', error);
-    }
+    // To be implemented
+    return;
  }

  async get(
@@ -384,12 +136,6 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
          );
          callback(JSON.stringify({ url: optimalNode }));
          break;
-        case QueryType.EquityTiers:
-          const equityTiers =
-            await this.compositeClient?.validatorClient.get.getEquityTierLimitConfiguration();
-          const parsedEquityTiers = this.parseToPrimitives(equityTiers);
-          callback(JSON.stringify(parsedEquityTiers));
-          break;
        case QueryType.FeeTiers:
          const feeTiers = await this.compositeClient?.validatorClient.get.getFeeTiers();
          const parsedFeeTiers = this.parseToPrimitives(feeTiers);
@@ -409,31 +155,6 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
          const parsedUserStats = this.parseToPrimitives(userStats);
          callback(JSON.stringify(parsedUserStats));
          break;
-        case QueryType.GetAccountBalances:
-          if (!this.localWallet?.address) throw new Error('Missing localWallet');
-          const accountBalances =
-            await this.compositeClient?.validatorClient.get.getAccountBalances(
-              this.localWallet.address
-            );
-          const parsedAccountBalances = this.parseToPrimitives(accountBalances);
-          callback(JSON.stringify(parsedAccountBalances));
-          break;
-        case QueryType.RewardsParams:
-          const rewardsParams = await this.compositeClient?.validatorClient.get.getRewardsParams();
-          const parsedRewardsParams = this.parseToPrimitives(rewardsParams);
-          callback(JSON.stringify(parsedRewardsParams));
-          break;
-        case QueryType.GetMarketPrice:
-          const price = await this.compositeClient?.validatorClient.get.getPrice(params.marketId);
-          const parsedPrice = this.parseToPrimitives(price);
-          callback(JSON.stringify(parsedPrice));
-          break;
-        case QueryType.GetDelegations:
-          const delegations =
-            await this.compositeClient?.validatorClient.get.getDelegatorDelegations(params.address);
-          const parseDelegations = this.parseToPrimitives(delegations);
-          callback(JSON.stringify(parseDelegations));
-          break;
        // Do not implement Transfers (yet)
        case QueryType.Transfers:
        default:
@@ -1,4 +1,5 @@
 import type { AbacusFileSystemProtocol, FileLocation, Nullable } from '@/constants/abacus';
+import { NETWORK_ENDPOINTS } from '@/constants/networks';

 export const ENDPOINTS_PATH =
  import.meta.env.MODE === 'production'
@@ -7,6 +8,10 @@ export const ENDPOINTS_PATH =

 class AbacusFileSystem implements AbacusFileSystemProtocol {
  readTextFile(location: FileLocation, path: string): Nullable<string> {
+    if (path === ENDPOINTS_PATH) {
+      return JSON.stringify(NETWORK_ENDPOINTS);
+    }
+
    return null;
  }

@@ -1,5 +1,3 @@
-import type { LocalWallet } from '@dydxprotocol/v4-client-js';
-
 import type {
  ClosePositionInputFields,
  Nullable,
@@ -8,7 +6,6 @@ import type {
  TradeInputFields,
  TransferInputFields,
  HistoricalPnlPeriods,
-  ParsingError,
 } from '@/constants/abacus';

 import {
@@ -22,11 +19,10 @@ import {
  UIImplementations,
  CoroutineTimer,
  TransferType,
-  AbacusAppConfig,
 } from '@/constants/abacus';

 import { DEFAULT_MARKETID } from '@/constants/markets';
-import { CURRENT_ABACUS_DEPLOYMENT, type DydxNetwork } from '@/constants/networks';
+import { type DydxNetwork } from '@/constants/networks';

 import type { RootStore } from '@/state/_store';

@@ -34,7 +30,6 @@ import { getInputTradeOptions } from '@/state/inputsSelectors';
 import { getTransferInputs } from '@/state/inputsSelectors';

 import AbacusRest from './rest';
-import AbacusAnalytics from './analytics';
 import AbacusWebsocket from './websocket';
 import AbacusChainTransaction from './dydxChainTransactions';
 import AbacusStateNotifier from './stateNotification';
@@ -50,25 +45,23 @@ class AbacusStateManager {
  stateManager: InstanceType<typeof AsyncAbacusStateManager>;
  websocket: AbacusWebsocket;
  stateNotifier: AbacusStateNotifier;
-  analytics: AbacusAnalytics;
  abacusFormatter: AbacusFormatter;
-  chainTransactions: AbacusChainTransaction;
+  chainTransactionClient: AbacusChainTransaction;

  constructor() {
    this.store = undefined;
    this.currentMarket = undefined;
    this.stateNotifier = new AbacusStateNotifier();
-    this.analytics = new AbacusAnalytics();
    this.websocket = new AbacusWebsocket();
    this.abacusFormatter = new AbacusFormatter();
-    this.chainTransactions = new AbacusChainTransaction();
+    this.chainTransactionClient = new AbacusChainTransaction();

    const ioImplementations = new IOImplementations(
      // @ts-ignore
      new AbacusRest(),
      this.websocket,
-      this.chainTransactions,
-      this.analytics,
+      this.chainTransactionClient,
+      null,
      new AbacusThreading(),
      new CoroutineTimer(),
      new AbacusFileSystem()
@@ -81,9 +74,8 @@ class AbacusStateManager {
    );

    this.stateManager = new AsyncAbacusStateManager(
-      '',
-      CURRENT_ABACUS_DEPLOYMENT,
-      AbacusAppConfig.Companion.forWeb,
+      import.meta.env.SHARED_RESOURCES_URI,
+      ENDPOINTS_PATH,
      ioImplementations,
      uiImplementations,
      // @ts-ignore
@@ -165,14 +157,11 @@ class AbacusStateManager {
  setStore = (store: RootStore) => {
    this.store = store;
    this.stateNotifier.setStore(store);
-    this.chainTransactions.setStore(store);
+    this.chainTransactionClient.setStore(store);
  };

-  setAccount = (localWallet?: LocalWallet) => {
-    if (localWallet) {
-      this.stateManager.accountAddress = localWallet.address;
-      this.chainTransactions.setLocalWallet(localWallet);
-    }
+  setAccount = (walletAddress: string) => {
+    this.stateManager.accountAddress = walletAddress;
  };

  setTransfersSourceAddress = (evmAddress: string) => {
@@ -230,34 +219,16 @@ class AbacusStateManager {
    this.stateManager.transferStatus(hash, fromChainId, toChainId);
  };

-  // ------ Transactions ------ //
-
-  placeOrder = (
-    callback: (
-      success: boolean,
-      parsingError: Nullable<ParsingError>,
-      data: Nullable<HumanReadablePlaceOrderPayload>
-    ) => void
-  ): Nullable<HumanReadablePlaceOrderPayload> => this.stateManager.commitPlaceOrder(callback);
-
-  closePosition = (
-    callback: (
-      success: boolean,
-      parsingError: Nullable<ParsingError>,
-      data: Nullable<HumanReadablePlaceOrderPayload>
-    ) => void
-  ): Nullable<HumanReadablePlaceOrderPayload> => this.stateManager.commitClosePosition(callback);
-
-  cancelOrder = (
-    orderId: string,
-    callback: (
-      success: boolean,
-      parsingError: Nullable<ParsingError>,
-      data: Nullable<HumanReadableCancelOrderPayload>
-    ) => void
-  ) => this.stateManager.cancelOrder(orderId, callback);
-
  // ------ Utils ------ //
+  placeOrderPayload = (): Nullable<HumanReadablePlaceOrderPayload> =>
+    this.stateManager.placeOrderPayload();
+
+  closePositionPayload = (): Nullable<HumanReadablePlaceOrderPayload> =>
+    this.stateManager.closePositionPayload();
+
+  cancelOrderPayload = (orderId: string): Nullable<HumanReadableCancelOrderPayload> =>
+    this.stateManager.cancelOrderPayload(orderId);
+
  getHistoricalPnlPeriod = (): Nullable<HistoricalPnlPeriods> =>
    this.stateManager.historicalPnlPeriod;

@@ -47,11 +47,6 @@ class AbacusRest implements AbacusRestProtocol {
      body,
    };

-    if (!url) {
-      callback(null, 0);
-      return;
-    }
-
    fetch(url, options)
      .then(async (response) => {
        const data = await response.text();
@@ -1,7 +1,6 @@
 import { kollections } from '@dydxprotocol/v4-abacus';

 import type {
-  AccountBalance,
  AbacusApiState,
  AbacusNotification,
  AbacusStateNotificationProtocol,
@@ -19,13 +18,9 @@ import { Changes } from '@/constants/abacus';
 import type { RootStore } from '@/state/_store';

 import {
-  setBalances,
-  setStakingBalances,
  setFills,
  setFundingPayments,
  setHistoricalPnl,
-  setLatestOrder,
-  setRestrictionType,
  setSubaccount,
  setTransfers,
  setWallet,
@@ -36,7 +31,6 @@ import { setAssets } from '@/state/assets';
 import { setConfigs } from '@/state/configs';
 import { setInputs } from '@/state/inputs';
 import { setHistoricalFundings, setLiveTrades, setMarkets, setOrderbook } from '@/state/perpetuals';
-import { isTruthy } from '../isTruthy';

 class AbacusStateNotifier implements AbacusStateNotificationProtocol {
  private store: RootStore | undefined;
@@ -77,23 +71,6 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
        );
      }

-      if (changes.has(Changes.accountBalances)) {
-        if (updatedState.account?.balances) {
-          const balances: Record<string, AccountBalance> = {};
-          for (const { k, v } of updatedState.account.balances.toArray()) {
-            balances[k] = v;
-          }
-          dispatch(setBalances(balances));
-        }
-        if (updatedState.account?.stakingBalances) {
-          const stakingBalances: Record<string, AccountBalance> = {};
-          for (const { k, v } of updatedState.account.stakingBalances.toArray()) {
-            stakingBalances[k] = v;
-          }
-          dispatch(setStakingBalances(stakingBalances));
-        }
-      }
-
      if (changes.has(Changes.configs)) {
        dispatch(setConfigs(updatedState.configs));
      }
@@ -110,22 +87,16 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
        dispatch(
          setMarkets({
            markets: Object.fromEntries(
-              (marketIds || updatedState.marketIds()?.toArray() || [])
-                .map((marketId: string) => {
-                  const marketData = updatedState.market(marketId);
-                  return [marketId, marketData];
-                })
-                .filter(isTruthy)
+              (marketIds || updatedState.marketIds()?.toArray() || []).map((marketId: string) => {
+                const marketData = updatedState.market(marketId);
+                return [marketId, marketData];
+              })
            ) as Record<string, PerpetualMarket>,
            update: !!marketIds,
          })
        );
      }

-      if (changes.has(Changes.restriction)) {
-        dispatch(setRestrictionType(updatedState.restriction));
-      }
-
      subaccountNumbers?.forEach((subaccountId: number) => {
        if (subaccountId !== null) {
          if (changes.has(Changes.subaccount)) {
@@ -184,9 +155,7 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
    }
  }

-  lastOrderChanged(order: SubaccountOrder) {
-    this.store?.dispatch(setLatestOrder(order));
-  }
+  lastOrderChanged(order: SubaccountOrder) {}

  errorsEmitted(errors: ParsingErrors) {
    console.error('parse errors', errors.toArray());
@@ -5,15 +5,10 @@ import type {
  AnalyticsEventData,
 } from '@/constants/analytics';

-const DEBUG_ANALYTICS = false;
-
 export const identify = <T extends AnalyticsUserProperty>(
  property: T,
  propertyValue: AnalyticsUserPropertyValue<T>
 ) => {
-  if (DEBUG_ANALYTICS) {
-    console.log(`[Analytics:Identify] ${property}`, propertyValue);
-  }
  const customEvent = new CustomEvent('dydx:identify', {
    detail: { property, propertyValue },
  });
@@ -25,9 +20,6 @@ export const track = <T extends AnalyticsEvent>(
  eventType: T,
  eventData?: AnalyticsEventData<T>
 ) => {
-  if (DEBUG_ANALYTICS) {
-    console.log(`[Analytics] ${eventType}`, eventData);
-  }
  const customEvent = new CustomEvent('dydx:track', {
    detail: { eventType, eventData },
  });
@@ -1,4 +0,0 @@
-import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-
-export const validateAgainstAvailableEnvironments = (value: DydxNetwork) =>
-  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
@@ -66,17 +66,3 @@ export const getSeparator = ({
  Intl.NumberFormat(browserLanguage)
    .formatToParts(1000.1)
    .find?.((part) => part.type === separatorType)?.value;
-
-/**
- * Converts a byte array (representing an arbitrary-size signed integer) into a bigint.
- * @param u Array of bytes represented as a Uint8Array.
- */
-export function bytesToBigInt(u: Uint8Array): bigint {
-  if (u.length <= 1) {
-    return BigInt(0);
-  }
-  const negated: boolean = (u[0] & 1) === 1;
-  const hex: string = Buffer.from(u.slice(1)).toString('hex');
-  const abs: bigint = BigInt(`0x${hex}`);
-  return negated ? -abs : abs;
-}
@@ -58,12 +58,6 @@ export const getStatusIconInfo = ({
        statusIconColor: `var(--color-negative)`,
      };
    }
-    case AbacusOrderStatus.untriggered: {
-      return {
-        statusIcon: IconName.OrderUntriggered,
-        statusIconColor: `var(--color-text-2)`,
-      };
-    }
    case AbacusOrderStatus.pending:
    default: {
      return {
@@ -10,23 +10,7 @@ import {
  bscTestnet,
  optimism,
  optimismGoerli,
-  base,
-  baseGoerli,
-  polygon,
-  polygonMumbai,
-  linea,
-  lineaTestnet,
-  mantle,
-  mantleTestnet,
-  moonbeam,
-  moonbaseAlpha,
-  filecoin,
-  filecoinHyperspace,
-  fantom,
-  fantomTestnet,
-  celo,
-  celoAlfajores,
-} from 'viem/chains';
+} from 'wagmi/chains';

 import { alchemyProvider } from 'wagmi/providers/alchemy';
 import { jsonRpcProvider } from 'wagmi/providers/jsonRpc';
@@ -36,15 +20,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

@@ -60,26 +36,10 @@ export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
  bscTestnet,
  optimism,
  optimismGoerli,
-  base,
-  baseGoerli,
-  polygon,
-  polygonMumbai,
-  linea,
-  lineaTestnet,
-  mantle,
-  mantleTestnet,
-  moonbeam,
-  moonbaseAlpha,
-  filecoin,
-  filecoinHyperspace,
-  fantom,
-  fantomTestnet,
-  celo,
-  celoAlfajores,
 ];

 const { chains, publicClient, webSocketPublicClient } = configureChains(WAGMI_SUPPORTED_CHAINS, [
-  // alchemyProvider({ apiKey: import.meta.env.VITE_ALCHEMY_API_KEY }),
+  alchemyProvider({ apiKey: import.meta.env.VITE_ALCHEMY_API_KEY }),
  jsonRpcProvider({
    rpc: (chain) => ({ http: chain.rpcUrls.default.http[0] }),
  }),
@@ -95,46 +55,53 @@ const injectedConnectorOptions = {
  },
 };

-type WalletConnectConfig = {
-  client: {
-    name: string;
-    description: string;
-    iconUrl: string;
-  };
-  v2: {
-    projectId: string;
-  };
-};
-
-const getWalletconnect2ConnectorOptions = (
-  config: WalletConnectConfig
-): ConstructorParameters<typeof WalletConnectConnector>[0] => ({
+const walletconnect1ConnectorOptions = {
  chains,
  options: {
-    projectId: config.v2.projectId,
+    bridge: import.meta.env.VITE_WALLETCONNECT1_BRIDGE,
+    qrcode: true,
+  },
+};
+
+const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnectConnector>[0] = {
+  chains,
+  options: {
+    projectId: import.meta.env.VITE_WALLETCONNECT2_PROJECT_ID,
    metadata: {
-      name: config.client.name,
-      description: config.client.description,
-      url: import.meta.env.VITE_BASE_URL,
-      icons: [config.client.iconUrl],
+      // TODO: update to local URLs/images
+      name: 'dYdX',
+      description: '',
+      url: 'https://trade.dydx.exchange',
+      icons: ['https://trade.dydx.exchange/cbw-image.png'],
    },
    showQrModal: true,
    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: {},
    },
  },
-});
+};

-const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
+const connectors = [
  new MetaMaskConnector({
    chains,
    options: {
      shimDisconnect: true,
+      shimChainChangedDisconnect: false,
    },
  }),
  new CoinbaseWalletConnector({
@@ -144,7 +111,8 @@ const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
      reloadOnDisconnect: false,
    },
  }),
-  new WalletConnectConnector(getWalletconnect2ConnectorOptions(walletConnectConfig)),
+  new WalletConnectLegacyConnector(walletconnect1ConnectorOptions),
+  new WalletConnectConnector(walletconnect2ConnectorOptions),
  new InjectedConnector(injectedConnectorOptions),
 ];

@@ -166,41 +134,58 @@ const createInjectedConnectorWithProvider = (provider: ExternalProvider) =>
      provider as unknown as Awaited<ReturnType<InjectedConnector['getProvider']>>;
  })(injectedConnectorOptions) as InjectedConnector;

-const createWalletConnect2ConnectorWithId = (
-  walletconnectId: string,
-  walletConnectConfig: WalletConnectConfig
-) => {
-  const walletconnect2ConnectorOptions = getWalletconnect2ConnectorOptions(walletConnectConfig);
-  return new WalletConnectConnector({
+// Create a custom wagmi WalletConnectLegacyConnector with a modal showing only wallet links matching the given name
+const createWalletConnect1ConnectorWithName = (walletconnect1Name: string) =>
+  new WalletConnectLegacyConnector({
+    ...walletconnect1ConnectorOptions,
+    options: {
+      ...walletconnect1ConnectorOptions.options,
+      qrcodeModalOptions: {
+        desktopLinks: [walletconnect1Name],
+        mobileLinks: [walletconnect1Name],
+      },
+    },
+  });
+
+const createWalletConnect2ConnectorWithId = (walletconnect2Id: string) =>
+  new WalletConnectConnector({
    ...walletconnect2ConnectorOptions,
    options: {
      ...walletconnect2ConnectorOptions.options,
      qrModalOptions: {
        ...walletconnect2ConnectorOptions.options.qrModalOptions,
-        explorerRecommendedWalletIds: [walletconnectId],
+        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,
  walletConnection,
-  walletConnectConfig,
 }: {
  walletType: WalletType;
  walletConnection: WalletConnection;
-  walletConnectConfig: WalletConnectConfig;
 }) => {
  const walletConfig = wallets[walletType];
  const walletConnectionConfig = walletConnectionTypes[walletConnection.type];

  return walletConnection.type === WalletConnectionType.InjectedEip1193 && walletConnection.provider
    ? createInjectedConnectorWithProvider(walletConnection.provider)
+    : walletConnection.type === WalletConnectionType.WalletConnect1 &&
+      walletConfig.walletconnect1Name
+    ? createWalletConnect1ConnectorWithName(walletConfig.walletconnect1Name)
    : walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id
-    ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id, walletConnectConfig)
-    : getConnectors(walletConnectConfig).find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
+    ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id)
+    : connectors.find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
 };
@@ -45,6 +45,12 @@ export const getWalletConnection = ({
        break;
      }

+      case WalletConnectionType.WalletConnect1: {
+        return {
+          type: WalletConnectionType.WalletConnect1,
+        };
+      }
+
      case WalletConnectionType.WalletConnect2: {
        return {
          type: WalletConnectionType.WalletConnect2,
@@ -1,17 +0,0 @@
-import styled, { AnyStyledComponent } from 'styled-components';
-
-import { articleMixins } from '@/styles/articleMixins';
-
-export const PrivacyPolicyPage = () => (
-  <Styled.Article>
-    <header>
-      <h1>Privacy Policy</h1>
-    </header>
-  </Styled.Article>
-);
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Article = styled.article`
-  ${articleMixins.article}
-`;
@@ -1,17 +0,0 @@
-import styled, { AnyStyledComponent } from 'styled-components';
-
-import { articleMixins } from '@/styles/articleMixins';
-
-export const TermsOfUsePage = () => (
-  <Styled.Article>
-    <header>
-      <h1>Terms of Use</h1>
-    </header>
-  </Styled.Article>
-);
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Article = styled.article`
-  ${articleMixins.article}
-`;
@@ -2,7 +2,6 @@ import { useMemo, useState } from 'react';
 import styled, { AnyStyledComponent, css } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';
 import { TooltipContextType } from '@visx/xychart';
-import BigNumber from 'bignumber.js';

 import type { Nullable } from '@/constants/abacus';
 import { OnboardingState } from '@/constants/account';
@@ -26,6 +25,7 @@ import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton
 import { isTruthy } from '@/lib/isTruthy';
 import { MustBigNumber } from '@/lib/numbers';

+
 export const usePortfolioValues = ({
  equity,
  visibleData,
@@ -140,12 +140,7 @@ export const AccountDetailsAndHistory = () => {
      <Styled.AccountValue>
        <Styled.WithLabel label={accountValueLabel}>
          <Styled.AccountEquity>
-            <Output
-              type={OutputType.Fiat}
-              value={accountEquity}
-              roundingMode={BigNumber.ROUND_FLOOR}
-              withBaseFont
-            />
+            <Output type={OutputType.Fiat} value={accountEquity} withBaseFont />
          </Styled.AccountEquity>
          <Styled.PnlDiff isPositive={MustBigNumber(pnlDiff).gte(0)}>
            {pnlDiff && <TriangleIndicator value={MustBigNumber(pnlDiff)} />}
@@ -3,7 +3,7 @@ import styled, { AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';

 import { layoutMixins } from '@/styles/layoutMixins';
-import { useAccountBalance, useAccounts, useTokenConfigs, useStringGetter } from '@/hooks';
+import { useAccountBalance, useAccounts, useStringGetter } from '@/hooks';

 import { ButtonAction, ButtonSize } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
@@ -29,16 +29,15 @@ export const DYDXBalancePanel = () => {

  const { walletType } = useAccounts();
  const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
-  const { nativeTokenBalance, nativeStakingBalance } = useAccountBalance();
-  const { chainTokenLabel } = useTokenConfigs();
+  const { nativeTokenBalance } = useAccountBalance();

  return (
-    <Panel
+    <Styled.TransfersCard
      slotHeader={
        <Styled.Header>
          <Styled.Title>
            {/* <AssetIcon symbol="DYDX" /> */}
-            {chainTokenLabel}
+            Dv4TNT
          </Styled.Title>
          <Styled.ReceiveAndTransferButtons>
            {!canAccountTrade ? (
@@ -98,7 +97,7 @@ export const DYDXBalancePanel = () => {
                </Styled.Label>
              ),

-              value: <Output type={OutputType.Asset} value={nativeStakingBalance} />,
+              value: <Output type={OutputType.Asset} value={undefined} />,
            },
          ]}
        />
@@ -107,23 +106,21 @@ export const DYDXBalancePanel = () => {
            {
              key: 'totalBalance',
              label: 'Total balance',
-              value: (
-                <Output
-                  type={OutputType.Asset}
-                  value={nativeTokenBalance + nativeStakingBalance}
-                  tag={chainTokenLabel}
-                />
-              ),
+              value: <Output type={OutputType.Asset} value={nativeTokenBalance} tag="Dv4TNT" />,
            },
          ]}
        />
      </Styled.Content>
-    </Panel>
+    </Styled.TransfersCard>
  );
 };

 const Styled: Record<string, AnyStyledComponent> = {};

+Styled.TransfersCard = styled(Panel)`
+  width: 21.25rem;
+`;
+
 Styled.Header = styled.div`
  ${layoutMixins.spacedRow}
  padding: 1.25rem 1.5rem 0.5rem;
@@ -177,14 +174,13 @@ Styled.IconContainer = styled.div`

 Styled.WalletAndStakedBalance = styled(Details)`
  --details-item-backgroundColor: var(--color-layer-6);
-
-  grid-template-columns: 1fr 1fr;
  gap: 0.5rem;

  > div {
    gap: 1rem;

    padding: 1rem;
+    width: 8.625rem;

    border-radius: 0.75em;
    background-color: var(--color-layer-5);
@@ -1,333 +1,17 @@
 import styled, { AnyStyledComponent } from 'styled-components';
-import { useDispatch, useSelector } from 'react-redux';

-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-import { STRING_KEYS } from '@/constants/localization';
-import { ButtonAction, ButtonSize, ButtonState, ButtonType } from '@/constants/buttons';
-import { DialogTypes } from '@/constants/dialogs';
-
-import { useAccountBalance, useBreakpoints, useStringGetter } from '@/hooks';
-
-import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';

-import { Details } from '@/components/Details';
-import { Panel } from '@/components/Panel';
-import { IconName } from '@/components/Icon';
-import { Button } from '@/components/Button';
-import { IconButton } from '@/components/IconButton';
-import { Link } from '@/components/Link';
-import { Output, OutputType } from '@/components/Output';
-import { VerticalSeparator } from '@/components/Separator';
-import { WithReceipt } from '@/components/WithReceipt';
-
-import { openDialog } from '@/state/dialogs';
-import { getSelectedNetwork } from '@/state/appSelectors';
-
 import { DYDXBalancePanel } from './DYDXBalancePanel';

-// TODO: replace placeholder URL with real URLs when avaialble
-const GOVERNANCE_HELP_URL = 'https://help.dydx.exchange/';
-const STAKING_HELP_URL = 'https://help.dydx.exchange/';
-
-export const RewardsPage = () => {
-  const dispatch = useDispatch();
-  const stringGetter = useStringGetter();
-  const { isTablet, isNotTablet } = useBreakpoints();
-
-  const selectedNetwork = useSelector(getSelectedNetwork);
-
-  // const chainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId);
-
-  // const { balance } = useAccountBalance({
-  //   addressOrDenom: import.meta.env.VITE_V3_TOKEN_ADDRESS,
-  //   assetSymbol: 'DYDX',
-  //   chainId,
-  //   isCosmosChain: false,
-  // });
-
-  // const tokenBalance = import.meta.env.VITE_V3_TOKEN_ADDRESS ? balance : 0;
-
-  return (
-    <Styled.Page>
-      {/* {isNotTablet ? (
-        <Styled.Migrate>
-          <Styled.TwoItemRow>
-            <div>
-              <Styled.MigrateTitle>
-                {stringGetter({ key: STRING_KEYS.MIGRATE })}
-              </Styled.MigrateTitle>
-              <Styled.Description>
-                {stringGetter({ key: STRING_KEYS.MIGRATE_DESCRIPTION })}
-                <Link href={MIGRATE_HELP_URL}>
-                  {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-                </Link>
-              </Styled.Description>
-            </div>
-            <Styled.MigrateAction>
-              <div>
-                <div>{stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })}</div>
-                <div>
-                  <Styled.Token type={OutputType.Asset} value={tokenBalance} />
-                </div>
-              </div>
-              <Button
-                action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
-                // type={ButtonType.Link}
-                // href={BRIDGE_URL}
-                disabled
-              >
-                {tokenBalance
-                  ? `${stringGetter({ key: STRING_KEYS.MIGRATE_NOW })} →`
-                  : stringGetter({ key: STRING_KEYS.NO_TOKENS_TO_MIGRATE })}
-              </Button>
-            </Styled.MigrateAction>
-          </Styled.TwoItemRow>
-        </Styled.Migrate>
-      ) : (
-        <Styled.MobileMigrateCard
-          slotHeader={
-            <Styled.MobileMigrateHeader>
-              <h3>{stringGetter({ key: STRING_KEYS.MIGRATE })}</h3>
-              <VerticalSeparator />
-              <span>
-                {stringGetter({
-                  key: STRING_KEYS.FROM_TO,
-                  params: { FROM: <strong>Ethereum</strong>, TO: <strong>dYdX Chain</strong> },
-                })}
-              </span>
-            </Styled.MobileMigrateHeader>
-          }
-        >
-          <Styled.WithReceipt
-            slotReceipt={
-              <Styled.Details
-                items={[
-                  {
-                    key: 'available-to-migrate',
-                    label: stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE }),
-                    value: <Output type={OutputType.Asset} value={tokenBalance} />,
-                  },
-                ]}
-              />
-            }
-          >
-            <Button
-              action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
-              size={ButtonSize.Medium}
-              disabled
-            >
-              {tokenBalance
-                ? `${stringGetter({ key: STRING_KEYS.MIGRATE_NOW })} →`
-                : stringGetter({ key: STRING_KEYS.NO_TOKENS_TO_MIGRATE })}
-            </Button>
-          </Styled.WithReceipt>
-          <Styled.LearnMore>
-            {stringGetter({ key: STRING_KEYS.WANT_TO_LEARN })}
-            <Link href={MIGRATE_HELP_URL}>{stringGetter({ key: STRING_KEYS.CLICK_HERE })}</Link>
-          </Styled.LearnMore>
-        </Styled.MobileMigrateCard>
-      )} */}
-
-      <Styled.PanelRow>
-        {isTablet && (
-          <Styled.BalancePanelContainer>
-            <DYDXBalancePanel />
-          </Styled.BalancePanelContainer>
-        )}
-
-        <Styled.Panel
-          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
-          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
-        >
-          <Styled.Row>
-            <Styled.Description>
-              {stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })}
-              <Link href={GOVERNANCE_HELP_URL} onClick={(e) => e.stopPropagation()}>
-                {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-              </Link>
-            </Styled.Description>
-            {/* TODO: vertically center based on Panel height */}
-            <Styled.IconButton
-              action={ButtonAction.Base}
-              iconName={IconName.Arrow}
-              size={ButtonSize.Small}
-            />
-          </Styled.Row>
-        </Styled.Panel>
-
-        <Styled.Panel
-          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>}
-          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
-        >
-          <Styled.Row>
-            <Styled.Description>
-              {stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })}
-              <Link href={STAKING_HELP_URL} onClick={(e) => e.stopPropagation()}>
-                {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-              </Link>
-            </Styled.Description>
-            {/* TODO: vertically center based on Panel height */}
-            <Styled.IconButton
-              action={ButtonAction.Base}
-              iconName={IconName.Arrow}
-              size={ButtonSize.Small}
-            />
-          </Styled.Row>
-        </Styled.Panel>
-
-        {isNotTablet && (
-          <Styled.BalancePanelContainer>
-            <DYDXBalancePanel />
-          </Styled.BalancePanelContainer>
-        )}
-      </Styled.PanelRow>
-    </Styled.Page>
-  );
-};
+export const RewardsPage = () => (
+  <Styled.Page>
+    <DYDXBalancePanel />
+  </Styled.Page>
+);

 const Styled: Record<string, AnyStyledComponent> = {};

 Styled.Page = styled.div`
-  ${layoutMixins.contentContainerPage}
-  gap: 1.5rem;
-
-  @media ${breakpoints.tablet} {
-    padding: 1rem;
-  }
-`;
-
-Styled.Panel = styled(Panel)`
-  padding: 0 1.5rem 1rem;
-
-  @media ${breakpoints.tablet} {
-    max-width: calc(100vw - 2rem);
-  }
-`;
-
-Styled.Row = styled.div`
-  ${layoutMixins.spacedRow}
-  gap: 1rem;
-
-  align-items: center;
-`;
-
-Styled.Description = styled.div`
-  color: var(--color-text-0);
-
-  a {
-    color: var(--color-text-1);
-  }
-`;
-
-Styled.Migrate = styled.section`
-  max-width: min(100vw, var(--content-max-width));
-
-  padding: 1.5rem;
-
-  background-color: var(--color-layer-3);
-  border-radius: 0.875rem;
-`;
-
-Styled.TwoItemRow = styled(Styled.Row)`
-  grid-template-columns: 1fr 1fr;
-`;
-
-Styled.MigrateAction = styled(Styled.TwoItemRow)`
-  padding: 1rem;
-
-  background-color: var(--color-layer-2);
-  border: solid var(--border-width) var(--color-border);
-  border-radius: 0.75rem;
-`;
-
-Styled.Token = styled(Output)`
-  font: var(--font-large-book);
-`;
-
-Styled.PanelRow = styled(Styled.Row)`
-  gap: 1.5rem;
-  max-width: min(100vw, var(--content-max-width));
-  align-items: flex-start;
-
-  > section {
-    cursor: pointer;
-  }
-
-  @media ${breakpoints.tablet} {
-    grid-auto-flow: row;
-    grid-template-columns: 1fr;
-    max-width: auto;
-  }
-`;
-
-Styled.BalancePanelContainer = styled.div`
-  width: 21.25rem;
-
-  @media ${breakpoints.tablet} {
-    width: auto;
-  }
-`;
-
-Styled.Title = styled.h3`
-  ${layoutMixins.inlineRow}
-  padding: 1.25rem 1.5rem 0.5rem;
-
-  font: var(--font-medium-book);
-  color: var(--color-text-2);
-`;
-
-Styled.MigrateTitle = styled(Styled.Title)`
-  padding: 0 0 0.5rem;
-`;
-
-Styled.MobileMigrateCard = styled(Styled.Panel)`
-  ${layoutMixins.flexColumn}
-  gap: 1rem;
-
-  align-items: center;
-`;
-
-Styled.MobileMigrateHeader = styled(Styled.Title)`
-  ${layoutMixins.inlineRow}
-  gap: 1ch;
-  padding-bottom: 1rem;
-
-  font: var(--font-small-book);
-  color: var(--color-text-0);
-
-  h3 {
-    ${layoutMixins.inlineRow}
-    font: var(--font-large-book);
-    color: var(--color-text-2);
-
-    svg {
-      font-size: 1.75rem;
-    }
-  }
-
-  span {
-    margin-top: 0.2rem;
-    b {
-      font-weight: var(--fontWeight-book);
-      color: var(--color-text-1);
-    }
-  }
-`;
-
-Styled.Details = styled(Details)`
-  padding: 0.5rem 1rem;
-`;
-
-Styled.WithReceipt = styled(WithReceipt)`
-  width: 100%;
-`;
-
-Styled.LearnMore = styled(Styled.Description)`
-  ${layoutMixins.row}
-  gap: 1ch;
-`;
-
-Styled.IconButton = styled(IconButton)`
-  color: var(--color-text-0);
+  ${layoutMixins.centered}
 `;
@@ -2,7 +2,6 @@ import { useState } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';

-import { AbacusOrderStatus } from '@/constants/abacus';
 import { STRING_KEYS } from '@/constants/localization';

 import { useBreakpoints, useStringGetter } from '@/hooks';
@@ -19,16 +18,13 @@ import { FillsTable, FillsTableColumnKey } from '@/views/tables/FillsTable';
 import { OrdersTable, OrdersTableColumnKey } from '@/views/tables/OrdersTable';
 import { PositionsTable, PositionsTableColumnKey } from '@/views/tables/PositionsTable';

-import {
-  calculateHasUncommittedOrders,
-  calculateIsAccountViewOnly,
-} from '@/state/accountCalculators';
+import { calculateIsAccountViewOnly } from '@/state/accountCalculators';

 import {
+  calculateHasUncommittedOrders,
  getCurrentMarketTradeInfoNumbers,
  getHasUnseenFillUpdates,
  getHasUnseenOrderUpdates,
-  getLatestOrderStatus,
  getTradeInfoNumbers,
 } from '@/state/accountSelectors';

@@ -73,7 +69,8 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
  const hasUnseenOrderUpdates = useSelector(getHasUnseenOrderUpdates);
  const hasUnseenFillUpdates = useSelector(getHasUnseenFillUpdates);
  const isAccountViewOnly = useSelector(calculateIsAccountViewOnly);
-  const isWaitingForOrderToIndex = useSelector(calculateHasUncommittedOrders);
+  const hasUncommittedOrders = useSelector(calculateHasUncommittedOrders);
+
  const showCurrentMarket = isTablet || view === PanelView.CurrentMarket;

  const fillsTagNumber = shortenNumberForDisplay(showCurrentMarket ? numFills : numTotalFills);
@@ -121,7 +118,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
      value: InfoSection.Orders,
      label: stringGetter({ key: STRING_KEYS.ORDERS }),

-      slotRight: isWaitingForOrderToIndex ? (
+      slotRight: hasUncommittedOrders ? (
        <Styled.LoadingSpinner />
      ) : (
        ordersTagNumber && (
@@ -12,12 +12,12 @@ import { getCurrentMarketAssetData } from '@/state/assetsSelectors';
 import { getCurrentMarketId } from '@/state/perpetualsSelectors';

 export const MarketSelectorAndStats = ({ className }: { className?: string }) => {
-  const { id = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
+  const { symbol = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
  const currentMarketId = useSelector(getCurrentMarketId);

  return (
    <Styled.Container className={className}>
-      <MarketsDropdown currentMarketId={currentMarketId} symbol={id} />
+      <MarketsDropdown currentMarketId={currentMarketId} symbol={symbol} />

      <VerticalSeparator />

@@ -3,6 +3,8 @@ import { configureStore } from '@reduxjs/toolkit';
 import abacusStateManager from '@/lib/abacus';
 import appMiddleware from './appMiddleware';
 import localizationMiddleware from './localizationMiddleware';
+import routerMiddleware from './routerMiddleware';
+import tradeMiddleware from './tradeMiddleware';

 import { accountSlice } from './account';
 import { appSlice } from './app';
@@ -12,6 +14,7 @@ import { dialogsSlice } from './dialogs';
 import { inputsSlice } from './inputs';
 import { layoutSlice } from './layout';
 import { localizationSlice } from './localization';
+import { navigationSlice } from './navigation';
 import { perpetualsSlice } from './perpetuals';

 export const commandMenuSlices = [layoutSlice, localizationSlice];
@@ -26,6 +29,7 @@ export const store = configureStore({
    inputs: inputsSlice.reducer,
    layout: layoutSlice.reducer,
    localization: localizationSlice.reducer,
+    navigation: navigationSlice.reducer,
    perpetuals: perpetualsSlice.reducer,
  },

@@ -35,6 +39,8 @@ export const store = configureStore({
    }),
    appMiddleware,
    localizationMiddleware,
+    routerMiddleware,
+    tradeMiddleware,
  ],

  devTools: process.env.NODE_ENV !== 'production',
@@ -1,7 +1,6 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';

 import type {
-  AccountBalance,
  SubaccountFill,
  Nullable,
  Subaccount,
@@ -12,7 +11,6 @@ import type {
  SubaccountTransfers,
  HistoricalPnlPeriods,
  SubAccountHistoricalPNLs,
-  UsageRestriction,
 } from '@/constants/abacus';

 import { OnboardingGuard, OnboardingState } from '@/constants/account';
@@ -22,46 +20,31 @@ import { WalletType } from '@/constants/wallets';
 import { getLocalStorage } from '@/lib/localStorage';

 export type AccountState = {
-  balances?: Record<string, AccountBalance>;
-  stakingBalances?: Record<string, AccountBalance>;
-  wallet?: Nullable<Wallet>;
-  walletType?: WalletType;
-
-  subaccount?: Nullable<Subaccount>;
  fills?: SubaccountFills;
  fundingPayments?: SubaccountFundingPayments;
  transfers?: SubaccountTransfers;
-  historicalPnl?: SubAccountHistoricalPNLs;
-
-  onboardingGuards: Record<OnboardingGuard, boolean | undefined>;
-  onboardingState: OnboardingState;
-
  clearedOrderIds?: string[];
+  uncommittedOrderClientIds?: number[];
  hasUnseenFillUpdates: boolean;
  hasUnseenOrderUpdates: boolean;
-  latestOrder?: Nullable<SubaccountOrder>;
+  historicalPnl?: SubAccountHistoricalPNLs;
+  onboardingGuards: Record<OnboardingGuard, boolean | undefined>;
+  onboardingState: OnboardingState;
+  subaccount?: Nullable<Subaccount>;
+  wallet?: Nullable<Wallet>;
+  walletType?: WalletType;
  historicalPnlPeriod?: HistoricalPnlPeriods;
-  uncommittedOrderClientIds: number[];
-
-  restriction?: Nullable<UsageRestriction>;
 };

 const initialState: AccountState = {
-  // Wallet
-  balances: undefined,
-  wallet: undefined,
-  walletType: getLocalStorage<WalletType>({
-    key: LocalStorageKey.OnboardingSelectedWalletType,
-  }),
-
-  // Subaccount
-  subaccount: undefined,
  fills: undefined,
  fundingPayments: undefined,
  transfers: undefined,
+  clearedOrderIds: undefined,
+  uncommittedOrderClientIds: undefined,
+  hasUnseenFillUpdates: false,
+  hasUnseenOrderUpdates: false,
  historicalPnl: undefined,
-
-  // Onboarding
  onboardingGuards: {
    [OnboardingGuard.hasAcknowledgedTerms]: Boolean(
      getLocalStorage<boolean>({
@@ -72,17 +55,11 @@ const initialState: AccountState = {
    [OnboardingGuard.hasPreviousTransactions]: undefined,
  },
  onboardingState: OnboardingState.Disconnected,
-
-  // UI
-  clearedOrderIds: undefined,
-  hasUnseenFillUpdates: false,
-  hasUnseenOrderUpdates: false,
-  latestOrder: undefined,
-  uncommittedOrderClientIds: [],
-  historicalPnlPeriod: undefined,
-
-  // Restriction
-  restriction: undefined,
+  subaccount: undefined,
+  wallet: undefined,
+  walletType: getLocalStorage<WalletType>({
+    key: LocalStorageKey.OnboardingSelectedWalletType,
+  }),
 };

 export const accountSlice = createSlice({
@@ -109,16 +86,6 @@ export const accountSlice = createSlice({
    setTransfers: (state, action: PayloadAction<any>) => {
      state.transfers = action.payload;
    },
-    setLatestOrder: (state, action: PayloadAction<Nullable<SubaccountOrder>>) => {
-      const { clientId } = action.payload ?? {};
-      state.latestOrder = action.payload;
-
-      if (clientId) {
-        state.uncommittedOrderClientIds = state.uncommittedOrderClientIds.filter(
-          (id) => id !== clientId
-        );
-      }
-    },
    clearOrder: (state, action: PayloadAction<string>) => ({
      ...state,
      clearedOrderIds: [...(state.clearedOrderIds || []), action.payload],
@@ -142,9 +109,6 @@ export const accountSlice = createSlice({
        state.historicalPnl = action.payload;
      }
    },
-    setRestrictionType: (state, action: PayloadAction<Nullable<UsageRestriction>>) => {
-      state.restriction = action.payload;
-    },
    setSubaccount: (state, action: PayloadAction<Nullable<Subaccount>>) => {
      const existingOrderIds = state.subaccount?.orders
        ? state.subaccount.orders.toArray().map((order) => order.id)
@@ -167,26 +131,22 @@ export const accountSlice = createSlice({
      ...state,
      wallet: action.payload,
    }),
+    addUncommittedOrderClientId: (state, action: PayloadAction<number>) => {
+      state.uncommittedOrderClientIds = state.uncommittedOrderClientIds
+        ? [...state.uncommittedOrderClientIds, action.payload]
+        : [action.payload];
+    },
+    removeUncommittedOrderClientId: (state, action: PayloadAction<number>) => {
+      state.uncommittedOrderClientIds = state.uncommittedOrderClientIds?.filter(
+        (clientId) => clientId !== action.payload
+      );
+    },
    viewedFills: (state) => {
      state.hasUnseenFillUpdates = false;
    },
    viewedOrders: (state) => {
      state.hasUnseenOrderUpdates = false;
    },
-    setBalances: (state, action: PayloadAction<Record<string, AccountBalance>>) => {
-      state.balances = action.payload;
-    },
-    setStakingBalances: (state, action: PayloadAction<Record<string, AccountBalance>>) => {
-      state.stakingBalances = action.payload;
-    },
-    addUncommittedOrderClientId: (state, action: PayloadAction<number>) => {
-      state.uncommittedOrderClientIds.push(action.payload);
-    },
-    removeUncommittedOrderClientId: (state, action: PayloadAction<number>) => {
-      state.uncommittedOrderClientIds = state.uncommittedOrderClientIds.filter(
-        (id) => id !== action.payload
-      );
-    },
  },
 });

@@ -194,18 +154,14 @@ export const {
  setFills,
  setFundingPayments,
  setTransfers,
-  setLatestOrder,
  clearOrder,
  setOnboardingGuard,
  setOnboardingState,
  setHistoricalPnl,
-  setRestrictionType,
  setSubaccount,
  setWallet,
-  viewedFills,
-  viewedOrders,
-  setBalances,
-  setStakingBalances,
  addUncommittedOrderClientId,
  removeUncommittedOrderClientId,
+  viewedFills,
+  viewedOrders,
 } = accountSlice.actions;
@@ -2,15 +2,17 @@ import { createSelector } from 'reselect';

 import { SubaccountPosition } from '@/constants/abacus';
 import { OnboardingState, OnboardingSteps } from '@/constants/account';
+import { isDydxV4Network } from '@/constants/networks';

 import {
  getExistingOpenPositions,
  getOnboardingGuards,
  getOnboardingState,
  getSubaccountId,
-  getUncommittedOrderClientIds,
 } from '@/state/accountSelectors';

+import { getSelectedNetwork } from '@/state/appSelectors';
+
 export const calculateOnboardingStep = createSelector(
  [getOnboardingState, getOnboardingGuards],
  (onboardingState: OnboardingState, onboardingGuards: ReturnType<typeof getOnboardingGuards>) => {
@@ -32,9 +34,9 @@ export const calculateOnboardingStep = createSelector(
 * @description calculate whether an account is in a state where they can trade
 */
 export const calculateCanAccountTrade = createSelector(
-  [getOnboardingState],
-  (onboardingState: OnboardingState) => {
-    return onboardingState === OnboardingState.AccountConnected;
+  [getOnboardingState, getSelectedNetwork],
+  (onboardingState: OnboardingState, selectedNetwork: string) => {
+    return onboardingState === OnboardingState.AccountConnected && isDydxV4Network(selectedNetwork);
  }
 );

@@ -67,11 +69,6 @@ export const calculateHasOpenPositions = createSelector(
  (openPositions?: SubaccountPosition[]) => (openPositions?.length || 0) > 0
 );

-export const calculateHasUncommittedOrders = createSelector(
-  [getUncommittedOrderClientIds],
-  (uncommittedOrderClientIds: number[]) => uncommittedOrderClientIds.length > 0
-);
-
 /**
 * @description calculate whether the client is loading info.
 * (account is connected but subaccountId is till missing)
@@ -78,12 +78,6 @@ export const getCurrentMarketPositionData = (state: RootState) => {
 export const getSubaccountOrders = (state: RootState) =>
  state.account.subaccount?.orders?.toArray();

-/**
- * @param state
- * @returns latestOrder of the currently connected subaccount throughout this session
- */
-export const getLatestOrder = (state: RootState) => state.account?.latestOrder;
-
 /**
 * @param state
 * @returns list of order ids that user has cleared and should be hidden
@@ -121,26 +115,7 @@ export const getSubaccountOpenOrdersBySideAndPrice = createSelector(
 );

 /**
- * @returns the clientId of the latest order
- */
-export const getLatestOrderClientId = createSelector([getLatestOrder], (order) => order?.clientId);
-
-/**
- * @returns the rawValue status of the latest order
- */
-export const getLatestOrderStatus = createSelector(
-  [getLatestOrder],
-  (order) => order?.status.rawValue
-);
-
-/**
- * @returns a list of clientIds belonging to uncommmited orders
- */
-export const getUncommittedOrderClientIds = (state: RootState) =>
-  state.account.uncommittedOrderClientIds;
-
-/**
- * @param orderId
+ * @param state
 * @returns order details with the given orderId
 */
 export const getOrderDetails = (orderId: string) =>
@@ -308,6 +283,21 @@ export const getIsAccountConnected = (state: RootState) =>
 */
 export const getOnboardingGuards = (state: RootState) => state.account.onboardingGuards;

+/**
+ * @param state
+ * @returns a boolean indicating whether the user has uncommitted orders
+ */
+export const calculateHasUncommittedOrders = (state: RootState) => {
+  return !!state.account.uncommittedOrderClientIds?.length;
+};
+
+/**
+ * @param state
+ * @returns List of uncommitted order clientIds
+ */
+export const getUncommittedOrderClientIds = (state: RootState) =>
+  state.account.uncommittedOrderClientIds;
+
 /**
 * @param state
 * @returns Whether there are unseen fill updates
@@ -332,23 +322,3 @@ export const getUserStats = (state: RootState) => ({
  makerVolume30D: state.account?.wallet?.user?.makerVolume30D,
  takerVolume30D: state.account?.wallet?.user?.takerVolume30D,
 });
-
-/**
- * @returns user wallet balances
- */
-export const getBalances = (state: RootState) => state.account?.balances;
-
-/**
- *  @returns user wallet staking balances
- * */
-export const getStakingBalances = (state: RootState) => state.account?.stakingBalances;
-
-/**
- * @returns UsageRestriction of the current session
- */
-export const getUsageRestriction = (state: RootState) => state.account.restriction;
-
-/**
- * @returns RestrictionType from the current session
- */
-export const getRestrictionType = (state: RootState) => state.account.restriction?.restriction;
@@ -2,10 +2,14 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';

 import { AbacusApiState } from '@/constants/abacus';
 import { LocalStorageKey } from '@/constants/localStorage';
-import { DEFAULT_APP_ENVIRONMENT, type DydxNetwork } from '@/constants/networks';
+
+import {
+  DEFAULT_APP_ENVIRONMENT,
+  isValidDydxNetwork,
+  type DydxNetwork,
+} from '@/constants/networks';

 import { getLocalStorage } from '@/lib/localStorage';
-import { validateAgainstAvailableEnvironments } from '@/lib/network';

 export interface AppState {
  apiState: AbacusApiState | undefined;
@@ -19,7 +23,7 @@ const initialState: AppState = {
  selectedNetwork: getLocalStorage({
    key: LocalStorageKey.SelectedNetwork,
    defaultValue: DEFAULT_APP_ENVIRONMENT,
-    validateFn: validateAgainstAvailableEnvironments,
+    validateFn: isValidDydxNetwork,
  }),
 };

@@ -23,38 +23,39 @@ export const dialogsSlice = createSlice({
  name: 'Dialogs',
  initialState,
  reducers: {
-    openDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => {
-      if (state.activeDialog?.type === action.payload.type) return;
+    addDialogToQueue: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => {
+      const dialogQueue = state.dialogQueue;
+      dialogQueue.push(action.payload);

-      if (state.activeDialog) {
-        state.dialogQueue.push(action.payload);
-      } else {
-        state.activeDialog = action.payload;
-      }
-    },
-    closeDialog: (state: DialogsState) => {
-      state.activeDialog = state.dialogQueue.shift();
-    },
-    forceOpenDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => {
-      if (state.activeDialog) {
-        state.dialogQueue.unshift(state.activeDialog);
-      }
-      state.activeDialog = action.payload;
-    },
-    closeDialogInTradeBox: (state: DialogsState) => {
-      state.activeTradeBoxDialog = undefined;
+      return {
+        ...state,
+        dialogQueue,
+      };
    },
+    closeDialog: (state: DialogsState) => ({
+      ...state,
+      activeDialog: state.dialogQueue.shift(),
+    }),
+    openDialog: (state: DialogsState, action: PayloadAction<DialogInfo<DialogTypes>>) => ({
+      ...state,
+      activeDialog: action.payload,
+    }),
+    closeDialogInTradeBox: (state: DialogsState) => ({
+      ...state,
+      activeTradeBoxDialog: undefined,
+    }),
    openDialogInTradeBox: (
      state: DialogsState,
      action: PayloadAction<DialogInfo<TradeBoxDialogTypes>>
-    ) => {
-      state.activeTradeBoxDialog = action.payload;
-    },
+    ) => ({
+      ...state,
+      activeTradeBoxDialog: action.payload,
+    }),
  },
 });

 export const {
-  forceOpenDialog,
+  addDialogToQueue,
  closeDialog,
  closeDialogInTradeBox,
  openDialog,
@@ -0,0 +1,42 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+export interface NavigationState {
+  tradeLocation: {
+    hash: string;
+    key: string;
+    pathname: string;
+    search: string;
+    state: any;
+  };
+}
+
+export const CLEAR_TRADE_LOCATION = {
+  hash: '',
+  key: '',
+  pathname: '',
+  search: '',
+  state: null,
+};
+
+const initialState: NavigationState = {
+  tradeLocation: {
+    hash: '',
+    key: '',
+    pathname: '',
+    search: '',
+    state: null,
+  },
+};
+
+export const navigationSlice = createSlice({
+  name: 'Navigation',
+  initialState,
+  reducers: {
+    setTradeLocation: (state, { payload }) => ({
+      ...state,
+      tradeLocation: payload,
+    }),
+  },
+});
+
+export const { setTradeLocation } = navigationSlice.actions;
@@ -0,0 +1,33 @@
+import type { PayloadAction } from '@reduxjs/toolkit';
+
+import { LocalStorageKey } from '@/constants/localStorage';
+
+import { closeDialogInTradeBox } from '@/state/dialogs';
+import { setTradeLocation } from '@/state/navigation';
+
+import abacusStateManager from '@/lib/abacus';
+import { setLocalStorage } from '@/lib/localStorage';
+import { getMarketIdFromLocation } from '@/lib/tradeData';
+
+export default (store: any) => (next: any) => async (action: PayloadAction<any>) => {
+  next(action);
+
+  const { type, payload } = action;
+
+  switch (type) {
+    case setTradeLocation.type: {
+      const marketId = getMarketIdFromLocation(payload);
+
+      if (marketId) {
+        abacusStateManager.setMarket(marketId);
+        store.dispatch(closeDialogInTradeBox());
+        setLocalStorage({ key: LocalStorageKey.LastViewedMarket, value: marketId });
+      }
+
+      break;
+    }
+    default: {
+      break;
+    }
+  }
+};
@@ -0,0 +1,39 @@
+import type { PayloadAction } from '@reduxjs/toolkit';
+
+import type { SubaccountOrder } from '@/constants/abacus';
+
+import { removeUncommittedOrderClientId, setSubaccount } from '@/state/account';
+
+import { getSubaccountOrders, getUncommittedOrderClientIds } from '@/state/accountSelectors';
+
+export default (store: any) => (next: any) => async (action: PayloadAction<any>) => {
+  const { type, payload } = action;
+  const state = store.getState();
+  next(action);
+
+  switch (type) {
+    case setSubaccount.type: {
+      const updatedOrders = payload?.orders?.toArray() || [];
+      const orders = getSubaccountOrders(state);
+      const uncommittedOrderClientIds = getUncommittedOrderClientIds(state);
+
+      if (uncommittedOrderClientIds?.length && updatedOrders?.length !== orders?.length) {
+        const updatedOrdersClientIds = Object.fromEntries(
+          updatedOrders.map((order: SubaccountOrder) => [order.clientId, order])
+        );
+
+        const receivedClientId = uncommittedOrderClientIds.find(
+          (clientId) => updatedOrdersClientIds[clientId]
+        );
+
+        if (receivedClientId) {
+          store.dispatch(removeUncommittedOrderClientId(receivedClientId));
+        }
+      }
+      break;
+    }
+    default: {
+      break;
+    }
+  }
+};
@@ -1,53 +0,0 @@
-import {
-  css,
-  type FlattenInterpolation,
-  type FlattenSimpleInterpolation,
-  type ThemeProps,
-} from 'styled-components';
-
-export const articleMixins: Record<
-  string,
-  FlattenSimpleInterpolation | FlattenInterpolation<ThemeProps<any>>
-> = {
-  article: css`
-    padding: 2rem;
-    overflow-wrap: break-word;
-    user-select: text;
-    margin: 0 auto;
-    width: 60rem;
-    max-width: 100vw;
-
-    header {
-      color: var(--color-text-0);
-      margin-bottom: 2rem;
-
-      h1 {
-        font: var(--font-extra-book);
-        color: var(--color-text-2);
-      }
-    }
-
-    h2 {
-      font: var(--font-large-book);
-      color: var(--color-text-2);
-      padding: 0.5rem 0;
-    }
-
-    h3,
-    strong {
-      font-weight: 700;
-    }
-
-    strong {
-      color: var(--color-text-2);
-    }
-
-    p {
-      padding: 0.5rem 0;
-    }
-
-    ul {
-      padding: 0.5rem 1rem;
-    }
-  `,
-};
@@ -62,10 +62,8 @@ export const AccountInfoConnectedState = () => {
  const { buyingPower, equity, marginUsage, leverage } = subAccount || {};

  const hasDiff =
-    (marginUsage?.postOrder !== null &&
-      !MustBigNumber(marginUsage?.postOrder).eq(MustBigNumber(marginUsage?.current))) ||
-    (buyingPower?.postOrder !== null &&
-      !MustBigNumber(buyingPower?.postOrder).eq(MustBigNumber(buyingPower?.current)));
+    marginUsage?.postOrder != null &&
+    !MustBigNumber(marginUsage?.postOrder).eq(MustBigNumber(marginUsage?.current));

  const showHeader = !hasDiff && !isTablet;

@@ -75,14 +73,16 @@ export const AccountInfoConnectedState = () => {
        <Styled.Header>
          <span>{stringGetter({ key: STRING_KEYS.ACCOUNT })}</span>
          <Styled.TransferButtons>
-            <Styled.Button
-              state={{ isDisabled: !dydxAccounts }}
-              onClick={() => dispatch(openDialog({ type: DialogTypes.Withdraw }))}
-              shape={ButtonShape.Pill}
-              size={ButtonSize.XSmall}
-            >
-              {stringGetter({ key: STRING_KEYS.WITHDRAW })}
-            </Styled.Button>
+            {import.meta.env.MODE !== 'production' && (
+              <Styled.Button
+                state={{ isDisabled: !dydxAccounts }}
+                onClick={() => dispatch(openDialog({ type: DialogTypes.Withdraw }))}
+                shape={ButtonShape.Pill}
+                size={ButtonSize.XSmall}
+              >
+                {stringGetter({ key: STRING_KEYS.WITHDRAW })}
+              </Styled.Button>
+            )}
            <Styled.Button
              state={{ isDisabled: !dydxAccounts }}
              onClick={() => dispatch(openDialog({ type: DialogTypes.Deposit }))}
@@ -24,7 +24,7 @@ export const MarketDetails: React.FC = () => {
  const stringGetter = useStringGetter();
  const { isTablet } = useBreakpoints();
  const { configs, market } = useSelector(getCurrentMarketData, shallowEqual) || {};
-  const { id, name, resources } = useSelector(getCurrentMarketAssetData, shallowEqual) || {};
+  const { symbol, name, resources } = useSelector(getCurrentMarketAssetData, shallowEqual) || {};

  if (!configs) return null;

@@ -75,7 +75,7 @@ export const MarketDetails: React.FC = () => {
          useGrouping
          value={stepSize}
          type={OutputType.Asset}
-          tag={id}
+          tag={symbol}
          fractionDigits={stepSizeDecimals}
        />
      ),
@@ -88,7 +88,7 @@ export const MarketDetails: React.FC = () => {
          useGrouping
          value={minOrderSize}
          type={OutputType.Asset}
-          tag={id}
+          tag={symbol}
          fractionDigits={stepSizeDecimals}
        />
      ),
@@ -132,16 +132,18 @@ export const MarketDetails: React.FC = () => {
      <Styled.Header>
        <Styled.WrapRow>
          <Styled.MarketTitle>
-            <AssetIcon symbol={id} />
+            <AssetIcon symbol={symbol} />
            {name}
          </Styled.MarketTitle>
          {isTablet && <Styled.MarketLinks />}
        </Styled.WrapRow>

        <Styled.MarketDescription>
-          {primaryDescriptionKey && <p>{stringGetter({ key: `APP.${primaryDescriptionKey}` })}</p>}
+          {primaryDescriptionKey && (
+            <p>{stringGetter({ key: STRING_KEYS[primaryDescriptionKey as StringKey] })}</p>
+          )}
          {secondaryDescriptionKey && (
-            <p>{stringGetter({ key: `APP.${secondaryDescriptionKey}` })}</p>
+            <p>{stringGetter({ key: STRING_KEYS[secondaryDescriptionKey as StringKey] })}</p>
          )}
        </Styled.MarketDescription>

@@ -15,17 +15,14 @@ export const MarketLinks = () => {

  const linkItems = [
    {
-      key: 'coinmarketcap',
      href: coinMarketCapsLink,
      icon: IconName.CoinMarketCap,
    },
    {
-      key: 'whitepaper',
      href: whitepaperLink,
      icon: IconName.Whitepaper,
    },
    {
-      key: 'project-website',
      href: websiteLink,
      icon: IconName.Website,
    },
@@ -34,8 +31,8 @@ export const MarketLinks = () => {
  return (
    <Styled.MarketLinks>
      {linkItems.map(
-        ({ key, href, icon }) =>
-          href && <IconButton key={key} href={href} iconName={icon} type={ButtonType.Link} />
+        ({ href, icon }) =>
+          href && <IconButton key={href} href={href} iconName={icon} type={ButtonType.Link} />
      )}
    </Styled.MarketLinks>
  );
@@ -45,7 +45,7 @@ const defaultMarketStatistics = Object.values(MarketStats);
 export const MarketStatsDetails = ({ showMidMarketPrice = true }: ElementProps) => {
  const stringGetter = useStringGetter();
  const { isTablet } = useBreakpoints();
-  const { id = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
+  const { symbol = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
  const { tickSizeDecimals } = useSelector(getCurrentMarketConfig, shallowEqual) ?? {};
  const midMarketPrice = useSelector(getCurrentMarketMidMarketPrice);
  const lastMidMarketPrice = useRef(midMarketPrice);
@@ -116,7 +116,7 @@ export const MarketStatsDetails = ({ showMidMarketPrice = true }: ElementProps)
                  <Styled.Output
                    type={OutputType.Number}
                    value={value}
-                    tag={id}
+                    tag={symbol}
                    fractionDigits={LARGE_TOKEN_DECIMALS}
                  />
                );
@@ -60,12 +60,12 @@ const MarketsDropdownContent = ({ onRowAction }: { onRowAction?: (market: string
                columnKey: 'market',
                getCellValue: (row) => row.market,
                label: stringGetter({ key: STRING_KEYS.MARKET }),
-                renderCell: ({ assetId, id }) => (
+                renderCell: ({ asset }) => (
                  <Styled.MarketName isFavorited={false}>
                    {/* TRCL-1693 <Icon iconName={IconName.Star} /> */}
-                    <AssetIcon symbol={assetId} />
-                    <h2>{id}</h2>
-                    <Tag>{assetId}</Tag>
+                    <AssetIcon symbol={asset.symbol} />
+                    <h2>{asset.name}</h2>
+                    <Tag>{asset.symbol}</Tag>
                  </Styled.MarketName>
                ),
              },
@@ -68,7 +68,7 @@ export const PositionInfo = ({ showNarrowVariation }: { showNarrowVariation?: bo
  const isLoading = useSelector(calculateIsAccountLoading);

  const { stepSizeDecimals, tickSizeDecimals } = currentMarketConfigs || {};
-  const { id } = currentMarketAssetData || {};
+  const { symbol } = currentMarketAssetData || {};
  const { type: dialogType } = activeDialog || {};
  const { type: tradeBoxDialogType } = activeTradeBoxDialog || {};

@@ -188,7 +188,7 @@ export const PositionInfo = ({ showNarrowVariation }: { showNarrowVariation?: bo
      label: STRING_KEYS.LIQUIDATION_PRICE,
      tooltip: 'liquidation-price',
      tooltipParams: {
-        SYMBOL: id || '',
+        SYMBOL: symbol || '',
      },
      fractionDigits: tickSizeDecimals,
      hasInvalidNewValue: Boolean(newLeverageIsInvalid),
@@ -326,7 +326,7 @@ export const PositionInfo = ({ showNarrowVariation }: { showNarrowVariation?: bo
            notionalTotal={notionalTotal?.current}
            postOrderSize={size?.postOrder}
            stepSizeDecimals={stepSizeDecimals}
-            symbol={id || undefined}
+            symbol={symbol || undefined}
            tickSizeDecimals={tickSizeDecimals}
            showNarrowVariation={showNarrowVariation}
            isLoading={isLoading}
@@ -370,7 +370,7 @@ export const PositionInfo = ({ showNarrowVariation }: { showNarrowVariation?: bo
          notionalTotal={notionalTotal?.current}
          postOrderSize={size?.postOrder}
          stepSizeDecimals={stepSizeDecimals}
-          symbol={id || undefined}
+          symbol={symbol || undefined}
          tickSizeDecimals={tickSizeDecimals}
          isLoading={isLoading}
        />
@@ -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;
@@ -49,15 +53,6 @@ export const TransferStatusToast = ({

  if (!status) return <LoadingDots size={3} />;

-  const statusString =
-    type === 'deposit'
-      ? status?.squidTransactionStatus === 'success'
-        ? STRING_KEYS.DEPOSIT_COMPLETE
-        : STRING_KEYS.DEPOSIT_STATUS
-      : status?.squidTransactionStatus === 'success'
-      ? STRING_KEYS.WITHDRAW_COMPLETE
-      : STRING_KEYS.WITHDRAW_STATUS;
-
  return (
    <Styled.Root open={open} onOpenChange={setOpen}>
      <WithReceipt
@@ -65,14 +60,14 @@ export const TransferStatusToast = ({
        side="bottom"
        slotReceipt={
          <Styled.Receipt>
-            <TransferStatusSteps status={status} type={type} />
+            <TransferStatusSteps status={status} />
          </Styled.Receipt>
        }
      >
        <Styled.BridgingStatus>
          <Styled.Status>
            {stringGetter({
-              key: statusString,
+              key: type === 'deposit' ? STRING_KEYS.DEPOSIT_STATUS : STRING_KEYS.WITHDRAW_STATUS,
              params: {
                AMOUNT_USD: <Styled.InlineOutput type={OutputType.Fiat} value={toAmount} />,
                ESTIMATED_DURATION: (
@@ -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 = [
      {
@@ -50,7 +51,7 @@ export const TransferStatusSteps = ({ status, type }: ElementProps) => {
        label: stringGetter({
          key: type === 'deposit' ? STRING_KEYS.DEPOSIT_TO_CHAIN : STRING_KEYS.WITHDRAW_TO_CHAIN,
          params: {
-            CHAIN: type === 'deposit' ? 'dYdX' : status?.toChain?.chainData?.chainName,
+            CHAIN: status?.toChain?.chainData?.chainName,
          },
        }),
        step: TransferStatusStep.ToChain,
@@ -73,10 +74,6 @@ export const TransferStatusSteps = ({ status, type }: ElementProps) => {
      currentStep = TransferStatusStep.FromChain;
    }

-    if (status?.squidTransactionStatus === 'success') {
-      currentStep = TransferStatusStep.Complete;
-    }
-
    return {
      currentStep,
      steps,
@@ -98,7 +98,7 @@ export const DepthChart = ({
  // Chart data

  const orderbook = useSelector(getCurrentMarketOrderbook, shallowEqual);
-  const { id = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
+  const { symbol = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
  const { stepSizeDecimals, tickSizeDecimals } =
    useSelector(getCurrentMarketConfig, shallowEqual) ?? {};

@@ -393,7 +393,7 @@ export const DepthChart = ({
                        ? chartPointAtPointer.size
                        : tooltipData!.nearestDatum?.datum.depth
                    }
-                    tag={id}
+                    tag={symbol}
                    accentColor={
                      {
                        [DepthChartSeries.Asks]: 'var(--color-negative)',
@@ -476,7 +476,7 @@ export const DepthChart = ({
                                    type={OutputType.Asset}
                                    value={chartPointAtPointer.size}
                                    fractionDigits={stepSizeDecimals}
-                                    tag={id}
+                                    tag={symbol}
                                    useGrouping={false}
                                  />
                                ),
@@ -543,7 +543,7 @@ export const DepthChart = ({
                                    type={OutputType.Asset}
                                    value={nearestDatum?.datum.depth}
                                    fractionDigits={stepSizeDecimals}
-                                    tag={id}
+                                    tag={symbol}
                                    useGrouping={false}
                                  />
                                ),
@@ -25,11 +25,7 @@ import { TimeSeriesChart } from '@/components/visx/TimeSeriesChart';
 import { AxisLabelOutput } from '@/components/visx/AxisLabelOutput';
 // import { TooltipContent } from '@/components/visx/TooltipContent';

-import {
-  getSubaccount,
-  getSubaccountHistoricalPnl,
-  getSubaccountId,
-} from '@/state/accountSelectors';
+import { getSubaccount, getSubaccountHistoricalPnl, getSubaccountId } from '@/state/accountSelectors';

 import abacusStateManager from '@/lib/abacus';
 import { formatRelativeTime } from '@/lib/dateTime';
@@ -28,7 +28,7 @@ type ElementProps = {
 };

 export const ClosePositionDialog = ({ setIsOpen }: ElementProps) => {
-  const { id } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
+  const { symbol } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
  const { isTablet } = useBreakpoints();
  const stringGetter = useStringGetter();

@@ -46,7 +46,7 @@ export const ClosePositionDialog = ({ setIsOpen }: ElementProps) => {
  } = {
    [MobilePlaceOrderSteps.EditOrder]: {
      title: <CloseOrderHeader />,
-      slotIcon: <AssetIcon symbol={id} />,
+      slotIcon: <AssetIcon symbol={symbol} />,
    },
    [MobilePlaceOrderSteps.PreviewOrder]: {
      title: (
@@ -32,9 +32,12 @@ export const DepositDialog = ({ setIsOpen }: ElementProps) => {
    >
      <Styled.Content>
        {showTestDeposit ? <TestnetDepositForm onDeposit={closeDialog} /> : <DepositForm />}
-        <Styled.TextToggle onClick={() => setShowTestDeposit(!showTestDeposit)}>
-          {showTestDeposit ? 'Show deposit form (Under Construction)' : 'Show test faucet'}
-        </Styled.TextToggle>
+        {/* TODO TRCL-1693 - uncomment when deposit form is ready */}
+         {import.meta.env.MODE !== 'production' && (
+          <Styled.TextToggle onClick={() => setShowTestDeposit(!showTestDeposit)}>
+            {showTestDeposit ? 'Show deposit form (Under Construction)' : 'Show test faucet'}
+          </Styled.TextToggle>
+        )}
      </Styled.Content>
    </Dialog>
  );
@@ -19,7 +19,7 @@ import { MustBigNumber } from '@/lib/numbers';

 type ElementProps = {
  fillId: string;
-  setIsOpen: (open: boolean) => void;
+  setIsOpen?: (open: boolean) => void;
 };

 export const FillDetailsDialog = ({ fillId, setIsOpen }: ElementProps) => {
@@ -94,7 +94,7 @@ export const FillDetailsDialog = ({ fillId, setIsOpen }: ElementProps) => {

  return (
    <DetailsDialog
-      slotIcon={<Styled.AssetIcon symbol={asset.id} />}
+      slotIcon={<Styled.AssetIcon symbol={asset.symbol} />}
      title={resources.typeStringKey && stringGetter({ key: resources.typeStringKey })}
      items={detailItems}
      setIsOpen={setIsOpen}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bill He	1938feb66b	address comments	2023-09-19 23:20:53 -07:00
Bill He	2b105fb522	Onboarding error handling	2023-09-18 21:58:30 -07:00
Bill He	ea81d7a150	temp	2023-09-18 16:31:46 -07:00