Merge branch 'main' into adamfraser-testnet-node-updates

reorder header, center align header, update collapse caret icons (#110 )
show loading state instead of "Unavailable" for place order button (#104 )
2023-10-30 17:57:34 +01:00 · 2023-10-27 23:32:51 -04:00 · 2023-10-27 17:39:12 -04:00 · 2023-10-27 16:47:34 -04:00 · 2023-10-27 16:14:34 -04:00 · 2023-10-27 16:13:48 -04:00
50 changed files with 941 additions and 623 deletions
@@ -6,4 +6,5 @@ VITE_PK_ENCRYPTION_KEY=

 VITE_WALLETCONNECT2_PROJECT_ID=

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

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

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

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

@@ -1,9 +1,9 @@
 {
  "name": "dydx-chain-web",
  "private": true,
-  "version": "0.0.1",
+  "version": "1.0.0",
  "type": "module",
-  "license": "BSL-1.1",
+  "license": "AGPL-3.0",
  "engines": {
    "node": ">=18"
  },
@@ -13,6 +13,7 @@
    "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",
@@ -38,9 +39,9 @@
    "@cosmjs/proto-signing": "^0.31.0",
    "@cosmjs/stargate": "^0.31.0",
    "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^0.7.2",
-    "@dydxprotocol/v4-client-js": "^0.40.3",
-    "@dydxprotocol/v4-localization": "^0.1.30",
+    "@dydxprotocol/v4-abacus": "^1.0.3",
+    "@dydxprotocol/v4-client-js": "^1.0.0",
+    "@dydxprotocol/v4-localization": "^1.0.0",
    "@ethersproject/providers": "^5.7.2",
    "@js-joda/core": "^5.5.3",
    "@radix-ui/react-collapsible": "^1.0.3",
@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'

-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 dependencies:
  '@0xsquid/sdk':
    specifier: ^1.10.0
@@ -27,14 +23,14 @@ dependencies:
    specifier: ^0.31.0
    version: 0.31.0
  '@dydxprotocol/v4-abacus':
-    specifier: ^0.7.2
-    version: 0.7.2
+    specifier: ^1.0.3
+    version: 1.0.3
  '@dydxprotocol/v4-client-js':
-    specifier: ^0.40.3
-    version: 0.40.3
+    specifier: ^1.0.0
+    version: 1.0.0
  '@dydxprotocol/v4-localization':
-    specifier: ^0.1.30
-    version: 0.1.30
+    specifier: ^1.0.0
+    version: 1.0.0
  '@ethersproject/providers':
    specifier: ^5.7.2
    version: 5.7.2
@@ -979,12 +975,12 @@ packages:
    resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
    dev: true

-  /@dydxprotocol/v4-abacus@0.7.2:
-    resolution: {integrity: sha512-5foamomN82FH6ko3EuzwFlSoAEY6Sal8fDgvZo2RsB19Ks6SFgFDeeOcEDdfoa3DNwvl8yW0C9cfxeQ+BfU8uA==}
+  /@dydxprotocol/v4-abacus@1.0.3:
+    resolution: {integrity: sha512-GuX37/DMMNSke8ZFcw52II7IVJfUgVGHqoi1Uw2cUb+hgIjjSG3OtbyRWedm5r6nqWq8BNLOexI0VVFB6OMVYg==}
    dev: false

-  /@dydxprotocol/v4-client-js@0.40.3:
-    resolution: {integrity: sha512-nMQd6tYisKDKIbfx0BGJSYEOSt+I+t5SsaBSmlgTdso+w2rCRO9vyxS+u6MF9h4w5FsVRfhHo3e6uTWX48WpGQ==}
+  /@dydxprotocol/v4-client-js@1.0.0:
+    resolution: {integrity: sha512-ehfHO+zQy795TcJRwtiawadFHZyh4HnpJNP26hCGsIjLE5q6LLHweQHpK/1N/sXU1PBOuQwc7iaJnFop6gYauQ==}
    dependencies:
      '@cosmjs/amino': 0.30.1
      '@cosmjs/encoding': 0.31.1
@@ -1011,8 +1007,8 @@ packages:
      - utf-8-validate
    dev: false

-  /@dydxprotocol/v4-localization@0.1.30:
-    resolution: {integrity: sha512-xTlQuQmPz7wfGkjd07giYMAxRrolDbJE3DryJSIMB6R1MBq1wLzAcwp/iR/nELRwilRX9c44Tap0gGt+oAajiQ==}
+  /@dydxprotocol/v4-localization@1.0.0:
+    resolution: {integrity: sha512-U7QjOlzpfSAVEchkNDB3xYRx7okzdeYi83XsnHwI+EHa2quFm/2Y2dhrBkT5fqpZmhcwxb/vG8AZmFSToOf9hA==}
    dev: false

  /@dydxprotocol/v4-proto@0.4.1:
@@ -14100,3 +14096,7 @@ packages:
  /zwitch@2.0.4:
    resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
    dev: true
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
@@ -8,67 +8,43 @@
                ],
                "components": [
                    {
-                        "/": "/trade/*"
+                        "/": "/"
                    },
                    {
-                        "/": "/r/*"
+                        "/": "/#/"
                    },
                    {
-                        "/": "/portfolio/overview"
+                        "/": "*/markets"
                    },
                    {
-                        "/": "/portfolio/positions"
+                        "/": "*/trade"
                    },
                    {
-                        "/": "/portfolio/orders"
+                        "/": "*/trade/*"
                    },
                    {
-                        "/": "/portfolio/fees"
+                        "/": "*/portfolio"
                    },
                    {
-                        "/": "/portfolio/history"
+                        "/": "*/portfolio/overview"
                    },
                    {
-                        "/": "/portfolio/history/trades"
+                        "/": "*/portfolio/positions"
                    },
                    {
-                        "/": "/portfolio/history/transfers"
+                        "/": "*/portfolio/orders"
                    },
                    {
-                        "/": "/portfolio/history/funding"
+                        "/": "*/portfolio/fees"
                    },
                    {
-                        "/": "/rewards"
+                        "/": "*/portfolio/history/trades"
                    },
                    {
-                        "/": "/my-profile"
+                        "/": "*/portfolio/history/transfers"
                    },
                    {
-                        "/": "/rankings/hedgies"
-                    },
-                    {
-                        "/": "/rankings/competition"
-                    },
-                    {
-                        "/": "/rankings/diamond"
-                    },
-                    {
-                        "/": "/rankings/platinum"
-                    },
-                    {
-                        "/": "/rankings/gold"
-                    },
-                    {
-                        "/": "/rankings/silver"
-                    },
-                    {
-                        "/": "/rankings/bronze"
-                    },
-                    {
-                        "/": "/rankings/pnl-absolute"
-                    },
-                    {
-                        "/": "/rankings/pnl-percent"
+                        "/": "*/portfolio/history/funding"
                    },
                    {
                        "/": "/walletsegue",
@@ -22,10 +22,11 @@
            "dydxprotocol-staging-west",
            "dydxprotocol-testnet",
            "dydxprotocol-testnet-dydx",
-            "dydxprotocol-testnet-dsrv",
            "dydxprotocol-testnet-nodefleet",
            "dydxprotocol-testnet-kingnodes",
-            "dydxprotocol-testnet-liquify"
+            "dydxprotocol-testnet-liquify",
+            "dydxprotocol-testnet-polkachu",
+            "dydxprotocol-testnet-bware"
         ],
         "default": "dydxprotocol-testnet"
      }
@@ -56,15 +57,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "http://indexer.v4dev.dydx.exchange",
+                  "api": "https://indexer.v4dev.dydx.exchange",
                  "socket": "wss://indexer.v4dev.dydx.exchange"
               }
            ],
            "validators": [
-               "http://validator.v4dev.dydx.exchange"
+               "https://validator.v4dev.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.0xsquid.com",
-            "faucet": "http://faucet.v4dev.dydx.exchange"
+            "faucet": "https://faucet.v4dev.dydx.exchange"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
@@ -307,10 +308,11 @@
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "help": "https://help.dydx.exchange"
         },
         "wallets": {
            "walletconnect": {
@@ -370,10 +372,11 @@
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "help": "https://help.dydx.exchange"
         },
         "wallets": {
            "walletconnect": {
@@ -424,6 +427,8 @@
               }
            ],
            "validators": [
+               "https://dydx-testnet-full-rpc.public.blastapi.io/",
+               "https://dydx-testnet-rpc.polkachu.com/",
               "https://dydx-testnet.nodefleet.org",
               "https://test-dydx.kingnodes.com",
               "https://dydx-rpc.liquify.com/api=8878132/dydx"
@@ -435,7 +440,7 @@
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
            "blogs": "https://www.dydx.foundation/blog"
@@ -499,71 +504,7 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX V4"
-         }
-      },
-      "dydxprotocol-testnet-dsrv": {
-         "name": "v4 Public Testnet/DSRV",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
-               }
-            ],
-            "validators": [
-               "https://dydx-testnet-archive.allthatnode.com:26657/XZvMM41hESf8PJrEQiTzbCOMVyFca79R"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com",
-            "faucet": "https://faucet.v4testnet.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "statusPage": "https://status.v4testnet.dydx.exchange/",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
            "blogs": "https://www.dydx.foundation/blog"
@@ -627,7 +568,7 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
            "blogs": "https://www.dydx.foundation/blog"
@@ -691,7 +632,7 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
            "blogs": "https://www.dydx.foundation/blog"
@@ -750,6 +691,134 @@
            "0xsquid": "https://testnet.api.squidrouter.com",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
+         "links": {
+            "tos": "https://dydx.exchange/v4-terms",
+            "privacy": "https://dydx.exchange/privacy",
+            "statusPage": "https://status.v4testnet.dydx.exchange/",
+            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX V4"
+         }
+      },
+      "dydxprotocol-testnet-polkachu": {
+         "name": "v4 Public Testnet/Polkahcu",
+         "ethereumChainId": "5",
+         "dydxChainId": "dydx-testnet-4",
+         "chainName": "dYdX Chain",
+         "chainLogo": "dydx-chain.png",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
+               }
+            ],
+            "validators": [
+               "https://dydx-testnet-rpc.polkachu.com/"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "faucet": "https://faucet.v4testnet.dydx.exchange"
+         },
+         "links": {
+            "tos": "https://dydx.exchange/v4-terms",
+            "privacy": "https://dydx.exchange/privacy",
+            "statusPage": "https://status.v4testnet.dydx.exchange/",
+            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX V4"
+         }
+      },
+      "dydxprotocol-testnet-bware": {
+         "name": "v4 Public Testnet/BWare",
+         "ethereumChainId": "5",
+         "dydxChainId": "dydx-testnet-4",
+         "chainName": "dYdX Chain",
+         "chainLogo": "dydx-chain.png",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
+               }
+            ],
+            "validators": [
+               "https://dydx-testnet-full-rpc.public.blastapi.io/"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "faucet": "https://faucet.v4testnet.dydx.exchange"
+         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
@@ -822,7 +891,8 @@
            "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": {
@@ -0,0 +1,76 @@
+/* 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);
+  }
+}
@@ -80,7 +80,7 @@ Styled.TriggerIcon = styled.span`
  width: var(--trigger-icon-width);

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

  ${Styled.Trigger}[data-state='open'] & {
@@ -3,31 +3,43 @@ import styled, { AnyStyledComponent } from 'styled-components';

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

-import { Dialog, DialogPlacement } from '@/components/Dialog';
-import { ComboboxMenu } from '@/components/ComboboxMenu';
+import { Dialog, DialogPlacement, type DialogProps } from '@/components/Dialog';
+import { ComboboxMenu, type ComboboxMenuProps } 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;
 };

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

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

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

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

@@ -23,6 +23,11 @@ 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,
@@ -34,7 +39,7 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend

  className,
  withStickyLayout,
-}: ElementProps<MenuItemValue, MenuGroupValue> & StyleProps) => {
+}: ComboboxMenuProps<MenuItemValue, MenuGroupValue>) => {
  const [highlightedCommand, setHighlightedCommand] = useState<MenuItemValue>();
  const [searchValue, setSearchValue] = useState('');
  // const inputRef = useRef<HTMLInputElement | null>(null);
@@ -171,6 +176,7 @@ 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;
@@ -269,18 +275,17 @@ 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);
-
-  ${layoutMixins.scrollSnapItem}
+  --item-gap: var(--comboboxMenu-item-gap);

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

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

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

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

  const showOverlay = ![DialogPlacement.Inline, DialogPlacement.FullScreen].includes(placement);
@@ -13,6 +13,7 @@ import {
  CaretIcon,
  CautionCircleStrokeIcon,
  CautionCircleIcon,
+  ChatIcon,
  CheckIcon,
  ChevronLeftIcon,
  ChevronRightIcon,
@@ -39,6 +40,7 @@ import {
  LockIcon,
  LogoShortIcon,
  MenuIcon,
+  MigrateIcon,
  MintscanIcon,
  OrderbookIcon,
  OrderCanceledIcon,
@@ -80,6 +82,7 @@ export enum IconName {
  Caret = 'Caret',
  CautionCircle = 'CautionCircle',
  CautionCircleStroked = 'CautionCircleStroked',
+  Chat = 'Chat',
  Check = 'Check',
  ChevronLeft = 'ChevronLeft',
  ChevronRight = 'ChevronRight',
@@ -106,6 +109,7 @@ export enum IconName {
  Lock = 'Lock',
  LogoShort = 'LogoShort',
  Menu = 'Menu',
+  Migrate = 'Migrate',
  Mintscan = 'Mintscan',
  Onboarding = 'Onboarding',
  Orderbook = 'OrderbookIcon',
@@ -148,6 +152,7 @@ const icons = {
  [IconName.Caret]: CaretIcon,
  [IconName.CautionCircle]: CautionCircleIcon,
  [IconName.CautionCircleStroked]: CautionCircleStrokeIcon,
+  [IconName.Chat]: ChatIcon,
  [IconName.Check]: CheckIcon,
  [IconName.ChevronLeft]: ChevronLeftIcon,
  [IconName.ChevronRight]: ChevronRightIcon,
@@ -174,6 +179,7 @@ const icons = {
  [IconName.Lock]: LockIcon,
  [IconName.LogoShort]: LogoShortIcon,
  [IconName.Menu]: MenuIcon,
+  [IconName.Migrate]: MigrateIcon,
  [IconName.Mintscan]: MintscanIcon,
  [IconName.Orderbook]: OrderbookIcon,
  [IconName.OrderCanceled]: OrderCanceledIcon,
@@ -525,6 +525,9 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
 `;

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

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

 Styled.Panel = styled.section`
-  ${layoutMixins.flexColumn}
+  ${layoutMixins.row}

  background-color: var(--color-layer-3);
  border-radius: 0.875rem;
 `;

+Styled.Left = styled.div`
+  ${layoutMixins.flexColumn}
+  width: 100%;
+`;
+
 Styled.Header = styled.header<{ hasSeparator?: boolean }>`
  ${layoutMixins.spacedRow}
-
-  padding: 0.875rem 1rem 0.625rem;
-  font-size: 0.875rem;
+  padding: 1rem 1rem;

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

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

@@ -86,6 +94,5 @@ Styled.Content = styled.div`
  ${layoutMixins.scrollArea}
  ${layoutMixins.stickyArea0}
  --stickyArea0-background: transparent;
-
-  padding: 0.5rem 1rem;
+  padding: 1rem 1rem;
 `;
@@ -44,4 +44,4 @@ export type EvmDerivedAddresses = {
  };
 };

-export const AMOUNT_RESERVED_FOR_GAS_USDC = 100_000;
+export const AMOUNT_RESERVED_FOR_GAS_USDC = 0.1;
@@ -21,7 +21,7 @@ export type MenuItem<MenuItemValue, MenuItemTypes = string> = {
  value: MenuItemValue;

  slotBefore?: React.ReactNode;
-  label: string;
+  label: React.ReactNode;
  labelRight?: React.ReactNode;
  tag?: React.ReactNode;
  slotAfter?: React.ReactNode;
@@ -44,7 +44,7 @@ export const useTradingView = ({
  const hasMarkets = marketIds.length > 0;

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

  return { savedResolution };
 };
@@ -6,7 +6,6 @@ import { useQuery } from 'react-query';
 import { formatUnits } from 'viem';

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

 import { convertBech32Address } from '@/lib/addressUtils';
@@ -21,7 +20,6 @@ import { useTokenConfigs } from './useTokenConfigs';
 type UseAccountBalanceProps = {
  // Token Items
  addressOrDenom?: string;
-  assetSymbol?: string;
  decimals?: number;

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

 export const useAccountBalance = ({
  addressOrDenom,
-  assetSymbol,
  bech32AddrPrefix,
  chainId,
  decimals = 0,
@@ -91,7 +88,7 @@ export const useAccountBalance = ({
  });

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

  const nativeTokenCoinBalance = balances?.[chainTokenDenom];
  const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount);
@@ -15,6 +15,8 @@ import type { ResolutionString } from 'public/tradingview/charting_library';

 import type { ConnectNetworkEvent, NetworkConfig } 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';

@@ -36,6 +38,7 @@ const useDydxClientContext = () => {
  // ------ Network ------ //

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

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

@@ -65,7 +68,14 @@ const useDydxClientContext = () => {
            new Network(
              selectedNetwork,
              new IndexerConfig(networkConfig.indexerUrl, networkConfig.websocketUrl),
-              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,
              })
@@ -74,13 +74,12 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
    () => ({
      depositToSubaccount: async ({
        subaccountClient,
-        assetId = 0,
        amount,
      }: {
        subaccountClient: SubaccountClient;
        assetId?: number;
-        amount: Long;
-      }) => await compositeClient?.validatorClient.post.deposit(subaccountClient, assetId, amount),
+        amount: number;
+      }) => await compositeClient?.depositToSubaccount(subaccountClient, amount.toString()),

      withdrawFromSubaccount: async ({
        subaccountClient,
@@ -201,13 +200,9 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
    async (balance: AccountBalance) => {
      if (!localDydxWallet) return;

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

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

  const deposit = useCallback(
-    async (amount: Long) => {
+    async (amount: number) => {
      if (!subaccountClient) {
        return;
      }
@@ -9,11 +9,13 @@ export const useTokenConfigs = (): {
      denom: string;
      name: string;
      decimals: number;
+      gasDenom?: string;
    },
    [DydxChainAsset.CHAINTOKEN]: {
      denom: string;
      name: string;
      decimals: number;
+      gasDenom?: string;
    },
  };
  usdcDenom: string;
@@ -0,0 +1 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5.625 6.1875h6.75m-6.75 2.25H9M1.6875 9.57c0 1.2.84225 2.2455 2.03025 2.4203.84675.1245 1.7025.2197 2.56725.2842.2625.0195.5025.1575.64875.3758L9 15.75l2.0663-3.0997c.0724-.1078.1685-.1977.2809-.2628.1125-.0651.2382-.1038.3678-.113.8589-.0641 1.7152-.1589 2.5672-.2842 1.188-.1748 2.0303-1.2195 2.0303-2.42105v-4.5135c0-1.2015-.8423-2.24625-2.0303-2.421A36.294434 36.294434 0 0 0 9 2.25c-1.794 0-3.558.13125-5.28225.38475-1.188.17475-2.03025 1.22025-2.03025 2.421V9.57Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>
@@ -1 +1 @@
-<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>
+<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>
@@ -8,6 +8,7 @@ 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';
@@ -34,6 +35,7 @@ export { default as LockIcon } from './lock.svg';
 export { default as LogoShortIcon } from './logo-short';
 export { default as MarketsIcon } from './markets.svg';
 export { default as MenuIcon } from './menu.svg';
+export { default as MigrateIcon } from './migrate.svg';
 export { default as MintscanIcon } from './logos/mintscan.svg';
 export { default as OrderbookIcon } from './orderbook.svg';
 export { default as OverviewIcon } from './overview.svg';
@@ -1,12 +1,16 @@
 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, useStringGetter } from '@/hooks';
+import { useApiState, useSelectedNetwork, 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';
@@ -24,6 +28,8 @@ 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
@@ -38,20 +44,37 @@ export const FooterDesktop = () => {

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

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

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

  background-color: ${({ exchangeStatus }) =>
    ({
@@ -104,12 +129,28 @@ 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}
-
-  padding: 0 0.5em;
+  font: var(--font-tiny-book);
 `;
@@ -24,6 +24,7 @@ import { openDialog } from '@/state/dialogs';

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

 export const HeaderDesktop = () => {
  const stringGetter = useStringGetter();
@@ -34,26 +35,26 @@ export const HeaderDesktop = () => {
    {
      group: 'navigation',
      items: [
-        {
-          value: 'MARKET',
-          label: stringGetter({ key: STRING_KEYS.MARKET }),
-          href: AppRoute.Markets,
-        },
        {
          value: 'TRADE',
          label: stringGetter({ key: STRING_KEYS.TRADE }),
          href: AppRoute.Trade,
        },
-        {
-          value: chainTokenLabel,
-          label: chainTokenLabel,
-          href: `/${chainTokenLabel}`,
-        },
        {
          value: 'PORTFOLIO',
          label: stringGetter({ key: STRING_KEYS.PORTFOLIO }),
          href: AppRoute.Portfolio,
        },
+        {
+          value: 'MARKETS',
+          label: stringGetter({ key: STRING_KEYS.MARKETS }),
+          href: AppRoute.Markets,
+        },
+        {
+          value: chainTokenLabel,
+          label: chainTokenLabel,
+          href: `/${chainTokenLabel}`,
+        },
        {
          value: 'MORE',
          label: stringGetter({ key: STRING_KEYS.MORE }),
@@ -62,7 +63,7 @@ export const HeaderDesktop = () => {
              value: 'DOCUMENTATION',
              slotBefore: <Icon iconName={IconName.Terminal} />,
              label: stringGetter({ key: STRING_KEYS.DOCUMENTATION }),
-              href: 'https://v4-teacher.vercel.app/',
+              href: 'https://docs.dydx.exchange/',
            },
            {
              value: 'MINTSCAN',
@@ -150,6 +151,7 @@ const Styled: Record<string, AnyStyledComponent> = {};

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

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

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

  display: grid;
@@ -169,6 +173,14 @@ Styled.Header = styled.header`
    )
    var(--border-width) 1fr var(--border-width) auto;

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

  :before {
@@ -179,6 +191,7 @@ Styled.Header = styled.header`
 Styled.NavigationMenu = styled(NavigationMenu)`
  & {
    --navigationMenu-height: var(--stickyArea-topHeight);
+    --navigationMenu-item-height: var(--trigger-height);
  }

  ${layoutMixins.scrollArea}
@@ -107,8 +107,8 @@ export const getHydratedTradingData = ({
  perpetualMarkets?: Record<string, PerpetualMarket>;
 }) => ({
  ...data,
-  asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId].assetId],
-  stepSizeDecimals: perpetualMarkets?.[data.marketId].configs?.stepSizeDecimals,
-  tickSizeDecimals: perpetualMarkets?.[data.marketId].configs?.tickSizeDecimals,
+  asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId]?.assetId],
+  stepSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.stepSizeDecimals,
+  tickSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.tickSizeDecimals,
  ...('side' in data && { orderSide: convertAbacusOrderSide(data.side) }),
 });
@@ -46,6 +46,8 @@ import {
  WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
 } from '@/constants/wallets';

+import { isTruthy } from './isTruthy';
+
 // Config

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

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

 const injectedConnectorOptions = {
  chains,
@@ -202,5 +208,7 @@ export const resolveWagmiConnector = ({
    ? createInjectedConnectorWithProvider(walletConnection.provider)
    : walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id
    ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id, walletConnectConfig)
-    : getConnectors(walletConnectConfig).find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
+    : getConnectors(walletConnectConfig).find(
+        ({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId
+      );
 };
@@ -17,7 +17,7 @@ import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { AppRoute, PortfolioRoute, HistoryRoute } from '@/constants/routes';
 import { wallets, WalletType } from '@/constants/wallets';
-import { useAccounts, useStringGetter } from '@/hooks';
+import { useAccounts, useStringGetter, useTokenConfigs } from '@/hooks';

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

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

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

      <Styled.TablePanel
-        header={stringGetter({ key: STRING_KEYS.HISTORY })}
-        linkto={`${AppRoute.Portfolio}/${PortfolioRoute.History}/${HistoryRoute.Trades}`}
+        slotHeaderContent={stringGetter({ key: STRING_KEYS.HISTORY })}
+        href={`${AppRoute.Portfolio}/${PortfolioRoute.History}/${HistoryRoute.Trades}`}
        hasSeparator
      >
        <FillsTable
@@ -273,22 +278,21 @@ Styled.RewardsPanel = styled(Panel)`
 `;

 Styled.TablePanel = styled(Panel)`
-  padding: 0;
  max-width: calc(100vw - 2rem);
  max-height: 10rem;
+  margin-top: 0.5rem;
+  padding: 0;
+  border-radius: 0.875rem;

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

    tbody {
-      background-color: transparent;
-
      tr {
        td:nth-child(2),
        td:nth-child(3) {
@@ -22,7 +22,6 @@ 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();
@@ -110,7 +109,7 @@ export const DYDXBalancePanel = () => {
              value: (
                <Output
                  type={OutputType.Asset}
-                  value={nativeTokenBalance + nativeStakingBalance}
+                  value={nativeTokenBalance.plus(nativeStakingBalance)}
                  tag={chainTokenLabel}
                />
              ),
@@ -126,7 +125,7 @@ const Styled: Record<string, AnyStyledComponent> = {};

 Styled.Header = styled.div`
  ${layoutMixins.spacedRow}
-  padding: 1.25rem 1.5rem 0.5rem;
+  padding: 1rem 1.5rem 0;
 `;

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

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

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

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

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

-import { Details } from '@/components/Details';
 import { Panel } from '@/components/Panel';
 import { IconName } from '@/components/Icon';
-import { Button } from '@/components/Button';
 import { IconButton } from '@/components/IconButton';
 import { Link } from '@/components/Link';
-import { Output, OutputType } from '@/components/Output';
-import { VerticalSeparator } from '@/components/Separator';
-import { WithReceipt } from '@/components/WithReceipt';

 import { openDialog } from '@/state/dialogs';
-import { getSelectedNetwork } from '@/state/appSelectors';

 import { DYDXBalancePanel } from './DYDXBalancePanel';
+import { MigratePanel } from './MigratePanel';

-// TODO: replace placeholder URL with real URLs when avaialble
+// TODO: consolidate help link urls to env variables
 const GOVERNANCE_HELP_URL = 'https://help.dydx.exchange/';
-const STAKING_HELP_URL = 'https://help.dydx.exchange/';
+const STAKING_HELP_URL =
+  'https://docs.dydx.community/dydx-chain-documentation/staking/how-to-stake';

 export const RewardsPage = () => {
  const dispatch = useDispatch();
  const stringGetter = useStringGetter();
+
  const { isTablet, isNotTablet } = useBreakpoints();

-  const selectedNetwork = useSelector(getSelectedNetwork);
-
-  // const chainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId);
-
-  // const { balance } = useAccountBalance({
-  //   addressOrDenom: import.meta.env.VITE_V3_TOKEN_ADDRESS,
-  //   assetSymbol: 'DYDX',
-  //   chainId,
-  //   isCosmosChain: false,
-  // });
-
-  // const tokenBalance = import.meta.env.VITE_V3_TOKEN_ADDRESS ? balance : 0;
+  const panelArrow = (
+    <Styled.Arrow>
+      <Styled.IconButton
+        action={ButtonAction.Base}
+        iconName={IconName.Arrow}
+        size={ButtonSize.Small}
+      />
+    </Styled.Arrow>
+  );

  return (
    <Styled.Page>
-      {/* {isNotTablet ? (
-        <Styled.Migrate>
-          <Styled.TwoItemRow>
-            <div>
-              <Styled.MigrateTitle>
-                {stringGetter({ key: STRING_KEYS.MIGRATE })}
-              </Styled.MigrateTitle>
-              <Styled.Description>
-                {stringGetter({ key: STRING_KEYS.MIGRATE_DESCRIPTION })}
-                <Link href={MIGRATE_HELP_URL}>
-                  {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-                </Link>
-              </Styled.Description>
-            </div>
-            <Styled.MigrateAction>
-              <div>
-                <div>{stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })}</div>
-                <div>
-                  <Styled.Token type={OutputType.Asset} value={tokenBalance} />
-                </div>
-              </div>
-              <Button
-                action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
-                // type={ButtonType.Link}
-                // href={BRIDGE_URL}
-                disabled
-              >
-                {tokenBalance
-                  ? `${stringGetter({ key: STRING_KEYS.MIGRATE_NOW })} →`
-                  : stringGetter({ key: STRING_KEYS.NO_TOKENS_TO_MIGRATE })}
-              </Button>
-            </Styled.MigrateAction>
-          </Styled.TwoItemRow>
-        </Styled.Migrate>
-      ) : (
-        <Styled.MobileMigrateCard
-          slotHeader={
-            <Styled.MobileMigrateHeader>
-              <h3>{stringGetter({ key: STRING_KEYS.MIGRATE })}</h3>
-              <VerticalSeparator />
-              <span>
-                {stringGetter({
-                  key: STRING_KEYS.FROM_TO,
-                  params: { FROM: <strong>Ethereum</strong>, TO: <strong>dYdX Chain</strong> },
-                })}
-              </span>
-            </Styled.MobileMigrateHeader>
-          }
-        >
-          <Styled.WithReceipt
-            slotReceipt={
-              <Styled.Details
-                items={[
-                  {
-                    key: 'available-to-migrate',
-                    label: stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE }),
-                    value: <Output type={OutputType.Asset} value={tokenBalance} />,
-                  },
-                ]}
-              />
-            }
-          >
-            <Button
-              action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
-              size={ButtonSize.Medium}
-              disabled
-            >
-              {tokenBalance
-                ? `${stringGetter({ key: STRING_KEYS.MIGRATE_NOW })} →`
-                : stringGetter({ key: STRING_KEYS.NO_TOKENS_TO_MIGRATE })}
-            </Button>
-          </Styled.WithReceipt>
-          <Styled.LearnMore>
-            {stringGetter({ key: STRING_KEYS.WANT_TO_LEARN })}
-            <Link href={MIGRATE_HELP_URL}>{stringGetter({ key: STRING_KEYS.CLICK_HERE })}</Link>
-          </Styled.LearnMore>
-        </Styled.MobileMigrateCard>
-      )} */}
-
+      {import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}
      <Styled.PanelRow>
        {isTablet && (
          <Styled.BalancePanelContainer>
@@ -138,42 +53,28 @@ export const RewardsPage = () => {

        <Styled.Panel
          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
+          slotRight={panelArrow}
          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
        >
-          <Styled.Row>
-            <Styled.Description>
-              {stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })}
-              <Link href={GOVERNANCE_HELP_URL} onClick={(e) => e.stopPropagation()}>
-                {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-              </Link>
-            </Styled.Description>
-            {/* TODO: vertically center based on Panel height */}
-            <Styled.IconButton
-              action={ButtonAction.Base}
-              iconName={IconName.Arrow}
-              size={ButtonSize.Small}
-            />
-          </Styled.Row>
+          <Styled.Description>
+            {stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })}
+            <Link href={GOVERNANCE_HELP_URL} onClick={(e) => e.stopPropagation()}>
+              {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
+            </Link>
+          </Styled.Description>
        </Styled.Panel>

        <Styled.Panel
          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>}
+          slotRight={panelArrow}
          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
        >
-          <Styled.Row>
-            <Styled.Description>
-              {stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })}
-              <Link href={STAKING_HELP_URL} onClick={(e) => e.stopPropagation()}>
-                {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
-              </Link>
-            </Styled.Description>
-            {/* TODO: vertically center based on Panel height */}
-            <Styled.IconButton
-              action={ButtonAction.Base}
-              iconName={IconName.Arrow}
-              size={ButtonSize.Small}
-            />
-          </Styled.Row>
+          <Styled.Description>
+            {stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })}
+            <Link href={STAKING_HELP_URL} onClick={(e) => e.stopPropagation()}>
+              {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
+            </Link>
+          </Styled.Description>
        </Styled.Panel>

        {isNotTablet && (
@@ -191,61 +92,25 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Page = styled.div`
  ${layoutMixins.contentContainerPage}
  gap: 1.5rem;
-
-  @media ${breakpoints.tablet} {
-    padding: 1rem;
-  }
 `;

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

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

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

-Styled.Migrate = styled.section`
-  max-width: min(100vw, var(--content-max-width));
-
-  padding: 1.5rem;
-
-  background-color: var(--color-layer-3);
-  border-radius: 0.875rem;
-`;
-
-Styled.TwoItemRow = styled(Styled.Row)`
-  grid-template-columns: 1fr 1fr;
-`;
-
-Styled.MigrateAction = styled(Styled.TwoItemRow)`
-  padding: 1rem;
-
-  background-color: var(--color-layer-2);
-  border: solid var(--border-width) var(--color-border);
-  border-radius: 0.75rem;
-`;
-
-Styled.Token = styled(Output)`
-  font: var(--font-large-book);
-`;
-
-Styled.PanelRow = styled(Styled.Row)`
+Styled.PanelRow = styled.div`
+  ${layoutMixins.spacedRow}
  gap: 1.5rem;
  max-width: min(100vw, var(--content-max-width));
  align-items: flex-start;
@@ -269,65 +134,11 @@ Styled.BalancePanelContainer = styled.div`
  }
 `;

-Styled.Title = styled.h3`
-  ${layoutMixins.inlineRow}
-  padding: 1.25rem 1.5rem 0.5rem;
-
-  font: var(--font-medium-book);
-  color: var(--color-text-2);
-`;
-
-Styled.MigrateTitle = styled(Styled.Title)`
-  padding: 0 0 0.5rem;
-`;
-
-Styled.MobileMigrateCard = styled(Styled.Panel)`
-  ${layoutMixins.flexColumn}
-  gap: 1rem;
-
-  align-items: center;
-`;
-
-Styled.MobileMigrateHeader = styled(Styled.Title)`
-  ${layoutMixins.inlineRow}
-  gap: 1ch;
-  padding-bottom: 1rem;
-
-  font: var(--font-small-book);
-  color: var(--color-text-0);
-
-  h3 {
-    ${layoutMixins.inlineRow}
-    font: var(--font-large-book);
-    color: var(--color-text-2);
-
-    svg {
-      font-size: 1.75rem;
-    }
-  }
-
-  span {
-    margin-top: 0.2rem;
-    b {
-      font-weight: var(--fontWeight-book);
-      color: var(--color-text-1);
-    }
-  }
-`;
-
-Styled.Details = styled(Details)`
-  padding: 0.5rem 1rem;
-`;
-
-Styled.WithReceipt = styled(WithReceipt)`
-  width: 100%;
-`;
-
-Styled.LearnMore = styled(Styled.Description)`
-  ${layoutMixins.row}
-  gap: 1ch;
-`;
-
 Styled.IconButton = styled(IconButton)`
  color: var(--color-text-0);
+  --color-border: var(--color-layer-6);
+`;
+
+Styled.Arrow = styled.div`
+  padding: 1rem 1.5rem;
 `;
@@ -17,7 +17,7 @@ import { MustBigNumber } from '@/lib/numbers';
 import { MidMarketPrice } from '@/views/MidMarketPrice';

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

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

    'abacus:connectNetwork': CustomEvent;
  }
+
+  var Intercom: any;
 }
@@ -36,11 +36,10 @@
  --single-unit-height: 9.375rem;

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

  /* Market Selector constants */
  --marketsDropdown-openWidth: 45rem;
@@ -188,13 +188,14 @@ 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: 0.5em;
+    gap: var(--item-gap);

    padding: var(--item-padding);
    border-radius: var(--item-radius);
@@ -168,7 +168,7 @@ Styled.TriggerIcon = styled.span`
  width: 0.75em;

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

  ${Styled.Trigger}[data-state='open'] & {
    rotate: -0.5turn;
@@ -104,4 +104,5 @@ Styled.Button = styled(Button)`

 Styled.IconButton = styled(IconButton)`
  color: var(--color-text-0);
+  --color-border: var(--color-layer-6);
 `;
@@ -1,69 +1,94 @@
+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 { layoutMixins } from '@/styles/layoutMixins';
+import { ChatIcon, FeedbackIcon, FileIcon, TerminalIcon } from '@/icons';

-import { Button } from '@/components/Button';
-import { Dialog } from '@/components/Dialog';
-import { ButtonAction, ButtonType } from '@/constants/buttons';
-import { Icon, IconName } from '@/components/Icon';
+import { ComboboxDialogMenu } from '@/components/ComboboxDialogMenu';
+
+import { isTruthy } from '@/lib/isTruthy';

 type ElementProps = {
  setIsOpen: (open: boolean) => void;
 };

-export const HELP_URL = `https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform?usp=sf_link`;
+const HELP_LINKS = {
+  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 (
-    <Dialog
+    <Styled.ComboboxDialogMenu
      isOpen
+      withSearch={false}
      setIsOpen={setIsOpen}
-      title={stringGetter({ key: STRING_KEYS.PROVIDE_FEEDBACK })}
-      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>
+      title={stringGetter({ key: STRING_KEYS.HELP })}
+      items={HELP_ITEMS}
+    />
  );
 };

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

-Styled.ButtonRow = styled.div`
-  ${layoutMixins.row}
-
-  gap: 0.5rem;
-  justify-content: end;
-`;
-
-Styled.Content = styled.div`
-  ${layoutMixins.column}
-  gap: 1rem;
+Styled.ComboboxDialogMenu = styled(ComboboxDialogMenu)`
+  --dialog-width: var(--dialog-small-width);
+  --dialog-content-paddingTop: 1rem;
+  --dialog-content-paddingBottom: 1rem;
+  --comboxDialogMenu-item-gap: 1rem;
 `;
@@ -37,7 +37,7 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => {
  const stringGetter = useStringGetter();
  const { isMobile } = useBreakpoints();

-  const { walletType } = useAccounts();
+  const { disconnect, walletType } = useAccounts();

  const currentOnboardingStep = useSelector(calculateOnboardingStep);

@@ -45,10 +45,17 @@ 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={setIsOpen}
+      setIsOpen={setIsOpenFromDialog}
      {...(currentOnboardingStep &&
        {
          [OnboardingSteps.ChooseWallet]: {
@@ -87,10 +94,10 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => {
            title: stringGetter({ key: STRING_KEYS.ACKNOWLEDGE_TERMS }),
            children: (
              <Styled.Content>
-                <AcknowledgeTerms />
+                <AcknowledgeTerms onClose={() => setIsOpenFromDialog?.(false)} />
              </Styled.Content>
            ),
-            width: '20rem',
+            width: '30rem',
          },
          [OnboardingSteps.DepositFunds]: {
            title: stringGetter({ key: STRING_KEYS.DEPOSIT }),
@@ -6,14 +6,17 @@ 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 = ({ onContinue }: ElementProps) => {
+export const AcknowledgeTerms = ({ onClose, onContinue }: ElementProps) => {
  const stringGetter = useStringGetter();

  const { saveHasAcknowledgedTerms } = useAccounts();
@@ -25,26 +28,40 @@ export const AcknowledgeTerms = ({ onContinue }: ElementProps) => {

  return (
    <>
-      <span>
+      <p>
        {stringGetter({
-          key: STRING_KEYS.LEGAL_UPDATES_DESCRIPTION,
+          key: STRING_KEYS.TOS_TITLE,
          params: {
-            TOU: (
+            TERMS_LINK: (
              <Styled.Link href={`/#${AppRoute.Terms}`}>
                {stringGetter({ key: STRING_KEYS.TERMS_OF_USE })}
              </Styled.Link>
            ),
-            PRIVACY_POLICY: (
+            PRIVACY_POLICY_LINK: (
              <Styled.Link href={`/#${AppRoute.Privacy}`}>
                {stringGetter({ key: STRING_KEYS.PRIVACY_POLICY })}
              </Styled.Link>
            ),
          },
        })}
-      </span>
-      <Button onClick={onAcknowledgement} action={ButtonAction.Primary}>
-        {stringGetter({ key: STRING_KEYS.I_AGREE })}
-      </Button>
+      </p>
+      <Styled.TOS>
+        <ul>
+          <li>{stringGetter({ key: STRING_KEYS.TOS_LINE1 })}</li>
+          <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>
    </>
  );
 };
@@ -59,3 +76,23 @@ 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;
+`;
@@ -130,12 +130,14 @@ export const GenerateKeys = ({
          }
        }
      } catch (error) {
+        setStatus(EvmDerivedAccountStatus.NotDerived);
        const { message } = parseWalletError({ error, stringGetter });

        if (message) {
          track(AnalyticsEvent.OnboardingWalletIsNonDeterministic);
          setError(message);
        }
+        return;
      }

      await setWalletFromEvmSignature(signature);
@@ -37,7 +37,7 @@ export const TradeDialog = ({ isOpen, setIsOpen, slotTrigger }: ElementProps) =>
  const selectedTradeType = getSelectedTradeType(type);
  const { typeOptions } = useSelector(getInputTradeOptions, shallowEqual) ?? {};

-  const allTradeTypeItems = typeOptions?.toArray()?.map(({ type, stringKey }) => ({
+  const allTradeTypeItems = (typeOptions?.toArray() ?? []).map(({ type, stringKey }) => ({
    value: type,
    label: stringGetter({
      key: stringKey as StringKey,
@@ -87,7 +87,6 @@ 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,
@@ -322,7 +322,6 @@ export const TradeForm = ({
          summary={summary ?? undefined}
          currentStep={currentStep}
          showDeposit={inputAlert?.errorAction === TradeInputErrorAction.DEPOSIT}
-          showConnectWallet={inputAlert?.errorAction === TradeInputErrorAction.CONNECT_WALLET}
        />
      </Styled.Footer>
    </Styled.TradeForm>
@@ -7,9 +7,8 @@ import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { TRADE_TYPE_STRINGS, MobilePlaceOrderSteps } from '@/constants/trade';

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

-import { AssetIcon } from '@/components/AssetIcon';
 import { Button } from '@/components/Button';
 import { Output, OutputType, ShowSign } from '@/components/Output';
 import { WithDetailsReceipt } from '@/components/WithDetailsReceipt';
@@ -47,6 +46,7 @@ export const PlaceOrderButtonAndReceipt = ({
 }: ElementProps) => {
  const stringGetter = useStringGetter();
  const dispatch = useDispatch();
+  const { chainTokenLabel } = useTokenConfigs();

  const canAccountTrade = useSelector(calculateCanAccountTrade);
  const subaccountNumber = useSelector(getSubaccountId);
@@ -88,7 +88,14 @@ export const PlaceOrderButtonAndReceipt = ({
          {/* <AssetIcon symbol="DYDX" /> */}
        </>
      ),
-      value: <Output type={OutputType.Asset} value={reward} useGrouping tag={reward ? "Dv4TNT" : ''} />,
+      value: (
+        <Output
+          type={OutputType.Asset}
+          value={reward}
+          useGrouping
+          tag={reward ? chainTokenLabel : ''}
+        />
+      ),
      tooltip: 'max-reward',
    },
    {
@@ -111,7 +118,7 @@ export const PlaceOrderButtonAndReceipt = ({
        ? actionStringKey
        : STRING_KEYS.UNAVAILABLE,
      buttonAction: ButtonAction.Primary,
-      buttonState: { isDisabled: !shouldEnableTrade },
+      buttonState: { isDisabled: !shouldEnableTrade, isLoading: hasMissingData },
    },

    [MobilePlaceOrderSteps.PreviewOrder]: {
@@ -148,7 +155,10 @@ export const PlaceOrderButtonAndReceipt = ({

  const buttonState = currentStep
    ? buttonStatesPerStep[currentStep].buttonState
-    : { isDisabled: !shouldEnableTrade || isLoading, isLoading };
+    : {
+        isDisabled: !shouldEnableTrade || isLoading,
+        isLoading: isLoading || hasMissingData,
+      };

  return (
    <WithDetailsReceipt detailItems={items}>
@@ -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>
        ),
      },
@@ -231,7 +231,7 @@ const getOrdersTableColumnDef = ({
          key: STRING_KEYS.FILL,
        })}`,
        renderCell: ({
-          asset: { symbol: assetSymbol },
+          asset,
          createdAtMilliseconds,
          size,
          status,
@@ -254,7 +254,7 @@ const getOrdersTableColumnDef = ({
                    value={createdAtMilliseconds}
                  />
                  <Styled.AssetIconWithStatus>
-                    <Styled.AssetIcon symbol={assetSymbol} />
+                    <Styled.AssetIcon symbol={asset?.id} />
                    <Styled.StatusDot color={statusIconColor} />
                  </Styled.AssetIconWithStatus>
                </>
@@ -276,7 +276,7 @@ const getOrdersTableColumnDef = ({
                  type={OutputType.Asset}
                  value={size}
                  fractionDigits={TOKEN_DECIMALS}
-                  tag={assetSymbol}
+                  tag={asset?.id}
                />
              </Styled.InlineRow>
            </TableCell>
Author	SHA1	Message	Date
Adam Fraser	d524bbebfe	Merge branch 'main' into adamfraser-testnet-node-updates	2023-10-30 17:57:34 +01:00
aleka	2fe6c2bb3b	reorder header, center align header, update collapse caret icons (#110 )	2023-10-27 23:32:51 -04:00
aleka	e6858ca917	show loading state instead of "Unavailable" for place order button (#104 ) * show loading instead of unavailable for place order button	2023-10-27 17:39:12 -04:00
aleka	d92b49f4fa	bump packages, fix missing asset symbol (#106 )	2023-10-27 16:47:34 -04:00
aleka	e7da21962a	add entry point to token migration (#98 ) * update migrate panel * address feedback	2023-10-27 16:14:34 -04:00
aleka	b479531e34	update v4 docs link (#102 )	2023-10-27 16:13:48 -04:00
Bill	0d4c5a547a	Abort key derivation if second signature fails (#109 )	2023-10-27 11:41:00 -07:00
Adam Fraser	7ab892e56c	Add Bware to testnet node config	2023-10-27 19:34:18 +02:00
Adam Fraser	296cec98f4	Remove DSRV from Testnet node config options	2023-10-27 19:19:00 +02:00
Rui	5b235ee53f	Add link to help page (#103 )	2023-10-27 09:15:31 -07:00
Adam Fraser	18dee0586b	Add Polkachu as RPC Node for Testnet (#105 ) * Update env.json * Add Polkachu option to environments * Fix trailing comma error	2023-10-25 18:21:27 -04:00
mikemag-dev	9f1f5987ee	Update apple-app-site-association (#100 )	2023-10-24 18:33:41 -04:00
James Jia	7f531516ca	v1.0: Update LICENSE and README (#101 ) * Update LICENSE and README * Update README, package.json * Update package.json	2023-10-24 14:14:49 -07:00
aleka	3fd71558c0	fix trading view error (#96 ) * fix trading view error * only init trading view if market id is first defined, and nits re fills table with empty asset	2023-10-24 17:06:00 -04:00
aleka	575856b77b	remove asset symbol for account balance logic (#95 )	2023-10-23 17:51:13 -04:00
John Huang	e3609782ed	Indexer and validator are on https for DEV (#97 )	2023-10-23 14:49:03 -07:00
Bill	5ca923984d	Update acknowledge copies (#94 ) * update acknowledgement dialog with new copies * update	2023-10-23 13:59:04 -07:00
Bill	d97626f543	Fix auto-deposit (#93 )	2023-10-23 12:02:05 -07:00
Jared Vu	835f82dbcc	Support Intercom (#92 ) * Add ChatIcon * FooterDesktop Help&Support * HelpDialog w/ triggers * Add other links * item gap css var passing * inject script * Add quotes to script * Close modal on select * Remove feedback form	2023-10-20 16:30:22 -07:00
Bill	051bdda73a	update v4-client init in useDydxClient (#91 ) * update v4-client init in useDydxClient * fix nit	2023-10-20 11:00:03 -07:00
				`@@ -0,0 +1 @@`
				<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>