Add validationFn and update tests

2023-10-15 22:11:41 -07:00
131 changed files with 2026 additions and 3117 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,7 +4,7 @@ VITE_ALCHEMY_API_KEY=

 VITE_PK_ENCRYPTION_KEY=

+VITE_WALLETCONNECT1_BRIDGE=
 VITE_WALLETCONNECT2_PROJECT_ID=

-VITE_V3_TOKEN_ADDRESS=0x6d5bb505a4f85c10b122ccc36e30f57e2b86a291
-VITE_TOKEN_MIGRATION_URI=https://bridge.dydx.trade/
+VITE_V3_TOKEN_ADDRESS=
@@ -13,7 +13,6 @@ dist
 dist-ssr
 *.local
 *.key
-.env

 # Editor directories and files
 .vscode/*
@@ -1,3 +1,45 @@
+Subject to your compliance with applicable law, you are granted the right to use the Licensed Work (defined below) under the terms of the below licenses; provided, however, that if you violate any such applicable law in your use of the Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Licensed Work will automatically and immediately terminate.
+
+Use of this software before the Change Date specified in the LICENSE file is governed by the Business Source License included in the LICENSE file and at https://spdx.org/licenses/BUSL-1.1.html.
+
+On and after the Change Date specified in the LICENSE file, use of this software will be governed by the Change License (GNU Affero GPL v3) as specified in the LICENSE file.
+
+
+Business Source License 1.1 
+Business Source License text copyright © 2023 MariaDB plc, All Rights Reserved. “Business Source License” is a trademark of MariaDB plc.
+Copyright (C) 2023 dYdX Trading Inc.
+
+Parameters
+Licensor: dYdX Trading Inc.
+Licensed Work: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-clients, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. github repository reflecting a copy of this license, or link to this license. 
+Additional Use Grant: None
+Change Date: On the later to occur of (i) the release of the Licensed Work labeled “dYdX Version 1.0 Affero GPL”, and which includes a document uploaded to the relevant github repository stating “The software in this repository is Version 1.0, subject to Affero GPL license”, and (ii) September 30, 2023 (approximate projected release of “Version 1.0” of this software).
+Change License: GNU Affero GPL License v3
+
+License text copyright © 2023 MariaDB plc, All Rights Reserved. “Business Source License” is a trademark of MariaDB plc.
+Terms
+The Licensor hereby grants you the right to copy, modify, create derivative works, redistribute, and make non-production use of the Licensed Work. The Licensor may make an Additional Use Grant, above, permitting limited production use.
+Effective on the Change Date, or the fourth anniversary of the first publicly available distribution of a specific version of the Licensed Work under this License, whichever comes first, the Licensor hereby grants you rights under the terms of the Change License, and the rights granted in the paragraph above terminate.
+If your use of the Licensed Work does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or authorized resellers, or you must refrain from using the Licensed Work.
+All copies of the original and modified Licensed Work, and derivative works of the Licensed Work, are subject to this License. This License applies separately for each version of the Licensed Work and the Change Date may vary for each version of the Licensed Work released by Licensor.
+You must conspicuously display this License on each original or modified copy of the Licensed Work. If you receive the Licensed Work in original or modified form from a third party, the terms and conditions set forth in this License apply to your use of that work.
+Any use of the Licensed Work in violation of this License will automatically terminate your rights under this License for the current and all other versions of the Licensed Work.
+This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License).TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. MariaDB hereby grants you permission to use this License’s text to license your works, and to refer to it using the trademark “Business Source License”, as long as you comply with the Covenants of Licensor below.
+Covenants of Licensor
+In consideration of the right to use this License’s text and the “Business Source License” name and trademark, Licensor covenants to MariaDB, and to all other recipients of the licensed work to be provided by Licensor:
+To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where “compatible” means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation.
+To either: (a) specify an additional grant of rights to use that does not impose any additional restriction on the right granted in this License, as the Additional Use Grant; or (b) insert the text “None” to specify a Change Date. Not to modify this License in any other way.
+Notice
+The Business Source License (this document, or the “License”) is not an Open Source license. However, the Licensed Work will eventually be made available under an Open Source License, as stated in this License.
+
+
+
+
+
+
+OPEN SOURCE LICENSE BELOW - TO BE APPLIED AFTER THE CHANGE DATE.
+
+
 Copyright (C) 2023 dYdX Trading Inc.

 Subject to your compliance with applicable law, you are granted the right to use the Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Licensed Work will automatically and immediately terminate.
@@ -1,17 +1,16 @@
 <p align="center"><img src="https://dydx.exchange/icon.svg?" width="256" /></p>

-<h1 align="center">dYdX Chain Web</h1>
+<h1 align="center">v4 Web</h1>

 <div align="center">
  <a href='https://github.com/dydxprotocol/v4-web/blob/main/LICENSE'>
-    <img src='https://img.shields.io/badge/License-AGPL_v3-blue.svg' alt='License' />
+    <img src='https://img.shields.io/badge/License-BSL_1.1-blue' alt='License' />
  </a>
 </div>

 ## 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.

@@ -26,7 +25,7 @@ Alternatively, follow the [IPFS Kubo installation guide](https://docs.ipfs.tech

 ## Part 1: Setting up your local environment

-### 1. Clone the repo
+### Step 1: Clone the repo

 Clone the repository and navigate to its directory:

@@ -35,7 +34,7 @@ git clone https://github.com/dydxprotocol/v4-web.git
 cd v4-web
 ```

-### 2. Install pnpm and dependencies
+### Step 2: Install pnpm and dependencies

 Install pnpm and the project dependencies:

@@ -62,16 +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)
-
-# Deployments
-
-## Deploying with Vercel
+## Part 3: Deploying with Vercel

 ### Step 1: Connect your repository to Vercel

@@ -88,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).

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

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

@@ -120,18 +110,3 @@ To access your content on IPFS:
 2. **Public IPFS gateway:** Access your content via a public IPFS gateway, such as [https://dweb.link](https://dweb.link/) or [https://w3s.link/](https://w3s.link/). Use the gateway URL with your CID appended, like `https://dweb.link/ipfs/your_cid`.

 Replace `your_cid` with the actual CID.
-
-## Cloudflare Settings
-
-We recommend that you add your website to Cloudflare for additional security settings.
-
-To block OFAC Sanctioned countries:
-1. Navigate Websites > Domain > Security > WAF
-
-2. Create Rule with the following settings:
-  * If incoming requests match
-`(ip.geoip.country eq "CU") or (ip.geoip.country eq "IR") or (ip.geoip.country eq "KP") or (ip.geoip.country eq "SY") or (ip.geoip.country eq "MM") or (ip.geoip.subdivision_1_iso_code eq "UA-09") or (ip.geoip.subdivision_1_iso_code eq "UA-14") or (ip.geoip.subdivision_1_iso_code eq "UA-43")`
-  * This rule will bring up a Cloudflare page when a restricted geography tries to access your site. You will have the option to display:
-    1. Custom Text
-      - (e.g. `Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use, or have engaged in activity that violates our terms of use, you have been blocked. You may withdraw your funds from the protocol at any time.`)
-    2. Default Cloudflare WAF block page
@@ -1,9 +1,9 @@
 {
  "name": "dydx-chain-web",
  "private": true,
-  "version": "1.0.0",
+  "version": "0.0.1",
  "type": "module",
-  "license": "AGPL-3.0",
+  "license": "BSL-1.1",
  "engines": {
    "node": ">=18"
  },
@@ -13,7 +13,6 @@
    "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-intercom": "node scripts/inject-intercom.js",
    "build:inject-statuspage": "node scripts/inject-statuspage.js",
    "deploy:ipfs": "node scripts/upload-ipfs.js --verbose",
    "deploy:update-ipns": "node scripts/update-ipns.js",
@@ -39,9 +38,9 @@
    "@cosmjs/proto-signing": "^0.31.0",
    "@cosmjs/stargate": "^0.31.0",
    "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^1.0.3",
-    "@dydxprotocol/v4-client-js": "^1.0.0",
-    "@dydxprotocol/v4-localization": "^1.0.0",
+    "@dydxprotocol/v4-abacus": "^0.6.4",
+    "@dydxprotocol/v4-client-js": "^0.36.1",
+    "@dydxprotocol/v4-localization": "^0.1.28",
    "@ethersproject/providers": "^5.7.2",
    "@js-joda/core": "^5.5.3",
    "@radix-ui/react-collapsible": "^1.0.3",
@@ -23,14 +23,14 @@ dependencies:
    specifier: ^0.31.0
    version: 0.31.0
  '@dydxprotocol/v4-abacus':
-    specifier: ^1.0.3
-    version: 1.0.3
+    specifier: ^0.6.4
+    version: 0.6.4
  '@dydxprotocol/v4-client-js':
-    specifier: ^1.0.0
-    version: 1.0.0
+    specifier: ^0.36.1
+    version: 0.36.1
  '@dydxprotocol/v4-localization':
-    specifier: ^1.0.0
-    version: 1.0.0
+    specifier: ^0.1.28
+    version: 0.1.28
  '@ethersproject/providers':
    specifier: ^5.7.2
    version: 5.7.2
@@ -641,7 +641,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

@@ -713,7 +713,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
@@ -975,12 +975,12 @@ packages:
    resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
    dev: true

-  /@dydxprotocol/v4-abacus@1.0.3:
-    resolution: {integrity: sha512-GuX37/DMMNSke8ZFcw52II7IVJfUgVGHqoi1Uw2cUb+hgIjjSG3OtbyRWedm5r6nqWq8BNLOexI0VVFB6OMVYg==}
+  /@dydxprotocol/v4-abacus@0.6.4:
+    resolution: {integrity: sha512-eH+/9Q/OnQtwzBwM1BJyXybFPdivGmFQWrxM71MFWGs6uIQGbZX775mpoa8deweSTyQ/QrRLRQ1mP2BPDgBQYg==}
    dev: false

-  /@dydxprotocol/v4-client-js@1.0.0:
-    resolution: {integrity: sha512-ehfHO+zQy795TcJRwtiawadFHZyh4HnpJNP26hCGsIjLE5q6LLHweQHpK/1N/sXU1PBOuQwc7iaJnFop6gYauQ==}
+  /@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
@@ -989,15 +989,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)
@@ -1007,12 +1006,12 @@ packages:
      - utf-8-validate
    dev: false

-  /@dydxprotocol/v4-localization@1.0.0:
-    resolution: {integrity: sha512-U7QjOlzpfSAVEchkNDB3xYRx7okzdeYi83XsnHwI+EHa2quFm/2Y2dhrBkT5fqpZmhcwxb/vG8AZmFSToOf9hA==}
+  /@dydxprotocol/v4-localization@0.1.28:
+    resolution: {integrity: sha512-g6LwjX7EIRm9HISfSX0H6yhktBCZby5opP/yI2aIUvn2OYyB25WcjLEuEvzW5Bh9XXiLijgLf3Tk91wPKWuFbA==}
    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
@@ -4705,8 +4704,8 @@ packages:
    resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==}
    dependencies:
      '@noble/curves': 1.1.0
-      '@noble/hashes': 1.3.2
-      '@scure/base': 1.1.3
+      '@noble/hashes': 1.3.1
+      '@scure/base': 1.1.1
    dev: false

  /@scure/bip32@1.3.2:
@@ -4728,7 +4727,7 @@ packages:
    resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==}
    dependencies:
      '@noble/hashes': 1.3.2
-      '@scure/base': 1.1.3
+      '@scure/base': 1.1.1
    dev: false

  /@solana/buffer-layout@4.0.1:
@@ -4742,8 +4741,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
@@ -7141,7 +7140,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:
@@ -8,43 +8,67 @@
                ],
                "components": [
                    {
-                        "/": "/"
+                        "/": "/trade/*"
                    },
                    {
-                        "/": "/#/"
+                        "/": "/r/*"
                    },
                    {
-                        "/": "*/markets"
+                        "/": "/portfolio/overview"
                    },
                    {
-                        "/": "*/trade"
+                        "/": "/portfolio/positions"
                    },
                    {
-                        "/": "*/trade/*"
+                        "/": "/portfolio/orders"
                    },
                    {
-                        "/": "*/portfolio"
+                        "/": "/portfolio/fees"
                    },
                    {
-                        "/": "*/portfolio/overview"
+                        "/": "/portfolio/history"
                    },
                    {
-                        "/": "*/portfolio/positions"
+                        "/": "/portfolio/history/trades"
                    },
                    {
-                        "/": "*/portfolio/orders"
+                        "/": "/portfolio/history/transfers"
                    },
                    {
-                        "/": "*/portfolio/fees"
+                        "/": "/portfolio/history/funding"
                    },
                    {
-                        "/": "*/portfolio/history/trades"
+                        "/": "/rewards"
                    },
                    {
-                        "/": "*/portfolio/history/transfers"
+                        "/": "/my-profile"
                    },
                    {
-                        "/": "*/portfolio/history/funding"
+                        "/": "/rankings/hedgies"
+                    },
+                    {
+                        "/": "/rankings/competition"
+                    },
+                    {
+                        "/": "/rankings/diamond"
+                    },
+                    {
+                        "/": "/rankings/platinum"
+                    },
+                    {
+                        "/": "/rankings/gold"
+                    },
+                    {
+                        "/": "/rankings/silver"
+                    },
+                    {
+                        "/": "/rankings/bronze"
+                    },
+                    {
+                        "/": "/rankings/pnl-absolute"
+                    },
+                    {
+                        "/": "/rankings/pnl-percent"
                    },
                    {
                        "/": "/walletsegue",
@@ -22,11 +22,10 @@
            "dydxprotocol-staging-west",
            "dydxprotocol-testnet",
            "dydxprotocol-testnet-dydx",
+            "dydxprotocol-testnet-dsrv",
            "dydxprotocol-testnet-nodefleet",
            "dydxprotocol-testnet-kingnodes",
-            "dydxprotocol-testnet-liquify",
-            "dydxprotocol-testnet-polkachu",
-            "dydxprotocol-testnet-bware"
+            "dydxprotocol-testnet-liquify"
         ],
         "default": "dydxprotocol-testnet"
      }
@@ -36,54 +35,38 @@
         "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,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://indexer.v4dev.dydx.exchange",
+                  "api": "http://indexer.v4dev.dydx.exchange",
                  "socket": "wss://indexer.v4dev.dydx.exchange"
               }
            ],
            "validators": [
-               "https://validator.v4dev.dydx.exchange"
+               "http://validator.v4dev.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.0xsquid.com",
-            "faucet": "https://faucet.v4dev.dydx.exchange"
+            "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",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "documentation": "https://docs.dydx.exchange/",
-            "community": "https://discord.com/invite/dydx",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -92,6 +75,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -108,21 +94,17 @@
         "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,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -134,7 +116,7 @@
               }
            ],
            "validators": [
-               "http://54.92.118.111"
+               "http://35.75.227.118"
            ],
            "0xsquid": "https://testnet.api.0xsquid.com"
         },
@@ -142,19 +124,7 @@
            "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",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "documentation": "https://docs.dydx.exchange/",
-            "community": "https://discord.com/invite/dydx",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -163,6 +133,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -179,21 +152,17 @@
         "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,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -213,19 +182,7 @@
            "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",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "documentation": "https://docs.dydx.exchange/",
-            "community": "https://discord.com/invite/dydx",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -234,6 +191,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -250,21 +210,17 @@
         "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,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -284,19 +240,7 @@
            "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",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "documentation": "https://docs.dydx.exchange/",
-            "community": "https://discord.com/invite/dydx",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -305,6 +249,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -321,21 +268,17 @@
         "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,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -356,20 +299,10 @@
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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",
-            "help": "https://help.dydx.exchange",
-            "foundation": "https://www.dydx.foundation",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -378,6 +311,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -394,21 +330,17 @@
         "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,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -429,20 +361,10 @@
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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",
-            "help": "https://help.dydx.exchange",
-            "foundation": "https://www.dydx.foundation",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -451,6 +373,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -466,22 +391,18 @@
      "dydxprotocol-testnet": {
         "name": "v4 Public Testnet",
         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "dydxChainId": "dydx-testnet-3",
         "isMainNet": false,
         "tokens": {
            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -493,8 +414,6 @@
               }
            ],
            "validators": [
-               "https://dydx-testnet-full-rpc.public.blastapi.io/",
-               "https://dydx-testnet-rpc.polkachu.com/",
               "https://dydx-testnet.nodefleet.org",
               "https://test-dydx.kingnodes.com",
               "https://dydx-rpc.liquify.com/api=8878132/dydx"
@@ -506,20 +425,10 @@
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -528,6 +437,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -536,29 +448,25 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 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",
+         "dydxChainId": "dydx-testnet-3",
         "isMainNet": false,
         "tokens": {
            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -580,20 +488,10 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -602,6 +500,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -610,29 +511,88 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
            "signTypedDataDomainName": "dYdX V4"
         }
      },
-      "dydxprotocol-testnet-nodefleet": {
-         "name": "v4 Public Testnet/nodefleet",
+      "dydxprotocol-testnet-dsrv": {
+         "name": "v4 Public Testnet/DSRV",
         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "dydxChainId": "dydx-testnet-3",
         "isMainNet": false,
         "tokens": {
            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
+               "name": "DYDX",
+               "denom": "dv4tnt",
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "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"
+               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX V4 Onboarding",
+            "signTypedDataDomainName": "dYdX V4"
+         }
+      },
+      "dydxprotocol-testnet-nodefleet": {
+         "name": "v4 Public Testnet/nodefleet",
+         "ethereumChainId": "5",
+         "dydxChainId": "dydx-testnet-3",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -654,20 +614,10 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -676,6 +626,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -684,29 +637,25 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 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",
+         "dydxChainId": "dydx-testnet-3",
         "isMainNet": false,
         "tokens": {
            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -728,20 +677,10 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
+            "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",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+            "blogs": "https://www.dydx.foundation/blog"
         },
         "wallets": {
            "walletconnect": {
@@ -750,6 +689,9 @@
                  "description": "dYdX v4 App",
                  "iconUrl": "/logos/dydx-x.png"
               },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
               }
@@ -758,29 +700,25 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 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",
+         "dydxChainId": "dydx-testnet-3",
         "isMainNet": false,
         "tokens": {
            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -802,81 +740,7 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://docs.dydx.exchange/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "governanceLearnMore": "https://help.dydx.exchange",
-            "stakingLearnMore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
-         },
-         "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-polkachu": {
-         "name": "v4 Public Testnet/Polkahcu",
-         "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-rpc.polkachu.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://docs.dydx.exchange/",
+            "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"
@@ -888,79 +752,8 @@
                  "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-bware": {
-         "name": "v4 Public Testnet/BWare",
-         "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-full-rpc.public.blastapi.io/"
-            ],
-            "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://docs.dydx.exchange/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog",
-            "foundation": "https://www.dydx.foundation",
-            "help": "https://help.dydx.exchange/",
-            "initialMarginFractionLearnmore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
-            "reduceOnlyLearnmore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
-            "governanceLearnmore": "https://help.dydx.exchange",
-            "stakingLearnmore": "https://help.dydx.exchange",
-            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnmore": "https://help.dydx.exchange",
-            "walletLearnmore": "https://www.dydx.academy/video/defi-wallet"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
               },
               "v2": {
                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
@@ -970,30 +763,26 @@
               "callbackUrl": "/walletsegue"
            },
            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
            "signTypedDataDomainName": "dYdX V4"
         }
      },
-      "dydxprotocol-mainnet": {
+      "dydxprotocol-mainet": {
         "name": "v4",
         "ethereumChainId": "1",
         "dydxChainId": "[mainnet chain id]",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
         "isMainNet": true,
         "tokens": {
            "comment": "Change according to mainnet release",
            "chain": {
-               "name": "TokenName",
-               "denom": "tokenDenom",
-               "decimals": 18,
+               "name": "DYDX",
+               "denom": "dv4tnt",
               "image": "/currencies/dydx.png"
            },
            "usdc": {
               "name": "USDC",
               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
               "gasDenom": "uusdc",
-               "decimals": 6,
               "image": "/currencies/usdc.png"
            }
         },
@@ -1014,20 +803,10 @@
            "tos": "[HTTP link to TOS]",
            "privacy": "[HTTP link to Privacy Policy]",
            "mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]",
-            "mintscanBase": "[HTTP link to TOS mintsacn base url]",
-            "feedback": "[HTTP link to feedback form, can be null]",
-            "blogs": "[HTTP link to blogs, can be null]",
-            "foundation": "[HTTP link to foundation, can be null]",
-            "initialMarginFractionLearnMore": "[HTTP link to initial margin fraction learn more, can be null]",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
            "documentation": "[HTTP link to documentation, can be null]",
            "community": "[HTTP link to community, can be null]",
-            "help": "[HTTP link to help page, can be null]",
-            "governanceLearnMore": "[HTTP link to governance learn more, can be null]",
-            "stakingLearnMore": "[HTTP link to staking learn more, can be null]",
-            "keplrDashboard": "[HTTP link to keplr dashboard, can be null]",
-            "accountExportLearnMore": "[HTTP link to account export learn more, can be null]",
-            "walletLearnMore": "[HTTP link to wallet learn more, can be null]"
+            "feedback": "[HTTP link to feedback form, can be null]",
+            "blogs": "[HTTP link to blogs, can be null]"
         },
         "wallets": {
            "walletconnect": {
@@ -1036,6 +815,9 @@
                  "description": "[Description of the app]",
                  "iconUrl": "[Relative URL of the icon URL]"
               },
+               "v1": {
+                  "bridgeUrl": "[Bridge URL]"
+               },
               "v2": {
                  "projectId": "[Project ID]"
               }
@@ -1049,4 +831,4 @@
         }
      }
   }
-}
+}
@@ -1,472 +1,474 @@
 [
  {
-    "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": "=\"#%/<>?@\\^`{|}:&",
-      "androidPackage": "io.metamask",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "metamask:",
-          "universal": "https://metamask.app.link"
+     "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":""
        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData",
-        "wallet_addEthereumChain"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "METAMASK",
-      "imageName": "metamask.png"
-    }
+     },
+     "config":{
+        "comment":"MetaMask",
+        "iosMinVersion":"0",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/metamask.png",
+        "image":"metamask.png",
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
+        "connections":[
+           {
+              "type":"walletConnectV2",
+              "native":"metamask:",
+              "universal":"https://metamask.app.link"
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"METAMASK"
+     }
  },
  {
-    "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": "=\"#%/<>?@\\^`{|}:&",
-      "androidPackage": "org.toshi",
-      "connections": [
-        {
-          "type": "walletSegue",
-          "native": "cbwallet:",
-          "universal": ""
+     "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":""
        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData",
-        "wallet_addEthereumChain"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "COINBASE_WALLET",
-      "imageName": "coinbase-wallet.png"
-    }
+     },
+     "config":{
+        "comment":"Coinbase",
+        "iosMinVersion":"1.8.0",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/coinbase-wallet.png",
+        "image":"coinbase-wallet.png",
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
+        "connections":[
+           {
+              "type":"walletSegue",
+              "native":"cbwallet:",
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"COINBASE_WALLET"
+     }
  },
  {
-    "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": "",
-      "androidPackage": "im.token.app",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "imtokenv2:",
-          "universal": ""
+     "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":""
        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "IMTOKEN",
-      "imageName": "imtoken.png"
-    }
+     },
+     "config":{
+        "comment":"imToken",
+        "iosMinVersion":"0",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/imtoken.png",
+        "image":"imtoken.png",
+        "connections":[
+           {
+              "type":"walletConnect",
+              "native":"imtokenv2:",
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"IMTOKEN"
+     }
  },
  {
-    "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": "",
-      "androidPackage": "com.wallet.crypto.trustapp",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "trust:",
-          "universal": "https://link.trustwallet.com"
+     "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":""
        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "TRUST_WALLET",
-      "imageName": "trust-wallet.png"
-    }
+     },
+     "config":{
+        "comment":"Trust Wallet",
+        "iosMinVersion":"0",
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/trust-wallet.png",
+        "image":"trust-wallet.png",
+        "connections":[
+           {
+              "type":"walletConnectV2",
+              "native":"trust:",
+              "universal":"https://link.trustwallet.com"
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"TRUST_WALLET"
+     }
  },
  {
-    "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": "",
-      "androidPackage": "io.zerion.android",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "zerion:",
-          "universal": ""
+     "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":""
        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "ZERION",
-      "imageName": "zerion.png"
-    }
+     },
+     "config":{
+        "comment":"Zerion Wallet",
+        "iosMinVersion":"0",
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/zerion.png",
+        "image":"zerion.png",
+        "connections":[
+           {
+              "type":"walletConnectV2",
+              "native":"zerion:",
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"ZERION"
+     }
  },
  {
-    "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": "",
-      "androidPackage": "vip.mytokenpocket",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "tpoutside:",
-          "universal": ""
+     "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":""
        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "TOKEN_POCKET",
-      "imageName": "tokenpocket.png"
-    }
+     },
+     "config":{
+        "comment":"TokenPocket",
+        "iosMinVersion":"0",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/tokenpocket.png",
+        "image":"tokenpocket.png",
+        "connections":[
+           {
+              "type":"walletConnect",
+              "native":"tpoutside:",
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"TOKEN_POCKET"
+     }
  },
  {
-    "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": "=\"#%/<>?@\\^`{|}:&",
-      "androidPackage": "me.rainbow",
-      "backlinked": true,
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "rainbow:",
-          "universal": "https://rnbwapp.com"
+     "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":""
        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "RAINBOW_WALLET",
-      "imageName": "rainbow-wallet.png"
-    }
+     },
+     "config":{
+        "comment":"Rainbow",
+        "iosMinVersion":"0",
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
+        "backlinked":true,
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/rainbow-wallet.png",
+        "image":"rainbow-wallet.png",
+        "connections":[
+           {
+              "type":"walletConnectV2",
+              "native":"rainbow:",
+              "universal":"https://rnbwapp.com"
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"RAINBOW_WALLET"
+     }
  },
  {
-    "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": "=\"#%/<>?@\\^`{|}:&",
-      "androidPackage": "io.oneinch.android",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "oneinch:",
-          "universal": "https://wallet.1inch.io"
+     "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":""
        }
-      ],
-      "methods": [
-        "eth_sendTransaction",
-        "personal_sign",
-        "eth_signTypedData"
-      ]
-    },
-    "userFields": {
-      "analyticEvent": "1INCH",
-      "imageName": "1inch.png"
-    }
+     },
+     "config":{
+        "comment":"1inch",
+        "iosMinVersion":"0",
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/1inch.png",
+        "image":"1inch.png",
+        "connections":[
+           {
+              "type":"walletConnect",
+              "native":"oneinch:",
+              "universal":"https://wallet.1inch.io"
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"1INCH"
+     }
+  },
+  {
+     "id":"bae74827272509a6d63ea25514d9c68ad235c14e45e183518c7ded4572a1b0c4",
+     "name":"Huobi Wallet",
+     "description":"",
+     "homepage":"https://huobiwallet.com/",
+     "chains":[
+        "eip155:1"
+     ],
+     "versions":[
+        "1"
+     ],
+     "app":{
+        "browser":"",
+        "ios":"https://apps.apple.com/us/app/id1433883012",
+        "android":"https://play.google.com/store/apps/details?id=com.huobionchainwallet.gp",
+        "mac":"",
+        "windows":"",
+        "linux":""
+     },
+     "mobile":{
+        "native":"huobiwallet:",
+        "universal":""
+     },
+     "desktop":{
+        "native":"",
+        "universal":""
+     },
+     "metadata":{
+        "shortName":"Huobi",
+        "colors":{
+           "primary":"rgb(45,101,248)",
+           "secondary":""
+        }
+     },
+     "config":{
+        "comment":"Huobi",
+        "iosMinVersion":"0",
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/huobi-wallet.png",
+        "image":"huobi-wallet.png",
+        "connections":[
+           {
+              "type":"walletConnect",
+              "native":"huobiwallet:",
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"HUOBI_WALLET"
+     }
  }
-]
+]
@@ -1,38 +0,0 @@
-## App Integrations
-### Amplitude
-Analytics service used to collect data to help the dYdX Product team make informed product decisions.
-
-<b>To use with dydxprotocol/v4-web:</b>
-1. Amplitude account with API key.
-2. Add API key in Github > Secrets and Variables > Actions as `AMPLITUDE_API_KEY`
-3. In your deploy scripts add `pnpm run build:inject-amplitude` after your pnpm build / vite build command.
-
-### Bugsnag
-Error handling service used to collect handled/unhandled errors within the app. The information collected is used to help debug and alert the engineering team of crashes/unhandled errors within the app to improve stability.
-
-<b>To use with dydxprotocol/v4-web:</b>
-1. Bugsnag account with API key.
-2. Add API key in Github > Secrets and Variables > Actions as `BUGSNAG_API_KEY`
-3. In your deploy scripts add `pnpm run build:inject-bugsnag` after your pnpm build / vite build command.
-4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-bugsnag`
-
-### StatusPage
-Service used to inform users of any status updates to our platform. These status updates are manually set and updated by the On Call engineers.
-
-<b>To use with dydxprotocol/v4-web:</b>
-1. StatusPage account and script URI
-2. Add API key in Github > Secrets and Variables > Actions as `STATUS_PAGE_SCRIPT_URI`
-3. In your deploy scripts add `pnpm run build:inject-statuspage` after your pnpm build / vite build command.
-4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-statuspage`
-
-### Intercom
-Service used for live customer support (chat/inbox) as well as home for Help Articles.
-
-<b>To use with dydxprotocol/v4-web:</b>
-1. Create Intercom account
-2. In Intercom UI
-Getting started > Set up Messenger > will give you your API Key on Step 2
-Customize Intercom Messenger by adding logo and brand colors
-3. Add API key in Github > Secrets and Variables > Actions as `INTERCOM_APP_ID`
-4. In your deploy scripts add `pnpm run build:inject-intercom` after your pnpm build / vite build command.
-5. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-intercom`
@@ -1,76 +0,0 @@
-/* eslint-disable no-console */
-import fs from 'fs/promises';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const INTERCOM_APP_ID = process.env.INTERCOM_APP_ID;
-
-const currentPath = fileURLToPath(import.meta.url);
-const projectRoot = path.dirname(currentPath);
-const htmlFilePath = path.resolve(projectRoot, '../dist/index.html');
-
-if (INTERCOM_APP_ID) {
-  try {
-    const html = await fs.readFile(htmlFilePath, 'utf-8');
-
-    const intercomScripts = `
-    <!-- Intercom -->
-    <script>
-      window.intercomSettings = {
-        api_base: 'https://api-iam.intercom.io',
-        app_id: '${INTERCOM_APP_ID}',
-        custom_launcher_selector: '.custom_intercom',
-        hide_default_launcher: true,
-      };
-    </script>
-
-    <script>
-    // We pre-filled your app ID in the widget URL: 'https://widget.intercom.io/widget/${INTERCOM_APP_ID}'
-    (function () {
-      var w = window;
-      var ic = w.Intercom;
-      if (typeof ic === 'function') {
-        ic('reattach_activator');
-        ic('update', w.intercomSettings);
-      } else {
-        var d = document;
-        var i = function () {
-          i.c(arguments);
-        };
-        i.q = [];
-        i.c = function (args) {
-          i.q.push(args);
-        };
-        w.Intercom = i;
-        var l = function () {
-          var s = d.createElement('script');
-          s.type = 'text/javascript';
-          s.async = true;
-          s.src = 'https://widget.intercom.io/widget/${INTERCOM_APP_ID}';
-          var x = d.getElementsByTagName('script')[0];
-          x.parentNode.insertBefore(s, x);
-        };
-        if (document.readyState === 'complete') {
-          l();
-        } else if (w.attachEvent) {
-          w.attachEvent('onload', l);
-        } else {
-          w.addEventListener('load', l, false);
-        }
-      }
-    })();
-  </script>
-    `;
-
-    const injectedHtml = html.replace(
-      '<div id="root"></div>',
-      `<div id="root"></div>\n${intercomScripts}\n`
-    );
-
-    await fs.writeFile(htmlFilePath, injectedHtml, 'utf-8');
-
-    console.log('Intercom scripts successfully injected.');
-  } catch (err) {
-    console.error('Error injecting Intercom scripts:', err);
-  }
-}
@@ -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,8 @@ 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 />} />
+            <Route path={AppRoute.Rewards} element={<RewardsPage />} />
            {isTablet && (
              <>
                <Route path={AppRoute.Alerts} element={<AlertsPage />} />
@@ -90,10 +79,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 +109,6 @@ const providers = [
  wrapProvider(GrazProvider),
  wrapProvider(WagmiConfig, { config }),
  wrapProvider(LocaleProvider),
-  wrapProvider(RestrictionProvider),
  wrapProvider(DydxProvider),
  wrapProvider(AccountsProvider),
  wrapProvider(SubaccountProvider),
@@ -80,7 +80,7 @@ Styled.TriggerIcon = styled.span`
  width: var(--trigger-icon-width);

  display: inline-flex;
-  transition: rotate 0.3s var(--ease-out-expo);
+  transition: transform 0.3s var(--ease-out-expo);
  color: var(--trigger-icon-color);

  ${Styled.Trigger}[data-state='open'] & {
@@ -225,7 +225,6 @@ Styled.CollapsibleContent = styled(CollapsibleContent)`
 `;

 Styled.IconButton = styled(IconButton)`
-  --button-icon-size: 1em;
  ${Styled.CollapsibleRoot}[data-state='closed'] & {
    rotate: -0.5turn;
  }
@@ -3,44 +3,31 @@ import styled, { AnyStyledComponent } from 'styled-components';

 import { type MenuConfig } from '@/constants/menus';

-import { Dialog, DialogPlacement, type DialogProps } from '@/components/Dialog';
-import { ComboboxMenu, type ComboboxMenuProps } from '@/components/ComboboxMenu';
+import { Dialog, DialogPlacement } from '@/components/Dialog';
+import { ComboboxMenu } from '@/components/ComboboxMenu';

 type ElementProps<MenuItemValue extends string | number, MenuGroupValue extends string | number> = {
+  isOpen?: boolean;
+  setIsOpen?: (open: boolean) => void;
  title?: React.ReactNode;
  description?: React.ReactNode;
+  slotTrigger?: React.ReactNode;
+  slotHeaderInner?: React.ReactNode;
+  slotFooter?: React.ReactNode;
  children?: React.ReactNode;
+
  items: MenuConfig<MenuItemValue, MenuGroupValue>;
+  onItemSelected?: () => void;
+  inputPlaceholder?: string;
+  slotEmpty?: React.ReactNode;
 };

 type StyleProps = {
+  placement: DialogPlacement,
  className?: string;
 };

-type PickComboxMenuProps<
-  MenuItemValue extends string | number,
-  MenuGroupValue extends string | number
-> = Pick<
-  ComboboxMenuProps<MenuItemValue, MenuGroupValue>,
-  'inputPlaceholder' | 'onItemSelected' | 'slotEmpty' | 'withSearch' | 'withStickyLayout'
->;
-
-type PickDialogProps = Pick<
-  DialogProps,
-  | 'description'
-  | 'isOpen'
-  | 'placement'
-  | 'setIsOpen'
-  | 'slotHeaderInner'
-  | 'slotTrigger'
-  | 'slotFooter'
-  | 'preventClose'
->;
-
-export const ComboboxDialogMenu = <
-  MenuItemValue extends string | number,
-  MenuGroupValue extends string | number
->({
+export const ComboboxDialogMenu = <MenuItemValue extends string | number, MenuGroupValue extends string | number>({
  isOpen = false,
  setIsOpen,
  title,
@@ -53,17 +40,11 @@ export const ComboboxDialogMenu = <
  onItemSelected,
  inputPlaceholder,
  slotEmpty,
-  withSearch,
-  withStickyLayout = true,
  children,
-
+  
  placement = DialogPlacement.Default,
-  preventClose,
  className,
-}: ElementProps<MenuItemValue, MenuGroupValue> &
-  PickComboxMenuProps<MenuItemValue, MenuGroupValue> &
-  PickDialogProps &
-  StyleProps) => (
+}: ElementProps<MenuItemValue, MenuGroupValue> & StyleProps) => (
  // TODO: sub-menu state management
  <Styled.Dialog
    isOpen={isOpen}
@@ -73,8 +54,8 @@ export const ComboboxDialogMenu = <
    slotHeaderInner={slotHeaderInner}
    slotTrigger={slotTrigger}
    slotFooter={slotFooter}
+
    placement={placement}
-    preventClose={preventClose}
    className={className}
  >
    <Styled.ComboboxMenu
@@ -83,8 +64,7 @@ export const ComboboxDialogMenu = <
      title={title}
      inputPlaceholder={inputPlaceholder}
      slotEmpty={slotEmpty}
-      withSearch={withSearch}
-      withStickyLayout={withStickyLayout}
+      withStickyLayout
    />
    {children}
  </Styled.Dialog>
@@ -118,5 +98,4 @@ Styled.Dialog = styled(Dialog)`

 Styled.ComboboxMenu = styled(ComboboxMenu)`
  --comboboxMenu-backgroundColor: var(--comboboxDialogMenu-backgroundColor);
-  --comboboxMenu-item-gap: var(--comboxDialogMenu-item-gap, 0.5rem);
 `;
@@ -8,7 +8,7 @@ import { layoutMixins } from '@/styles/layoutMixins';

 import { Tag } from '@/components/Tag';

-type ElementProps<MenuItemValue extends string | number, MenuGroupValue extends string | number> = {
+type ElementProps<MenuItemValue extends string, MenuGroupValue extends string> = {
  items: MenuConfig<MenuItemValue, MenuGroupValue>;
  onItemSelected?: () => void;

@@ -23,11 +23,6 @@ type StyleProps = {
  withStickyLayout?: boolean;
 };

-export type ComboboxMenuProps<
-  MenuItemValue extends string | number,
-  MenuGroupValue extends string | number
-> = ElementProps<MenuItemValue, MenuGroupValue> & StyleProps;
-
 export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extends string>({
  items,
  onItemSelected,
@@ -39,7 +34,7 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend

  className,
  withStickyLayout,
-}: ComboboxMenuProps<MenuItemValue, MenuGroupValue>) => {
+}: ElementProps<MenuItemValue, MenuGroupValue> & StyleProps) => {
  const [highlightedCommand, setHighlightedCommand] = useState<MenuItemValue>();
  const [searchValue, setSearchValue] = useState('');
  // const inputRef = useRef<HTMLInputElement | null>(null);
@@ -176,7 +171,6 @@ Styled.Command = styled(Command)<{ $withStickyLayout?: boolean }>`
  --comboboxMenu-item-highlighted-backgroundColor: var(--color-layer-3);
  --comboboxMenu-item-highlighted-textColor: var(--color-text-1);
  --comboboxMenu-item-backgroundColor: ;
-  --comboboxMenu-item-gap: 0.5rem;

  display: grid;
  align-content: start;
@@ -275,17 +269,18 @@ Styled.List = styled(Command.List)<{ $withStickyLayout?: boolean }>`
 `;

 Styled.Item = styled(Command.Item)`
-  ${layoutMixins.scrollSnapItem}
  ${popoverMixins.item}
  --item-checked-backgroundColor: var(--comboboxMenu-item-checked-backgroundColor);
  --item-checked-textColor: var(--comboboxMenu-item-checked-textColor);
  --item-highlighted-textColor: var(--comboboxMenu-item-highlighted-textColor);
-  --item-gap: var(--comboboxMenu-item-gap);
+
+  ${layoutMixins.scrollSnapItem}

  background-color: var(--comboboxMenu-backgroundColor, inherit);

  display: flex;
  align-items: center;
+  gap: 0.5rem;

  &[aria-disabled='true'] {
    opacity: 0.75;
@@ -48,8 +48,6 @@ type StyleProps = {
  className?: string;
 };

-export type DialogProps = ElementProps & StyleProps;
-
 const DialogPortal = ({
  withPortal,
  container,
@@ -84,7 +82,7 @@ export const Dialog = ({
  hasHeaderBorder = false,
  children,
  className,
-}: DialogProps) => {
+}: ElementProps & StyleProps) => {
  const closeButtonRef = useRef<HTMLButtonElement>();

  const showOverlay = ![DialogPlacement.Inline, DialogPlacement.FullScreen].includes(placement);
@@ -33,11 +33,9 @@ export const DropdownHeaderMenu = <MenuItemValue extends string>({

  return (
    <Root>
-      <Styled.Trigger className={className} asChild>
-        <div>
+      <Styled.Trigger className={className}>
        {children}
        <Styled.DropdownIconButton iconName={IconName.Caret} isToggle />
-        </div>
      </Styled.Trigger>
      <Portal>
        <Styled.Content
@@ -6,14 +6,11 @@ import {
  AddressConnectorIcon,
  ArrowIcon,
  Bar3Icon,
-  BellIcon,
-  BellStrokeIcon,
  BoxCloseIcon,
  CalculatorIcon,
  CaretIcon,
  CautionCircleStrokeIcon,
  CautionCircleIcon,
-  ChatIcon,
  CheckIcon,
  ChevronLeftIcon,
  ChevronRightIcon,
@@ -24,10 +21,9 @@ import {
  CommentIcon,
  CopyIcon,
  CubeIcon,
-  DepositIcon,
-  DepthChartIcon,
  DiscordIcon,
  EtherscanIcon,
+  DepthChartIcon,
  ExportKeysIcon,
  FeedbackIcon,
  FileIcon,
@@ -41,7 +37,6 @@ import {
  LockIcon,
  LogoShortIcon,
  MenuIcon,
-  MigrateIcon,
  MintscanIcon,
  OrderbookIcon,
  OrderCanceledIcon,
@@ -70,21 +65,17 @@ import {
  WarningIcon,
  WebsiteIcon,
  WhitepaperIcon,
-  WithdrawIcon,
 } from '@/icons';

 export enum IconName {
  AddressConnector = 'AddressConnector',
  Arrow = 'Arrow',
  Bar3 = 'Bar3',
-  Bell = 'Bell',
-  BellStroked = 'BellStroked',
  BoxClose = 'BoxClose',
  Calculator = 'Calculator',
  Caret = 'Caret',
  CautionCircle = 'CautionCircle',
  CautionCircleStroked = 'CautionCircleStroked',
-  Chat = 'Chat',
  Check = 'Check',
  ChevronLeft = 'ChevronLeft',
  ChevronRight = 'ChevronRight',
@@ -95,7 +86,6 @@ export enum IconName {
  Comment = 'Comment',
  Copy = 'Copy',
  Cube = 'Cube',
-  Deposit = 'Deposit',
  DepthChart = 'DepthChart',
  Discord = 'Discord',
  Etherscan = 'Etherscan',
@@ -112,7 +102,6 @@ export enum IconName {
  Lock = 'Lock',
  LogoShort = 'LogoShort',
  Menu = 'Menu',
-  Migrate = 'Migrate',
  Mintscan = 'Mintscan',
  Onboarding = 'Onboarding',
  Orderbook = 'OrderbookIcon',
@@ -142,21 +131,17 @@ export enum IconName {
  Warning = 'Warning',
  Website = 'Website',
  Whitepaper = 'Whitepaper',
-  Withdraw = 'Withdraw',
 }

 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,
  [IconName.CautionCircle]: CautionCircleIcon,
  [IconName.CautionCircleStroked]: CautionCircleStrokeIcon,
-  [IconName.Chat]: ChatIcon,
  [IconName.Check]: CheckIcon,
  [IconName.ChevronLeft]: ChevronLeftIcon,
  [IconName.ChevronRight]: ChevronRightIcon,
@@ -167,7 +152,6 @@ const icons = {
  [IconName.Comment]: CommentIcon,
  [IconName.Copy]: CopyIcon,
  [IconName.Cube]: CubeIcon,
-  [IconName.Deposit]: DepositIcon,
  [IconName.DepthChart]: DepthChartIcon,
  [IconName.Discord]: DiscordIcon,
  [IconName.Etherscan]: EtherscanIcon,
@@ -184,7 +168,6 @@ const icons = {
  [IconName.Lock]: LockIcon,
  [IconName.LogoShort]: LogoShortIcon,
  [IconName.Menu]: MenuIcon,
-  [IconName.Migrate]: MigrateIcon,
  [IconName.Mintscan]: MintscanIcon,
  [IconName.Orderbook]: OrderbookIcon,
  [IconName.OrderCanceled]: OrderCanceledIcon,
@@ -213,7 +196,6 @@ const icons = {
  [IconName.Warning]: WarningIcon,
  [IconName.Website]: WebsiteIcon,
  [IconName.Whitepaper]: WhitepaperIcon,
-  [IconName.Withdraw]: WithdrawIcon,
 } as Record<IconName, ElementType>;

 type ElementProps = {
@@ -231,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;
@@ -67,7 +67,6 @@ const Styled: Record<string, AnyStyledComponent> = {};
 const buttonMixin = css`
  // Params
  --button-icon-size: 1.125em;
-  --button-padding: 0;

  // Rules
  > * {
@@ -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)`
@@ -71,7 +71,7 @@ const NavItem = forwardRef(
          )}
        </span>
        {slotAfter}
-        {subitems?.length && <Styled.Icon iconName={IconName.Triangle} />}
+        {subitems?.length && <Styled.Icon iconName={IconName.Caret} />}
      </>
    );

@@ -525,9 +525,6 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
 `;

 Styled.Icon = styled(Icon)`
-  font-size: 0.375em;
-  transition: rotate 0.3s var(--ease-out-expo);
-
  ${Styled.List}[data-orientation="menu"] & {
    rotate: -0.25turn;
  }
@@ -8,7 +8,6 @@ import { layoutMixins } from '@/styles/layoutMixins';
 type PanelProps = {
  slotHeaderContent?: string;
  slotHeader?: React.ReactNode;
-  slotRight?: React.ReactNode;
  children?: React.ReactNode;
  href?: string;
  onHeaderClick?: () => void;
@@ -23,7 +22,6 @@ type PanelStyleProps = {
 export const Panel = ({
  slotHeaderContent,
  slotHeader,
-  slotRight,
  children,
  href,
  onHeaderClick,
@@ -31,80 +29,56 @@ export const Panel = ({
  hasSeparator,
  className,
 }: PanelProps & PanelStyleProps) => (
-  <Styled.Panel onClick={onClick} className={className}>
-    <Styled.Left>
-      {href ? (
-        <Link to={href}>
-          {slotHeader ? (
-            slotHeader
-          ) : (
-            <Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
-              {slotHeaderContent}
-              <Styled.Icon iconName={IconName.ChevronRight} />
-            </Styled.Header>
-          )}
-        </Link>
-      ) : slotHeader ? (
-        slotHeader
-      ) : (
-        slotHeaderContent && (
+  <Styled.Panel onClick={onClick}>
+    {href ? (
+      <Link to={href}>
+        {slotHeader ? (
+          slotHeader
+        ) : (
          <Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
            {slotHeaderContent}
+            <Styled.Icon iconName={IconName.ChevronRight} />
          </Styled.Header>
-        )
-      )}
-      <Styled.Content>{children}</Styled.Content>
-    </Styled.Left>
-    {slotRight}
+        )}
+      </Link>
+    ) : slotHeader ? (
+      slotHeader
+    ) : (
+      slotHeaderContent && (
+        <Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
+          {slotHeaderContent}
+        </Styled.Header>
+      )
+    )}
+    <Styled.Content className={className}>{children}</Styled.Content>
  </Styled.Panel>
 );

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

-Styled.Panel = styled.section<{ onClick?: () => void }>`
-  --panel-paddingY: 1rem;
-  --panel-paddingX: 1rem;
-  --panel-content-paddingY: var(--panel-paddingY);
-  --panel-content-paddingX: var(--panel-paddingX);
-
-  ${layoutMixins.row}
+Styled.Panel = styled.section`
+  ${layoutMixins.flexColumn}

  background-color: var(--color-layer-3);
  border-radius: 0.875rem;
-
-  ${({ onClick }) =>
-    onClick &&
-    css`
-      cursor: pointer;
-
-      &:hover {
-        button:not(:disabled) {
-          color: var(--button-hover-textColor);
-          filter: var(--button-hover-filter);
-        }
-      }
-    `}
-`;
-
-Styled.Left = styled.div`
-  ${layoutMixins.flexColumn}
-  width: 100%;
 `;

 Styled.Header = styled.header<{ hasSeparator?: boolean }>`
  ${layoutMixins.spacedRow}
-  padding: var(--panel-paddingY) var(--panel-paddingX);
+
+  padding: 0.875rem 1rem 0.625rem;
+  font-size: 0.875rem;

  ${({ hasSeparator }) =>
    hasSeparator &&
    css`
-      padding-bottom: 0.625rem;
      box-shadow: 0 var(--border-width) var(--border-color);
    `}
 `;

 Styled.Icon = styled(Icon)`
  color: var(--color-text-0);
+
  font-size: 0.625rem;
 `;

@@ -112,5 +86,6 @@ Styled.Content = styled.div`
  ${layoutMixins.scrollArea}
  ${layoutMixins.stickyArea0}
  --stickyArea0-background: transparent;
-  padding: var(--panel-content-paddingY) var(--panel-content-paddingX);
+
+  padding: 0.5rem 1rem;
 `;
@@ -7,15 +7,13 @@ import { ButtonShape, ButtonSize } from '@/constants/buttons';
 import { useBreakpoints } from '@/hooks';
 import { layoutMixins } from '@/styles/layoutMixins';

-import { type BaseButtonProps } from '@/components/BaseButton';
+import {  type BaseButtonProps } from '@/components/BaseButton';
 import { ToggleButton } from '@/components/ToggleButton';

 type ElementProps<MenuItemValue extends string> = {
  items: MenuItem<MenuItemValue>[];
  value: MenuItemValue;
-  onValueChange: (value: any) => void;
-  onInteraction?: () => void;
-  ensureSelected?: boolean;
+  onValueChange: (value: MenuItemValue) => void;
 };

 type StyleProps = {
@@ -27,14 +25,10 @@ export const ToggleGroup = forwardRef(
    {
      items,
      value,
-      ensureSelected = true,
      onValueChange,
-      onInteraction,
-
      className,
      size,
      shape = ButtonShape.Pill,
-
      ...buttonProps
    }: ElementProps<MenuItemValue> & StyleProps & BaseButtonProps,
    ref: Ref<HTMLDivElement>
@@ -46,17 +40,12 @@ export const ToggleGroup = forwardRef(
        ref={ref}
        type="single"
        value={value}
-        onValueChange={(newValue: MenuItemValue) => {
-          if ((ensureSelected && newValue) || !ensureSelected) {
-            onValueChange(newValue);
-          }
-          onInteraction?.();
-        }}
+        onValueChange={onValueChange}
        className={className}
        loop
      >
        {items.map((item) => (
-          <Item key={item.value} value={item.value} asChild>
+          <Item key={item.value} value={item.value} aria-label={item.label} asChild>
            <ToggleButton
              size={size ? size : isTablet ? ButtonSize.Small : ButtonSize.XSmall}
              shape={shape}
@@ -2,13 +2,11 @@ import type { ReactNode } from 'react';
 import styled, { AnyStyledComponent } from 'styled-components';
 import { Content, Portal, Provider, Root, Trigger, Arrow } from '@radix-ui/react-tooltip';

-import { STRING_KEYS } from '@/constants/localization';
 import { tooltipStrings } from '@/constants/tooltips';

-import { useStringGetter, useURLConfigs } from '@/hooks';
+import { useStringGetter } from '@/hooks';

 import { Icon, IconName } from '@/components/Icon';
-import { Link } from '@/components/Link';

 import { layoutMixins } from '@/styles/layoutMixins';
 import { popoverMixins } from '@/styles/popoverMixins';
@@ -40,24 +38,20 @@ export const WithTooltip = ({
  slotTooltip,
 }: ElementProps & StyleProps) => {
  const stringGetter = useStringGetter();
-  const urlConfigs = useURLConfigs();

  const getTooltipStrings = tooltip && tooltipStrings[tooltip];
  if (!getTooltipStrings && !tooltipString && !slotTooltip) return <>{children}</>;

  let tooltipTitle;
  let tooltipBody;
-  let tooltipLearnMore;

  if (getTooltipStrings) {
-    const { title, body, learnMoreLink } = getTooltipStrings({
+    const { title, body } = getTooltipStrings({
      stringGetter,
      stringParams,
-      urlConfigs,
    });
    tooltipTitle = title;
    tooltipBody = body;
-    tooltipLearnMore = learnMoreLink;
  } else {
    tooltipBody = tooltipString;
  }
@@ -78,13 +72,6 @@ export const WithTooltip = ({
              <dl>
                {tooltipTitle && <dt>{tooltipTitle}</dt>}
                {tooltipBody && <dd>{tooltipBody}</dd>}
-                {tooltipLearnMore && (
-                  <dd>
-                    <Styled.LearnMore href={tooltipLearnMore}>
-                      {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-                    </Styled.LearnMore>
-                  </dd>
-                )}
                <Styled.Arrow />
              </dl>
            )}
@@ -155,7 +142,3 @@ Styled.Arrow = styled(Arrow)`
 Styled.Icon = styled(Icon)`
  color: var(--color-text-0);
 `;
-
-Styled.LearnMore = styled(Link)`
-  --link-color: var(--color-accent);
-`;
@@ -59,6 +59,16 @@ 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;
@@ -68,13 +78,8 @@ 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;
@@ -194,12 +199,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 +256,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>>;
@@ -44,4 +44,4 @@ export type EvmDerivedAddresses = {
  };
 };

-export const AMOUNT_RESERVED_FOR_GAS_USDC = 0.1;
+export const AMOUNT_RESERVED_FOR_GAS_USDC = 100_000;
@@ -10,10 +10,7 @@ export enum DialogTypes {
  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
 };
@@ -8,8 +8,6 @@ import {
  WARNINGS_STRING_KEYS,
 } from '@dydxprotocol/v4-localization';

-import { type LinksConfigs } from '@/hooks/useURLConfigs';
-
 export { TOOLTIP_STRING_KEYS } from '@dydxprotocol/v4-localization';

 export enum SupportedLocales {
@@ -81,11 +79,9 @@ export type TooltipStrings = {
  [key: string]: ({
    stringGetter,
    stringParams,
-    urlConfigs,
  }: {
    stringGetter: StringGetterFunction;
    stringParams?: any;
-    urlConfigs?: LinksConfigs;
  }) => {
    title: string;
    body: string;
@@ -21,7 +21,7 @@ export type MenuItem<MenuItemValue, MenuItemTypes = string> = {
  value: MenuItemValue;

  slotBefore?: React.ReactNode;
-  label: React.ReactNode;
+  label: string;
  labelRight?: React.ReactNode;
  tag?: React.ReactNode;
  slotAfter?: React.ReactNode;
@@ -8,5 +8,5 @@ export const AVAILABLE_ENVIRONMENTS =

 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 type DydxNetwork = (typeof AVAILABLE_ENVIRONMENTS.environments)[number];
 export const DEFAULT_APP_ENVIRONMENT = AVAILABLE_ENVIRONMENTS.default as DydxNetwork;
@@ -7,8 +7,7 @@ export enum AppRoute {
  Profile = '/profile',
  Alerts = '/alerts',
  Settings = '/settings',
-  Terms = '/terms',
-  Privacy = '/privacy',
+  Rewards = '/DV4TNT',
 }

 export enum PortfolioRoute {
@@ -37,3 +36,7 @@ export const HISTORY_ROUTE = `${AppRoute.Portfolio}/${PortfolioRoute.History}/:s
 export const DEFAULT_TRADE_ROUTE = `${AppRoute.Trade}/${DEFAULT_MARKETID}`;
 export const SETTINGS_ROUTE = `${AppRoute.Settings}/*`;
 export const DEFAULT_DOCUMENT_TITLE = 'dYdX';
+
+export enum ExternalLink {
+  Foundation = 'https://dydx.foundation',
+}
@@ -57,10 +57,10 @@ export const tradeTooltips: TooltipStrings = {
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_BODY }),
  }),
-  'initial-margin-fraction': ({ stringGetter, urlConfigs }) => ({
+  'initial-margin-fraction': ({ stringGetter }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_BODY }),
-    learnMoreLink: urlConfigs?.initialMarginFractionLearnMore,
+    learnMoreLink: 'https://help.dydx.exchange/articles/5232637-maximum-position-sizes',
  }),
  'initial-stop': ({ stringGetter }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_STOP_TITLE }),
@@ -146,10 +146,10 @@ export const tradeTooltips: TooltipStrings = {
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_BODY }),
  }),
-  'reduce-only': ({ stringGetter, urlConfigs }) => ({
+  'reduce-only': ({ stringGetter }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_BODY }),
-    learnMoreLink: urlConfigs?.reduceOnlyLearnMore,
+    learnMoreLink: 'https://help.dydx.exchange/articles/6345793-reduce-only-orders',
  }),
  spread: () => ({
    title: 'Spread',
@@ -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';
@@ -32,6 +32,7 @@ export enum WalletConnectionType {
  CoinbaseWalletSdk = 'coinbaseWalletSdk',
  CosmosSigner = 'CosmosSigner',
  InjectedEip1193 = 'injectedEip1193',
+  WalletConnect1 = 'walletConnect1',
  WalletConnect2 = 'walletConnect2',
 }

@@ -61,6 +62,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 +92,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 +117,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
      WalletConnectionType.InjectedEip1193,
      // WalletConnectionType.CoinbaseWalletSdk,
      WalletConnectionType.WalletConnect2,
+      WalletConnectionType.WalletConnect1,
    ],
    matchesInjectedEip1193: (provider) =>
      Object.entries(wallets).every(
@@ -141,22 +131,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,71 +163,109 @@ 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,
@@ -237,6 +273,12 @@ export const wallets: Record<WalletType, WalletConfig> = {
    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,
@@ -302,10 +344,10 @@ export type DydxAddress = `dydx${string}`;
 export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
  rpc: 'https://dydx-testnet-archive.allthatnode.com:26657',
  rest: 'https://dydx-testnet-archive.allthatnode.com:1317',
-  chainId: 'dydx-testnet-4',
+  chainId: 'dydx-testnet-3',
  chainName: 'dYdX Public Testnet',
  chainSymbolImageUrl:
-    'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-4/chain.png',
+    'https://raw.githubusercontent.com/chainapsis/keplr-chain-registry/main/images/dydx-testnet-3/chain.png',
  bech32Config: {
    bech32PrefixAccPub: 'dydxpub',
    bech32PrefixValPub: 'dydxvaloperpub',
@@ -319,31 +361,26 @@ export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
  },
  stakeCurrency: {
    coinDenom: 'DV4TNT',
-    coinDecimals: 18,
-    coinMinimalDenom: 'adv4tnt',
+    coinDecimals: 6,
+    coinMinimalDenom: 'dv4tnt',
  },
  currencies: [
    {
      coinDenom: 'DV4TNT',
-      coinDecimals: 18,
-      coinMinimalDenom: 'adv4tnt',
+      coinDecimals: 6,
+      coinMinimalDenom: 'dv4tnt',
    },
    {
      coinDenom: 'USDC',
-      coinDecimals: 6,
      coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
+      coinDecimals: 6,
    },
  ],
  feeCurrencies: [
    {
      coinDenom: 'DV4TNT',
-      coinDecimals: 18,
-      coinMinimalDenom: 'adv4tnt',
-    },
-    {
-      coinDenom: 'USDC',
      coinDecimals: 6,
-      coinMinimalDenom: 'ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5',
+      coinMinimalDenom: 'dv4tnt',
    },
  ],
  features: [],
@@ -352,5 +389,15 @@ export const DYDX_CHAIN_INFO: Parameters<typeof suggestChain>[0] = {
 // TODO: export this type from abacus instead
 export enum DydxChainAsset {
  USDC = 'usdc',
-  CHAINTOKEN = 'chain',
+  DYDX = 'dydx',
 }
+
+export const DYDX_CHAIN_ASSET_COIN_DENOM: Record<DydxChainAsset, string> = {
+  [DydxChainAsset.USDC]: USDC_DENOM,
+  [DydxChainAsset.DYDX]: DYDX_DENOM,
+};
+
+export const DYDX_CHAIN_ASSET_TAGS: Record<DydxChainAsset, string> = {
+  [DydxChainAsset.USDC]: 'USDC',
+  [DydxChainAsset.DYDX]: 'Dv4TNT',
+};
@@ -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,17 +16,14 @@ 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';
 import { useSubaccount } from './useSubaccount';
-import { useURLConfigs } from './useURLConfigs';

 export {
  useApiState,
  useBreakpoints,
-  useTokenConfigs,
  useCommandMenu,
  useCurrentMarketId,
  useDebounce,
@@ -44,10 +40,8 @@ export {
  useNow,
  useOnClickOutside,
  usePageTitlePriceUpdates,
-  useRestrictions,
  useShouldShowFooter,
  useSelectedNetwork,
  useStringGetter,
  useSubaccount,
-  useURLConfigs,
 };
@@ -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 && marketId) {
+    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, !!marketId]);
+  }, [getCandlesForDatafeed, hasMarkets, selectedLocale, selectedNetwork]);

  return { savedResolution };
 };
@@ -5,7 +5,10 @@ import { StargateClient } from '@cosmjs/stargate';
 import { useQuery } from 'react-query';
 import { formatUnits } from 'viem';

+import { USDC_DENOM, DYDX_DENOM } from '@dydxprotocol/v4-client-js';
+
 import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
 import { EvmAddress } from '@/constants/wallets';

 import { convertBech32Address } from '@/lib/addressUtils';
@@ -15,11 +18,11 @@ import { getBalances, getStakingBalances } from '@/state/accountSelectors';
 import { getSelectedNetwork } from '@/state/appSelectors';

 import { useAccounts } from './useAccounts';
-import { useTokenConfigs } from './useTokenConfigs';

 type UseAccountBalanceProps = {
  // Token Items
  addressOrDenom?: string;
+  assetSymbol?: string;
  decimals?: number;

  // Chain Items
@@ -38,6 +41,7 @@ export const CHAIN_DEFAULT_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeee

 export const useAccountBalance = ({
  addressOrDenom,
+  assetSymbol,
  bech32AddrPrefix,
  chainId,
  decimals = 0,
@@ -48,7 +52,6 @@ export const useAccountBalance = ({

  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);

@@ -88,16 +91,20 @@ export const useAccountBalance = ({
  });

  const { formatted: evmBalance } = evmQuery.data || {};
-  const balance = isCosmosChain ? cosmosQuery.data : evmBalance;
+  const balance = !assetSymbol ? '0' : isCosmosChain ? cosmosQuery.data : evmBalance;

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

-  const usdcCoinBalance = balances?.[usdcDenom];
-  const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).toNumber();
+  const usdcCoinBalance = balances?.[USDC_DENOM];
+  const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).div(QUANTUM_MULTIPLIER).toNumber();

-  const nativeStakingCoinBalanace = stakingBalances?.[chainTokenDenom];
-  const nativeStakingBalance = MustBigNumber(nativeStakingCoinBalanace?.amount).toNumber();
+  const nativeStakingCoinBalanace = stakingBalances?.[DYDX_DENOM];
+  const nativeStakingBalance = MustBigNumber(nativeStakingCoinBalanace?.amount)
+    .div(QUANTUM_MULTIPLIER)
+    .toNumber();

  return {
    balance,
@@ -2,23 +2,21 @@ 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 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 +57,7 @@ const useAccountsContext = () => {
      forgetEvmSignature(previousEvmAddress);
    }

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

    setPreviousEvmAddress(evmAddress);
  }, [evmAddress]);
@@ -130,8 +126,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,6 +217,7 @@ const useAccountsContext = () => {
  }, [evmAddress, evmDerivedAddresses, signerWagmi, connectedDydxAddress, signerGraz]);

  // abacus
+  // TODO: useAbacus({ dydxAddress })
  useEffect(() => {
    if (dydxAddress) abacusStateManager.setAccount(localDydxWallet);
    else abacusStateManager.attemptDisconnectAccount();
@@ -253,21 +258,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 +308,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]);
 };
@@ -2,23 +2,27 @@ 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,

    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,
  };
 };
@@ -6,10 +6,8 @@ import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constant
 import { getAssets } from '@/state/assetsSelectors';
 import { getPerpetualMarkets } from '@/state/perpetualsSelectors';

-import { isTruthy } from '@/lib/isTruthy';
-
 const filterFunctions = {
-  [MarketFilters.ALL]: () => true,
+  [MarketFilters.ALL]: (market: MarketData) => true,
  [MarketFilters.LAYER_1]: (market: MarketData) => {
    return market.asset.tags?.toArray().includes('Layer 1');
  },
@@ -30,15 +28,13 @@ export const useMarketsData = (
  const allAssets = useSelector(getAssets, shallowEqual) || {};

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

  const filteredMarkets = useMemo(() => {
@@ -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,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,7 +2,7 @@ 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';

@@ -3,10 +3,15 @@ import { shallowEqual, useSelector, 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 {
+  type LocalWallet,
+  SubaccountClient,
+  DYDX_DENOM,
+  USDC_DENOM,
+} from '@dydxprotocol/v4-client-js';

 import type {
  AccountBalance,
@@ -29,9 +34,9 @@ import { MustBigNumber } from '@/lib/numbers';
 import { log } from '@/lib/telemetry';

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

+
 type SubaccountContextType = ReturnType<typeof useSubaccountContext>;
 const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType);
 SubaccountContext.displayName = 'Subaccount';
@@ -48,7 +53,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(
@@ -74,12 +78,13 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
    () => ({
      depositToSubaccount: async ({
        subaccountClient,
+        assetId = 0,
        amount,
      }: {
        subaccountClient: SubaccountClient;
        assetId?: number;
-        amount: number;
-      }) => await compositeClient?.depositToSubaccount(subaccountClient, amount.toString()),
+        amount: Long;
+      }) => await compositeClient?.validatorClient.post.deposit(subaccountClient, assetId, amount),

      withdrawFromSubaccount: async ({
        subaccountClient,
@@ -87,7 +92,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
      }: {
        subaccountClient: SubaccountClient;
        amount: number;
-      }) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount.toString()),
+      }) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount),

      transferFromSubaccountToAddress: async ({
        subaccountClient,
@@ -130,21 +135,12 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
        amount: number;
        recipient: string;
      }) =>
-        await compositeClient?.validatorClient.post.send(
-          subaccountClient.wallet,
-          () =>
-            new Promise((resolve) => {
-              const msg = compositeClient?.sendTokenMessage(
-                subaccountClient.wallet,
-                amount.toString(),
-                recipient,
-              );
-
-              resolve([msg]);
-            }),
+        await compositeClient?.validatorClient.post.sendToken(
+          subaccountClient,
+          recipient,
+          DYDX_DENOM,
+          Long.fromNumber(amount * QUANTUM_MULTIPLIER),
          false,
-          compositeClient?.validatorClient?.post.defaultDydxGasPrice,
-          undefined,
          Method.BroadcastTxCommit
        ),

@@ -161,7 +157,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,
@@ -200,9 +196,13 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
    async (balance: AccountBalance) => {
      if (!localDydxWallet) return;

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

-      if (amount > 0) {
+      const amount = Long.fromString(amountAfterDust || '0');
+
+      if (amount.greaterThan(Long.ZERO)) {
        const subaccountClient = new SubaccountClient(localDydxWallet, 0);
        await depositToSubaccount({ amount, subaccountClient });
      }
@@ -211,7 +211,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
  );

  const balances = useSelector(getBalances, shallowEqual);
-  const usdcCoinBalance = balances?.[usdcDenom];
+  const usdcCoinBalance = balances?.[USDC_DENOM];

  useEffect(() => {
    if (usdcCoinBalance) {
@@ -220,7 +220,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
  }, [usdcCoinBalance]);

  const deposit = useCallback(
-    async (amount: number) => {
+    async (amount: Long) => {
      if (!subaccountClient) {
        return;
      }
@@ -248,7 +248,8 @@ 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;
    },
@@ -274,7 +275,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
      await getFaucetFunds({ dydxAddress, subaccountNumber });
    } catch (error) {
      log('useSubaccount/getFaucetFunds', error);
-      throw error;
    }
  }, [dydxAddress, getFaucetFunds, subaccountNumber]);

@@ -313,6 +313,11 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
        placeOrderParams = abacusStateManager.placeOrder(callback);
      }

+      track(AnalyticsEvent.TradePlaceOrder, {
+        ...placeOrderParams,
+        isClosePosition,
+      } as HumanReadablePlaceOrderPayload & { isClosePosition: boolean });
+
      return placeOrderParams;
    },
    [subaccountClient]
@@ -341,6 +346,7 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
    }) => {
      const callback = (success: boolean, parsingError?: Nullable<ParsingError>) => {
        if (success) {
+          track(AnalyticsEvent.TradeCancelOrder);
          onSuccess?.();
        } else {
          onError?.({ errorStringKey: parsingError?.stringKey });
@@ -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,50 +0,0 @@
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-
-import { useSelectedNetwork } from '@/hooks';
-
-const FALLBACK_URL = 'https://help.dydx.exchange/';
-
-export interface LinksConfigs {
-  tos: string,
-  privacy: string,
-  mintscan: string,
-  mintscanBase: string,
-  feedback?: string,
-  help?: string,
-  blogs?: string,
-  foundation?: string,
-  initialMarginFractionLearnMore?: string,
-  reduceOnlyLearnMore?: string,
-  documentation?: string,
-  community?: string,
-  governanceLearnMore?: string,
-  stakingLearnMore?: string,
-  keplrDashboard?: string,
-  accountExportLearnMore?: string,
-  walletLearnMore?: string
-}
-
-export const useURLConfigs = (): LinksConfigs => {
-  const { selectedNetwork } = useSelectedNetwork();
-  const linksConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].links as LinksConfigs;
-
-  return {
-    tos: linksConfigs.tos,
-    privacy: linksConfigs.privacy,
-    mintscan: linksConfigs.mintscan,
-    mintscanBase: linksConfigs.mintscanBase,
-    feedback: linksConfigs.feedback || FALLBACK_URL,
-    help: linksConfigs.help || FALLBACK_URL,
-    blogs: linksConfigs.blogs || FALLBACK_URL,
-    foundation: linksConfigs.foundation || FALLBACK_URL,
-    initialMarginFractionLearnMore: linksConfigs.initialMarginFractionLearnMore || FALLBACK_URL,
-    reduceOnlyLearnMore: linksConfigs.reduceOnlyLearnMore || FALLBACK_URL,
-    documentation: linksConfigs.documentation || FALLBACK_URL,
-    community: linksConfigs.community || FALLBACK_URL,
-    governanceLearnMore: linksConfigs.governanceLearnMore || FALLBACK_URL,
-    stakingLearnMore: linksConfigs.stakingLearnMore || FALLBACK_URL,
-    keplrDashboard: linksConfigs.keplrDashboard || FALLBACK_URL,
-    accountExportLearnMore: linksConfigs.accountExportLearnMore || FALLBACK_URL,
-    walletLearnMore: linksConfigs.walletLearnMore || FALLBACK_URL,
-  };
-};
@@ -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>
@@ -1 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5.625 6.1875h6.75m-6.75 2.25H9M1.6875 9.57c0 1.2.84225 2.2455 2.03025 2.4203.84675.1245 1.7025.2197 2.56725.2842.2625.0195.5025.1575.64875.3758L9 15.75l2.0663-3.0997c.0724-.1078.1685-.1977.2809-.2628.1125-.0651.2382-.1038.3678-.113.8589-.0641 1.7152-.1589 2.5672-.2842 1.188-.1748 2.0303-1.2195 2.0303-2.42105v-4.5135c0-1.2015-.8423-2.24625-2.0303-2.421A36.294434 36.294434 0 0 0 9 2.25c-1.794 0-3.558.13125-5.28225.38475-1.188.17475-2.03025 1.22025-2.03025 2.421V9.57Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>
@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
-  <g clip-path="url(#clip0_18204_36775)">
-    <path d="M13.2426 6.25736C14.0817 7.09647 14.6531 8.16557 14.8846 9.32946C15.1162 10.4933 14.9973 11.6997 14.5432 12.7961C14.0891 13.8925 13.32 14.8295 12.3334 15.4888C11.3467 16.1481 10.1866 16.5 8.99993 16.5C7.81324 16.5 6.6532 16.1481 5.66651 15.4888C4.67981 14.8295 3.91078 13.8925 3.45665 12.7961C3.00253 11.6997 2.88371 10.4933 3.11522 9.32946C3.34673 8.16557 3.91817 7.09647 4.75729 6.25736" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round"/>
-    <path d="M11.25 9L9 11.25M9 11.25L6.75 9M9 11.25V1.6875" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round" stroke-linejoin="round"/>
-  </g>
-  <defs>
-    <clipPath id="clip0_18204_36775">
-      <rect width="18" height="18" fill="white"/>
-    </clipPath>
-  </defs>
-</svg>
@@ -1 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15 8C15 9.53527 14.6867 10.8758 14.2269 11.7954C13.77 12.7092 13.3116 12.9664 13.0527 12.9968L12.6636 12.8953C12.4116 12.7511 12.092 12.4331 11.7731 11.7954C11.3133 10.8758 11 9.53527 11 8C11 6.46473 11.3133 5.12424 11.7731 4.20457C12.0924 3.56607 12.4124 3.24815 12.6645 3.10417L13.0519 3.00311C13.3107 3.0331 13.7696 3.28991 14.2269 4.20457C14.6867 5.12424 15 6.46473 15 8ZM12.2928 2.16768L1.41963 5.00415C0.628571 5.08768 0 6.39699 0 7.99992C0 9.60346 0.629045 10.9131 1.42053 10.9958L2.50023 11.2774V12.9998C2.50023 13.8283 3.17181 14.4998 4.00023 14.4998C4.82866 14.4998 5.50023 13.8283 5.50023 12.9998V12.0601L12.2914 13.8317C12.5186 13.9417 12.7559 14 13 14C14.6569 14 16 11.3137 16 8C16 4.68629 14.6569 2 13 2C12.7564 2 12.5196 2.05808 12.2928 2.16768ZM10.9931 3.5402L2.49607 5.75681C2.80523 6.30634 3 7.10764 3 7.99992C3 8.89214 2.80525 9.69339 2.49614 10.2429L10.9929 12.4595C10.3833 11.3612 10 9.77013 10 8C10 6.22968 10.3834 4.63843 10.9931 3.5402ZM2 7.99992C2 8.70677 1.85462 9.29725 1.66623 9.67403C1.59961 9.80728 1.54246 9.88955 1.5 9.93955C1.45754 9.88955 1.40039 9.80728 1.33377 9.67403C1.14538 9.29725 1 8.70677 1 7.99992C1 7.29308 1.14538 6.70259 1.33377 6.32582C1.40039 6.19256 1.45754 6.11029 1.5 6.06029C1.54246 6.11029 1.59961 6.19256 1.66623 6.32582C1.85462 6.70259 2 7.29308 2 7.99992ZM1.41964 10.0124C1.41962 10.0124 1.42071 10.0118 1.42296 10.0109C1.42079 10.0121 1.41966 10.0125 1.41964 10.0124ZM1.57704 10.0109C1.57929 10.0118 1.58038 10.0124 1.58036 10.0124C1.58033 10.0125 1.57921 10.0121 1.57704 10.0109ZM1.58036 5.9874C1.58038 5.98747 1.57929 5.98808 1.57704 5.98899C1.57921 5.98778 1.58034 5.98732 1.58036 5.9874ZM1.42296 5.98899C1.42071 5.98808 1.41962 5.98747 1.41964 5.9874C1.41966 5.98732 1.42079 5.98778 1.42296 5.98899ZM3.50023 12.9998V11.5383L4.50023 11.7992V12.9998C4.50023 13.276 4.27638 13.4998 4.00023 13.4998C3.72409 13.4998 3.50023 13.276 3.50023 12.9998Z" fill="currentColor"/></svg>
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15 8C15 9.53527 14.6867 10.8758 14.2269 11.7954C13.77 12.7092 13.3116 12.9664 13.0527 12.9968L12.6636 12.8953C12.4116 12.7511 12.092 12.4331 11.7731 11.7954C11.3133 10.8758 11 9.53527 11 8C11 6.46473 11.3133 5.12424 11.7731 4.20457C12.0924 3.56607 12.4124 3.24815 12.6645 3.10417L13.0519 3.00311C13.3107 3.0331 13.7696 3.28991 14.2269 4.20457C14.6867 5.12424 15 6.46473 15 8ZM12.2928 2.16768L1.41963 5.00415C0.628571 5.08768 0 6.39699 0 7.99992C0 9.60346 0.629045 10.9131 1.42053 10.9958L2.50023 11.2774V12.9998C2.50023 13.8283 3.17181 14.4998 4.00023 14.4998C4.82866 14.4998 5.50023 13.8283 5.50023 12.9998V12.0601L12.2914 13.8317C12.5186 13.9417 12.7559 14 13 14C14.6569 14 16 11.3137 16 8C16 4.68629 14.6569 2 13 2C12.7564 2 12.5196 2.05808 12.2928 2.16768ZM10.9931 3.5402L2.49607 5.75681C2.80523 6.30634 3 7.10764 3 7.99992C3 8.89214 2.80525 9.69339 2.49614 10.2429L10.9929 12.4595C10.3833 11.3612 10 9.77013 10 8C10 6.22968 10.3834 4.63843 10.9931 3.5402ZM2 7.99992C2 8.70677 1.85462 9.29725 1.66623 9.67403C1.59961 9.80728 1.54246 9.88955 1.5 9.93955C1.45754 9.88955 1.40039 9.80728 1.33377 9.67403C1.14538 9.29725 1 8.70677 1 7.99992C1 7.29308 1.14538 6.70259 1.33377 6.32582C1.40039 6.19256 1.45754 6.11029 1.5 6.06029C1.54246 6.11029 1.59961 6.19256 1.66623 6.32582C1.85462 6.70259 2 7.29308 2 7.99992ZM1.41964 10.0124C1.41962 10.0124 1.42071 10.0118 1.42296 10.0109C1.42079 10.0121 1.41966 10.0125 1.41964 10.0124ZM1.57704 10.0109C1.57929 10.0118 1.58038 10.0124 1.58036 10.0124C1.58033 10.0125 1.57921 10.0121 1.57704 10.0109ZM1.58036 5.9874C1.58038 5.98747 1.57929 5.98808 1.57704 5.98899C1.57921 5.98778 1.58034 5.98732 1.58036 5.9874ZM1.42296 5.98899C1.42071 5.98808 1.41962 5.98747 1.41964 5.9874C1.41966 5.98732 1.42079 5.98778 1.42296 5.98899ZM3.50023 12.9998V11.5383L4.50023 11.7992V12.9998C4.50023 13.276 4.27638 13.4998 4.00023 13.4998C3.72409 13.4998 3.50023 13.276 3.50023 12.9998Z" fill="currentColor"/></svg>
@@ -2,13 +2,11 @@ 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';
 export { default as CautionCircleIcon } from './caution-circle.svg';
 export { default as CautionCircleStrokeIcon } from './caution-circle-stroke.svg';
-export { default as ChatIcon } from './chat-bubble.svg';
 export { default as CheckIcon } from './check.svg';
 export { default as ChevronLeftIcon } from './chevron-left.svg';
 export { default as ChevronRightIcon } from './chevron-right.svg';
@@ -19,7 +17,6 @@ export { default as CoinsIcon } from './coins.svg';
 export { default as CommentIcon } from './comment.svg';
 export { default as CopyIcon } from './copy.svg';
 export { default as CubeIcon } from './cube.svg';
-export { default as DepositIcon } from './deposit.svg';
 export { default as DepthChartIcon } from './depth-chart.svg';
 export { default as DiscordIcon } from './discord.svg';
 export { default as ExportKeysIcon } from './export-keys.svg';
@@ -36,7 +33,6 @@ export { default as LockIcon } from './lock.svg';
 export { default as LogoShortIcon } from './logo-short';
 export { default as MarketsIcon } from './markets.svg';
 export { default as MenuIcon } from './menu.svg';
-export { default as MigrateIcon } from './migrate.svg';
 export { default as MintscanIcon } from './logos/mintscan.svg';
 export { default as OrderbookIcon } from './orderbook.svg';
 export { default as OverviewIcon } from './overview.svg';
@@ -60,7 +56,6 @@ export { default as TransferIcon } from './transfer.svg';
 export { default as TriangleIcon } from './triangle.svg';
 export { default as TryAgainIcon } from './try-again.svg';
 export { default as WarningIcon } from './warning.svg';
-export { default as WithdrawIcon } from './withdraw.svg';

 // Wallets
 export { default as BitkeepIcon } from './wallets/bitkeep.svg';
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
-  <path d="M13.2426 6.2573C14.0817 7.09641 14.6531 8.16551 14.8846 9.3294C15.1162 10.4933 14.9973 11.6997 14.5432 12.796C14.0891 13.8924 13.32 14.8295 12.3334 15.4888C11.3467 16.148 10.1866 16.4999 8.99993 16.4999C7.81324 16.4999 6.6532 16.148 5.66651 15.4888C4.67981 14.8295 3.91078 13.8924 3.45665 12.796C3.00253 11.6997 2.88371 10.4933 3.11522 9.3294C3.34673 8.16551 3.91817 7.09641 4.75729 6.2573" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round"/>
-  <path d="M11.25 2.9375L9 0.6875M9 0.6875L6.75 2.9375M9 0.6875V10.25" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
@@ -15,12 +15,9 @@ 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';
@@ -56,10 +53,7 @@ export const DialogManager = () => {
    [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} />,
@@ -1,16 +1,12 @@
 import styled, { type AnyStyledComponent, css } from 'styled-components';

 import { AbacusApiStatus } from '@/constants/abacus';
-import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';

-import { useApiState, useSelectedNetwork, useStringGetter } from '@/hooks';
-import { ChatIcon, LinkOutIcon } from '@/icons';
+import { useApiState, useStringGetter } from '@/hooks';

 import { layoutMixins } from '@/styles/layoutMixins';

-import { Button } from '@/components/Button';
 import { Details } from '@/components/Details';
 import { Output, OutputType } from '@/components/Output';
 import { WithTooltip } from '@/components/WithTooltip';
@@ -28,8 +24,6 @@ enum ExchangeStatus {
 export const FooterDesktop = () => {
  const stringGetter = useStringGetter();
  const { height, indexerHeight, status, statusErrorMessage } = useApiState();
-  const { selectedNetwork } = useSelectedNetwork();
-  const { statusPage } = ENVIRONMENT_CONFIG_MAP[selectedNetwork].links;

  const { exchangeStatus, label } =
    !status || status === AbacusApiStatus.NORMAL
@@ -44,37 +38,20 @@ export const FooterDesktop = () => {

  return (
    <Styled.Footer>
-      <Styled.Row>
-        <WithTooltip
-          slotTooltip={
-            statusErrorMessage && (
-              <dl>
-                <dd>{statusErrorMessage}</dd>
-              </dl>
-            )
-          }
-        >
-          <Styled.FooterButton
-            slotLeft={<Styled.StatusDot exchangeStatus={exchangeStatus} />}
-            slotRight={statusPage && <LinkOutIcon />}
-            size={ButtonSize.XSmall}
-            state={{ isDisabled: !statusPage }}
-          >
-            {label}
-          </Styled.FooterButton>
-        </WithTooltip>
-
-        {globalThis?.Intercom && (
-          <Styled.FooterButton
-            slotLeft={<ChatIcon />}
-            size={ButtonSize.XSmall}
-            onClick={() => globalThis.Intercom('show')}
-          >
-            {stringGetter({ key: STRING_KEYS.HELP_AND_SUPPORT })}
-          </Styled.FooterButton>
-        )}
-      </Styled.Row>
-
+      <WithTooltip
+        slotTooltip={
+          statusErrorMessage && (
+            <dl>
+              <dd>{statusErrorMessage}</dd>
+            </dl>
+          )
+        }
+      >
+        <Styled.Row>
+          <Styled.StatusDot exchangeStatus={exchangeStatus} />
+          <span>{label}</span>
+        </Styled.Row>
+      </WithTooltip>
      {import.meta.env.MODE !== 'production' && (
        <Styled.Details
          withSeparators
@@ -105,22 +82,20 @@ Styled.Footer = styled.footer`
  ${layoutMixins.stickyFooter}
  ${layoutMixins.spacedRow}
  grid-area: Footer;
+
+  font-size: 0.66em;
 `;

 Styled.Row = styled.div`
  ${layoutMixins.row}
-  ${layoutMixins.spacedRow}
-  width: var(--sidebar-width);
-
-  padding: 0 0.5rem;
-  border-right: 1px solid var(--color-border);
+  padding: 0 1rem;
+  gap: 0.5rem;
 `;

 Styled.StatusDot = styled.div<{ exchangeStatus: ExchangeStatus }>`
-  width: 0.5rem;
-  height: 0.5rem;
+  width: 1em;
+  height: 1em;
  border-radius: 50%;
-  margin-right: 0.25rem;

  background-color: ${({ exchangeStatus }) =>
    ({
@@ -129,28 +104,12 @@ Styled.StatusDot = styled.div<{ exchangeStatus: ExchangeStatus }>`
    }[exchangeStatus])};
 `;

-Styled.FooterButton = styled(Button)`
-  --button-height: 1.5rem;
-  --button-radius: 0.25rem;
-  --button-backgroundColor: var(--color-layer-2);
-  --button-border: none;
-  --button-textColor: var(--color-text-0);
-
-  &:hover:not(:disabled) {
-    --button-backgroundColor: var(--color-layer-3);
-    --button-textColor: var(--color-text-1);
-  }
-
-  &:disabled {
-    cursor: default;
-  }
-`;
-
 Styled.WarningOutput = styled(Output)`
  color: var(--color-warning);
 `;

 Styled.Details = styled(Details)`
  ${layoutMixins.scrollArea}
-  font: var(--font-tiny-book);
+
+  padding: 0 0.5em;
 `;
@@ -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, useURLConfigs } from '@/hooks';
+import { useStringGetter } from '@/hooks';
+import { LogoShortIcon, BellIcon } from '@/icons';

 import { Icon, IconName } from '@/components/Icon';
 import { IconButton } from '@/components/IconButton';
@@ -24,38 +23,35 @@ import { openDialog } from '@/state/dialogs';

 import { headerMixins } from '@/styles/headerMixins';
 import { layoutMixins } from '@/styles/layoutMixins';
-import breakpoints from '@/styles/breakpoints';

 export const HeaderDesktop = () => {
  const stringGetter = useStringGetter();
-  const { documentation, community, mintscanBase } = useURLConfigs();
  const dispatch = useDispatch();
-  const { chainTokenLabel } = useTokenConfigs();

  const navItems = [
    {
      group: 'navigation',
      items: [
+        {
+          value: 'MARKET',
+          label: stringGetter({ key: STRING_KEYS.MARKET }),
+          href: AppRoute.Markets,
+        },
        {
          value: 'TRADE',
          label: stringGetter({ key: STRING_KEYS.TRADE }),
          href: AppRoute.Trade,
        },
+        {
+          value: 'Dv4TNT',
+          label: 'Dv4TNT',
+          href: AppRoute.Rewards,
+        },
        {
          value: 'PORTFOLIO',
          label: stringGetter({ key: STRING_KEYS.PORTFOLIO }),
          href: AppRoute.Portfolio,
        },
-        {
-          value: 'MARKETS',
-          label: stringGetter({ key: STRING_KEYS.MARKETS }),
-          href: AppRoute.Markets,
-        },
-        {
-          value: chainTokenLabel,
-          label: chainTokenLabel,
-          href: `/${chainTokenLabel}`,
-        },
        {
          value: 'MORE',
          label: stringGetter({ key: STRING_KEYS.MORE }),
@@ -64,31 +60,31 @@ export const HeaderDesktop = () => {
              value: 'DOCUMENTATION',
              slotBefore: <Icon iconName={IconName.Terminal} />,
              label: stringGetter({ key: STRING_KEYS.DOCUMENTATION }),
-              href: documentation,
+              href: 'https://v4-teacher.vercel.app/',
            },
            {
              value: 'MINTSCAN',
              slotBefore: <Icon iconName={IconName.Mintscan} />,
              label: stringGetter({ key: STRING_KEYS.MINTSCAN }),
-              href: mintscanBase,
+              href: 'https://testnet.mintscan.io/dydx-testnet',
            },
            {
              value: 'COMMUNITY',
              slotBefore: <Icon iconName={IconName.Discord} />,
              label: stringGetter({ key: STRING_KEYS.COMMUNITY }),
-              href: community,
+              href: 'https://discord.gg/dydx',
            },
            {
              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',
@@ -135,9 +131,7 @@ export const HeaderDesktop = () => {
        <VerticalSeparator />

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

        <VerticalSeparator />
@@ -152,7 +146,6 @@ const Styled: Record<string, AnyStyledComponent> = {};

 Styled.Header = styled.header`
  --header-horizontal-padding-mobile: 0.5rem;
-  --trigger-height: 2.25rem;
  --logo-width: 3.5rem;

  ${layoutMixins.container}
@@ -160,8 +153,6 @@ Styled.Header = styled.header`
  ${layoutMixins.scrollSnapItem}
  backdrop-filter: none;

-  height: var(--page-currentHeaderHeight);
-
  grid-area: Header;

  display: grid;
@@ -174,15 +165,7 @@ Styled.Header = styled.header`
    )
    var(--border-width) 1fr var(--border-width) auto;

-  @media ${breakpoints.tablet} {
-    --trigger-height: 3rem;
-  }
-
-  @media ${breakpoints.mobile} {
-    --navBefore-width: 7rem;
-  }
-
-  font-size: 0.9375rem;
+  font-size: 0.9375em;

  :before {
    backdrop-filter: blur(10px);
@@ -192,7 +175,6 @@ Styled.Header = styled.header`
 Styled.NavigationMenu = styled(NavigationMenu)`
  & {
    --navigationMenu-height: var(--stickyArea-topHeight);
-    --navigationMenu-item-height: var(--trigger-height);
  }

  ${layoutMixins.scrollArea}
@@ -232,8 +214,7 @@ Styled.NavAfter = styled.div`
  }
 `;

-Styled.IconButton = styled(IconButton)<{ size?: string }>`
+Styled.IconButton = styled(IconButton)`
  ${headerMixins.button}
  --button-border: none;
-  --button-icon-size: 1rem;
 `;
@@ -0,0 +1,38 @@
+import environments from '../../../public/configs/env.json';
+
+import { validateAgainstAvailableEnvironments } from '../network';
+
+describe('validateAgainstAvailableEnvironments', () => {
+  describe('production environment', () => {
+    beforeAll(() => {
+      jest.mock('../../constants/networks', () => ({
+        AVAILABLE_ENVIRONMENTS: {
+          environments: [],
+          default: 'dydxprotocol-testnet-dydx',
+        }, //environments.deployments.TESTNET,
+      }));
+    });
+
+    afterAll(() => {
+      jest.unmock('../../constants/networks');
+    });
+
+    it('Returns true for valid environments', () => {
+      expect(validateAgainstAvailableEnvironments('dydxprotocol-testnet-dydx')).toEqual(true);
+    });
+
+    it('Returns false for invalid environments', () => {
+      expect(validateAgainstAvailableEnvironments('dydxprotocol-dev')).toEqual(false);
+    });
+  });
+
+  describe('staging environment', () => {
+    it('Returns true for valid environments', () => {
+      expect(validateAgainstAvailableEnvironments('dydxprotocol-dev')).toEqual(true);
+    });
+
+    it('Returns false for invalid environments', () => {
+      expect(validateAgainstAvailableEnvironments('INVALID')).toEqual(false);
+    });
+  });
+});
@@ -45,11 +45,15 @@ describe('getStringsForDateTimeDiff', () => {

 describe('getStringsForTimeInterval', () => {
  it.each([
-    [Duration.fromObject({ months: 2 }), '2', 'MONTHS_ABBREVIATED'],
-    [Duration.fromObject({ weeks: 3, days: 2 }), '3', 'WEEKS_ABBREVIATED'],
-    [Duration.fromObject({ days: 5, hours: 12 }), '6', 'DAYS_ABBREVIATED'],
-    [Duration.fromObject({ hours: 8, minutes: 30 }), '9', 'HOURS_ABBREVIATED'],
-    [Duration.fromObject({ minutes: 45 }), '45', 'MINUTES_ABBREVIATED'],
+    [Duration.fromObject({ months: 2 }), '2', 'APP.GENERAL.TIME_STRINGS.MONTHS_ABBREVIATED'],
+    [Duration.fromObject({ weeks: 3, days: 2 }), '3', 'APP.GENERAL.TIME_STRINGS.WEEKS_ABBREVIATED'],
+    [Duration.fromObject({ days: 5, hours: 12 }), '6', 'APP.GENERAL.TIME_STRINGS.DAYS_ABBREVIATED'],
+    [
+      Duration.fromObject({ hours: 8, minutes: 30 }),
+      '9',
+      'APP.GENERAL.TIME_STRINGS.HOURS_ABBREVIATED',
+    ],
+    [Duration.fromObject({ minutes: 45 }), '45', 'APP.GENERAL.TIME_STRINGS.MINUTES_ABBREVIATED'],
  ])(
    'returns the correct timeString and unitStringKey',
    (timeInterval, expectedTimeString, expectedUnitStringKey) => {
@@ -14,6 +14,8 @@ import {
  OrderSide,
  OrderTimeInForce,
  OrderExecution,
+  DYDX_DENOM,
+  GAS_PRICE_DYDX_DENOM,
 } from '@dydxprotocol/v4-client-js';

 import {
@@ -59,42 +61,22 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
  }

  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 +84,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 +99,9 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
      this.store?.dispatch(
        openDialog({ type: DialogTypes.ExchangeOffline, dialogProps: { preventClose: true } })
      );
+
      log('DydxChainTransactions/connectNetwork', error);
+      return;
    }
  }

@@ -223,13 +213,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
      params ?? {};

    try {
-      const tx = await this.compositeClient?.cancelRawOrder(
+      const tx = await this.compositeClient?.cancelOrder(
        new SubaccountClient(this.localWallet, subaccountNumber),
        clientId,
        orderFlags,
        clobPairId,
-        goodTilBlock || undefined,
-        goodTilBlockTime || undefined,
+        goodTilBlock ?? undefined,
+        goodTilBlockTime ?? undefined
      );

      const parsedTx = this.parseToPrimitives(tx);
@@ -261,7 +251,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
            const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount);

            resolve([msg]);
-          })
+          }),
      );

      const parsedTx = this.parseToPrimitives(tx);
@@ -276,9 +266,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    }
  }

-  async simulateTransferNativeTokenTransaction(
-    params: HumanReadableTransferPayload
-  ): Promise<string> {
+  async simulateTransferNativeTokenTransaction(params: HumanReadableTransferPayload): Promise<string> {
    if (!this.compositeClient || !this.localWallet) {
      throw new Error('Missing compositeClient or localWallet');
    }
@@ -292,18 +280,16 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
        this.localWallet,
        () =>
          new Promise((resolve) => {
-            if (!this.localWallet) {
-              throw new Error('Missing compositeClient or localWallet');
-            }
-            const msg = compositeClient?.sendTokenMessage(
-              this.localWallet,
-              amount,
+            const msg = compositeClient?.validatorClient.post.composer.composeMsgSendToken(
+              subaccountClient.address,
              recipient,
+              DYDX_DENOM,
+              Long.fromNumber(amount * QUANTUM_MULTIPLIER)
            );

            resolve([msg]);
          }),
-        this.compositeClient?.validatorClient?.post.defaultDydxGasPrice,
+        GAS_PRICE_DYDX_DENOM,
      );

      const parsedTx = this.parseToPrimitives(tx);
@@ -411,10 +397,9 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
          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 accountBalances = await this.compositeClient?.validatorClient.get.getAccountBalances(
+            this.localWallet.address
+          );
          const parsedAccountBalances = this.parseToPrimitives(accountBalances);
          callback(JSON.stringify(parsedAccountBalances));
          break;
@@ -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();
@@ -25,7 +25,6 @@ import {
  setFundingPayments,
  setHistoricalPnl,
  setLatestOrder,
-  setRestrictionType,
  setSubaccount,
  setTransfers,
  setWallet,
@@ -122,10 +121,6 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
        );
      }

-      if (changes.has(Changes.restriction)) {
-        dispatch(setRestrictionType(updatedState.restriction));
-      }
-
      subaccountNumbers?.forEach((subaccountId: number) => {
        if (subaccountId !== null) {
          if (changes.has(Changes.subaccount)) {
@@ -1,4 +1,4 @@
-import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { AVAILABLE_ENVIRONMENTS, type DydxNetwork } from '@/constants/networks';

 export const validateAgainstAvailableEnvironments = (value: DydxNetwork) =>
-  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
+  AVAILABLE_ENVIRONMENTS.environments.includes(value);
@@ -107,8 +107,8 @@ export const getHydratedTradingData = ({
  perpetualMarkets?: Record<string, PerpetualMarket>;
 }) => ({
  ...data,
-  asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId]?.assetId],
-  stepSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.stepSizeDecimals,
-  tickSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.tickSizeDecimals,
+  asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId].assetId],
+  stepSizeDecimals: perpetualMarkets?.[data.marketId].configs?.stepSizeDecimals,
+  tickSizeDecimals: perpetualMarkets?.[data.marketId].configs?.tickSizeDecimals,
  ...('side' in data && { orderSide: convertAbacusOrderSide(data.side) }),
 });
@@ -10,7 +10,7 @@ export const getTimestamp = (value?: BigNumberish | null) =>
      ? value
      : typeof value === 'string'
      ? new Date(value).getTime()
-      : new Date(value.toString()).getTime()
+      : new Date(value.toNumber()).getTime()
    : undefined;

 export const getStringsForDateTimeDiff = (dateTime: DateTime) => {
@@ -77,4 +77,4 @@ export const formatSeconds = (seconds: number) => {
  const minutes = Math.floor(seconds / 60);
  const remainingSeconds = seconds % 60;
  return `${getTimeString(minutes)}:${getTimeString(remainingSeconds)}`;
-}
+};
@@ -36,17 +36,7 @@ import { CoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet';
 import { InjectedConnector } from 'wagmi/connectors/injected';
 import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
 import { WalletConnectConnector } from 'wagmi/connectors/walletConnect';
-
-import {
-  type WalletConnection,
-  WalletConnectionType,
-  type WalletType,
-  walletConnectionTypes,
-  wallets,
-  WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
-} from '@/constants/wallets';
-
-import { isTruthy } from './isTruthy';
+import { WalletConnectLegacyConnector } from 'wagmi/connectors/walletConnectLegacy';

 // Config

@@ -80,17 +70,13 @@ export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
  celoAlfajores,
 ];

-const { chains, publicClient, webSocketPublicClient } = configureChains(
-  WAGMI_SUPPORTED_CHAINS,
-  [
-    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] }),
-    }),
-    publicProvider(),
-  ].filter(isTruthy)
-);
+const { chains, publicClient, webSocketPublicClient } = configureChains(WAGMI_SUPPORTED_CHAINS, [
+  // alchemyProvider({ apiKey: import.meta.env.VITE_ALCHEMY_API_KEY }),
+  jsonRpcProvider({
+    rpc: (chain) => ({ http: chain.rpcUrls.default.http[0] }),
+  }),
+  publicProvider(),
+]);

 const injectedConnectorOptions = {
  chains,
@@ -101,46 +87,52 @@ 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,
+      name: 'dYdX',
+      description: '',
      url: import.meta.env.VITE_BASE_URL,
-      icons: [config.client.iconUrl],
+      icons: [`${import.meta.env.VITE_BASE_URL}/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({
@@ -150,7 +142,8 @@ const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
      reloadOnDisconnect: false,
    },
  }),
-  new WalletConnectConnector(getWalletconnect2ConnectorOptions(walletConnectConfig)),
+  new WalletConnectLegacyConnector(walletconnect1ConnectorOptions),
+  new WalletConnectConnector(walletconnect2ConnectorOptions),
  new InjectedConnector(injectedConnectorOptions),
 ];

@@ -172,43 +165,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}
-`;
@@ -17,7 +17,7 @@ import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { AppRoute, PortfolioRoute, HistoryRoute } from '@/constants/routes';
 import { wallets, WalletType } from '@/constants/wallets';
-import { useAccounts, useStringGetter, useTokenConfigs } from '@/hooks';
+import { useAccounts, useStringGetter } from '@/hooks';

 import { getOnboardingState } from '@/state/accountSelectors';
 import { openDialog } from '@/state/dialogs';
@@ -37,7 +37,6 @@ const Profile = () => {
  const isConnected = onboardingState !== OnboardingState.Disconnected;

  const { evmAddress, dydxAddress, walletType } = useAccounts();
-  const { chainTokenLabel } = useTokenConfigs();

  const { data: ensName } = useEnsName({
    address: evmAddress,
@@ -138,11 +137,7 @@ const Profile = () => {
            layout="grid"
          />
        </Panel>
-        <Styled.RewardsPanel
-          slotHeaderContent={stringGetter({ key: STRING_KEYS.REWARDS })}
-          href={`/${chainTokenLabel}`}
-          hasSeparator
-        >
+        <Styled.RewardsPanel header={stringGetter({ key: STRING_KEYS.REWARDS })} hasSeparator>
          <Styled.Details
            items={[
              { key: 'maker', label: stringGetter({ key: STRING_KEYS.YOU_WILL_EARN }), value: '-' },
@@ -154,8 +149,8 @@ const Profile = () => {
      </Styled.EqualGrid>

      <Styled.TablePanel
-        slotHeaderContent={stringGetter({ key: STRING_KEYS.HISTORY })}
-        href={`${AppRoute.Portfolio}/${PortfolioRoute.History}/${HistoryRoute.Trades}`}
+        header={stringGetter({ key: STRING_KEYS.HISTORY })}
+        linkto={`${AppRoute.Portfolio}/${PortfolioRoute.History}/${HistoryRoute.Trades}`}
        hasSeparator
      >
        <FillsTable
@@ -180,7 +175,7 @@ Styled.MobileProfileLayout = styled.div`
  ${layoutMixins.contentContainerPage}

  gap: 1rem;
-  padding: 1.25rem;
+  padding: 1rem;
 `;

 Styled.Header = styled.header`
@@ -278,25 +273,22 @@ Styled.RewardsPanel = styled(Panel)`
 `;

 Styled.TablePanel = styled(Panel)`
-  --panel-content-paddingY: 0;
-  --panel-content-paddingX: 0;
-
-  > div > div {
-    margin-top: 0.5rem;
-    --scrollArea-height: 10rem;
-    border-radius: 0.875rem;
-  }
+  padding: 0;
+  max-width: calc(100vw - 2rem);
+  max-height: 10rem;

  table {
-    max-height: 10rem;
    --tableCell-padding: 0.25rem 1rem;
-    --tableRow-backgroundColor: var(--color-layer-3);
-    background-color: var(--color-layer-3);
+
+    background-color: transparent;
+
    thead {
      color: var(--color-text-0);
    }

    tbody {
+      background-color: transparent;
+
      tr {
        td:nth-child(2),
        td:nth-child(3) {
@@ -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)} />}
@@ -1,12 +1,12 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Nullable } from '@dydxprotocol/v4-abacus';
 import styled, { AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';

 import { FeeTier } from '@/constants/abacus';
-import { FEE_DECIMALS } from '@/constants/numbers';
+import { FEE_DECIMALS, QUANTUM_MULTIPLIER } from '@/constants/numbers';
 import { STRING_KEYS } from '@/constants/localization';
-import { useBreakpoints, useStringGetter } from '@/hooks';
+import { useAccounts, useBreakpoints, useStringGetter } from '@/hooks';
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { tableMixins } from '@/styles/tableMixins';
@@ -29,8 +29,9 @@ const EQUALITY_SYMBOL_MAP = {
 };

 export const Fees = () => {
+  const { dydxAddress } = useAccounts();
  const stringGetter = useStringGetter();
-  const { isTablet, isNotTablet } = useBreakpoints();
+  const { isNotTablet } = useBreakpoints();
  const userFeeTier = useSelector(getUserFeeTier, shallowEqual);
  const userStats = useSelector(getUserStats, shallowEqual);
  const feeTiers = useSelector(getFeeTiers, shallowEqual);
@@ -55,28 +56,28 @@ export const Fees = () => {
      <Styled.AdditionalConditions>
        {!isAdditional && !totalShare && !makerShare && <Output type={OutputType.Text} />}
        {!!totalShare && (
-          <Styled.AdditionalConditionsText>
-            {isAdditional && stringGetter({ key: STRING_KEYS.AND })}{' '}
-            {stringGetter({ key: STRING_KEYS.EXCHANGE_MARKET_SHARE })}{' '}
-            <Styled.Highlighted>{'>'}</Styled.Highlighted>{' '}
+          <Styled.TextRow>
+            {isAdditional && <span>{stringGetter({ key: STRING_KEYS.AND })}</span>}
+            <span>{stringGetter({ key: STRING_KEYS.EXCHANGE_MARKET_SHARE })}</span>
+            <Styled.Highlighted>{'>'}</Styled.Highlighted>
            <Styled.HighlightOutput
              type={OutputType.Percent}
              value={totalShare}
              fractionDigits={0}
            />
-          </Styled.AdditionalConditionsText>
+          </Styled.TextRow>
        )}
        {!!makerShare && (
-          <Styled.AdditionalConditionsText>
-            {isAdditional && stringGetter({ key: STRING_KEYS.AND })}{' '}
-            {stringGetter({ key: STRING_KEYS.MAKER_MARKET_SHARE })}{' '}
-            <Styled.Highlighted>{'>'}</Styled.Highlighted>{' '}
+          <Styled.TextRow>
+            {isAdditional && <span>{stringGetter({ key: STRING_KEYS.AND })}</span>}
+            <span>{stringGetter({ key: STRING_KEYS.MAKER_MARKET_SHARE })}</span>
+            <Styled.Highlighted>{'>'}</Styled.Highlighted>
            <Styled.HighlightOutput
              type={OutputType.Percent}
              value={makerShare}
              fractionDigits={0}
            />
-          </Styled.AdditionalConditionsText>
+          </Styled.TextRow>
        )}
      </Styled.AdditionalConditions>
    ),
@@ -102,90 +103,91 @@ export const Fees = () => {
            },
          ]}
        />
-
-        <Styled.FeeTable
-          label="Fee Tiers"
-          data={feeTiers || []}
-          getRowKey={(row: FeeTier) => row.tier}
-          getRowAttributes={(row: FeeTier) => ({
-            'data-yours': row.tier === userFeeTier,
-          })}
-          columns={(
-            [
-              {
-                columnKey: 'tier',
-                getCellValue: (row) => row.tier,
-                label: stringGetter({ key: STRING_KEYS.TIER }),
-                allowsSorting: false,
-                renderCell: ({ tier }) => (
-                  <Styled.Tier>
-                    <Styled.Output type={OutputType.Text} value={tier} />
-                    {tier === userFeeTier && (
-                      <Styled.YouTag size={TagSize.Medium}>
-                        {stringGetter({ key: STRING_KEYS.YOU })}
-                      </Styled.YouTag>
-                    )}
-                  </Styled.Tier>
-                ),
-              },
-              {
-                columnKey: 'volume',
-                getCellValue: (row) => row.volume,
-                label: stringGetter({ key: STRING_KEYS.VOLUME_30D }),
-                allowsSorting: false,
-                renderCell: ({ symbol, volume, makerShare, totalShare }) => (
-                  <>
-                    <span>{`${
-                      symbol in EQUALITY_SYMBOL_MAP
-                        ? EQUALITY_SYMBOL_MAP[symbol as keyof typeof EQUALITY_SYMBOL_MAP]
-                        : symbol
-                    } `}</span>
-                    <Styled.HighlightOutput type={OutputType.CompactFiat} value={volume} />
-                    {isTablet &&
-                      AdditionalConditions({ totalShare, makerShare, isAdditional: true })}
-                  </>
-                ),
-              },
-              isNotTablet && {
-                columnKey: 'condition',
-                getCellValue: (row) => row.volume,
-                label: stringGetter({ key: STRING_KEYS.ADDITIONAL_CONDITION }),
-                allowsSorting: false,
-                renderCell: ({ totalShare, makerShare }) =>
-                  AdditionalConditions({ totalShare, makerShare }),
-              },
-              {
-                columnKey: 'maker',
-                getCellValue: (row) => row.maker,
-                label: stringGetter({ key: STRING_KEYS.MAKER }),
-                allowsSorting: false,
-                renderCell: ({ maker }) => (
-                  <Styled.HighlightOutput
-                    type={OutputType.SmallPercent}
-                    value={maker}
-                    fractionDigits={FEE_DECIMALS}
-                  />
-                ),
-              },
-              {
-                columnKey: 'taker',
-                getCellValue: (row) => row.taker,
-                label: stringGetter({ key: STRING_KEYS.TAKER }),
-                allowsSorting: false,
-                renderCell: ({ taker }) => (
-                  <Styled.HighlightOutput
-                    type={OutputType.SmallPercent}
-                    value={taker}
-                    fractionDigits={FEE_DECIMALS}
-                  />
-                ),
-              },
-            ] as ColumnDef<FeeTier>[]
-          ).filter(isTruthy)}
-          selectionBehavior="replace"
-          withOuterBorder={isNotTablet}
-          withInnerBorders
-        />
+        <div>
+          <Styled.FeeTable
+            label="Fee Tiers"
+            data={feeTiers || []}
+            getRowKey={(row: FeeTier) => row.tier}
+            getRowAttributes={(row: FeeTier) => ({
+              'data-yours': row.tier === userFeeTier,
+            })}
+            columns={(
+              [
+                {
+                  columnKey: 'tier',
+                  getCellValue: (row) => row.tier,
+                  label: stringGetter({ key: STRING_KEYS.TIER }),
+                  allowsSorting: false,
+                  renderCell: ({ tier }) => (
+                    <Styled.Tier>
+                      <Styled.Output type={OutputType.Text} value={tier} />
+                      {tier === userFeeTier && (
+                        <Styled.YouTag size={TagSize.Medium}>
+                          {stringGetter({ key: STRING_KEYS.YOU })}
+                        </Styled.YouTag>
+                      )}
+                    </Styled.Tier>
+                  ),
+                },
+                {
+                  columnKey: 'volume',
+                  getCellValue: (row) => row.volume,
+                  label: stringGetter({ key: STRING_KEYS.VOLUME_30D }),
+                  allowsSorting: false,
+                  renderCell: ({ symbol, volume, makerShare, totalShare }) => (
+                    <>
+                      <span>{`${
+                        symbol in EQUALITY_SYMBOL_MAP
+                          ? EQUALITY_SYMBOL_MAP[symbol as keyof typeof EQUALITY_SYMBOL_MAP]
+                          : symbol
+                      } `}</span>
+                      <Styled.HighlightOutput type={OutputType.CompactFiat} value={volume} />
+                      {!isNotTablet &&
+                        AdditionalConditions({ totalShare, makerShare, isAdditional: true })}
+                    </>
+                  ),
+                },
+                isNotTablet && {
+                  columnKey: 'condition',
+                  getCellValue: (row) => row.volume,
+                  label: stringGetter({ key: STRING_KEYS.ADDITIONAL_CONDITION }),
+                  allowsSorting: false,
+                  renderCell: ({ totalShare, makerShare }) =>
+                    AdditionalConditions({ totalShare, makerShare }),
+                },
+                {
+                  columnKey: 'maker',
+                  getCellValue: (row) => row.maker,
+                  label: stringGetter({ key: STRING_KEYS.MAKER }),
+                  allowsSorting: false,
+                  renderCell: ({ maker }) => (
+                    <Styled.HighlightOutput
+                      type={OutputType.SmallPercent}
+                      value={maker}
+                      fractionDigits={FEE_DECIMALS}
+                    />
+                  ),
+                },
+                {
+                  columnKey: 'taker',
+                  getCellValue: (row) => row.taker,
+                  label: stringGetter({ key: STRING_KEYS.TAKER }),
+                  allowsSorting: false,
+                  renderCell: ({ taker }) => (
+                    <Styled.HighlightOutput
+                      type={OutputType.SmallPercent}
+                      value={taker}
+                      fractionDigits={FEE_DECIMALS}
+                    />
+                  ),
+                },
+              ] as ColumnDef<FeeTier>[]
+            ).filter(isTruthy)}
+            selectionBehavior="replace"
+            withOuterBorder={isNotTablet}
+            withInnerBorders
+          />
+        </div>
      </Styled.ContentWrapper>
    </AttachedExpandingSection>
  );
@@ -196,43 +198,21 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.ContentWrapper = styled.div`
  ${layoutMixins.flexColumn}
  gap: 1.5rem;
-  max-width: 100vw;
 `;

 Styled.AdditionalConditions = styled.div`
  ${tableMixins.cellContentColumn}
-  justify-content: end;

  color: var(--color-text-0);
-  font: var(--font-small-book);

  > :nth-child(2) {
-    font: var(--font-small-book);
-  }
-`;
-
-Styled.AdditionalConditionsText = styled.span`
-  display: flex;
-  gap: 0.5ch;
-
-  @media ${breakpoints.mobile} {
-    display: inline;
-    max-width: 8rem;
-    min-width: 0;
-
-    output {
-      display: inline;
-    }
+    font: var(--font-base-book);
  }
 `;

 Styled.FeesDetails = styled(Details)`
  gap: 1rem;

-  @media ${breakpoints.notTablet} {
-    margin: 0 1.25rem;
-  }
-
  @media ${breakpoints.tablet} {
    padding: 1rem 1rem 0 1rem;
    --details-grid-numColumns: 1;
@@ -257,7 +237,11 @@ Styled.FeesDetails = styled(Details)`
  }

  output {
-    font: var(--font-base-book);
+    font: var(--font-medium-book);
+
+    @media ${breakpoints.tablet} {
+      font: var(--font-base-book);
+    }
  }
 `;

@@ -287,11 +271,6 @@ Styled.FeeTable = styled(Table)`

  font: var(--font-base-book);

-  @media ${breakpoints.mobile} {
-    --tableCell-padding: 1rem 1.25rem;
-    font: var(--font-small-book);
-  }
-
  tbody tr {
    &[data-yours='true'] {
      background-color: var(--color-layer-3);
@@ -304,10 +283,6 @@ Styled.FeeTable = styled(Table)`

  @media ${breakpoints.notTablet} {
    --tableHeader-backgroundColor: var(--color-layer-1);
-
-    thead tr {
-      --border-width: 0;
-    }
  }
 `;

@@ -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';
@@ -22,6 +22,7 @@ import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton
 import { openDialog } from '@/state/dialogs';
 import { calculateCanAccountTrade } from '@/state/accountCalculators';

+// TODO(@aforaleka): replace with real data
 export const DYDXBalancePanel = () => {
  const dispatch = useDispatch();
  const stringGetter = useStringGetter();
@@ -29,15 +30,14 @@ export const DYDXBalancePanel = () => {
  const { walletType } = useAccounts();
  const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
  const { nativeTokenBalance, nativeStakingBalance } = useAccountBalance();
-  const { chainTokenLabel } = useTokenConfigs();

  return (
-    <Styled.Panel
+    <Panel
      slotHeader={
        <Styled.Header>
          <Styled.Title>
-            <AssetIcon symbol={chainTokenLabel} />
-            {chainTokenLabel}
+            {/* <AssetIcon symbol="DYDX" /> */}
+            Dv4TNT
          </Styled.Title>
          <Styled.ReceiveAndTransferButtons>
            {!canAccountTrade ? (
@@ -106,31 +106,20 @@ export const DYDXBalancePanel = () => {
            {
              key: 'totalBalance',
              label: 'Total balance',
-              value: (
-                <Output
-                  type={OutputType.Asset}
-                  value={nativeTokenBalance.plus(nativeStakingBalance)}
-                  tag={chainTokenLabel}
-                />
-              ),
+              value: <Output type={OutputType.Asset} value={nativeTokenBalance + nativeStakingBalance} tag="Dv4TNT" />,
            },
          ]}
        />
      </Styled.Content>
-    </Styled.Panel>
+    </Panel>
  );
 };

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

-Styled.Panel = styled(Panel)`
-  --panel-paddingX: 1.5rem;
-`;
-
 Styled.Header = styled.div`
  ${layoutMixins.spacedRow}
-  gap: 1rem;
-  padding: 1rem 1.5rem 0;
+  padding: 1.25rem 1.5rem 0.5rem;
 `;

 Styled.Title = styled.h3`
@@ -159,6 +148,7 @@ Styled.ReceiveButton = styled(Button)`
 Styled.Content = styled.div`
  ${layoutMixins.flexColumn}
  gap: 0.75rem;
+  padding: 0 0.5rem 0.5rem;
 `;

 Styled.IconContainer = styled.div`
@@ -182,7 +172,8 @@ Styled.WalletAndStakedBalance = styled(Details)`
  --details-item-backgroundColor: var(--color-layer-6);

  grid-template-columns: 1fr 1fr;
-  gap: 1rem;
+  gap: 0.5rem;
+

  > div {
    gap: 1rem;
@@ -1,224 +0,0 @@
-import styled, { AnyStyledComponent } from 'styled-components';
-import { useSelector } from 'react-redux';
-
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-import { STRING_KEYS } from '@/constants/localization';
-import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons';
-
-import { useAccountBalance, useBreakpoints, useStringGetter } from '@/hooks';
-
-import { layoutMixins } from '@/styles/layoutMixins';
-
-import { Details } from '@/components/Details';
-import { Panel } from '@/components/Panel';
-import { Button } from '@/components/Button';
-import { Link } from '@/components/Link';
-import { IconName, Icon } from '@/components/Icon';
-import { Output, OutputType } from '@/components/Output';
-import { VerticalSeparator } from '@/components/Separator';
-import { Tag } from '@/components/Tag';
-import { WithReceipt } from '@/components/WithReceipt';
-
-import { getSelectedNetwork } from '@/state/appSelectors';
-
-import { MustBigNumber } from '@/lib/numbers';
-
-const TOKEN_MIGRATION_LEARN_MORE_LINK =
-  'https://www.dydx.foundation/blog/update-on-exploring-the-future-of-dydx';
-
-export const MigratePanel = () => {
-  const { isNotTablet } = useBreakpoints();
-  const stringGetter = useStringGetter();
-
-  const selectedNetwork = useSelector(getSelectedNetwork);
-
-  const chainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId);
-
-  // v3 token is only on mainnet
-  const { balance: tokenBalance } = useAccountBalance({
-    addressOrDenom: chainId === 1 ? import.meta.env.VITE_V3_TOKEN_ADDRESS : undefined,
-    chainId: 1,
-    isCosmosChain: false,
-  });
-
-  return isNotTablet ? (
-    <Styled.MigratePanel
-      slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.MIGRATE })}</Styled.Title>}
-      slotRight={
-        <Styled.MigrateAction>
-          <div>
-            <div>{stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })}</div>
-            <Styled.Token type={OutputType.Asset} value={tokenBalance} />
-          </div>
-          {import.meta.env.VITE_TOKEN_MIGRATION_URI && (
-            <Button
-              action={MustBigNumber(tokenBalance).gt(0) ? ButtonAction.Primary : ButtonAction.Base}
-              type={ButtonType.Link}
-              href={import.meta.env.VITE_TOKEN_MIGRATION_URI}
-              slotRight={<Icon iconName={IconName.LinkOut} />}
-            >
-              {stringGetter({ key: STRING_KEYS.MIGRATE_NOW })}
-            </Button>
-          )}
-        </Styled.MigrateAction>
-      }
-    >
-      <Styled.Description>
-        {stringGetter({ key: STRING_KEYS.MIGRATE_DESCRIPTION })}
-        <Link href={TOKEN_MIGRATION_LEARN_MORE_LINK}>
-          {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-        </Link>
-      </Styled.Description>
-    </Styled.MigratePanel>
-  ) : (
-    <Styled.MigratePanel
-      slotHeader={
-        <Styled.MobileMigrateHeader>
-          <h3>
-            <Icon iconName={IconName.Migrate} />
-            {stringGetter({ key: STRING_KEYS.MIGRATE })}
-          </h3>
-          <Styled.VerticalSeparator />
-          <span>
-            {stringGetter({
-              key: STRING_KEYS.FROM_TO,
-              params: { FROM: <b>Ethereum</b>, TO: <b>dYdX Chain</b> },
-            })}
-          </span>
-        </Styled.MobileMigrateHeader>
-      }
-    >
-      <Styled.Column>
-        <Styled.WithReceipt
-          slotReceipt={
-            <Styled.Details
-              items={[
-                {
-                  key: 'available-to-migrate',
-                  label: (
-                    <Styled.InlineRow>
-                      {stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })}
-                      <Tag>DYDX</Tag>
-                    </Styled.InlineRow>
-                  ),
-                  value: <Output type={OutputType.Asset} value={tokenBalance} />,
-                },
-              ]}
-            />
-          }
-        >
-          {import.meta.env.VITE_TOKEN_MIGRATION_URI && (
-            <Button
-              action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
-              size={ButtonSize.Medium}
-              slotRight={<Icon iconName={IconName.LinkOut} />}
-              href={import.meta.env.VITE_TOKEN_MIGRATION_URI}
-            >
-              {stringGetter({ key: STRING_KEYS.MIGRATE_NOW })}
-            </Button>
-          )}
-        </Styled.WithReceipt>
-        <Styled.InlineRow>
-          {stringGetter({ key: STRING_KEYS.WANT_TO_LEARN })}
-          <Link href={TOKEN_MIGRATION_LEARN_MORE_LINK} withIcon>
-            {stringGetter({ key: STRING_KEYS.CLICK_HERE })}
-          </Link>
-        </Styled.InlineRow>
-      </Styled.Column>
-    </Styled.MigratePanel>
-  );
-};
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.MigratePanel = styled(Panel)`
-  --panel-paddingX: 1.5rem;
-  width: 100%;
-`;
-
-Styled.Title = styled.h3`
-  font: var(--font-medium-book);
-  color: var(--color-text-2);
-
-  padding: 1rem 1.5rem 0;
-`;
-
-Styled.MigrateAction = styled.div`
-  ${layoutMixins.flexEqualColumns}
-  align-items: center;
-  margin-right: 1rem;
-  gap: 1rem;
-  padding: 1rem;
-  width: 100%;
-
-  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);
-  color: var(--color-text-2);
-`;
-
-Styled.Description = styled.div`
-  color: var(--color-text-0);
-  --link-color: var(--color-text-1);
-`;
-
-Styled.Column = styled.div`
-  ${layoutMixins.flexColumn}
-  gap: 1rem;
-  align-items: center;
-`;
-
-Styled.MobileMigrateHeader = styled.div`
-  ${layoutMixins.inlineRow}
-  gap: 1ch;
-
-  font: var(--font-small-book);
-  color: var(--color-text-0);
-
-  padding: 1rem 1.5rem 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.VerticalSeparator = styled(VerticalSeparator)`
-  z-index: 1;
-
-  && {
-    height: 1.5rem;
-  }
-`;
-
-Styled.Details = styled(Details)`
-  padding: 0.5rem 1rem;
-`;
-
-Styled.WithReceipt = styled(WithReceipt)`
-  width: 100%;
-`;
-
-Styled.InlineRow = styled.div`
-  ${layoutMixins.inlineRow}
-  color: var(--color-text-0);
-  --link-color: var(--color-text-1);
-`;
@@ -1,74 +1,186 @@
 import styled, { AnyStyledComponent } from 'styled-components';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';

+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 import { STRING_KEYS } from '@/constants/localization';
-import { ButtonAction, ButtonSize } from '@/constants/buttons';
+import { ButtonAction, ButtonSize, ButtonState, ButtonType } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';

-import { useBreakpoints, useStringGetter, useURLConfigs } from '@/hooks';
+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';
-import { MigratePanel } from './MigratePanel';
+
+// 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 { governanceLearnMore, stakingLearnMore } = useURLConfigs();
  const { isTablet, isNotTablet } = useBreakpoints();

-  const panelArrow = (
-    <Styled.Arrow>
-      <Styled.IconButton
-        action={ButtonAction.Base}
-        iconName={IconName.Arrow}
-        size={ButtonSize.Small}
-      />
-    </Styled.Arrow>
-  );
+  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>
-      {import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}
+      {/* {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 && <DYDXBalancePanel />}
+        {isTablet && (
+          <Styled.BalancePanelContainer>
+            <DYDXBalancePanel />
+          </Styled.BalancePanelContainer>
+        )}

        <Styled.Panel
          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
-          slotRight={panelArrow}
          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
        >
-          <Styled.Description>
-            {stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })}
-            <Link href={governanceLearnMore} onClick={(e) => e.stopPropagation()}>
-              {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-            </Link>
-          </Styled.Description>
+          <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>}
-          slotRight={panelArrow}
          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
        >
-          <Styled.Description>
-            {stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })}
-            <Link href={stakingLearnMore} onClick={(e) => e.stopPropagation()}>
-              {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-            </Link>
-          </Styled.Description>
+          <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 && <DYDXBalancePanel />}
+        {isNotTablet && (
+          <Styled.BalancePanelContainer>
+            <DYDXBalancePanel />
+          </Styled.BalancePanelContainer>
+        )}
      </Styled.PanelRow>
    </Styled.Page>
  );
@@ -79,56 +191,143 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Page = styled.div`
  ${layoutMixins.contentContainerPage}
  gap: 1.5rem;
-  padding: 2rem;
-  align-items: center;
-
-  > * {
-    --content-max-width: 70rem;
-    max-width: min(calc(100vw - 4rem), var(--content-max-width));
-  }

  @media ${breakpoints.tablet} {
-    padding: 1.25rem;
-
-    > * {
-      max-width: calc(100vw - 2.5rem);
-      width: 100%;
-    }
+    padding: 1rem;
  }
 `;

 Styled.Panel = styled(Panel)`
-  --panel-paddingX: 1.5rem;
+  padding: 0 1.5rem 1rem;
+
+  @media ${breakpoints.tablet} {
+    max-width: calc(100vw - 2rem);
+  }
 `;

-Styled.Title = styled.h3`
-  font: var(--font-medium-book);
-  color: var(--color-text-2);
-  padding: 1rem 1.5rem 0;
+Styled.Row = styled.div`
+  ${layoutMixins.spacedRow}
+  gap: 1rem;
+
+  align-items: center;
 `;

 Styled.Description = styled.div`
  color: var(--color-text-0);
-  --link-color: var(--color-text-1);
+
+  a {
+    color: var(--color-text-1);
+  }
 `;

-Styled.PanelRow = styled.div`
-  ${layoutMixins.gridEqualColumns}
-  gap: 1.5rem;
+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);
-  --color-border: var(--color-layer-6);
-`;
-
-Styled.Arrow = styled.div`
-  padding: 1rem;
 `;
@@ -227,8 +227,8 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
            },
          ]}
          value={view}
-          onValueChange={setView}
-          onInteraction={() => {
+          onValueChange={(newView: string) => {
+            setView((newView || view) as PanelView);
            setIsOpen?.(true);
          }}
        />
@@ -17,7 +17,7 @@ import { MustBigNumber } from '@/lib/numbers';
 import { MidMarketPrice } from '@/views/MidMarketPrice';

 export const TradeHeaderMobile = () => {
-  const { name, id } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
+  const { name, symbol } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
  const navigate = useNavigate();

  const { market, priceChange24H, priceChange24HPercent } =
@@ -27,7 +27,7 @@ export const TradeHeaderMobile = () => {
    <Styled.Header>
      <BackButton onClick={() => navigate(AppRoute.Markets)} />
      <Styled.MarketName>
-        <Styled.AssetIcon symbol={id} />
+        <Styled.AssetIcon symbol={symbol} />
        <Styled.Name>
          <h3>{name}</h3>
          <span>{market}</span>
@@ -13,6 +13,4 @@ declare global {

    'abacus:connectNetwork': CustomEvent;
  }
-
-  var Intercom: any;
 }
@@ -3,6 +3,7 @@ import { configureStore } from '@reduxjs/toolkit';
 import abacusStateManager from '@/lib/abacus';
 import appMiddleware from './appMiddleware';
 import localizationMiddleware from './localizationMiddleware';
+import routerMiddleware from './routerMiddleware';

 import { accountSlice } from './account';
 import { appSlice } from './app';
@@ -12,6 +13,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 +28,7 @@ export const store = configureStore({
    inputs: inputsSlice.reducer,
    layout: layoutSlice.reducer,
    localization: localizationSlice.reducer,
+    navigation: navigationSlice.reducer,
    perpetuals: perpetualsSlice.reducer,
  },

@@ -35,6 +38,7 @@ export const store = configureStore({
    }),
    appMiddleware,
    localizationMiddleware,
+    routerMiddleware,
  ],

  devTools: process.env.NODE_ENV !== 'production',
@@ -12,7 +12,6 @@ import type {
  SubaccountTransfers,
  HistoricalPnlPeriods,
  SubAccountHistoricalPNLs,
-  UsageRestriction,
 } from '@/constants/abacus';

 import { OnboardingGuard, OnboardingState } from '@/constants/account';
@@ -22,46 +21,34 @@ 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[];
  hasUnseenFillUpdates: boolean;
  hasUnseenOrderUpdates: boolean;
+  historicalPnl?: SubAccountHistoricalPNLs;
  latestOrder?: Nullable<SubaccountOrder>;
-  historicalPnlPeriod?: HistoricalPnlPeriods;
+  onboardingGuards: Record<OnboardingGuard, boolean | undefined>;
+  onboardingState: OnboardingState;
+  subaccount?: Nullable<Subaccount>;
  uncommittedOrderClientIds: number[];
-
-  restriction?: Nullable<UsageRestriction>;
+  wallet?: Nullable<Wallet>;
+  walletType?: WalletType;
+  historicalPnlPeriod?: HistoricalPnlPeriods;
+  balances?: Record<string, AccountBalance>;
+  stakingBalances?: Record<string, AccountBalance>;
 };

 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,
+  hasUnseenFillUpdates: false,
+  hasUnseenOrderUpdates: false,
  historicalPnl: undefined,
-
-  // Onboarding
+  latestOrder: undefined,
  onboardingGuards: {
    [OnboardingGuard.hasAcknowledgedTerms]: Boolean(
      getLocalStorage<boolean>({
@@ -72,17 +59,12 @@ const initialState: AccountState = {
    [OnboardingGuard.hasPreviousTransactions]: undefined,
  },
  onboardingState: OnboardingState.Disconnected,
-
-  // UI
-  clearedOrderIds: undefined,
-  hasUnseenFillUpdates: false,
-  hasUnseenOrderUpdates: false,
-  latestOrder: undefined,
+  subaccount: undefined,
  uncommittedOrderClientIds: [],
-  historicalPnlPeriod: undefined,
-
-  // Restriction
-  restriction: undefined,
+  wallet: undefined,
+  walletType: getLocalStorage<WalletType>({
+    key: LocalStorageKey.OnboardingSelectedWalletType,
+  }),
 };

 export const accountSlice = createSlice({
@@ -142,9 +124,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)
@@ -199,7 +178,6 @@ export const {
  setOnboardingGuard,
  setOnboardingState,
  setHistoricalPnl,
-  setRestrictionType,
  setSubaccount,
  setWallet,
  viewedFills,
@@ -342,13 +342,3 @@ 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,6 +2,7 @@ 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 { getLocalStorage } from '@/lib/localStorage';
@@ -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;
+    }
+  }
+};
@@ -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;
-    }
-  `,
-};
@@ -36,10 +36,11 @@
  --single-unit-height: 9.375rem;

  /* Modal constants */
-  --dialog-small-width: 18.75rem;
-  --dialog-medium-width: 20.5rem;
-  --dialog-large-width: 26.25rem;
-  --dialog-header-height: 4rem;
+  --sidebar-modal-width: 18.75rem;
+  --modal-small-width: 18.75rem;
+  --modal-medium-width: 20.5rem;
+  --modal-large-width: 26.25rem;
+  --modal-header-height: 4rem;

  /* Market Selector constants */
  --marketsDropdown-openWidth: 45rem;
@@ -188,14 +188,13 @@ export const popoverMixins = {
    --item-highlighted-backgroundColor: var(--color-layer-2);
    --item-highlighted-textColor: var(--color-text-2);

-    --item-gap: 0.5em;
    --item-radius: 0px;
    --item-padding: 0.5em 1em;

    display: flex;
    justify-content: space-between;
    align-items: center;
-    gap: var(--item-gap);
+    gap: 0.5em;

    padding: var(--item-padding);
    border-radius: var(--item-radius);
@@ -75,14 +75,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 }))}
@@ -29,7 +29,7 @@ export const MarketFilter = ({
    <>
      {!isSearch && (
        <ToggleGroup
-          items={Object.values(filters).map((value) => ({
+          items={Object.entries(filters).map(([key, value]) => ({
            label: stringGetter({ key: MARKET_FILTER_LABELS[value] }),
            value,
          }))}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5.625 6.1875h6.75m-6.75 2.25H9M1.6875 9.57c0 1.2.84225 2.2455 2.03025 2.4203.84675.1245 1.7025.2197 2.56725.2842.2625.0195.5025.1575.64875.3758L9 15.75l2.0663-3.0997c.0724-.1078.1685-.1977.2809-.2628.1125-.0651.2382-.1038.3678-.113.8589-.0641 1.7152-.1589 2.5672-.2842 1.188-.1748 2.0303-1.2195 2.0303-2.42105v-4.5135c0-1.2015-.8423-2.24625-2.0303-2.421A36.294434 36.294434 0 0 0 9 2.25c-1.794 0-3.558.13125-5.28225.38475-1.188.17475-2.03025 1.22025-2.03025 2.421V9.57Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>