remove wc1

LICENSE

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

README.md

@@ -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.
 
@@ -62,14 +61,7 @@ pnpm ladle
 
 This will automatically open your default browser at `http://localhost:61000`.
 
-## Part 3: Configuring environment
+## Part 3: Deploying with Vercel
-
-Add or modify the relevant endpoints, links and options in `/public/configs/env.json`.
-You'll need to provide a Wallet Connect project id to enable onboarding and wallet connection:
-- Create a project on https://cloud.walletconnect.com/app
-- Copy over the project ID into this [field](https://github.com/dydxprotocol/v4-web/blob/67ecbd75b43e0c264b7b4d2d9b3d969830b0621c/public/configs/env.json#L822C33-L822C46)
-
-## Part 4: Deploying with Vercel
 
 ### Step 1: Connect your repository to Vercel
 
@@ -86,7 +78,7 @@ If you wish to incorporate analytics via Amplitude and Bugsnag, you can use our
 
 For more details, check out Vercel's [official documentation](https://vercel.com/docs).
 
-## Part 5: Deploying to IPFS
+## Part 4: Deploying to IPFS
 
 ### web3.storage: deploy to IPFS via web3.storage using the provided script
 

package.json

@@ -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": "^0.7.6",
+    "@dydxprotocol/v4-abacus": "^0.6.4",
-    "@dydxprotocol/v4-client-js": "^0.40.3",
+    "@dydxprotocol/v4-client-js": "^0.36.1",
-    "@dydxprotocol/v4-localization": "^0.1.32",
+    "@dydxprotocol/v4-localization": "^0.1.24",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-collapsible": "^1.0.3",

pnpm-lock.yaml

@@ -27,14 +27,14 @@ dependencies:
     specifier: ^0.31.0
     version: 0.31.0
   '@dydxprotocol/v4-abacus':
-    specifier: ^0.7.6
+    specifier: ^0.6.4
-    version: 0.7.6
+    version: 0.6.4
   '@dydxprotocol/v4-client-js':
-    specifier: ^0.40.3
+    specifier: ^0.36.1
-    version: 0.40.3
+    version: 0.36.1
   '@dydxprotocol/v4-localization':
-    specifier: ^0.1.32
+    specifier: ^0.1.24
-    version: 0.1.32
+    version: 0.1.24
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -645,7 +645,7 @@ packages:
   /@confio/ics23@0.6.8:
     resolution: {integrity: sha512-wB6uo+3A50m0sW/EWcU64xpV/8wShZ6bMTa7pF8eYsTrSkQA7oLUIJcs/wb8g4y2Oyq701BaGiO6n/ak5WXO1w==}
     dependencies:
-      '@noble/hashes': 1.3.2
+      '@noble/hashes': 1.3.1
       protobufjs: 6.11.4
     dev: false
 
@@ -717,7 +717,7 @@ packages:
       '@cosmjs/encoding': 0.30.1
       '@cosmjs/math': 0.30.1
       '@cosmjs/utils': 0.30.1
-      '@noble/hashes': 1.3.2
+      '@noble/hashes': 1.3.1
       bn.js: 5.2.1
       elliptic: 6.5.4
       libsodium-wrappers: 0.7.11
@@ -979,12 +979,12 @@ packages:
     resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
     dev: true
 
-  /@dydxprotocol/v4-abacus@0.7.6:
+  /@dydxprotocol/v4-abacus@0.6.4:
-    resolution: {integrity: sha512-FdDXRaFMfxhyrJJs0dNrb1KG6X95lPHelua1yCn/SVgzwGaAqlJczrzmdh98INntuRAgIxOu69R5mCGyekumyg==}
+    resolution: {integrity: sha512-eH+/9Q/OnQtwzBwM1BJyXybFPdivGmFQWrxM71MFWGs6uIQGbZX775mpoa8deweSTyQ/QrRLRQ1mP2BPDgBQYg==}
     dev: false
 
-  /@dydxprotocol/v4-client-js@0.40.3:
+  /@dydxprotocol/v4-client-js@0.36.1:
-    resolution: {integrity: sha512-nMQd6tYisKDKIbfx0BGJSYEOSt+I+t5SsaBSmlgTdso+w2rCRO9vyxS+u6MF9h4w5FsVRfhHo3e6uTWX48WpGQ==}
+    resolution: {integrity: sha512-KJ3MtWI61wmm+xZtXQd7/hYKIoVFG32TRdyyVaXXO8vpW9Oqd0JD8QSM/wuegkciAh5YmP/BrDzYuu77zHO6yg==}
     dependencies:
       '@cosmjs/amino': 0.30.1
       '@cosmjs/encoding': 0.31.1
@@ -993,15 +993,14 @@ packages:
       '@cosmjs/stargate': 0.30.1
       '@cosmjs/tendermint-rpc': 0.30.1
       '@cosmjs/utils': 0.31.1
-      '@dydxprotocol/v4-proto': 0.4.1
+      '@dydxprotocol/v4-proto': 0.2.1
       '@osmonauts/lcd': 0.6.0
-      '@scure/bip32': 1.3.2
+      '@scure/bip32': 1.3.1
       '@scure/bip39': 1.2.1
       axios: 1.1.3
       bech32: 1.1.4
       bignumber.js: 9.1.1
       ethereum-cryptography: 2.1.2
-      ethers: 6.6.1
       long: 4.0.0
       protobufjs: 6.11.4
       ws: 8.13.0(bufferutil@4.0.7)(utf-8-validate@5.0.10)
@@ -1011,12 +1010,12 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@0.1.32:
+  /@dydxprotocol/v4-localization@0.1.24:
-    resolution: {integrity: sha512-ZtXScxgFLjUt0Ag52RyFnQe9aEl1Aky5fp+vMGOBduVkFiCEMRMkSsSgg6grMdyw/x0AbnxOTRkhYoX2MsK9Ow==}
+    resolution: {integrity: sha512-zSiu8+/6BWNWZXxe73zUp/UjuLG1Cp5UuhXKtbATqqkeZyVCs01QxbBCTs1MLfgsLh02IrfhXCPHvXnzZyReEw==}
     dev: false
 
-  /@dydxprotocol/v4-proto@0.4.1:
+  /@dydxprotocol/v4-proto@0.2.1:
-    resolution: {integrity: sha512-2pBkokufWcxfIpiXE6QuQOBXUe154OTp6ojCIdOPW9TFLxzchoygxXnb5dL6rAQVNj9Qbg+hhXBllutt4m99dw==}
+    resolution: {integrity: sha512-Q5b/g331DoyMjBpO2/jtrxUX3WF5UaIKZp/unK332xuefHNFnkMYtZ05p0V71iSdO35tBdz8yt0VYP2WtUsp+w==}
     dependencies:
       protobufjs: 6.11.4
     dev: false
@@ -4709,8 +4708,8 @@ packages:
     resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==}
     dependencies:
       '@noble/curves': 1.1.0
-      '@noble/hashes': 1.3.2
+      '@noble/hashes': 1.3.1
-      '@scure/base': 1.1.3
+      '@scure/base': 1.1.1
     dev: false
 
   /@scure/bip32@1.3.2:
@@ -4732,7 +4731,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:
@@ -4746,8 +4745,8 @@ packages:
     resolution: {integrity: sha512-up5VG1dK+GPhykmuMIozJZBbVqpm77vbOG6/r5dS7NBGZonwHfTLdBbsYc3rjmaQ4DpCXUa3tUc4RZHRORvZrw==}
     dependencies:
       '@babel/runtime': 7.22.10
-      '@noble/curves': 1.2.0
+      '@noble/curves': 1.1.0
-      '@noble/hashes': 1.3.2
+      '@noble/hashes': 1.3.1
       '@solana/buffer-layout': 4.0.1
       agentkeepalive: 4.5.0
       bigint-buffer: 1.1.5
@@ -7145,7 +7144,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:

public/configs/env.json

@@ -35,36 +35,32 @@
          "name": "v4 Dev",
          "ethereumChainId": "5",
          "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
-               "name": "Dv4TNT",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://indexer.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",
@@ -79,6 +75,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -95,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",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -121,7 +116,7 @@
                }
             ],
             "validators": [
-               "http://54.92.118.111"
+               "http://35.75.227.118"
             ],
             "0xsquid": "https://testnet.api.0xsquid.com"
          },
@@ -138,6 +133,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -154,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",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -197,6 +191,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -213,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",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -256,6 +249,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -272,21 +268,17 @@
          "name": "v4 Staging",
          "ethereumChainId": "5",
          "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
-               "name": "Dv4TNT",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -310,8 +302,7 @@
             "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",
+            "blogs": "https://www.dydx.foundation/blog"
-            "help": "https://help.dydx.exchange"
          },
          "wallets": {
             "walletconnect": {
@@ -320,6 +311,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -336,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",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -374,8 +364,7 @@
             "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",
+            "blogs": "https://www.dydx.foundation/blog"
-            "help": "https://help.dydx.exchange"
          },
          "wallets": {
             "walletconnect": {
@@ -384,6 +373,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -399,22 +391,18 @@
       "dydxprotocol-testnet": {
          "name": "v4 Public Testnet",
          "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
+         "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
-               "name": "Dv4TNT",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -449,6 +437,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -457,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",
+         "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
-               "name": "Dv4TNT",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -513,6 +500,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -521,29 +511,25 @@
                "callbackUrl": "/walletsegue"
             },
             "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
             "signTypedDataDomainName": "dYdX V4"
          }
       },
       "dydxprotocol-testnet-dsrv": {
          "name": "v4 Public Testnet/DSRV",
          "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
+         "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
-               "name": "Dv4TNT",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -577,6 +563,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -585,29 +574,25 @@
                "callbackUrl": "/walletsegue"
             },
             "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataAction": "dYdX V4 Onboarding",
             "signTypedDataDomainName": "dYdX V4"
          }
       },
       "dydxprotocol-testnet-nodefleet": {
          "name": "v4 Public Testnet/nodefleet",
          "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
+         "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
-               "name": "Dv4TNT",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -641,6 +626,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -649,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",
+         "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
-               "name": "Dv4TNT",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -705,6 +689,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -713,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",
+         "dydxChainId": "dydx-testnet-3",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
          "isMainNet": false,
          "tokens": {
             "chain": {
-               "name": "Dv4TNT",
+               "name": "DYDX",
-               "denom": "adv4tnt",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -769,6 +752,9 @@
                   "description": "dYdX v4 App",
                   "iconUrl": "/logos/dydx-x.png"
                },
+               "v1": {
+                  "bridgeUrl": "wss://api.stage.dydx.exchange/wc/"
+               },
                "v2": {
                   "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
                }
@@ -777,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",
+               "name": "DYDX",
-               "denom": "tokenDenom",
+               "denom": "dv4tnt",
-               "decimals": 18,
                "image": "/currencies/dydx.png"
             },
             "usdc": {
                "name": "USDC",
                "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
                "gasDenom": "uusdc",
-               "decimals": 6,
                "image": "/currencies/usdc.png"
             }
          },
@@ -824,8 +806,7 @@
             "documentation": "[HTTP link to documentation, can be null]",
             "community": "[HTTP link to community, can be null]",
             "feedback": "[HTTP link to feedback form, can be null]",
-            "blogs": "[HTTP link to blogs, can be null]",
+            "blogs": "[HTTP link to blogs, can be null]"
-            "help": "[HTTP link to help page, can be null]"
          },
          "wallets": {
             "walletconnect": {
@@ -834,6 +815,9 @@
                   "description": "[Description of the app]",
                   "iconUrl": "[Relative URL of the icon URL]"
                },
+               "v1": {
+                  "bridgeUrl": "[Bridge URL]"
+               },
                "v2": {
                   "projectId": "[Project ID]"
                }
@@ -847,4 +831,4 @@
          }
       }
    }
-}
+}

public/configs/wallets.json

@@ -1,464 +1,474 @@
 [
   {
-    "id": "c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96",
+     "id":"c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96",
-    "name": "MetaMask",
+     "name":"MetaMask",
-    "description": "",
+     "description":"",
-    "homepage": "https://metamask.io/",
+     "homepage":"https://metamask.io/",
-    "chains": [
+     "chains":[
-      "eip155:1",
+        "eip155:1",
-      "eip155:42161",
+        "eip155:42161",
-      "eip155:43114"
+        "eip155:43114"
-    ],
+     ],
-    "versions": [
+     "versions":[
-      "1"
+        "1"
-    ],
+     ],
-    "app": {
+     "app":{
-      "browser": "",
+        "browser":"",
-      "ios": "https://apps.apple.com/us/app/metamask/id1438144202",
+        "ios":"https://apps.apple.com/us/app/metamask/id1438144202",
-      "android": "https://play.google.com/store/apps/details?id=io.metamask",
+        "android":"https://play.google.com/store/apps/details?id=io.metamask",
-      "mac": "",
+        "mac":"",
-      "windows": "",
+        "windows":"",
-      "linux": ""
+        "linux":""
-    },
+     },
-    "mobile": {
+     "mobile":{
-      "native": "metamask:",
+        "native":"metamask:",
-      "universal": "https://metamask.app.link"
+        "universal":"https://metamask.app.link"
-    },
+     },
-    "desktop": {
+     "desktop":{
-      "native": "",
+        "native":"",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "metadata": {
+     "metadata":{
-      "shortName": "MetaMask",
+        "shortName":"MetaMask",
-      "colors": {
+        "colors":{
-        "primary": "rgb(255, 255, 255)",
+           "primary":"rgb(255, 255, 255)",
-        "secondary": ""
+           "secondary":""
-      }
-    },
-    "config": {
-      "comment": "MetaMask",
-      "iosMinVersion": "0",
-      "imageUrl": "",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "metamask:",
-          "universal": "https://metamask.app.link"
         }
-      ],
+     },
-      "methods": [
+     "config":{
-        "eth_sendTransaction",
+        "comment":"MetaMask",
-        "personal_sign",
+        "iosMinVersion":"0",
-        "eth_signTypedData",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/metamask.png",
-        "wallet_addEthereumChain"
+        "image":"metamask.png",
-      ]
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
-    },
+        "connections":[
-    "userFields": {
+           {
-      "analyticEvent": "METAMASK",
+              "type":"walletConnectV2",
-      "imageName": "metamask.png"
+              "native":"metamask:",
-    }
+              "universal":"https://metamask.app.link"
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"METAMASK"
+     }
   },
   {
-    "id": "coinbase-wallet",
+     "id":"coinbase-wallet",
-    "name": "Coinbase Wallet",
+     "name":"Coinbase Wallet",
-    "description": "",
+     "description":"",
-    "homepage": "https://www.coinbase.com/wallet",
+     "homepage":"https://www.coinbase.com/wallet",
-    "chains": [
+     "chains":[
-      "eip155:1"
+        "eip155:1"
-    ],
+     ],
-    "versions": [
+     "versions":[
-      "1"
+        "1"
-    ],
+     ],
-    "app": {
+     "app":{
-      "browser": "",
+        "browser":"",
-      "ios": "https://apps.apple.com/us/app/coinbase-wallet-nfts-crypto/id1278383455",
+        "ios":"https://apps.apple.com/us/app/coinbase-wallet-nfts-crypto/id1278383455",
-      "android": "https://play.google.com/store/apps/details?id=org.toshi",
+        "android":"https://play.google.com/store/apps/details?id=org.toshi",
-      "mac": "",
+        "mac":"",
-      "windows": "",
+        "windows":"",
-      "linux": ""
+        "linux":""
-    },
+     },
-    "mobile": {
+     "mobile":{
-      "native": "cbwallet:",
+        "native":"cbwallet:",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "desktop": {
+     "desktop":{
-      "native": "",
+        "native":"",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "metadata": {
+     "metadata":{
-      "shortName": "Coinbase",
+        "shortName":"Coinbase",
-      "colors": {
+        "colors":{
-        "primary": "rgb(255, 255, 255)",
+           "primary":"rgb(255, 255, 255)",
-        "secondary": ""
+           "secondary":""
-      }
-    },
-    "config": {
-      "comment": "Coinbase",
-      "iosMinVersion": "1.8.0",
-      "imageUrl": "",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "connections": [
-        {
-          "type": "walletSegue",
-          "native": "cbwallet:",
-          "universal": ""
         }
-      ],
+     },
-      "methods": [
+     "config":{
-        "eth_sendTransaction",
+        "comment":"Coinbase",
-        "personal_sign",
+        "iosMinVersion":"1.8.0",
-        "eth_signTypedData",
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/coinbase-wallet.png",
-        "wallet_addEthereumChain"
+        "image":"coinbase-wallet.png",
-      ]
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
-    },
+        "connections":[
-    "userFields": {
+           {
-      "analyticEvent": "COINBASE_WALLET",
+              "type":"walletSegue",
-      "imageName": "coinbase-wallet.png"
+              "native":"cbwallet:",
-    }
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"COINBASE_WALLET"
+     }
   },
   {
-    "id": "9d373b43ad4d2cf190fb1a774ec964a1addf406d6fd24af94ab7596e58c291b2",
+     "id":"9d373b43ad4d2cf190fb1a774ec964a1addf406d6fd24af94ab7596e58c291b2",
-    "name": "imToken",
+     "name":"imToken",
-    "description": "",
+     "description":"",
-    "homepage": "https://token.im/",
+     "homepage":"https://token.im/",
-    "chains": [
+     "chains":[
-      "eip155:1"
+        "eip155:1"
-    ],
+     ],
-    "versions": [
+     "versions":[
-      "1"
+        "1"
-    ],
+     ],
-    "app": {
+     "app":{
-      "browser": "",
+        "browser":"",
-      "ios": "https://itunes.apple.com/us/app/imtoken2/id1384798940",
+        "ios":"https://itunes.apple.com/us/app/imtoken2/id1384798940",
-      "android": "https://play.google.com/store/apps/details?id=im.token.app",
+        "android":"https://play.google.com/store/apps/details?id=im.token.app",
-      "mac": "",
+        "mac":"",
-      "windows": "",
+        "windows":"",
-      "linux": ""
+        "linux":""
-    },
+     },
-    "mobile": {
+     "mobile":{
-      "native": "imtokenv2:",
+        "native":"imtokenv2:",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "desktop": {
+     "desktop":{
-      "native": "",
+        "native":"",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "metadata": {
+     "metadata":{
-      "shortName": "imToken",
+        "shortName":"imToken",
-      "colors": {
+        "colors":{
-        "primary": "rgb(255, 255, 255)",
+           "primary":"rgb(255, 255, 255)",
-        "secondary": ""
+           "secondary":""
-      }
-    },
-    "config": {
-      "comment": "imToken",
-      "iosMinVersion": "0",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "imtokenv2:",
-          "universal": ""
         }
-      ],
+     },
-      "methods": [
+     "config":{
-        "eth_sendTransaction",
+        "comment":"imToken",
-        "personal_sign",
+        "iosMinVersion":"0",
-        "eth_signTypedData"
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/imtoken.png",
-      ]
+        "image":"imtoken.png",
-    },
+        "connections":[
-    "userFields": {
+           {
-      "analyticEvent": "IMTOKEN",
+              "type":"walletConnect",
-      "imageName": "imtoken.png"
+              "native":"imtokenv2:",
-    }
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"IMTOKEN"
+     }
   },
   {
-    "id": "4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0",
+     "id":"4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0",
-    "name": "Trust Wallet",
+     "name":"Trust Wallet",
-    "description": "",
+     "description":"",
-    "homepage": "https://trustwallet.com/",
+     "homepage":"https://trustwallet.com/",
-    "chains": [
+     "chains":[
-      "eip155:1",
+        "eip155:1",
-      "eip155:42161",
+        "eip155:42161",
-      "eip155:43114"
+        "eip155:43114"
-    ],
+     ],
-    "versions": [
+     "versions":[
-      "1"
+        "1"
-    ],
+     ],
-    "app": {
+     "app":{
-      "browser": "",
+        "browser":"",
-      "ios": "https://apps.apple.com/app/apple-store/id1288339409",
+        "ios":"https://apps.apple.com/app/apple-store/id1288339409",
-      "android": "https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp",
+        "android":"https://play.google.com/store/apps/details?id=com.wallet.crypto.trustapp",
-      "mac": "",
+        "mac":"",
-      "windows": "",
+        "windows":"",
-      "linux": ""
+        "linux":""
-    },
+     },
-    "mobile": {
+     "mobile":{
-      "native": "trust:",
+        "native":"trust:",
-      "universal": "https://link.trustwallet.com"
+        "universal":"https://link.trustwallet.com"
-    },
+     },
-    "desktop": {
+     "desktop":{
-      "native": "",
+        "native":"",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "metadata": {
+     "metadata":{
-      "shortName": "Trust",
+        "shortName":"Trust",
-      "colors": {
+        "colors":{
-        "primary": "rgb(51, 117, 187)",
+           "primary":"rgb(51, 117, 187)",
-        "secondary": ""
+           "secondary":""
-      }
-    },
-    "config": {
-      "comment": "Trust Wallet",
-      "iosMinVersion": "0",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "trust:",
-          "universal": "https://link.trustwallet.com"
         }
-      ],
+     },
-      "methods": [
+     "config":{
-        "eth_sendTransaction",
+        "comment":"Trust Wallet",
-        "personal_sign",
+        "iosMinVersion":"0",
-        "eth_signTypedData"
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
-      ]
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/trust-wallet.png",
-    },
+        "image":"trust-wallet.png",
-    "userFields": {
+        "connections":[
-      "analyticEvent": "TRUST_WALLET",
+           {
-      "imageName": "trust-wallet.png"
+              "type":"walletConnectV2",
-    }
+              "native":"trust:",
+              "universal":"https://link.trustwallet.com"
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"TRUST_WALLET"
+     }
   },
   {
-    "id": "Zerion",
+     "id":"Zerion",
-    "name": "Zerion",
+     "name":"Zerion",
-    "description": "",
+     "description":"",
-    "homepage": "https://zerion.io/",
+     "homepage":"https://zerion.io/",
-    "chains": [
+     "chains":[
-      "eip155:1"
+        "eip155:1"
-    ],
+     ],
-    "versions": [
+     "versions":[
-      "1"
+        "1"
-    ],
+     ],
-    "app": {
+     "app":{
-      "browser": "",
+        "browser":"",
-      "ios": "https://apps.apple.com/app/apple-store/id1456732565",
+        "ios":"https://apps.apple.com/app/apple-store/id1456732565",
-      "android": "https://play.google.com/store/apps/details?id=io.zerion.android",
+        "android":"https://play.google.com/store/apps/details?id=io.zerion.android",
-      "mac": "",
+        "mac":"",
-      "windows": "",
+        "windows":"",
-      "linux": ""
+        "linux":""
-    },
+     },
-    "mobile": {
+     "mobile":{
-      "native": "zerion:",
+        "native":"zerion:",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "desktop": {
+     "desktop":{
-      "native": "",
+        "native":"",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "metadata": {
+     "metadata":{
-      "shortName": "Zerion",
+        "shortName":"Zerion",
-      "colors": {
+        "colors":{
-        "primary": "rgb(51, 117, 187)",
+           "primary":"rgb(51, 117, 187)",
-        "secondary": ""
+           "secondary":""
-      }
-    },
-    "config": {
-      "comment": "Zerion Wallet",
-      "iosMinVersion": "0",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "zerion:",
-          "universal": ""
         }
-      ],
+     },
-      "methods": [
+     "config":{
-        "eth_sendTransaction",
+        "comment":"Zerion Wallet",
-        "personal_sign",
+        "iosMinVersion":"0",
-        "eth_signTypedData"
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
-      ]
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/zerion.png",
-    },
+        "image":"zerion.png",
-    "userFields": {
+        "connections":[
-      "analyticEvent": "ZERION",
+           {
-      "imageName": "zerion.png"
+              "type":"walletConnectV2",
-    }
+              "native":"zerion:",
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"ZERION"
+     }
   },
   {
-    "id": "20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66",
+     "id":"20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66",
-    "name": "TokenPocket",
+     "name":"TokenPocket",
-    "description": "",
+     "description":"",
-    "homepage": "https://tokenpocket.pro/",
+     "homepage":"https://tokenpocket.pro/",
-    "chains": [
+     "chains":[
-      "eip155:1"
+        "eip155:1"
-    ],
+     ],
-    "versions": [
+     "versions":[
-      "1"
+        "1"
-    ],
+     ],
-    "app": {
+     "app":{
-      "browser": "",
+        "browser":"",
-      "ios": "https://apps.apple.com/us/app/tokenpocket-trusted-wallet/id1436028697",
+        "ios":"https://apps.apple.com/us/app/tokenpocket-trusted-wallet/id1436028697",
-      "android": "https://play.google.com/store/apps/details?id=vip.mytokenpocket",
+        "android":"https://play.google.com/store/apps/details?id=vip.mytokenpocket",
-      "mac": "",
+        "mac":"",
-      "windows": "",
+        "windows":"",
-      "linux": ""
+        "linux":""
-    },
+     },
-    "mobile": {
+     "mobile":{
-      "native": "tpoutside:",
+        "native":"tpoutside:",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "desktop": {
+     "desktop":{
-      "native": "",
+        "native":"",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "metadata": {
+     "metadata":{
-      "shortName": "TokenPocket",
+        "shortName":"TokenPocket",
-      "colors": {
+        "colors":{
-        "primary": "rgb(41, 128, 254)",
+           "primary":"rgb(41, 128, 254)",
-        "secondary": ""
+           "secondary":""
-      }
-    },
-    "config": {
-      "comment": "TokenPocket",
-      "iosMinVersion": "0",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "tpoutside:",
-          "universal": ""
         }
-      ],
+     },
-      "methods": [
+     "config":{
-        "eth_sendTransaction",
+        "comment":"TokenPocket",
-        "personal_sign",
+        "iosMinVersion":"0",
-        "eth_signTypedData"
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/tokenpocket.png",
-      ]
+        "image":"tokenpocket.png",
-    },
+        "connections":[
-    "userFields": {
+           {
-      "analyticEvent": "TOKEN_POCKET",
+              "type":"walletConnect",
-      "imageName": "tokenpocket.png"
+              "native":"tpoutside:",
-    }
+              "universal":""
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"TOKEN_POCKET"
+     }
   },
   {
-    "id": "1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369",
+     "id":"1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369",
-    "name": "Rainbow",
+     "name":"Rainbow",
-    "description": "",
+     "description":"",
-    "homepage": "https://rainbow.me/",
+     "homepage":"https://rainbow.me/",
-    "chains": [
+     "chains":[
-      "eip155:1"
+        "eip155:1"
-    ],
+     ],
-    "versions": [
+     "versions":[
-      "1"
+        "1"
-    ],
+     ],
-    "app": {
+     "app":{
-      "browser": "",
+        "browser":"",
-      "ios": "https://apps.apple.com/us/app/rainbow-ethereum-wallet/id1457119021",
+        "ios":"https://apps.apple.com/us/app/rainbow-ethereum-wallet/id1457119021",
-      "android": "",
+        "android":"",
-      "mac": "",
+        "mac":"",
-      "windows": "",
+        "windows":"",
-      "linux": ""
+        "linux":""
-    },
+     },
-    "mobile": {
+     "mobile":{
-      "native": "rainbow:",
+        "native":"rainbow:",
-      "universal": "https://rnbwapp.com"
+        "universal":"https://rnbwapp.com"
-    },
+     },
-    "desktop": {
+     "desktop":{
-      "native": "",
+        "native":"",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "metadata": {
+     "metadata":{
-      "shortName": "Rainbow",
+        "shortName":"Rainbow",
-      "colors": {
+        "colors":{
-        "primary": "rgb(0, 30, 89)",
+           "primary":"rgb(0, 30, 89)",
-        "secondary": ""
+           "secondary":""
-      }
-    },
-    "config": {
-      "comment": "Rainbow",
-      "iosMinVersion": "0",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "backlinked": true,
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "rainbow:",
-          "universal": "https://rnbwapp.com"
         }
-      ],
+     },
-      "methods": [
+     "config":{
-        "eth_sendTransaction",
+        "comment":"Rainbow",
-        "personal_sign",
+        "iosMinVersion":"0",
-        "eth_signTypedData"
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
-      ]
+        "backlinked":true,
-    },
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/rainbow-wallet.png",
-    "userFields": {
+        "image":"rainbow-wallet.png",
-      "analyticEvent": "RAINBOW_WALLET",
+        "connections":[
-      "imageName": "rainbow-wallet.png"
+           {
-    }
+              "type":"walletConnectV2",
+              "native":"rainbow:",
+              "universal":"https://rnbwapp.com"
+           }
+        ]
+     },
+     "userFields":{
+        "analyticEvent":"RAINBOW_WALLET"
+     }
   },
   {
-    "id": "09102e7bbbd3f92001eda104abe23803181629f695e8f1b95af96d88ff7d5890",
+     "id":"09102e7bbbd3f92001eda104abe23803181629f695e8f1b95af96d88ff7d5890",
-    "name": "1inch Wallet",
+     "name":"1inch Wallet",
-    "description": "",
+     "description":"",
-    "homepage": "https://1inch.io/wallet/",
+     "homepage":"https://1inch.io/wallet/",
-    "chains": [
+     "chains":[
-      "eip155:1",
+        "eip155:1",
-      "eip155:56"
+        "eip155:56"
-    ],
+     ],
-    "versions": [
+     "versions":[
-      "1"
+        "1"
-    ],
+     ],
-    "app": {
+     "app":{
-      "browser": "",
+        "browser":"",
-      "ios": "https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391",
+        "ios":"https://apps.apple.com/us/app/1inch-defi-wallet/id1546049391",
-      "android": "",
+        "android":"",
-      "mac": "",
+        "mac":"",
-      "windows": "",
+        "windows":"",
-      "linux": ""
+        "linux":""
-    },
+     },
-    "mobile": {
+     "mobile":{
-      "native": "oneinch:",
+        "native":"oneinch:",
-      "universal": "https://wallet.1inch.io"
+        "universal":"https://wallet.1inch.io"
-    },
+     },
-    "desktop": {
+     "desktop":{
-      "native": "",
+        "native":"",
-      "universal": ""
+        "universal":""
-    },
+     },
-    "metadata": {
+     "metadata":{
-      "shortName": "1inch",
+        "shortName":"1inch",
-      "colors": {
+        "colors":{
-        "primary": "rgb(31, 36, 46)",
+           "primary":"rgb(31, 36, 46)",
-        "secondary": ""
+           "secondary":""
-      }
-    },
-    "config": {
-      "comment": "1inch",
-      "iosMinVersion": "0",
-      "encoding": "=\"#%/<>?@\\^`{|}:&",
-      "imageUrl": "",
-      "connections": [
-        {
-          "type": "walletConnectV2",
-          "native": "oneinch:",
-          "universal": "https://wallet.1inch.io"
         }
-      ],
+     },
-      "methods": [
+     "config":{
-        "eth_sendTransaction",
+        "comment":"1inch",
-        "personal_sign",
+        "iosMinVersion":"0",
-        "eth_signTypedData"
+        "encoding":"=\"#%/<>?@\\^`{|}:&",
-      ]
+        "imageUrl":"https://v4.testnet.dydx.exchange/wallets/1inch.png",
-    },
+        "image":"1inch.png",
-    "userFields": {
+        "connections":[
-      "analyticEvent": "1INCH",
+           {
-      "imageName": "1inch.png"
+              "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"
+     }
   }
-]
+]

scripts/inject-intercom.js

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

src/App.tsx

@@ -7,20 +7,13 @@ import { GrazProvider } from 'graz';
 
 import { AppRoute, DEFAULT_TRADE_ROUTE } from '@/constants/routes';
 
-import {
+import { useBreakpoints, useInitializePage, useShouldShowFooter, useAnalytics } from '@/hooks';
-  useBreakpoints,
-  useTokenConfigs,
-  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),

src/components/ComboboxDialogMenu.tsx

@@ -3,43 +3,31 @@ import styled, { AnyStyledComponent } from 'styled-components';
 
 import { type MenuConfig } from '@/constants/menus';
 
-import { Dialog, DialogPlacement, type DialogProps } from '@/components/Dialog';
+import { Dialog, DialogPlacement } from '@/components/Dialog';
-import { ComboboxMenu, type ComboboxMenuProps } from '@/components/ComboboxMenu';
+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<
+export const ComboboxDialogMenu = <MenuItemValue extends string | number, MenuGroupValue extends string | number>({
-  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'
->;
-
-export const ComboboxDialogMenu = <
-  MenuItemValue extends string | number,
-  MenuGroupValue extends string | number
->({
   isOpen = false,
   setIsOpen,
   title,
@@ -52,16 +40,11 @@ export const ComboboxDialogMenu = <
   onItemSelected,
   inputPlaceholder,
   slotEmpty,
-  withSearch,
-  withStickyLayout = true,
   children,
-
+  
   placement = DialogPlacement.Default,
   className,
-}: ElementProps<MenuItemValue, MenuGroupValue> &
+}: ElementProps<MenuItemValue, MenuGroupValue> & StyleProps) => (
-  PickComboxMenuProps<MenuItemValue, MenuGroupValue> &
-  PickDialogProps &
-  StyleProps) => (
   // TODO: sub-menu state management
   <Styled.Dialog
     isOpen={isOpen}
@@ -71,6 +54,7 @@ export const ComboboxDialogMenu = <
     slotHeaderInner={slotHeaderInner}
     slotTrigger={slotTrigger}
     slotFooter={slotFooter}
+
     placement={placement}
     className={className}
   >
@@ -80,8 +64,7 @@ export const ComboboxDialogMenu = <
       title={title}
       inputPlaceholder={inputPlaceholder}
       slotEmpty={slotEmpty}
-      withSearch={withSearch}
+      withStickyLayout
-      withStickyLayout={withStickyLayout}
     />
     {children}
   </Styled.Dialog>
@@ -115,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);
 `;

src/components/ComboboxMenu.tsx

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

src/components/Dialog.tsx

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

src/components/Icon.tsx

@@ -6,14 +6,11 @@ import {
   AddressConnectorIcon,
   ArrowIcon,
   Bar3Icon,
-  BellIcon,
-  BellStrokeIcon,
   BoxCloseIcon,
   CalculatorIcon,
   CaretIcon,
   CautionCircleStrokeIcon,
   CautionCircleIcon,
-  ChatIcon,
   CheckIcon,
   ChevronLeftIcon,
   ChevronRightIcon,
@@ -74,14 +71,11 @@ 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',
@@ -143,14 +137,11 @@ 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,
@@ -222,8 +213,7 @@ export const Icon = styled(
     iconComponent: Component = iconName && icons[iconName],
     className,
     ...props
-  }: ElementProps & StyleProps) =>
+  }: ElementProps & StyleProps) => (Component ? <Component className={className} {...props} /> : null)
-    Component ? <Component className={className} {...props} /> : null
 )`
   width: 1em;
   height: 1em;

src/components/Input.tsx

@@ -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)`

src/constants/abacus.ts

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

src/constants/account.ts

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

src/constants/dialogs.ts

@@ -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',

src/constants/localStorage.ts

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

src/constants/menus.ts

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

src/constants/routes.ts

@@ -7,8 +7,7 @@ export enum AppRoute {
   Profile = '/profile',
   Alerts = '/alerts',
   Settings = '/settings',
-  Terms = '/terms',
+  Rewards = '/DV4TNT',
-  Privacy = '/privacy',
 }
 
 export enum PortfolioRoute {

src/constants/wallets.ts

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

src/hooks/index.ts

@@ -1,6 +1,5 @@
 import { useApiState } from './useApiState';
 import { useBreakpoints } from './useBreakpoints';
-import { useTokenConfigs } from './useTokenConfigs';
 import { useCommandMenu } from './useCommandMenu';
 import { useCurrentMarketId } from './useCurrentMarketId';
 import { useDebounce } from './useDebounce';
@@ -17,7 +16,6 @@ import { useLocalStorage } from './useLocalStorage';
 import { useNow } from './useNow';
 import { useOnClickOutside } from './useOnClickOutside';
 import { usePageTitlePriceUpdates } from './usePageTitlePriceUpdates';
-import { useRestrictions } from './useRestrictions';
 import { useShouldShowFooter } from './useShouldShowFooter';
 import { useSelectedNetwork } from './useSelectedNetwork';
 import { useStringGetter } from './useStringGetter';
@@ -26,7 +24,6 @@ import { useSubaccount } from './useSubaccount';
 export {
   useApiState,
   useBreakpoints,
-  useTokenConfigs,
   useCommandMenu,
   useCurrentMarketId,
   useDebounce,
@@ -43,7 +40,6 @@ export {
   useNow,
   useOnClickOutside,
   usePageTitlePriceUpdates,
-  useRestrictions,
   useShouldShowFooter,
   useSelectedNetwork,
   useStringGetter,

src/hooks/tradingView/useTradingView.ts

@@ -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 };
 };

src/hooks/useAccountBalance.ts

@@ -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 nativeTokenCoinBalance = balances?.[DYDX_DENOM];
-  const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount);
+  const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount)
+    .div(QUANTUM_MULTIPLIER)
+    .toNumber();
 
-  const usdcCoinBalance = balances?.[usdcDenom];
+  const usdcCoinBalance = balances?.[USDC_DENOM];
-  const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).toNumber();
+  const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).div(QUANTUM_MULTIPLIER).toNumber();
 
-  const nativeStakingCoinBalanace = stakingBalances?.[chainTokenDenom];
+  const nativeStakingCoinBalanace = stakingBalances?.[DYDX_DENOM];
-  const nativeStakingBalance = MustBigNumber(nativeStakingCoinBalanace?.amount).toNumber();
+  const nativeStakingBalance = MustBigNumber(nativeStakingCoinBalanace?.amount)
+    .div(QUANTUM_MULTIPLIER)
+    .toNumber();
 
   return {
     balance,

src/hooks/useAccounts.tsx

@@ -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) {
+    if (evmAddress) abacusStateManager.setTransfersSourceAddress(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,
   };
 };

src/hooks/useCurrentMarketId.ts

@@ -44,9 +44,6 @@ export const useCurrentMarketId = () => {
   }, [validId]);
 
   useEffect(() => {
-    // Check for marketIds otherwise Abacus will silently fail its isMarketValid check
+    abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
-    if (marketIds) {
+  }, [selectedNetwork, marketId]);
-      abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
-    }
-  }, [selectedNetwork, marketIds, marketId]);
 };

src/hooks/useDydxClient.tsx

@@ -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 IndexerConfig(networkConfig.indexerUrl, networkConfig.indexerSocketUrl),
-              new ValidatorConfig(networkConfig.validatorUrl, networkConfig.chainId,
+              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,
-                }, {
                 broadcastPollIntervalMs: 3_000,
                 broadcastTimeoutMs: 60_000,
               })
@@ -191,27 +178,7 @@ const useDydxClientContext = () => {
     [requestCandles]
   );
 
-  const { updateSanctionedAddresses } = useRestrictions();
+  // ------ Subacount Methods ------ //
-
-  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]
-  );
 
   return {
     // Client initialization
@@ -219,13 +186,11 @@ const useDydxClientContext = () => {
     networkConfig,
     compositeClient,
     faucetClient,
-    isConnected: !!compositeClient,
 
     // Wallet Methods
     getWalletFromEvmSignature,
 
     // Public Methods
     getCandlesForDatafeed,
-    screenAddresses,
   };
 };

src/hooks/useInitializePage.ts

@@ -10,7 +10,6 @@ import { useLocalStorage } from '@/hooks';
 import { initializeLocalization } from '@/state/app';
 
 import abacusStateManager from '@/lib/abacus';
-import { validateAgainstAvailableEnvironments } from '@/lib/network';
 
 export const useInitializePage = () => {
   const dispatch = useDispatch();
@@ -19,7 +18,6 @@ export const useInitializePage = () => {
   const [localStorageNetwork] = useLocalStorage<DydxNetwork>({
     key: LocalStorageKey.SelectedNetwork,
     defaultValue: DEFAULT_APP_ENVIRONMENT,
-    validateFn: validateAgainstAvailableEnvironments,
   });
 
   useEffect(() => {

src/hooks/useNotificationTypes.tsx

@@ -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: () => {
+    useNotificationAction: () => {
-    //   const dispatch = useDispatch();
+      const dispatch = useDispatch();
-    //   const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
-    //   const ordersByOrderId = Object.fromEntries(orders.map((order) => [order.id, order]));
 
-    //   const fills = useSelector(getSubaccountFills, shallowEqual) || [];
+      return (orderId) => {
-    //   const fillsByOrderId = groupBy(fills, (fill) => fill.orderId);
+        dispatch(
-
+          openDialog({
-    //   return (id) => {
+            type: DialogTypes.OrderDetails,
-    //     if (ordersByOrderId[id]) {
+            dialogProps: { orderId },
-    //       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 },
-    //         })
-    //       );
-    //     }
-    //   };
-    // },
   } 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: error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
-                        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;
-`;
+`;

src/hooks/useRestrictions.tsx

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

src/hooks/useSelectedNetwork.ts

@@ -2,15 +2,13 @@ import { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { LocalStorageKey } from '@/constants/localStorage';
-import { DEFAULT_APP_ENVIRONMENT, DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { DEFAULT_APP_ENVIRONMENT, DydxNetwork } from '@/constants/networks';
 
 import { useAccounts, useLocalStorage } from '@/hooks';
 
 import { setSelectedNetwork } from '@/state/app';
 import { getSelectedNetwork } from '@/state/appSelectors';
 
-import { validateAgainstAvailableEnvironments } from '@/lib/network';
-
 export const useSelectedNetwork = (): {
   switchNetwork: (network: DydxNetwork) => void;
   selectedNetwork: DydxNetwork;
@@ -22,7 +20,6 @@ export const useSelectedNetwork = (): {
   const [, setLocalStorageNetwork] = useLocalStorage<DydxNetwork>({
     key: LocalStorageKey.SelectedNetwork,
     defaultValue: DEFAULT_APP_ENVIRONMENT,
-    validateFn: validateAgainstAvailableEnvironments,
   });
 
   const switchNetwork = useCallback(

src/hooks/useSubaccount.tsx

@@ -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;
+        amount: Long;
-      }) => await compositeClient?.depositToSubaccount(subaccountClient, amount.toString()),
+      }) => 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(
+        await compositeClient?.validatorClient.post.sendToken(
-          subaccountClient.wallet,
+          subaccountClient,
-          () =>
+          recipient,
-            new Promise((resolve) => {
+          DYDX_DENOM,
-              const msg = compositeClient?.sendTokenMessage(
+          Long.fromNumber(amount * QUANTUM_MULTIPLIER),
-                subaccountClient.wallet,
-                amount.toString(),
-                recipient,
-              );
-
-              resolve([msg]);
-            }),
           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]);
 

src/hooks/useTokenConfigs.ts

@@ -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,
-  };
-};

src/hooks/useWalletConnection.ts

@@ -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,

src/icons/bell-stroke.svg

@@ -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>

src/icons/bell.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>

src/icons/chat-bubble.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>

src/icons/feedback.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>

src/icons/index.ts

@@ -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';

src/layout/DialogManager.tsx

@@ -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} />,

src/layout/Footer/FooterDesktop.tsx

@@ -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 { useApiState, useStringGetter } from '@/hooks';
-import { ChatIcon, LinkOutIcon } from '@/icons';
 
 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
-        <WithTooltip
+        slotTooltip={
-          slotTooltip={
+          statusErrorMessage && (
-            statusErrorMessage && (
+            <dl>
-              <dl>
+              <dd>{statusErrorMessage}</dd>
-                <dd>{statusErrorMessage}</dd>
+            </dl>
-              </dl>
+          )
-            )
+        }
-          }
+      >
-        >
+        <Styled.Row>
-          <Styled.FooterButton
+          <Styled.StatusDot exchangeStatus={exchangeStatus} />
-            slotLeft={<Styled.StatusDot exchangeStatus={exchangeStatus} />}
+          <span>{label}</span>
-            slotRight={statusPage && <LinkOutIcon />}
+        </Styled.Row>
-            size={ButtonSize.XSmall}
+      </WithTooltip>
-            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>
-
       {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}
+  padding: 0 1rem;
-  width: var(--sidebar-width);
+  gap: 0.5rem;
-
-  padding: 0 0.5rem;
-  border-right: 1px solid var(--color-border);
 `;
 
 Styled.StatusDot = styled.div<{ exchangeStatus: ExchangeStatus }>`
-  width: 0.5rem;
+  width: 1em;
-  height: 0.5rem;
+  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;
 `;

src/layout/Header/HeaderDesktop.tsx

@@ -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 { useStringGetter } from '@/hooks';
-
+import { LogoShortIcon, BellIcon } from '@/icons';
-import { useTokenConfigs, useStringGetter } from '@/hooks';
 
 import { Icon, IconName } from '@/components/Icon';
 import { IconButton } from '@/components/IconButton';
@@ -28,7 +27,6 @@ import { layoutMixins } from '@/styles/layoutMixins';
 export const HeaderDesktop = () => {
   const stringGetter = useStringGetter();
   const dispatch = useDispatch();
-  const { chainTokenLabel } = useTokenConfigs();
 
   const navItems = [
     {
@@ -45,9 +43,9 @@ export const HeaderDesktop = () => {
           href: AppRoute.Trade,
         },
         {
-          value: chainTokenLabel,
+          value: 'Dv4TNT',
-          label: chainTokenLabel,
+          label: 'Dv4TNT',
-          href: `/${chainTokenLabel}`,
+          href: AppRoute.Rewards,
         },
         {
           value: 'PORTFOLIO',
@@ -80,13 +78,13 @@ export const HeaderDesktop = () => {
               value: 'TERMS_OF_USE',
               slotBefore: <Icon iconName={IconName.File} />,
               label: stringGetter({ key: STRING_KEYS.TERMS_OF_USE }),
-              href: AppRoute.Terms,
+              href: 'https://dydx.exchange/terms',
             },
             {
               value: 'PRIVACY_POLICY',
               slotBefore: <Icon iconName={IconName.Privacy} />,
               label: stringGetter({ key: STRING_KEYS.PRIVACY_POLICY }),
-              href: AppRoute.Privacy,
+              href: 'https://dydx.exchange/privacy',
             },
             {
               value: 'HELP',
@@ -133,9 +131,7 @@ export const HeaderDesktop = () => {
         <VerticalSeparator />
 
         <NotificationsMenu
-          slotTrigger={
+          slotTrigger={<Styled.IconButton shape={ButtonShape.Rectangle} iconComponent={BellIcon} />}
-            <Styled.IconButton shape={ButtonShape.Rectangle} iconComponent={BellStrokeIcon} />
-          }
         />
 
         <VerticalSeparator />
@@ -169,7 +165,7 @@ Styled.Header = styled.header`
     )
     var(--border-width) 1fr var(--border-width) auto;
 
-  font-size: 0.9375rem;
+  font-size: 0.9375em;
 
   :before {
     backdrop-filter: blur(10px);
@@ -218,8 +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;
 `;

src/lib/abacus/dydxChainTransactions.ts

@@ -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 IndexerConfig(indexerUrl, indexerSocketUrl),
-          new ValidatorConfig(
+          new ValidatorConfig(validatorUrl, chainId, {
-            validatorUrl,
+            broadcastPollIntervalMs: 3_000,
-            chainId,
+            broadcastTimeoutMs: 60_000,
-            {
+          })
-              USDC_DENOM,
-              USDC_DECIMALS,
-              USDC_GAS_DENOM,
-              CHAINTOKEN_DENOM,
-              CHAINTOKEN_DECIMALS,
-            },
-            {
-              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,
+        goodTilBlock ?? undefined,
-        goodTilBlockTime || 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(
+  async simulateTransferNativeTokenTransaction(params: HumanReadableTransferPayload): Promise<string> {
-    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) {
+            const msg = compositeClient?.validatorClient.post.composer.composeMsgSendToken(
-              throw new Error('Missing compositeClient or localWallet');
+              subaccountClient.address,
-            }
-            const msg = compositeClient?.sendTokenMessage(
-              this.localWallet,
-              amount,
               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 =
+          const accountBalances = await this.compositeClient?.validatorClient.get.getAccountBalances(
-            await this.compositeClient?.validatorClient.get.getAccountBalances(
+            this.localWallet.address
-              this.localWallet.address
+          );
-            );
           const parsedAccountBalances = this.parseToPrimitives(accountBalances);
           callback(JSON.stringify(parsedAccountBalances));
           break;

src/lib/abacus/rest.ts

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

src/lib/abacus/stateNotification.ts

@@ -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)) {

src/lib/network.ts

@@ -1,4 +0,0 @@
-import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-
-export const validateAgainstAvailableEnvironments = (value: DydxNetwork) =>
-  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);

src/lib/orders.ts

@@ -107,8 +107,8 @@ export const getHydratedTradingData = ({
   perpetualMarkets?: Record<string, PerpetualMarket>;
 }) => ({
   ...data,
-  asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId]?.assetId],
+  asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId].assetId],
-  stepSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.stepSizeDecimals,
+  stepSizeDecimals: perpetualMarkets?.[data.marketId].configs?.stepSizeDecimals,
-  tickSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.tickSizeDecimals,
+  tickSizeDecimals: perpetualMarkets?.[data.marketId].configs?.tickSizeDecimals,
   ...('side' in data && { orderSide: convertAbacusOrderSide(data.side) }),
 });

src/lib/wagmi.ts

@@ -36,15 +36,7 @@ import { CoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet';
 import { InjectedConnector } from 'wagmi/connectors/injected';
 import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
 import { WalletConnectConnector } from 'wagmi/connectors/walletConnect';
-
+import { WalletConnectLegacyConnector } from 'wagmi/connectors/walletConnectLegacy';
-import {
-  type WalletConnection,
-  WalletConnectionType,
-  type WalletType,
-  walletConnectionTypes,
-  wallets,
-  WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
-} from '@/constants/wallets';
 
 // Config
 
@@ -95,46 +87,45 @@ const injectedConnectorOptions = {
   },
 };
 
-type WalletConnectConfig = {
+const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnectConnector>[0] = {
-  client: {
-    name: string;
-    description: string;
-    iconUrl: string;
-  };
-  v2: {
-    projectId: string;
-  };
-};
-
-const getWalletconnect2ConnectorOptions = (
-  config: WalletConnectConfig
-): ConstructorParameters<typeof WalletConnectConnector>[0] => ({
   chains,
   options: {
-    projectId: config.v2.projectId,
+    projectId: import.meta.env.VITE_WALLETCONNECT2_PROJECT_ID,
     metadata: {
-      name: config.client.name,
+      // TODO: update to local URLs/images
-      description: config.client.description,
+      name: 'dYdX',
-      url: import.meta.env.VITE_BASE_URL,
+      description: '',
-      icons: [config.client.iconUrl],
+      url: 'https://trade.dydx.exchange',
+      icons: ['https://trade.dydx.exchange/cbw-image.png'],
     },
     showQrModal: true,
     qrModalOptions: {
       themeMode: 'dark' as const,
       themeVariables: {
-        '--wcm-accent-color': '#5973fe',
+        '--w3m-accent-color': '#5973fe',
-        '--wcm-font-family': 'var(--fontFamily-base)',
+        '--w3m-background-color': '#5973fe',
+        '--w3m-color-bg-1': 'var(--color-layer-3)',
+        '--w3m-color-bg-2': 'var(--color-layer-4)',
+        '--w3m-color-bg-3': 'var(--color-layer-5)',
+        '--w3m-font-family': 'var(--fontFamily-base)',
+        '--w3m-font-feature-settings': 'none',
+        '--w3m-overlay-backdrop-filter': 'blur(6px)',
+        // '--w3m-logo-image-url': 'https://trade.dydx.exchange/cbw-image.png',
       },
-      explorerRecommendedWalletIds: WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
+      enableExplorer: true,
+      explorerAllowList: [],
+      explorerDenyList: [],
+      chainImages: {},
     },
   },
-});
+};
 
-const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
+const connectors = [
   new MetaMaskConnector({
     chains,
     options: {
       shimDisconnect: true,
+      shimChainChangedDisconnect: false,
     },
   }),
   new CoinbaseWalletConnector({
@@ -144,7 +135,7 @@ const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
       reloadOnDisconnect: false,
     },
   }),
-  new WalletConnectConnector(getWalletconnect2ConnectorOptions(walletConnectConfig)),
+  new WalletConnectConnector(walletconnect2ConnectorOptions),
   new InjectedConnector(injectedConnectorOptions),
 ];
 
@@ -166,34 +157,35 @@ const createInjectedConnectorWithProvider = (provider: ExternalProvider) =>
       provider as unknown as Awaited<ReturnType<InjectedConnector['getProvider']>>;
   })(injectedConnectorOptions) as InjectedConnector;
 
-const createWalletConnect2ConnectorWithId = (
+const createWalletConnect2ConnectorWithId = (walletconnect2Id: string) =>
-  walletconnectId: string,
+  new WalletConnectConnector({
-  walletConnectConfig: WalletConnectConfig
-) => {
-  const walletconnect2ConnectorOptions = getWalletconnect2ConnectorOptions(walletConnectConfig);
-  return 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];
@@ -201,6 +193,6 @@ export const resolveWagmiConnector = ({
   return walletConnection.type === WalletConnectionType.InjectedEip1193 && walletConnection.provider
     ? createInjectedConnectorWithProvider(walletConnection.provider)
     : walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id
-    ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id, walletConnectConfig)
+    ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id)
-    : getConnectors(walletConnectConfig).find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
+    : connectors.find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
 };

src/pages/PrivacyPolicyPage.tsx

@@ -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}
-`;

src/pages/TermsOfUsePage.tsx

@@ -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}
-`;

src/pages/portfolio/AccountDetailsAndHistory.tsx

@@ -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
+            <Output type={OutputType.Fiat} value={accountEquity} withBaseFont />
-              type={OutputType.Fiat}
-              value={accountEquity}
-              roundingMode={BigNumber.ROUND_FLOOR}
-              withBaseFont
-            />
           </Styled.AccountEquity>
           <Styled.PnlDiff isPositive={MustBigNumber(pnlDiff).gte(0)}>
             {pnlDiff && <TriangleIndicator value={MustBigNumber(pnlDiff)} />}

src/pages/rewards/DYDXBalancePanel.tsx

@@ -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,7 +30,6 @@ export const DYDXBalancePanel = () => {
   const { walletType } = useAccounts();
   const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
   const { nativeTokenBalance, nativeStakingBalance } = useAccountBalance();
-  const { chainTokenLabel } = useTokenConfigs();
 
   return (
     <Panel
@@ -37,7 +37,7 @@ export const DYDXBalancePanel = () => {
         <Styled.Header>
           <Styled.Title>
             {/* <AssetIcon symbol="DYDX" /> */}
-            {chainTokenLabel}
+            Dv4TNT
           </Styled.Title>
           <Styled.ReceiveAndTransferButtons>
             {!canAccountTrade ? (
@@ -106,13 +106,7 @@ export const DYDXBalancePanel = () => {
             {
               key: 'totalBalance',
               label: 'Total balance',
-              value: (
+              value: <Output type={OutputType.Asset} value={nativeTokenBalance + nativeStakingBalance} tag="Dv4TNT" />,
-                <Output
-                  type={OutputType.Asset}
-                  value={nativeTokenBalance.plus(nativeStakingBalance)}
-                  tag={chainTokenLabel}
-                />
-              ),
             },
           ]}
         />
@@ -125,7 +119,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Header = styled.div`
   ${layoutMixins.spacedRow}
-  padding: 1rem 1.5rem 0;
+  padding: 1.25rem 1.5rem 0.5rem;
 `;
 
 Styled.Title = styled.h3`
@@ -154,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`
@@ -179,6 +174,7 @@ Styled.WalletAndStakedBalance = styled(Details)`
   grid-template-columns: 1fr 1fr;
   gap: 0.5rem;
 
+
   > div {
     gap: 1rem;
 

src/polyfills.ts

@@ -13,6 +13,4 @@ declare global {
 
     'abacus:connectNetwork': CustomEvent;
   }
-
-  var Intercom: any;
 }

src/state/_store.ts

@@ -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',

src/state/account.ts

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

src/state/accountSelectors.ts

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

src/state/app.ts

@@ -2,10 +2,10 @@ 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';
-import { validateAgainstAvailableEnvironments } from '@/lib/network';
 
 export interface AppState {
   apiState: AbacusApiState | undefined;
@@ -19,7 +19,6 @@ const initialState: AppState = {
   selectedNetwork: getLocalStorage({
     key: LocalStorageKey.SelectedNetwork,
     defaultValue: DEFAULT_APP_ENVIRONMENT,
-    validateFn: validateAgainstAvailableEnvironments,
   }),
 };
 

src/state/dialogs.ts

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

src/state/navigation.ts

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

src/state/routerMiddleware.ts

@@ -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;
+    }
+  }
+};

src/styles/articleMixins.ts

@@ -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;
-    }
-  `,
-};

src/styles/constants.css

@@ -36,10 +36,11 @@
   --single-unit-height: 9.375rem;
 
   /* Modal constants */
-  --dialog-small-width: 18.75rem;
+  --sidebar-modal-width: 18.75rem;
-  --dialog-medium-width: 20.5rem;
+  --modal-small-width: 18.75rem;
-  --dialog-large-width: 26.25rem;
+  --modal-medium-width: 20.5rem;
-  --dialog-header-height: 4rem;
+  --modal-large-width: 26.25rem;
+  --modal-header-height: 4rem;
 
   /* Market Selector constants */
   --marketsDropdown-openWidth: 45rem;

src/styles/popoverMixins.ts

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

src/views/AccountInfo/AccountInfoConnectedState.tsx

@@ -75,14 +75,16 @@ export const AccountInfoConnectedState = () => {
         <Styled.Header>
           <span>{stringGetter({ key: STRING_KEYS.ACCOUNT })}</span>
           <Styled.TransferButtons>
-            <Styled.Button
+            {import.meta.env.MODE !== 'production' && (
-              state={{ isDisabled: !dydxAccounts }}
+              <Styled.Button
-              onClick={() => dispatch(openDialog({ type: DialogTypes.Withdraw }))}
+                state={{ isDisabled: !dydxAccounts }}
-              shape={ButtonShape.Pill}
+                onClick={() => dispatch(openDialog({ type: DialogTypes.Withdraw }))}
-              size={ButtonSize.XSmall}
+                shape={ButtonShape.Pill}
-            >
+                size={ButtonSize.XSmall}
-              {stringGetter({ key: STRING_KEYS.WITHDRAW })}
+              >
-            </Styled.Button>
+                {stringGetter({ key: STRING_KEYS.WITHDRAW })}
+              </Styled.Button>
+            )}
             <Styled.Button
               state={{ isDisabled: !dydxAccounts }}
               onClick={() => dispatch(openDialog({ type: DialogTypes.Deposit }))}

src/views/TransferStatus.tsx

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

src/views/TransferStatusSteps.tsx

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

src/views/charts/PnlChart.tsx

@@ -25,11 +25,7 @@ import { TimeSeriesChart } from '@/components/visx/TimeSeriesChart';
 import { AxisLabelOutput } from '@/components/visx/AxisLabelOutput';
 // import { TooltipContent } from '@/components/visx/TooltipContent';
 
-import {
+import { getSubaccount, getSubaccountHistoricalPnl, getSubaccountId } from '@/state/accountSelectors';
-  getSubaccount,
-  getSubaccountHistoricalPnl,
-  getSubaccountId,
-} from '@/state/accountSelectors';
 
 import abacusStateManager from '@/lib/abacus';
 import { formatRelativeTime } from '@/lib/dateTime';

src/views/dialogs/DepositDialog.tsx

@@ -32,9 +32,12 @@ export const DepositDialog = ({ setIsOpen }: ElementProps) => {
     >
       <Styled.Content>
         {showTestDeposit ? <TestnetDepositForm onDeposit={closeDialog} /> : <DepositForm />}
-        <Styled.TextToggle onClick={() => setShowTestDeposit(!showTestDeposit)}>
+        {/* TODO TRCL-1693 - uncomment when deposit form is ready */}
-          {showTestDeposit ? 'Show deposit form (Under Construction)' : 'Show test faucet'}
+         {import.meta.env.MODE !== 'production' && (
-        </Styled.TextToggle>
+          <Styled.TextToggle onClick={() => setShowTestDeposit(!showTestDeposit)}>
+            {showTestDeposit ? 'Show deposit form (Under Construction)' : 'Show test faucet'}
+          </Styled.TextToggle>
+        )}
       </Styled.Content>
     </Dialog>
   );

src/views/dialogs/DisconnectDialog.tsx

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

src/views/dialogs/ExchangeOfflineDialog.tsx

@@ -5,7 +5,6 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { AbacusApiStatus } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
-
 import { useApiState, useStringGetter } from '@/hooks';
 import { layoutMixins } from '@/styles/layoutMixins';
 

src/views/dialogs/HelpDialog.tsx

@@ -1,94 +1,69 @@
-import { useMemo } from 'react';
 import styled, { AnyStyledComponent } from 'styled-components';
+import { useDispatch } from 'react-redux';
+import { Close } from '@radix-ui/react-dialog';
 
 import { STRING_KEYS } from '@/constants/localization';
 import { useStringGetter } from '@/hooks';
-import { ChatIcon, FeedbackIcon, FileIcon, TerminalIcon } from '@/icons';
+import { layoutMixins } from '@/styles/layoutMixins';
 
-import { ComboboxDialogMenu } from '@/components/ComboboxDialogMenu';
+import { Button } from '@/components/Button';
-
+import { Dialog } from '@/components/Dialog';
-import { isTruthy } from '@/lib/isTruthy';
+import { ButtonAction, ButtonType } from '@/constants/buttons';
+import { Icon, IconName } from '@/components/Icon';
 
 type ElementProps = {
   setIsOpen: (open: boolean) => void;
 };
 
-const HELP_LINKS = {
+export const HELP_URL = `https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform?usp=sf_link`;
-  apiDocumentation: 'https://v4-teacher.vercel.app/',
-  helpCenter: null,
-  feedback: null,
-};
 
+/**
+ * HelpDialog
+ * - Will temporarily be used as a 'Give Feedback' dialog.
+ * - It will ask users to navigate to a Google Form in order to record feedback.
+ */
 export const HelpDialog = ({ setIsOpen }: ElementProps) => {
   const stringGetter = useStringGetter();
 
-  const HELP_ITEMS = useMemo(
-    () => [
-      {
-        group: 'help-items',
-        items: [
-          HELP_LINKS.helpCenter && {
-            value: 'help-center',
-            label: stringGetter({ key: STRING_KEYS.HELP_CENTER }),
-            description: stringGetter({ key: STRING_KEYS.HELP_CENTER_DESCRIPTION }),
-            onSelect: () => {
-              HELP_LINKS.helpCenter && globalThis.open(HELP_LINKS.helpCenter, '_blank');
-              setIsOpen(false);
-            },
-            slotBefore: <FileIcon />,
-          },
-          HELP_LINKS.apiDocumentation && {
-            value: 'api-documentation',
-            label: stringGetter({ key: STRING_KEYS.API_DOCUMENTATION }),
-            description: stringGetter({ key: STRING_KEYS.API_DOCUMENTATION_DESCRIPTION }),
-            onSelect: () => {
-              HELP_LINKS.apiDocumentation && globalThis.open(HELP_LINKS.apiDocumentation, '_blank');
-              setIsOpen(false);
-            },
-            slotBefore: <TerminalIcon />,
-          },
-          globalThis?.Intercom && {
-            value: 'live-chat',
-            label: stringGetter({ key: STRING_KEYS.LIVE_CHAT }),
-            description: stringGetter({ key: STRING_KEYS.LIVE_CHAT_DESCRIPTION }),
-            onSelect: () => {
-              globalThis.Intercom('show');
-              setIsOpen(false);
-            },
-            slotBefore: <ChatIcon />,
-          },
-          HELP_LINKS.feedback && {
-            value: 'feedback',
-            label: stringGetter({ key: STRING_KEYS.PROVIDE_FEEDBACK }),
-            description: stringGetter({ key: STRING_KEYS.PROVIDE_FEEDBACK_DESCRIPTION }),
-            onSelect: () => {
-              HELP_LINKS.feedback && globalThis.open(HELP_LINKS.feedback, '_blank');
-              setIsOpen(false);
-            },
-            slotBefore: <FeedbackIcon />,
-          },
-        ].filter(isTruthy),
-      },
-    ],
-    [stringGetter]
-  );
-
   return (
-    <Styled.ComboboxDialogMenu
+    <Dialog
       isOpen
-      withSearch={false}
       setIsOpen={setIsOpen}
-      title={stringGetter({ key: STRING_KEYS.HELP })}
+      title={stringGetter({ key: STRING_KEYS.PROVIDE_FEEDBACK })}
-      items={HELP_ITEMS}
+      description={stringGetter({ key: STRING_KEYS.PROVIDE_FEEDBACK_DESCRIPTION })}
-    />
+    >
+      <Styled.Content>
+        <p>
+          You will be navigated to a Google Form where you will be able to provide feedback. Thank
+          you for your contribution!
+        </p>
+        <Styled.ButtonRow>
+          <Close asChild>
+            <Button
+              action={ButtonAction.Primary}
+              type={ButtonType.Link}
+              href={HELP_URL}
+              slotRight={<Icon iconName={IconName.LinkOut} />}
+            >
+              {stringGetter({ key: STRING_KEYS.CONTINUE })}
+            </Button>
+          </Close>
+        </Styled.ButtonRow>
+      </Styled.Content>
+    </Dialog>
   );
 };
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
-Styled.ComboboxDialogMenu = styled(ComboboxDialogMenu)`
+Styled.ButtonRow = styled.div`
-  --dialog-width: var(--dialog-small-width);
+  ${layoutMixins.row}
-  --dialog-content-paddingTop: 1rem;
+
-  --dialog-content-paddingBottom: 1rem;
+  gap: 0.5rem;
-  --comboxDialogMenu-item-gap: 1rem;
+  justify-content: end;
+`;
+
+Styled.Content = styled.div`
+  ${layoutMixins.column}
+  gap: 1rem;
 `;

src/views/dialogs/OnboardingDialog.tsx

@@ -37,7 +37,7 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => {
   const stringGetter = useStringGetter();
   const { isMobile } = useBreakpoints();
 
-  const { disconnect, walletType } = useAccounts();
+  const { walletType } = useAccounts();
 
   const currentOnboardingStep = useSelector(calculateOnboardingStep);
 
@@ -45,17 +45,10 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => {
     if (!currentOnboardingStep) setIsOpen?.(false);
   }, [currentOnboardingStep]);
 
-  const setIsOpenFromDialog = (open: boolean) => {
-    if (!open && currentOnboardingStep === OnboardingSteps.AcknowledgeTerms) {
-      disconnect();
-    }
-    setIsOpen?.(open);
-  }
-
   return (
     <Styled.Dialog
       isOpen={Boolean(currentOnboardingStep)}
-      setIsOpen={setIsOpenFromDialog}
+      setIsOpen={setIsOpen}
       {...(currentOnboardingStep &&
         {
           [OnboardingSteps.ChooseWallet]: {
@@ -94,10 +87,10 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => {
             title: stringGetter({ key: STRING_KEYS.ACKNOWLEDGE_TERMS }),
             children: (
               <Styled.Content>
-                <AcknowledgeTerms onClose={() => setIsOpenFromDialog?.(false)} />
+                <AcknowledgeTerms />
               </Styled.Content>
             ),
-            width: '30rem',
+            width: '20rem',
           },
           [OnboardingSteps.DepositFunds]: {
             title: stringGetter({ key: STRING_KEYS.DEPOSIT }),

src/views/dialogs/OnboardingDialog/AcknowledgeTerms.tsx

@@ -2,21 +2,17 @@ import styled, { type AnyStyledComponent } from 'styled-components';
 
 import { useAccounts, useStringGetter } from '@/hooks';
 
-import { AppRoute } from '@/constants/routes';
 import { STRING_KEYS } from '@/constants/localization';
 import { ButtonAction } from '@/constants/buttons';
 
-import { layoutMixins } from '@/styles/layoutMixins';
-
 import { Button } from '@/components/Button';
 import { Link } from '@/components/Link';
 
 type ElementProps = {
-  onClose?: () => void;
   onContinue?: () => void;
 };
 
-export const AcknowledgeTerms = ({ onClose, onContinue }: ElementProps) => {
+export const AcknowledgeTerms = ({ onContinue }: ElementProps) => {
   const stringGetter = useStringGetter();
 
   const { saveHasAcknowledgedTerms } = useAccounts();
@@ -28,40 +24,26 @@ export const AcknowledgeTerms = ({ onClose, onContinue }: ElementProps) => {
 
   return (
     <>
-      <p>
+      <span>
         {stringGetter({
-          key: STRING_KEYS.TOS_TITLE,
+          key: STRING_KEYS.LEGAL_UPDATES_DESCRIPTION,
           params: {
-            TERMS_LINK: (
+            TOU: (
-              <Styled.Link href={`/#${AppRoute.Terms}`}>
+              <Styled.Link href="https://dydx.exchange/v4-terms">
                 {stringGetter({ key: STRING_KEYS.TERMS_OF_USE })}
               </Styled.Link>
             ),
-            PRIVACY_POLICY_LINK: (
+            PRIVACY_POLICY: (
-              <Styled.Link href={`/#${AppRoute.Privacy}`}>
+              <Styled.Link href="https://dydx.exchange/privacy">
                 {stringGetter({ key: STRING_KEYS.PRIVACY_POLICY })}
               </Styled.Link>
             ),
           },
         })}
-      </p>
+      </span>
-      <Styled.TOS>
+      <Button onClick={onAcknowledgement} action={ButtonAction.Primary}>
-        <ul>
+        {stringGetter({ key: STRING_KEYS.I_AGREE })}
-          <li>{stringGetter({ key: STRING_KEYS.TOS_LINE1 })}</li>
+      </Button>
-          <li>{stringGetter({ key: STRING_KEYS.TOS_LINE2 })}</li>
-          <li>{stringGetter({ key: STRING_KEYS.TOS_LINE3 })}</li>
-          <li>{stringGetter({ key: STRING_KEYS.TOS_LINE4 })}</li>
-          <li>{stringGetter({ key: STRING_KEYS.TOS_LINE5 })}</li>
-        </ul>
-      </Styled.TOS>
-      <Styled.Row>
-        <Styled.Button onClick={onClose} action={ButtonAction.Base}>
-          {stringGetter({ key: STRING_KEYS.CLOSE })}
-        </Styled.Button>
-        <Styled.Button onClick={onAcknowledgement} action={ButtonAction.Primary}>
-          {stringGetter({ key: STRING_KEYS.I_AGREE })}
-        </Styled.Button>
-      </Styled.Row>
     </>
   );
 };
@@ -76,23 +58,3 @@ Styled.Link = styled(Link)`
     color: var(--color-accent);
   }
 `;
-
-Styled.TOS = styled.section`
-  background-color: var(--color-layer-4);
-  padding: 1rem 1rem 1rem 2rem;
-  border-radius: 0.875rem;
-  > ul {
-    ${layoutMixins.column};
-    gap: 1rem;
-  }
-`;
-
-Styled.Row = styled.div`
-  ${layoutMixins.row};
-
-  gap: 1rem;
-`;
-
-Styled.Button = styled(Button)`
-  flex-grow: 1;
-`;

src/views/dialogs/OnboardingDialog/ChooseWallet.tsx

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

src/views/dialogs/OnboardingDialog/GenerateKeys.tsx

@@ -264,6 +264,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.StatusCardsContainer = styled.div`
   display: grid;
+  margin-top: 1rem;
   gap: 1rem;
 `;
 

src/views/dialogs/RateLimitDialog.tsx

@@ -1,42 +0,0 @@
-import styled, { AnyStyledComponent } from 'styled-components';
-
-import { STRING_KEYS } from '@/constants/localization';
-import { useStringGetter } from '@/hooks';
-import { layoutMixins } from '@/styles/layoutMixins';
-
-import { Dialog } from '@/components/Dialog';
-import { Icon, IconName } from '@/components/Icon';
-
-type ElementProps = {
-  preventClose?: boolean;
-  setIsOpen?: (open: boolean) => void;
-};
-
-export const RateLimitDialog = ({ preventClose, setIsOpen }: ElementProps) => {
-  const stringGetter = useStringGetter();
-
-  return (
-    <Dialog
-      isOpen
-      preventClose={preventClose}
-      setIsOpen={setIsOpen}
-      title={stringGetter({ key: STRING_KEYS.RATE_LIMIT_REACHED_ERROR_TITLE })}
-      slotIcon={<Styled.Icon iconName={IconName.Warning} />}
-    >
-      <Styled.Content>
-        {stringGetter({ key: STRING_KEYS.RATE_LIMIT_REACHED_ERROR_MESSAGE })}
-      </Styled.Content>
-    </Dialog>
-  );
-};
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Icon = styled(Icon)`
-  color: var(--color-warning);
-`;
-
-Styled.Content = styled.div`
-  ${layoutMixins.column}
-  gap: 1rem;
-`;

src/views/dialogs/ReceiveDialog.tsx

@@ -6,7 +6,7 @@ import { DydxChainAsset } from '@/constants/wallets';
 
 import { formMixins } from '@/styles/formMixins';
 import { layoutMixins } from '@/styles/layoutMixins';
-import { useAccounts, useTokenConfigs, useStringGetter } from '@/hooks';
+import { useAccounts, useStringGetter } from '@/hooks';
 
 import { AssetIcon } from '@/components/AssetIcon';
 import { CopyButton } from '@/components/CopyButton';
@@ -24,10 +24,9 @@ type ElementProps = {
   setIsOpen: (open: boolean) => void;
 };
 
-export const ReceiveDialog = ({ selectedAsset = DydxChainAsset.CHAINTOKEN, setIsOpen }: ElementProps) => {
+export const ReceiveDialog = ({ selectedAsset = DydxChainAsset.DYDX, setIsOpen }: ElementProps) => {
   const stringGetter = useStringGetter();
   const { dydxAddress } = useAccounts();
-  const { chainTokenLabel, usdcLabel } = useTokenConfigs();
 
   const [asset, setAsset] = useState(selectedAsset);
 
@@ -36,17 +35,16 @@ export const ReceiveDialog = ({ selectedAsset = DydxChainAsset.CHAINTOKEN, setIs
       value: DydxChainAsset.USDC,
       label: (
         <Styled.InlineRow>
-          <AssetIcon symbol="USDC" /> {usdcLabel}
+          <AssetIcon symbol="USDC" /> USDC
         </Styled.InlineRow>
       ),
     },
     {
-      value: DydxChainAsset.CHAINTOKEN,
+      value: DydxChainAsset.DYDX,
       label: (
         <Styled.InlineRow>
-          {/* TODO: conditionally display the native token assetIcon */}
           {/* <AssetIcon symbol="DYDX" />  */}
-          {chainTokenLabel}
+          Dv4TNT
         </Styled.InlineRow>
       ),
     },

src/views/dialogs/RestrictedGeoDialog.tsx

@@ -1,42 +0,0 @@
-import styled, { AnyStyledComponent } from 'styled-components';
-
-import { STRING_KEYS } from '@/constants/localization';
-import { useStringGetter } from '@/hooks';
-import { layoutMixins } from '@/styles/layoutMixins';
-
-import { Dialog } from '@/components/Dialog';
-import { Icon, IconName } from '@/components/Icon';
-
-type ElementProps = {
-  preventClose?: boolean;
-  setIsOpen?: (open: boolean) => void;
-};
-
-export const RestrictedGeoDialog = ({ preventClose, setIsOpen }: ElementProps) => {
-  const stringGetter = useStringGetter();
-
-  return (
-    <Dialog
-      isOpen
-      preventClose={preventClose}
-      setIsOpen={setIsOpen}
-      title={stringGetter({ key: STRING_KEYS.REGION_NOT_PERMITTED_TITLE })}
-      slotIcon={<Styled.Icon iconName={IconName.Warning} />}
-    >
-      <Styled.Content>
-        {stringGetter({ key: STRING_KEYS.REGION_NOT_PERMITTED_SUBTITLE })}
-      </Styled.Content>
-    </Dialog>
-  );
-};
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Icon = styled(Icon)`
-  color: var(--color-warning);
-`;
-
-Styled.Content = styled.div`
-  ${layoutMixins.column}
-  gap: 1rem;
-`;

src/views/dialogs/RestrictedWalletDialog.tsx

@@ -1,42 +0,0 @@
-import styled, { AnyStyledComponent } from 'styled-components';
-
-import { STRING_KEYS } from '@/constants/localization';
-import { useStringGetter } from '@/hooks';
-import { layoutMixins } from '@/styles/layoutMixins';
-
-import { Dialog } from '@/components/Dialog';
-import { Icon, IconName } from '@/components/Icon';
-
-type ElementProps = {
-  preventClose?: boolean;
-  setIsOpen?: (open: boolean) => void;
-};
-
-export const RestrictedWalletDialog = ({ preventClose, setIsOpen }: ElementProps) => {
-  const stringGetter = useStringGetter();
-
-  return (
-    <Dialog
-      isOpen
-      preventClose={preventClose}
-      setIsOpen={setIsOpen}
-      title={stringGetter({ key: STRING_KEYS.WALLET_RESTRICTED_ERROR_TITLE })}
-      slotIcon={<Styled.Icon iconName={IconName.Warning} />}
-    >
-      <Styled.Content>
-        {stringGetter({ key: STRING_KEYS.REGION_NOT_PERMITTED_SUBTITLE })}
-      </Styled.Content>
-    </Dialog>
-  );
-};
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Icon = styled(Icon)`
-  color: var(--color-warning);
-`;
-
-Styled.Content = styled.div`
-  ${layoutMixins.column}
-  gap: 1rem;
-`;

src/views/forms/AccountManagementForms/DepositForm.tsx

@@ -87,6 +87,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
   // Async Data
   const { balance, queryStatus, isQueryFetching } = useAccountBalance({
     addressOrDenom: sourceToken?.address || CHAIN_DEFAULT_TOKEN_ADDRESS,
+    assetSymbol: sourceToken?.symbol || undefined,
     chainId: chainId,
     decimals: sourceToken?.decimals || undefined,
     isCosmosChain: false,

src/views/forms/AccountManagementForms/WithdrawForm.tsx

@@ -10,16 +10,9 @@ import { TransferInputField, TransferInputTokenResource, TransferType } from '@/
 import { AlertType } from '@/constants/alerts';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { NumberSign } from '@/constants/numbers';
+import { NumberSign, QUANTUM_MULTIPLIER } from '@/constants/numbers';
 
-import {
+import { useDebounce, useStringGetter, useSubaccount } from '@/hooks';
-  useAccounts,
-  useDebounce,
-  useDydxClient,
-  useRestrictions,
-  useStringGetter,
-  useSubaccount,
-} from '@/hooks';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -46,11 +39,10 @@ import { MustBigNumber } from '@/lib/numbers';
 
 import { TokenSelectMenu } from './TokenSelectMenu';
 import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt';
-import { join } from 'path';
 
 export const WithdrawForm = () => {
   const stringGetter = useStringGetter();
-  const [error, setError] = useState<string>();
+  const [error, setError] = useState<Error | null>(null);
   const [isLoading, setIsLoading] = useState(false);
 
   const { sendSquidWithdraw } = useSubaccount();
@@ -79,11 +71,9 @@ export const WithdrawForm = () => {
   const { addTransferNotification } = useLocalNotifications();
 
   // Async Data
-  const debouncedAmountBN = useMemo(() => MustBigNumber(debouncedAmount), [debouncedAmount]);
+  const debouncedAmountBN = MustBigNumber(debouncedAmount);
-  const freeCollateralBN = useMemo(
+  const withdrawAmountBN = MustBigNumber(withdrawAmount);
-    () => MustBigNumber(freeCollateral?.current),
+  const freeCollateralBN = MustBigNumber(freeCollateral?.current);
-    [freeCollateral?.current]
-  );
 
   useEffect(() => {
     abacusStateManager.setTransferValue({
@@ -115,85 +105,50 @@ export const WithdrawForm = () => {
             value: debouncedAmount,
             field: TransferInputField.usdcSize,
           });
-          setError(undefined);
+          setError(null);
         }
       } catch (error) {
-        setError(error.message);
+        setError(error);
       } finally {
         setIsLoading(false);
       }
     };
 
     setTransferValue();
-  }, [debouncedAmountBN]);
+  }, [debouncedAmountBN.toNumber()]);
-
-  const { screenAddresses } = useDydxClient();
-  const { dydxAddress } = useAccounts();
 
   const onSubmit = useCallback(
     async (e: FormEvent) => {
       try {
         e.preventDefault();
 
-        if (!requestPayload?.data || !debouncedAmountBN.toNumber() || !toAddress || !dydxAddress) {
+        if (!requestPayload?.data || !debouncedAmountBN.toNumber()) {
           throw new Error('Invalid request payload');
         }
 
         setIsLoading(true);
-        setError(undefined);
+        const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload?.data);
 
-        const screenResults = await screenAddresses({
+        if (txHash?.hash) {
-          addresses: [toAddress, dydxAddress],
+          const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
-        });
 
-        if (screenResults?.[dydxAddress]) {
+          addTransferNotification({
-          setError(
+            txHash: hash,
-            stringGetter({
+            fromChainId: TESTNET_CHAIN_ID,
-              key: STRING_KEYS.WALLET_RESTRICTED_WITHDRAWAL_TRANSFER_ORIGINATION_ERROR_MESSAGE,
+            toChainId: chainIdStr || undefined,
-            })
+            toAmount: debouncedAmountBN.toNumber(),
-          );
+            triggeredAt: Date.now(),
-        } else if (screenResults?.[toAddress]) {
+          });
-          setError(
+          abacusStateManager.clearTransferInputValues();
-            stringGetter({
+          setWithdrawAmount('');
-              key: STRING_KEYS.WALLET_RESTRICTED_WITHDRAWAL_TRANSFER_DESTINATION_ERROR_MESSAGE,
-            })
-          );
-        } else {
-          const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data);
-          if (txHash?.hash) {
-            const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
-            addTransferNotification({
-              txHash: hash,
-              fromChainId: TESTNET_CHAIN_ID,
-              toChainId: chainIdStr || undefined,
-              toAmount: debouncedAmountBN.toNumber(),
-              triggeredAt: Date.now(),
-            });
-            abacusStateManager.clearTransferInputValues();
-            setWithdrawAmount('');
-          }
         }
       } catch (error) {
-        if (error?.code === 429) {
+        setError(error);
-          setError(stringGetter({ key: STRING_KEYS.RATE_LIMIT_REACHED_ERROR_MESSAGE }));
-        } else {
-          setError(
-            error.message
-              ? stringGetter({
-                  key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-                  params: {
-                    ERROR_MESSAGE:
-                      error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
-                  },
-                })
-              : stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG })
-          );
-        }
       } finally {
         setIsLoading(false);
       }
     },
-    [requestPayload, debouncedAmountBN, chainIdStr, toAddress, screenAddresses, stringGetter]
+    [requestPayload, debouncedAmountBN, chainIdStr]
   );
 
   const onChangeAddress = useCallback((e: ChangeEvent<HTMLInputElement>) => {
@@ -224,7 +179,7 @@ export const WithdrawForm = () => {
 
   const onClickMax = useCallback(() => {
     setWithdrawAmount(freeCollateralBN.toString());
-  }, [freeCollateralBN, setWithdrawAmount]);
+  }, [freeCollateral?.current, setWithdrawAmount]);
 
   const onSelectChain = useCallback((chain: string) => {
     if (chain) {
@@ -260,7 +215,7 @@ export const WithdrawForm = () => {
           value={freeCollateral?.current}
           newValue={freeCollateral?.postOrder}
           sign={NumberSign.Negative}
-          hasInvalidNewValue={MustBigNumber(withdrawAmount).minus(freeCollateralBN).isNegative()}
+          hasInvalidNewValue={withdrawAmountBN.minus(freeCollateralBN).isNegative()}
           withDiff={
             Boolean(withdrawAmount) && !debouncedAmountBN.isNaN() && !debouncedAmountBN.isZero()
           }
@@ -269,23 +224,18 @@ export const WithdrawForm = () => {
     },
   ];
 
-  const { sanctionedAddresses } = useRestrictions();
-
   const errorMessage = useMemo(() => {
     if (error) {
-      return stringGetter({
+      return error?.message
-        key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
+        ? stringGetter({
-        params: { ERROR_MESSAGE: error },
+            key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-      });
+            params: { ERROR_MESSAGE: error.message },
+          })
+        : stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG });
     }
 
     if (!toAddress) return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_ADDRESS });
 
-    if (sanctionedAddresses.has(toAddress))
-      return stringGetter({
-        key: STRING_KEYS.TRANSFER_INVALID_DYDX_ADDRESS,
-      });
-
     if (debouncedAmountBN) {
       if (!chainIdStr) {
         return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_CHAIN });
@@ -299,15 +249,7 @@ export const WithdrawForm = () => {
     }
 
     return undefined;
-  }, [
+  }, [error, freeCollateralBN, chainIdStr, debouncedAmountBN, toToken]);
-    error,
-    freeCollateralBN,
-    chainIdStr,
-    debouncedAmountBN,
-    toToken,
-    toAddress,
-    sanctionedAddresses,
-  ]);
 
   const isDisabled =
     !!errorMessage ||
@@ -315,8 +257,7 @@ export const WithdrawForm = () => {
     !chainIdStr ||
     !toAddress ||
     debouncedAmountBN.isNaN() ||
-    debouncedAmountBN.isZero() ||
+    debouncedAmountBN.isZero();
-    isLoading;
 
   return (
     <Styled.Form onSubmit={onSubmit}>

src/views/forms/TradeForm/AdvancedTradeOptions.tsx

@@ -29,7 +29,7 @@ export const AdvancedTradeOptions = () => {
   const currentTradeFormConfig = useSelector(getInputTradeOptions, shallowEqual);
   const inputTradeData = useSelector(getInputTradeData, shallowEqual);
 
-  const { execution, goodTil, postOnly, reduceOnly, timeInForce, type } = inputTradeData || {};
+  const { execution, goodTil, postOnly, reduceOnly, timeInForce } = inputTradeData || {};
 
   const { executionOptions, needsGoodUntil, needsPostOnly, needsReduceOnly, timeInForceOptions } =
     currentTradeFormConfig || {};
@@ -37,7 +37,6 @@ export const AdvancedTradeOptions = () => {
   const { duration, unit } = goodTil || {};
 
   const needsExecution = executionOptions || needsPostOnly || needsReduceOnly;
-  const hasTimeInForce = timeInForceOptions?.toArray()?.length;
 
   return (
     <Styled.Collapsible
@@ -48,7 +47,7 @@ export const AdvancedTradeOptions = () => {
     >
       <Styled.AdvancedInputsContainer>
         <Styled.AdvancedInputsRow needsGoodUntil={needsGoodUntil}>
-          {hasTimeInForce && (
+          {timeInForceOptions?.toArray() && (
             <Styled.SelectMenu
               value={timeInForce}
               onValueChange={(selectedTimeInForceOption: string) =>
@@ -73,9 +72,7 @@ export const AdvancedTradeOptions = () => {
               id="trade-good-til-time"
               type={InputType.Number}
               decimals={INTEGER_DECIMALS}
-              label={stringGetter({
+              label={stringGetter({ key: STRING_KEYS.TIME })}
-                key: hasTimeInForce ? STRING_KEYS.TIME : STRING_KEYS.GOOD_TIL_TIME,
-              })}
               onChange={({ value }: NumberFormatValues) => {
                 abacusStateManager.setTradeValue({
                   value: Number(value),

src/views/forms/TransferForm.tsx

@@ -3,6 +3,8 @@ import styled, { type AnyStyledComponent } from 'styled-components';
 import { type NumberFormatValues } from 'react-number-format';
 import { shallowEqual, useSelector } from 'react-redux';
 import type { SyntheticInputEvent } from 'react-number-format/types/types';
+import { debounce } from 'lodash';
+import { StdFee } from '@cosmjs/stargate';
 import { validation } from '@dydxprotocol/v4-client-js';
 
 import { TransferInputField, TransferType } from '@/constants/abacus';
@@ -10,18 +12,19 @@ import { AlertType } from '@/constants/alerts';
 import { ButtonShape, ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
 import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-import { NumberSign } from '@/constants/numbers';
+import { NumberSign, QUANTUM_MULTIPLIER } from '@/constants/numbers';
-import { DydxChainAsset } from '@/constants/wallets';
+import {
+  DYDX_CHAIN_ASSET_COIN_DENOM,
+  DYDX_CHAIN_ASSET_TAGS,
+  DydxChainAsset,
+} from '@/constants/wallets';
 
 import {
   useAccountBalance,
   useAccounts,
-  useDydxClient,
-  useRestrictions,
   useSelectedNetwork,
   useStringGetter,
   useSubaccount,
-  useTokenConfigs,
 } from '@/hooks';
 
 import { formMixins } from '@/styles/formMixins';
@@ -54,7 +57,7 @@ type TransferFormProps = {
 };
 
 export const TransferForm = ({
-  selectedAsset = DydxChainAsset.CHAINTOKEN,
+  selectedAsset = DydxChainAsset.DYDX,
   onDone,
   className,
 }: TransferFormProps) => {
@@ -69,13 +72,12 @@ export const TransferForm = ({
   const { transfer } = useSubaccount();
   const { nativeTokenBalance, usdcBalance } = useAccountBalance();
   const { selectedNetwork } = useSelectedNetwork();
-  const { tokensConfigs, usdcLabel, chainTokenLabel } = useTokenConfigs();
 
   // User Input
   const [asset, setAsset] = useState<DydxChainAsset>(selectedAsset);
 
   // Form states
-  const [error, setError] = useState<string>();
+  const [error, setError] = useState<Error | undefined>();
   const [isLoading, setIsLoading] = useState(false);
 
   const balance = asset === DydxChainAsset.USDC ? freeCollateral?.current : nativeTokenBalance;
@@ -94,6 +96,16 @@ export const TransferForm = ({
   const balanceBN = MustBigNumber(balance);
   const newBalanceBN = MustBigNumber(newBalance);
 
+  const isAddressValid = useMemo(
+    () =>
+      recipientAddress &&
+      dydxAddress !== recipientAddress &&
+      validation.isValidAddress(recipientAddress),
+    [recipientAddress]
+  );
+
+  const isAmountValid = balance && amount && amountBN.gt(0) && newBalanceBN.gte(0);
+
   useEffect(() => {
     abacusStateManager.setTransferValue({
       value: TransferType.transferOut.rawValue,
@@ -113,21 +125,6 @@ export const TransferForm = ({
     });
   }, [asset]);
 
-  const { sanctionedAddresses } = useRestrictions();
-
-  const isAddressValid = useMemo(
-    () =>
-      recipientAddress &&
-      dydxAddress !== recipientAddress &&
-      validation.isValidAddress(recipientAddress) &&
-      !sanctionedAddresses.has(recipientAddress),
-    [recipientAddress, sanctionedAddresses, dydxAddress]
-  );
-
-  const isAmountValid = balance && amount && amountBN.gt(0) && newBalanceBN.gte(0);
-
-  const { screenAddresses } = useDydxClient();
-
   const onTransfer = async () => {
     if (!isAmountValid || !isAddressValid || !fee) return;
     setIsLoading(true);
@@ -136,54 +133,23 @@ export const TransferForm = ({
     try {
       // Subtract fees from amount if sending native tokens
       const amountToTransfer = (
-        asset === DydxChainAsset.CHAINTOKEN ? amountBN.minus(fee) : amountBN
+        asset === DydxChainAsset.DYDX ? amountBN.minus(fee) : amountBN
       ).toNumber();
 
-      const screenResults = await screenAddresses({
+      const txResponse = await transfer(
-        addresses: [recipientAddress!, dydxAddress!],
+        amountToTransfer,
-      });
+        recipientAddress as string,
+        DYDX_CHAIN_ASSET_COIN_DENOM[asset]
+      );
 
-      if (screenResults?.[dydxAddress!]) {
+      if (txResponse?.code === 0) {
-        setError(
+        console.log('TransferForm > txReceipt > ', txResponse?.hash);
-          stringGetter({
+        onDone?.();
-            key: STRING_KEYS.WALLET_RESTRICTED_WITHDRAWAL_TRANSFER_ORIGINATION_ERROR_MESSAGE,
-          })
-        );
-      } else if (screenResults?.[recipientAddress!]) {
-        setError(
-          stringGetter({
-            key: STRING_KEYS.WALLET_RESTRICTED_WITHDRAWAL_TRANSFER_DESTINATION_ERROR_MESSAGE,
-          })
-        );
       } else {
-        const txResponse = await transfer(
+        throw new Error(txResponse?.rawLog ?? 'Transaction did not commit.');
-          amountToTransfer,
-          recipientAddress as string,
-          tokensConfigs[asset].denom,
-        );
-
-        if (txResponse?.code === 0) {
-          console.log('TransferForm > txReceipt > ', txResponse?.hash);
-          onDone?.();
-        } else {
-          throw new Error(txResponse?.rawLog ?? 'Transaction did not commit.');
-        }
       }
     } catch (error) {
-      if (error?.code === 429) {
+      setError(error);
-        setError(stringGetter({ key: STRING_KEYS.RATE_LIMIT_REACHED_ERROR_MESSAGE }));
-      } else {
-        setError(
-          error.message
-            ? stringGetter({
-                key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-                params: {
-                  ERROR_MESSAGE: error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
-                },
-              })
-            : stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG })
-        );
-      }
       log('TransferForm/onTransfer', error);
     } finally {
       setIsLoading(false);
@@ -218,16 +184,16 @@ export const TransferForm = ({
       value: DydxChainAsset.USDC,
       label: (
         <Styled.InlineRow>
-          <AssetIcon symbol="USDC" /> {usdcLabel}
+          <AssetIcon symbol="USDC" /> {DYDX_CHAIN_ASSET_TAGS[DydxChainAsset.USDC]}
         </Styled.InlineRow>
       ),
     },
     {
-      value: DydxChainAsset.CHAINTOKEN,
+      value: DydxChainAsset.DYDX,
       label: (
         <Styled.InlineRow>
           {/* <AssetIcon symbol="DYDX" />  */}
-          {chainTokenLabel}
+          {DYDX_CHAIN_ASSET_TAGS[DydxChainAsset.DYDX]}
         </Styled.InlineRow>
       ),
     },
@@ -249,7 +215,7 @@ export const TransferForm = ({
       key: 'amount',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.AVAILABLE })} <Tag>{tokensConfigs[asset].name}</Tag>
+          {stringGetter({ key: STRING_KEYS.AVAILABLE })} <Tag>{DYDX_CHAIN_ASSET_TAGS[asset]}</Tag>
         </span>
       ),
       value: (
@@ -265,6 +231,13 @@ export const TransferForm = ({
     },
   ];
 
+  const addressValidationErrorMessage = stringGetter({
+    key:
+      dydxAddress === recipientAddress
+        ? STRING_KEYS.TRANSFER_TO_YOURSELF
+        : STRING_KEYS.TRANSFER_INVALID_DYDX_ADDRESS,
+  });
+
   const renderFormInputButton = ({
     label,
     isInputEmpty,
@@ -329,12 +302,7 @@ export const TransferForm = ({
 
       {recipientAddress && !isAddressValid && (
         <Styled.AddressValidationAlertMessage type={AlertType.Error}>
-          {stringGetter({
+          {addressValidationErrorMessage}
-            key:
-              dydxAddress === recipientAddress
-                ? STRING_KEYS.TRANSFER_TO_YOURSELF
-                : STRING_KEYS.TRANSFER_INVALID_DYDX_ADDRESS,
-          })}
         </Styled.AddressValidationAlertMessage>
       )}
 
@@ -374,13 +342,13 @@ export const TransferForm = ({
         </AlertMessage>
       )}
 
-      {error && <AlertMessage type={AlertType.Error}>{error}</AlertMessage>}
+      {error && <AlertMessage type={AlertType.Error}>{error.message}</AlertMessage>}
 
       <Styled.Footer>
         <TransferButtonAndReceipt
           selectedAsset={asset}
           fees={fee || undefined}
-          isDisabled={!isAmountValid || !isAddressValid || !fee || isLoading}
+          isDisabled={!isAmountValid || !isAddressValid || !fee}
           isLoading={isLoading || Boolean(isAmountValid && isAddressValid && !fee)}
         />
       </Styled.Footer>

src/views/forms/TransferForm/TransferButtonAndReceipt.tsx

@@ -3,9 +3,9 @@ import { shallowEqual, useSelector } from 'react-redux';
 import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
 import { NumberSign } from '@/constants/numbers';
-import { DydxChainAsset } from '@/constants/wallets';
+import { DYDX_CHAIN_ASSET_TAGS, DydxChainAsset } from '@/constants/wallets';
 
-import { useAccountBalance, useTokenConfigs, useStringGetter } from '@/hooks';
+import { useAccountBalance, useStringGetter } from '@/hooks';
 
 import { Button } from '@/components/Button';
 import { DiffOutput } from '@/components/DiffOutput';
@@ -37,7 +37,6 @@ export const TransferButtonAndReceipt = ({
   const stringGetter = useStringGetter();
   const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
   const { size } = useSelector(getTransferInputs, shallowEqual) || {};
-  const { tokensConfigs } = useTokenConfigs();
 
   const { equity: equityInfo, leverage: leverageInfo } =
     useSelector(getSubaccount, shallowEqual) || {};
@@ -61,7 +60,7 @@ export const TransferButtonAndReceipt = ({
       key: 'fees',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.FEES })} <Tag>{tokensConfigs[selectedAsset].name}</Tag>
+          {stringGetter({ key: STRING_KEYS.FEES })} <Tag>{DYDX_CHAIN_ASSET_TAGS[selectedAsset]}</Tag>
         </span>
       ),
       value: <Output type={OutputType.Asset} value={fees} />,
@@ -70,7 +69,7 @@ export const TransferButtonAndReceipt = ({
       key: 'balance',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.BALANCE })} <Tag>{tokensConfigs[selectedAsset].name}</Tag>
+          {stringGetter({ key: STRING_KEYS.BALANCE })} <Tag>{DYDX_CHAIN_ASSET_TAGS[selectedAsset]}</Tag>
         </span>
       ),
       value: (

src/views/menus/AccountMenu.tsx

@@ -9,13 +9,7 @@ import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS, TOOLTIP_STRING_KEYS } from '@/constants/localization';
 import { DydxChainAsset, wallets } from '@/constants/wallets';
 
-import {
+import { useAccounts, useBreakpoints, useStringGetter, useAccountBalance } from '@/hooks';
-  useAccounts,
-  useBreakpoints,
-  useTokenConfigs,
-  useStringGetter,
-  useAccountBalance,
-} from '@/hooks';
 
 import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton';
 
@@ -45,7 +39,6 @@ export const AccountMenu = () => {
   const onboardingState = useSelector(getOnboardingState);
   const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {};
   const { nativeTokenBalance } = useAccountBalance();
-  const { usdcLabel, chainTokenLabel } = useTokenConfigs();
 
   const { evmAddress, walletType, dydxAddress, hdKey } = useAccounts();
 
@@ -114,23 +107,17 @@ export const AccountMenu = () => {
               <div>
                 <div>
                   <Styled.label>
-                    {stringGetter({
+                    {stringGetter({ key: STRING_KEYS.ASSET_BALANCE, params: { ASSET: 'Dv4TNT' } })}
-                      key: STRING_KEYS.ASSET_BALANCE,
-                      params: { ASSET: chainTokenLabel },
-                    })}
                     {/* <AssetIcon symbol="DYDX" /> */}
                   </Styled.label>
                   <Styled.BalanceOutput type={OutputType.Asset} value={nativeTokenBalance} />
                 </div>
-                <AssetActions asset={DydxChainAsset.CHAINTOKEN} dispatch={dispatch} />
+                <AssetActions asset={DydxChainAsset.DYDX} dispatch={dispatch} />
               </div>
               <div>
                 <div>
                   <Styled.label>
-                    {stringGetter({
+                    {stringGetter({ key: STRING_KEYS.ASSET_BALANCE, params: { ASSET: 'USDC' } })}
-                      key: STRING_KEYS.ASSET_BALANCE,
-                      params: { ASSET: usdcLabel },
-                    })}
                     <AssetIcon symbol="USDC" />
                   </Styled.label>
                   <Styled.BalanceOutput

src/views/menus/NotificationsMenu.tsx

@@ -178,11 +178,10 @@ export const NotificationsMenu = ({
 };
 
 const $UnreadIndicator = styled.div`
-  width: 0.5rem;
+  width: 0.5em;
-  height: 0.5rem;
+  height: 0.5em;
   border-radius: 50%;
   background-color: var(--color-accent);
-  border: 1px solid var(--color-layer-2);
 `;
 
 const $TriggerContainer = styled.div`
@@ -193,8 +192,8 @@ const $TriggerUnreadIndicator = styled($UnreadIndicator)`
   place-self: center;
 
   position: relative;
-  right: -0.2rem;
+  right: -0.425em;
-  top: -0.325rem;
+  top: -0.425em;
 `;
 
 const $Output = styled(Output)`

src/views/tables/FillsTable.tsx

@@ -161,7 +161,7 @@ const getFillsTableColumnDef = ({
                 }[orderSide],
               })}
             </Styled.Side>
-            <Output type={OutputType.Text} value={asset?.id} />
+            <Output type={OutputType.Text} value={asset.id} />
           </Styled.TableCell>
         ),
       },