privy theme

* Support notification for trading rewards

* bump abacus

* Stack notifications based on notification type

* address comments

.env.example

@@ -4,7 +4,11 @@ VITE_ALCHEMY_API_KEY=
 
 VITE_PK_ENCRYPTION_KEY=
 
-VITE_WALLETCONNECT2_PROJECT_ID=
-
 VITE_V3_TOKEN_ADDRESS=
-VITE_TOKEN_MIGRATION_URI=
+VITE_TOKEN_MIGRATION_URI=
+
+AMPLITUDE_API_KEY=
+BUGSNAG_API_KEY=
+IOS_APP_ID=
+INTERCOM_APP_ID=
+STATUS_PAGE_SCRIPT_URI=

LICENSE

@@ -1,6 +1,9 @@
 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.
+Subject to your compliance with applicable law and the v4 Terms of Use, available at dydx.exchange/legal, you are granted the right to use the Program or 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 Program or Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Program or Licensed Work will automatically and immediately terminate.
+
+
+The “Program” or “Licensed Work” shall mean any of the following: 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. repository reflecting a copy of, or link to, this license.
 
 
 The GNU Affero General Public License

README.md

@@ -26,7 +26,7 @@ Alternatively, follow the [IPFS Kubo installation guide](https://docs.ipfs.tech
 
 ## Part 1: Setting up your local environment
 
-### Step 1: Clone the repo
+### 1. Clone the repo
 
 Clone the repository and navigate to its directory:
 
@@ -35,7 +35,7 @@ git clone https://github.com/dydxprotocol/v4-web.git
 cd v4-web
 ```
 
-### Step 2: Install pnpm and dependencies
+### 2. Install pnpm and dependencies
 
 Install pnpm and the project dependencies:
 
@@ -69,7 +69,24 @@ You'll need to provide a Wallet Connect project id to enable onboarding and wall
 - Create a project on https://cloud.walletconnect.com/app
 - Copy over the project ID into this [field](https://github.com/dydxprotocol/v4-web/blob/67ecbd75b43e0c264b7b4d2d9b3d969830b0621c/public/configs/env.json#L822C33-L822C46)
 
-## Part 4: Deploying with Vercel
+## Part 4: Set Enviornment variables
+Set environment variables via `.env`.
+
+- `VITE_BASE_URL` (required): The base URL of the deployment (e.g., `https://www.example.com`).
+- `VITE_ALCHEMY_API_KEY` (optional): Add an Alchemy API key for EVM interactions; the app will fall back to public RPCs if not provided.
+- `VITE_PK_ENCRYPTION_KEY` (optional): AES encryption key used for signature obfuscation; necessary for enabling the "Remember Me" feature.
+- `VITE_V3_TOKEN_ADDRESS` (optional): Address of the V3 $DYDX token.
+- `VITE_TOKEN_MIGRATION_URI` (optional): The URL of the token migration website.
+- `AMPLITUDE_API_KEY` (optional): Amplitude API key for enabling Amplitude; used with `pnpm run build:inject-amplitude`.
+- `BUGSNAG_API_KEY` (optional): API key for enabling Bugsnag; used with `pnpm run build:inject-bugsnag`.
+- `IOS_APP_ID` (optional): iOS app ID used for enabling deep linking to the iOS app; used with `pnpm run build:inject-app-deeplinks`.
+- `INTERCOM_APP_ID` (optional): Used for enabling Intercom; utilized with `pnpm run build:inject-intercom`.
+- `STATUS_PAGE_SCRIPT_URI` (optional): Used for enabling the status page; used with `pnpm run build:inject-statuspage`.
+
+
+# Deployments
+
+## Deploying with Vercel
 
 ### Step 1: Connect your repository to Vercel
 
@@ -81,12 +98,17 @@ For the "Build & Development Settings", we recommend the following:
 - Framework Preset: `Vite`
 - Build Command (override): `pnpm run build`
 
+By default, the dev server runs in development mode and the build command runs in production mode. To override the default mode, you can pass in the `--mode` option flag. For example, if you want to build your app for testnet:
+```
+pnpm run build --mode testnet
+```
+
 If you wish to incorporate analytics via Amplitude and Bugsnag, you can use our scripts:
 `pnpm run build:inject-amplitude` and `pnpm run build:inject-bugsnag`. You will need to provide your own API keys for these services. In the Environment Variables section, name the variables as `AMPLITUDE_API_KEY` and `BUGSNAG_API_KEY` and provide the respective keys as their values.
 
 For more details, check out Vercel's [official documentation](https://vercel.com/docs).
 
-## Part 5: Deploying to IPFS
+## Deploying to IPFS
 
 ### web3.storage: deploy to IPFS via web3.storage using the provided script
 
@@ -118,3 +140,18 @@ To access your content on IPFS:
 2. **Public IPFS gateway:** Access your content via a public IPFS gateway, such as [https://dweb.link](https://dweb.link/) or [https://w3s.link/](https://w3s.link/). Use the gateway URL with your CID appended, like `https://dweb.link/ipfs/your_cid`.
 
 Replace `your_cid` with the actual CID.
+
+## Cloudflare Settings
+
+We recommend that you add your website to Cloudflare for additional security settings.
+
+To block OFAC Sanctioned countries:
+1. Navigate Websites > Domain > Security > WAF
+
+2. Create Rule with the following settings:
+  * If incoming requests match
+`(ip.geoip.country eq "CU") or (ip.geoip.country eq "IR") or (ip.geoip.country eq "KP") or (ip.geoip.country eq "SY") or (ip.geoip.country eq "MM") or (ip.geoip.subdivision_1_iso_code eq "UA-09") or (ip.geoip.subdivision_1_iso_code eq "UA-14") or (ip.geoip.subdivision_1_iso_code eq "UA-43")`
+  * This rule will bring up a Cloudflare page when a restricted geography tries to access your site. You will have the option to display:
+    1. Custom Text
+      - (e.g. `Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use, or have engaged in activity that violates our terms of use, you have been blocked. You may withdraw your funds from the protocol at any time.`)
+    2. Default Cloudflare WAF block page

dev-dist/registerSW.js

@@ -0,0 +1 @@
+if('serviceWorker' in navigator) navigator.serviceWorker.register('/dev-sw.js?dev-sw', { scope: '/', type: 'classic' })

package.json

@@ -39,14 +39,19 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^1.0.3",
-    "@dydxprotocol/v4-client-js": "^0.40.3",
-    "@dydxprotocol/v4-localization": "^0.1.32",
+    "@dydxprotocol/v4-abacus": "^1.2.5",
+    "@dydxprotocol/v4-client-js": "^1.0.11",
+    "@dydxprotocol/v4-localization": "^1.1.11",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
+    "@privy-io/react-auth": "^1.53.1",
+    "@privy-io/wagmi-connector": "^0.1.12",
+    "@radix-ui/react-accordion": "^1.1.2",
+    "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-dropdown-menu": "^2.0.5",
+    "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-navigation-menu": "^1.1.3",
     "@radix-ui/react-popover": "^1.0.6",
     "@radix-ui/react-radio-group": "^1.1.3",
@@ -96,6 +101,7 @@
     "long": "^5.2.3",
     "luxon": "^3.3.0",
     "qr-code-styling": "1.6.0-rc.1",
+    "query-string": "^8.1.0",
     "react": "^18.2.0",
     "react-aria": "^3.25.0",
     "react-dom": "^18.2.0",
@@ -107,8 +113,8 @@
     "reselect": "^4.1.8",
     "styled-components": "^5.3.11",
     "use-latest": "^1.2.1",
-    "viem": "^1.12.2",
-    "wagmi": "^1.3.7"
+    "viem": "^1.20.0",
+    "wagmi": "^1.4.12"
   },
   "devDependencies": {
     "@babel/core": "^7.22.5",
@@ -147,6 +153,7 @@
     "url-polyfill": "^1.1.12",
     "util": "^0.12.5",
     "vite": "^4.3.9",
+    "vite-plugin-pwa": "^0.17.4",
     "vite-plugin-svgr": "^3.2.0",
     "vitest": "^0.32.2",
     "w3name": "^1.0.8",

public/configs/cctp.json

@@ -0,0 +1,12 @@
+[
+    {
+        "chainId": "1",
+        "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+        "name": "Ethereum"
+    },
+    {
+        "chainId": "5",
+        "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
+        "name": "Ethereum Goerli"
+    }
+]

public/configs/documentation.json

@@ -0,0 +1,16 @@
+{
+    "tradingRewardsFAQs": [
+        {
+            "questionLocalizationKey": "APP.TRADING_REWARDS.FAQ_WHO_IS_ELIGIBLE_QUESTION",
+            "answerLocalizationKey": "APP.TRADING_REWARDS.FAQ_WHO_IS_ELIGIBLE_ANSWER"
+        },
+        {
+            "questionLocalizationKey": "APP.TRADING_REWARDS.FAQ_HOW_DO_TRADING_REWARDS_WORK_QUESTION",
+            "answerLocalizationKey": "APP.TRADING_REWARDS.FAQ_HOW_DO_TRADING_REWARDS_WORK_ANSWER"
+        },
+        {
+            "questionLocalizationKey": "APP.TRADING_REWARDS.FAQ_HOW_DO_I_CLAIM_MY_REWARDS_QUESTION",
+            "answerLocalizationKey": "APP.TRADING_REWARDS.FAQ_HOW_DO_I_CLAIM_MY_REWARDS_ANSWER"
+        }
+    ]
+}

public/configs/env.json

@@ -1,4 +1,9 @@
 {
+   "apps": {
+      "ios": {
+         "scheme": "dydxv4"
+      }
+   },
    "deployments": {
       "MAINNET": {
          "environments": [
@@ -22,11 +27,11 @@
             "dydxprotocol-staging-west",
             "dydxprotocol-testnet",
             "dydxprotocol-testnet-dydx",
-            "dydxprotocol-testnet-dsrv",
             "dydxprotocol-testnet-nodefleet",
             "dydxprotocol-testnet-kingnodes",
             "dydxprotocol-testnet-liquify",
-            "dydxprotocol-testnet-polkachu"
+            "dydxprotocol-testnet-polkachu",
+            "dydxprotocol-testnet-bware"
          ],
          "default": "dydxprotocol-testnet"
       }
@@ -34,10 +39,11 @@
    "environments": {
       "dydxprotocol-dev": {
          "name": "v4 Dev",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -65,13 +71,26 @@
                "https://validator.v4dev.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.0xsquid.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4dev.dydx.exchange"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -94,10 +113,11 @@
       },
       "dydxprotocol-dev-2": {
          "name": "v4 Dev 2",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -124,13 +144,26 @@
             "validators": [
                "http://54.92.118.111"
             ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
+            "0xsquid": "https://testnet.api.0xsquid.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -153,10 +186,11 @@
       },
       "dydxprotocol-dev-4": {
          "name": "v4 Dev 4",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -176,20 +210,33 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "http://indexer.v4dev4.dydx.exchange",
-                  "socket": "ws://indexer.v4dev4.dydx.exchange"
+                  "api": "https://indexer.v4dev4.dydx.exchange",
+                  "socket": "wss://indexer.v4dev4.dydx.exchange"
                }
             ],
             "validators": [
                "http://validator.v4dev4.dydx.exchange"
             ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
+            "0xsquid": "https://testnet.api.0xsquid.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -212,10 +259,11 @@
       },
       "dydxprotocol-dev-5": {
          "name": "v4 Dev 5",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -242,13 +290,26 @@
             "validators": [
                "http://18.223.78.50"
             ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
+            "0xsquid": "https://testnet.api.0xsquid.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
             "privacy": "https://dydx.exchange/privacy",
             "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -271,10 +332,11 @@
       },
       "dydxprotocol-staging": {
          "name": "v4 Staging",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -302,7 +364,8 @@
             "validators": [
                "https://validator.v4staging.dydx.exchange"
             ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -312,7 +375,16 @@
             "community": "https://discord.com/invite/dydx",
             "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
             "blogs": "https://www.dydx.foundation/blog",
-            "help": "https://help.dydx.exchange"
+            "help": "https://help.dydx.exchange",
+            "foundation": "https://www.dydx.foundation",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -333,12 +405,86 @@
             "signTypedDataDomainName": "dYdX Chain"
          }
       },
-      "dydxprotocol-staging-west": {
-         "name": "v4 Staging West",
-         "ethereumChainId": "5",
+      "dydxprotocol-staging-forced-update": {
+         "name": "v4 Staging Forced Update",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://indexer.v4staging.dydx.exchange",
+                  "socket": "wss://indexer.v4staging.dydx.exchange"
+               }
+            ],
+            "faucet": "https://faucet.v4staging.dydx.exchange",
+            "validators": [
+               "https://validator.v4staging.dydx.exchange"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+         },
+         "links": {
+            "tos": "https://dydx.exchange/v4-terms",
+            "privacy": "https://dydx.exchange/privacy",
+            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://v4-teacher.vercel.app/",
+            "community": "https://discord.com/invite/dydx",
+            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX Chain"
+         },
+         "apps": {
+            "ios": {
+               "minimalVersion": "1.0",
+               "build":40000,
+               "url": "https://apps.apple.com/app/dydx/id1564787350"
+            }
+         }
+      },
+      "dydxprotocol-staging-west": {
+         "name": "v4 Staging West",
+         "ethereumChainId": "11155111",
+         "dydxChainId": "dydxprotocol-testnet",
+         "chainName": "dYdX Chain",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -366,7 +512,8 @@
             "validators": [
                "https://validator-uswest1.v4staging.dydx.exchange"
             ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -376,7 +523,16 @@
             "community": "https://discord.com/invite/dydx",
             "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
             "blogs": "https://www.dydx.foundation/blog",
-            "help": "https://help.dydx.exchange"
+            "help": "https://help.dydx.exchange",
+            "foundation": "https://www.dydx.foundation",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -399,10 +555,11 @@
       },
       "dydxprotocol-testnet": {
          "name": "v4 Public Testnet",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -422,17 +579,19 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "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"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -442,7 +601,17 @@
             "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",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -465,10 +634,11 @@
       },
       "dydxprotocol-testnet-dydx": {
          "name": "v4 Public Testnet/dYdX",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -496,6 +666,7 @@
                "https://validator.v4testnet.dydx.exchange"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -506,71 +677,17 @@
             "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-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://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",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -593,10 +710,11 @@
       },
       "dydxprotocol-testnet-nodefleet": {
          "name": "v4 Public Testnet/nodefleet",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -616,14 +734,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
                "https://dydx-testnet.nodefleet.org"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -634,7 +753,17 @@
             "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",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -657,10 +786,11 @@
       },
       "dydxprotocol-testnet-kingnodes": {
          "name": "v4 Public Testnet/KingNodes",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -680,14 +810,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
                "https://test-dydx.kingnodes.com"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -698,7 +829,17 @@
             "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",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -721,10 +862,11 @@
       },
       "dydxprotocol-testnet-liquify": {
          "name": "v4 Public Testnet/Liquify",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -744,14 +886,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
                "https://dydx-rpc.liquify.com/api=8878132/dydx"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -762,6 +905,83 @@
             "documentation": "https://docs.dydx.exchange/",
             "community": "https://discord.com/invite/dydx",
             "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX V4"
+         }
+      },
+      "dydxprotocol-testnet-polkachu": {
+         "name": "v4 Public Testnet/Polkahcu",
+         "ethereumChainId": "11155111",
+         "dydxChainId": "dydx-testnet-4",
+         "chainName": "dYdX Chain",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+               }
+            ],
+            "validators": [
+               "https://dydx-testnet-rpc.polkachu.com/"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.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}",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "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": {
@@ -783,12 +1003,13 @@
             "signTypedDataDomainName": "dYdX V4"
          }
       },
-      "dydxprotocol-testnet-polkachu": {
-         "name": "v4 Public Testnet/Polkahcu",
-         "ethereumChainId": "5",
+      "dydxprotocol-testnet-bware": {
+         "name": "v4 Public Testnet/BWare",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -808,14 +1029,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
-               "https://dydx-testnet-rpc.polkachu.com/"
+               "https://dydx-testnet-full-rpc.public.blastapi.io/"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -823,10 +1045,20 @@
             "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"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnmore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnmore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnmore": "https://help.dydx.exchange",
+            "stakingLearnmore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnmore": "https://help.dydx.exchange",
+            "walletLearnmore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
             "walletconnect": {
@@ -852,7 +1084,8 @@
          "ethereumChainId": "1",
          "dydxChainId": "[mainnet chain id]",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "[mainnet squid integrator id]",
          "isMainNet": true,
          "tokens": {
             "comment": "Change according to mainnet release",
@@ -881,17 +1114,27 @@
                "[Validator endpoint 1",
                "[Validator endpoint n]"
             ],
-            "0xsquid": "[0xSquid endpoint for mainnet]"
+            "0xsquid": "[0xSquid endpoint for mainnet]",
+            "nobleValidator": "[noble validator endpoint for mainnet]"
          },
          "links": {
             "tos": "[HTTP link to TOS]",
             "privacy": "[HTTP link to Privacy Policy]",
             "mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]",
-            "documentation": "[HTTP link to documentation, can be null]",
-            "community": "[HTTP link to community, can be null]",
+            "mintscanBase": "[HTTP link to TOS mintscan base url]",
             "feedback": "[HTTP link to feedback form, can be null]",
             "blogs": "[HTTP link to blogs, can be null]",
-            "help": "[HTTP link to help page, can be null]"
+            "foundation": "[HTTP link to foundation, can be null]",
+            "initialMarginFractionLearnMore": "[HTTP link to initial margin fraction learn more, can be null]",
+            "reduceOnlyLearnMore": "[HTTP link to reduce-only learn more, can be null]",
+            "documentation": "[HTTP link to documentation, can be null]",
+            "community": "[HTTP link to community, can be null]",
+            "help": "[HTTP link to help page, can be null]",
+            "governanceLearnMore": "[HTTP link to governance learn more, can be null]",
+            "stakingLearnMore": "[HTTP link to staking learn more, can be null]",
+            "keplrDashboard": "[HTTP link to keplr dashboard, can be null]",
+            "accountExportLearnMore": "[HTTP link to account export learn more, can be null]",
+            "walletLearnMore": "[HTTP link to wallet learn more, can be null]"
          },
          "wallets": {
             "walletconnect": {

public/configs/markets.json

@@ -1,454 +1,360 @@
 {
-    "1INCH-USD":{
-       "name":"1inch",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://1inch.io/",
-       "whitepaperLink":"https://github.com/1inch",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/1inch/"
-    },
-    "AAVE-USD":{
-       "name":"Aave",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://aave.com/",
-       "whitepaperLink":"https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aave/"
-    },
-    "ADA-USD":{
-       "name":"Cardano",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://cardano.org/",
-       "whitepaperLink":"https://why.cardano.org/en/introduction/motivation/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cardano/"
-    },
-    "ALGO-USD":{
-       "name":"Algorand",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://algorand.com/",
-       "whitepaperLink":"https://algorand.com/technology/white-papers",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/algorand/"
-    },
-    "APE-USD":{
-       "name":"ApeCoin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://apecoin.com/",
-       "whitepaperLink":"https://apecoin.com/about",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/apecoin-ape/"
-    },
-    "APT-USD":{
-       "name":"Aptos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://aptoslabs.com/",
-       "whitepaperLink":"https://aptos.dev/aptos-white-paper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aptos/"
-    },
-    "ARB-USD":{
-       "name":"Arbitrum",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://arbitrum.io/",
-       "whitepaperLink":"https://github.com/OffchainLabs/nitro",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/arbitrum/"
-    },
-    "ATOM-USD":{
-       "name":"Cosmos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://cosmos.network/",
-       "whitepaperLink":"https://v1.cosmos.network/resources/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cosmos/"
-    },
-    "AVAX-USD":{
-       "name":"Avalanche",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.avalabs.org/",
-       "whitepaperLink":"https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/avalanche/"
-    },
-    "BCH-USD":{
-       "name":"Bitcoin Cash",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://bitcoincash.org/",
-       "whitepaperLink":"https://bitcoincash.org/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin-cash/"
-    },
-    "BLUR-USD":{
-       "name":"Blur",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://blur.io/",
-       "whitepaperLink":"https://docs.blur.foundation/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/blur-token/"
-    },
-    "CELO-USD":{
-       "name":"Celo",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://celo.org",
-       "whitepaperLink":"https://docs.celo.org",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/celo/"
-    },
-    "BTC-USD":{
-       "name":"Bitcoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://bitcoin.org/",
-       "whitepaperLink":"https://bitcoin.org/bitcoin.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin/"
-    },
-    "COMP-USD":{
-       "name":"Compound",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://compound.finance/",
-       "whitepaperLink":"https://compound.finance/documents/Compound.Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/compound/"
-    },
-    "CRV-USD":{
-       "name":"Curve",
-       "tags":[
-          "Governance"
-       ],
-       "websiteLink":"https://curve.fi/",
-       "whitepaperLink":"https://curve.fi/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/curve-dao-token/"
-    },
-    "DOGE-USD":{
-       "name":"Dogecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://dogecoin.com/",
-       "whitepaperLink":"https://github.com/dogecoin/dogecoin",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/dogecoin/"
-    },
-    "DOT-USD":{
-       "name":"Polkadot",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://polkadot.network/",
-       "whitepaperLink":"https://polkadot.network/PolkaDotPaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polkadot-new/"
-    },
-    "ENJ-USD":{
-       "name":"Enjin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://enjin.io/",
-       "whitepaperLink":"https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/enjin-coin/"
-    },
-    "EOS-USD":{
-       "name":"EOS",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://eos.io/",
-       "whitepaperLink":"https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/eos/"
-    },
-    "ETC-USD":{
-       "name":"Ethereum Classic",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ethereumclassic.org/",
-       "whitepaperLink":"https://ethereumclassic.org/why-classic",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum-classic/"
-    },
-    "ETH-USD":{
-       "name":"Ethereum",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ethereum.org/",
-       "whitepaperLink":"https://ethereum.org/whitepaper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum/",
-       "displayStepSize":"0.001",
-       "displayTickSize":"0.1"
-    },
-    "FIL-USD":{
-       "name":"Filecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://filecoin.io/",
-       "whitepaperLink":"https://filecoin.io/filecoin.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/filecoin/"
-    },
-    "HNT-USD":{
-       "name":"Helium",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.helium.com",
-       "whitepaperLink":"http://whitepaper.helium.com",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/helium/"
-    },
-    "ICP-USD":{
-       "name":"Internet Computer",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://dfinity.org",
-       "whitepaperLink":"https://dfinity.org/whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/internet-computer/"
-    },
-    "LDO-USD":{
-       "name":"Lido DAO",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://lido.fi/",
-       "whitepaperLink":"https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/lido-dao/"
-    },
-    "LINK-USD":{
-       "name":"Chainlink",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://chain.link/",
-       "whitepaperLink":"https://link.smartcontract.com/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/chainlink/"
-    },
-    "LTC-USD":{
-       "name":"Litecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://litecoin.org/",
-       "whitepaperLink":"https://litecoin.info/index.php/Main_Page",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/litecoin/"
-    },
-    "MATIC-USD":{
-       "name":"Polygon",
-       "tags":[
-          "Layer 2"
-       ],
-       "websiteLink":"https://polygon.technology/",
-       "whitepaperLink":"https://polygon.technology/lightpaper-polygon.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polygon/"
-    },
-    "MKR-USD":{
-       "name":"Maker",
-       "tags":[
-          "Governance"
-       ],
-       "websiteLink":"https://makerdao.com",
-       "whitepaperLink":"https://makerdao.com/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/maker/"
-    },
-    "NEAR-USD":{
-       "name":"NEAR Protocol",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://near.org",
-       "whitepaperLink":"https://near.org/papers/the-official-near-white-paper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/near-protocol/"
-    },
-    "OP-USD":{
-       "name":"Optimism",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://www.optimism.io/",
-       "whitepaperLink":"https://github.com/ethereum-optimism",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/optimism-ethereum/"
-    },
-    "PEPE-USD":{
-       "name":"Pepe",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://www.pepe.vip/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/pepe/"
-    },
-    "RUNE-USD":{
-       "name":"THORChain",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://thorchain.org",
-       "whitepaperLink":"https://whitepaper.io/document/709/thorchain-whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/thorchain/"
-    },
-    "SEI-USD":{
-       "name":"Sei",
-       "tags":[
-          "Layer 1",
-          "Defi"
-       ],
-       "websiteLink":"https://www.sei.io/",
-       "whitepaperLink":"https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sei/"
-    },
-    "SHIB-USD":{
-       "name":"Shiba Inu",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://shibatoken.com/",
-       "whitepaperLink":"https://docs.shibatoken.com/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/shiba-inu/"
-    },
-    "SNX-USD":{
-       "name":"Synthetix",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://synthetix.io/",
-       "whitepaperLink":"https://docs.synthetix.io/litepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/synthetix-network-token/"
-    },
-    "SOL-USD":{
-       "name":"Solana",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://solana.com/",
-       "whitepaperLink":"https://solana.com/solana-whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/solana/"
-    },
-    "SUI-USD":{
-       "name":"Sui",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://sui.io/",
-       "whitepaperLink":"https://github.com/MystenLabs",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sui/"
-    },
-    "SUSHI-USD":{
-       "name":"Sushi",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://sushi.com/",
-       "whitepaperLink":"https://docs.sushi.com/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sushiswap/"
-    },
-    "TRX-USD":{
-       "name":"TRON",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://tron.network/",
-       "whitepaperLink":"https://tron.network/static/doc/white_paper_v_2_0.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/tron/"
-    },
-    "UMA-USD":{
-       "name":"UMA",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://umaproject.org/",
-       "whitepaperLink":"https://github.com/UMAprotocol/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/uma/"
-    },
-    "UNI-USD":{
-       "name":"Uniswap",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://uniswap.org/",
-       "whitepaperLink":"https://uniswap.org/whitepaper-v3.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/uniswap/"
-    },
-    "WLD-USD":{
-       "name":"Worldcoin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://worldcoin.org/",
-       "whitepaperLink":"https://whitepaper.worldcoin.org/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/worldcoin-org/"
-    },
-    "XLM-USD":{
-       "name":"Stellar",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.stellar.org/",
-       "whitepaperLink":"https://www.stellar.org/papers/stellar-consensus-protocol",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/stellar/"
-    },
-    "XMR-USD":{
-       "name":"Monero",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.getmonero.org/",
-       "whitepaperLink":"https://www.getmonero.org/resources/research-lab/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/monero/"
-    },
-    "XRP-USD":{
-       "name":"Ripple",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ripple.com/currency/",
-       "whitepaperLink":"https://github.com/ripple",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/xrp/"
-    },
-    "XTZ-USD":{
-       "name":"Tezos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://tezos.com",
-       "whitepaperLink":"https://tezos.com/whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/tezos/"
-    },
-    "YFI-USD":{
-       "name":"Yearn",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://yearn.finance/",
-       "whitepaperLink":"https://docs.yearn.finance/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/yearn-finance/"
-    },
-    "ZEC-USD":{
-       "name":"Zcash",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://z.cash/",
-       "whitepaperLink":"https://z.cash/technology/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/zcash/"
-    },
-    "ZRX-USD":{
-       "name":"0x",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://0x.org/",
-       "whitepaperLink":"https://0x.org/pdfs/0x_white_paper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/0x/"
-    }
- }
+  "1INCH-USD": {
+    "name": "1inch",
+    "tags": ["Defi"],
+    "websiteLink": "https://1inch.io/",
+    "whitepaperLink": "https://github.com/1inch",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/1inch/"
+  },
+  "AAVE-USD": {
+    "name": "Aave",
+    "tags": ["Defi"],
+    "websiteLink": "https://aave.com/",
+    "whitepaperLink": "https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/aave/"
+  },
+  "ADA-USD": {
+    "name": "Cardano",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://cardano.org/",
+    "whitepaperLink": "https://why.cardano.org/en/introduction/motivation/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cardano/"
+  },
+  "ALGO-USD": {
+    "name": "Algorand",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://algorand.com/",
+    "whitepaperLink": "https://algorand.com/technology/white-papers",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/algorand/"
+  },
+  "APE-USD": {
+    "name": "ApeCoin",
+    "tags": [],
+    "websiteLink": "https://apecoin.com/",
+    "whitepaperLink": "https://apecoin.com/about",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/apecoin-ape/"
+  },
+  "APT-USD": {
+    "name": "Aptos",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://aptoslabs.com/",
+    "whitepaperLink": "https://aptos.dev/aptos-white-paper/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/aptos/"
+  },
+  "ARB-USD": {
+    "name": "Arbitrum",
+    "tags": [],
+    "websiteLink": "https://arbitrum.io/",
+    "whitepaperLink": "https://github.com/OffchainLabs/nitro",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/arbitrum/"
+  },
+  "ATOM-USD": {
+    "name": "Cosmos",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://cosmos.network/",
+    "whitepaperLink": "https://v1.cosmos.network/resources/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cosmos/"
+  },
+  "AVAX-USD": {
+    "name": "Avalanche",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://www.avalabs.org/",
+    "whitepaperLink": "https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/avalanche/"
+  },
+  "BCH-USD": {
+    "name": "Bitcoin Cash",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://bitcoincash.org/",
+    "whitepaperLink": "https://bitcoincash.org/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin-cash/"
+  },
+  "BLUR-USD": {
+    "name": "Blur",
+    "tags": [],
+    "websiteLink": "https://blur.io/",
+    "whitepaperLink": "https://docs.blur.foundation/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/blur-token/"
+  },
+  "CELO-USD": {
+    "name": "Celo",
+    "tags": [],
+    "websiteLink": "https://celo.org",
+    "whitepaperLink": "https://docs.celo.org",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/celo/"
+  },
+  "BTC-USD": {
+    "name": "Bitcoin",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://bitcoin.org/",
+    "whitepaperLink": "https://bitcoin.org/bitcoin.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin/"
+  },
+  "COMP-USD": {
+    "name": "Compound",
+    "tags": ["Defi"],
+    "websiteLink": "https://compound.finance/",
+    "whitepaperLink": "https://compound.finance/documents/Compound.Whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/compound/"
+  },
+  "CRV-USD": {
+    "name": "Curve",
+    "tags": ["Governance"],
+    "websiteLink": "https://curve.fi/",
+    "whitepaperLink": "https://curve.fi/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/curve-dao-token/"
+  },
+  "DOGE-USD": {
+    "name": "Dogecoin",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://dogecoin.com/",
+    "whitepaperLink": "https://github.com/dogecoin/dogecoin",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/dogecoin/"
+  },
+  "DOT-USD": {
+    "name": "Polkadot",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://polkadot.network/",
+    "whitepaperLink": "https://polkadot.network/PolkaDotPaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polkadot-new/"
+  },
+  "ENJ-USD": {
+    "name": "Enjin",
+    "tags": [],
+    "websiteLink": "https://enjin.io/",
+    "whitepaperLink": "https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/enjin-coin/"
+  },
+  "EOS-USD": {
+    "name": "EOS",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://eos.io/",
+    "whitepaperLink": "https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/eos/"
+  },
+  "ETC-USD": {
+    "name": "Ethereum Classic",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://ethereumclassic.org/",
+    "whitepaperLink": "https://ethereumclassic.org/why-classic",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum-classic/"
+  },
+  "ETH-USD": {
+    "name": "Ethereum",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://ethereum.org/",
+    "whitepaperLink": "https://ethereum.org/whitepaper/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum/",
+    "displayStepSize": "0.001",
+    "displayTickSize": "0.1"
+  },
+  "FIL-USD": {
+    "name": "Filecoin",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://filecoin.io/",
+    "whitepaperLink": "https://filecoin.io/filecoin.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/filecoin/"
+  },
+  "HNT-USD": {
+    "name": "Helium",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://www.helium.com",
+    "whitepaperLink": "http://whitepaper.helium.com",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/helium/"
+  },
+  "ICP-USD": {
+    "name": "Internet Computer",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://dfinity.org",
+    "whitepaperLink": "https://dfinity.org/whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/internet-computer/"
+  },
+  "LDO-USD": {
+    "name": "Lido DAO",
+    "tags": ["Defi"],
+    "websiteLink": "https://lido.fi/",
+    "whitepaperLink": "https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/lido-dao/"
+  },
+  "LINK-USD": {
+    "name": "Chainlink",
+    "tags": ["Defi"],
+    "websiteLink": "https://chain.link/",
+    "whitepaperLink": "https://link.smartcontract.com/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/chainlink/"
+  },
+  "LTC-USD": {
+    "name": "Litecoin",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://litecoin.org/",
+    "whitepaperLink": "https://litecoin.info/index.php/Main_Page",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/litecoin/"
+  },
+  "MATIC-USD": {
+    "name": "Polygon",
+    "tags": ["Layer 2"],
+    "websiteLink": "https://polygon.technology/",
+    "whitepaperLink": "https://polygon.technology/lightpaper-polygon.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polygon/"
+  },
+  "MKR-USD": {
+    "name": "Maker",
+    "tags": ["Governance"],
+    "websiteLink": "https://makerdao.com",
+    "whitepaperLink": "https://makerdao.com/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/maker/"
+  },
+  "NEAR-USD": {
+    "name": "NEAR Protocol",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://near.org",
+    "whitepaperLink": "https://near.org/papers/the-official-near-white-paper/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/near-protocol/"
+  },
+  "OP-USD": {
+    "name": "Optimism",
+    "tags": [],
+    "websiteLink": "https://www.optimism.io/",
+    "whitepaperLink": "https://github.com/ethereum-optimism",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/optimism-ethereum/"
+  },
+  "PEPE-USD": {
+    "name": "Pepe",
+    "tags": [],
+    "websiteLink": "https://www.pepe.vip/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/pepe/"
+  },
+  "RUNE-USD": {
+    "name": "THORChain",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://thorchain.org",
+    "whitepaperLink": "https://whitepaper.io/document/709/thorchain-whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/thorchain/"
+  },
+  "SEI-USD": {
+    "name": "Sei",
+    "tags": ["Layer 1", "Defi"],
+    "websiteLink": "https://www.sei.io/",
+    "whitepaperLink": "https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sei/"
+  },
+  "SHIB-USD": {
+    "name": "Shiba Inu",
+    "tags": [],
+    "websiteLink": "https://shibatoken.com/",
+    "whitepaperLink": "https://docs.shibatoken.com/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/shiba-inu/"
+  },
+  "SNX-USD": {
+    "name": "Synthetix",
+    "tags": ["Defi"],
+    "websiteLink": "https://synthetix.io/",
+    "whitepaperLink": "https://docs.synthetix.io/litepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/synthetix-network-token/"
+  },
+  "SOL-USD": {
+    "name": "Solana",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://solana.com/",
+    "whitepaperLink": "https://solana.com/solana-whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/"
+  },
+  "SUI-USD": {
+    "name": "Sui",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://sui.io/",
+    "whitepaperLink": "https://github.com/MystenLabs",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sui/"
+  },
+  "SUSHI-USD": {
+    "name": "Sushi",
+    "tags": ["Defi"],
+    "websiteLink": "https://sushi.com/",
+    "whitepaperLink": "https://docs.sushi.com/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sushiswap/"
+  },
+  "TIA-USD": {
+    "name": "Celestia",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://celestia.org/",
+    "whitepaperLink": "https://arxiv.org/pdf/1905.09274.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/celestia/"
+  },
+  "TRX-USD": {
+    "name": "TRON",
+    "tags": ["Defi"],
+    "websiteLink": "https://tron.network/",
+    "whitepaperLink": "https://tron.network/static/doc/white_paper_v_2_0.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/tron/"
+  },
+  "UMA-USD": {
+    "name": "UMA",
+    "tags": ["Defi"],
+    "websiteLink": "https://umaproject.org/",
+    "whitepaperLink": "https://github.com/UMAprotocol/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/uma/"
+  },
+  "UNI-USD": {
+    "name": "Uniswap",
+    "tags": ["Defi"],
+    "websiteLink": "https://uniswap.org/",
+    "whitepaperLink": "https://uniswap.org/whitepaper-v3.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/uniswap/"
+  },
+  "WLD-USD": {
+    "name": "Worldcoin",
+    "tags": [],
+    "websiteLink": "https://worldcoin.org/",
+    "whitepaperLink": "https://whitepaper.worldcoin.org/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/worldcoin-org/"
+  },
+  "XLM-USD": {
+    "name": "Stellar",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://www.stellar.org/",
+    "whitepaperLink": "https://www.stellar.org/papers/stellar-consensus-protocol",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/stellar/"
+  },
+  "XMR-USD": {
+    "name": "Monero",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://www.getmonero.org/",
+    "whitepaperLink": "https://www.getmonero.org/resources/research-lab/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/monero/"
+  },
+  "XRP-USD": {
+    "name": "Ripple",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://ripple.com/currency/",
+    "whitepaperLink": "https://github.com/ripple",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/xrp/"
+  },
+  "XTZ-USD": {
+    "name": "Tezos",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://tezos.com",
+    "whitepaperLink": "https://tezos.com/whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/tezos/"
+  },
+  "YFI-USD": {
+    "name": "Yearn",
+    "tags": ["Defi"],
+    "websiteLink": "https://yearn.finance/",
+    "whitepaperLink": "https://docs.yearn.finance/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/yearn-finance/"
+  },
+  "ZEC-USD": {
+    "name": "Zcash",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://z.cash/",
+    "whitepaperLink": "https://z.cash/technology/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/zcash/"
+  },
+  "ZRX-USD": {
+    "name": "0x",
+    "tags": ["Defi"],
+    "websiteLink": "https://0x.org/",
+    "whitepaperLink": "https://0x.org/pdfs/0x_white_paper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/0x/"
+  }
+}

public/configs/wallets.json

@@ -40,6 +40,7 @@
       "iosMinVersion": "0",
       "imageUrl": "",
       "encoding": "=\"#%/<>?@\\^`{|}:&",
+      "androidPackage": "io.metamask",
       "connections": [
         {
           "type": "walletConnectV2",
@@ -98,6 +99,7 @@
       "iosMinVersion": "1.8.0",
       "imageUrl": "",
       "encoding": "=\"#%/<>?@\\^`{|}:&",
+      "androidPackage": "org.toshi",
       "connections": [
         {
           "type": "walletSegue",
@@ -155,6 +157,7 @@
       "comment": "imToken",
       "iosMinVersion": "0",
       "imageUrl": "",
+      "androidPackage": "im.token.app",
       "connections": [
         {
           "type": "walletConnectV2",
@@ -196,7 +199,7 @@
     },
     "mobile": {
       "native": "trust:",
-      "universal": "https://link.trustwallet.com"
+      "universal": ""
     },
     "desktop": {
       "native": "",
@@ -214,6 +217,7 @@
       "iosMinVersion": "0",
       "encoding": "=\"#%/<>?@\\^`{|}:&",
       "imageUrl": "",
+      "androidPackage": "com.wallet.crypto.trustapp",
       "connections": [
         {
           "type": "walletConnectV2",
@@ -271,6 +275,7 @@
       "iosMinVersion": "0",
       "encoding": "=\"#%/<>?@\\^`{|}:&",
       "imageUrl": "",
+      "androidPackage": "io.zerion.android",
       "connections": [
         {
           "type": "walletConnectV2",
@@ -327,6 +332,7 @@
       "comment": "TokenPocket",
       "iosMinVersion": "0",
       "imageUrl": "",
+      "androidPackage": "vip.mytokenpocket",
       "connections": [
         {
           "type": "walletConnectV2",
@@ -383,6 +389,7 @@
       "comment": "Rainbow",
       "iosMinVersion": "0",
       "encoding": "=\"#%/<>?@\\^`{|}:&",
+      "androidPackage": "me.rainbow",
       "backlinked": true,
       "imageUrl": "",
       "connections": [
@@ -442,6 +449,7 @@
       "comment": "1inch",
       "iosMinVersion": "0",
       "encoding": "=\"#%/<>?@\\^`{|}:&",
+      "androidPackage": "io.oneinch.android",
       "imageUrl": "",
       "connections": [
         {

public/dots-background-2.svg

@@ -0,0 +1,230 @@
+<svg width="254" height="77" viewBox="0 0 254 77" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1258">
+<g id="Ellipse 9" opacity="0.4" filter="url(#filter0_f_20300_14972)">
+<ellipse cx="86.5425" cy="-3.91219" rx="116.542" ry="20.0878" fill="#7774FF"/>
+</g>
+<g id="Ellipse 10" opacity="0.3" filter="url(#filter1_f_20300_14972)">
+<circle cx="74.5734" cy="4.63007" r="1.00507" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 12" opacity="0.3" filter="url(#filter2_f_20300_14972)">
+<circle cx="82.1105" cy="7.64179" r="1.00507" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 22" opacity="0.3" filter="url(#filter3_f_20300_14972)">
+<circle cx="116.785" cy="4.63007" r="1.00507" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 11" opacity="0.3" filter="url(#filter4_f_20300_14972)">
+<circle cx="64.774" cy="8.90488" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 18" opacity="0.3" filter="url(#filter5_f_20300_14972)">
+<circle cx="96.4322" cy="3.87363" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 20" opacity="0.3" filter="url(#filter6_f_20300_14972)">
+<circle cx="76.0807" cy="14.9361" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 21" opacity="0.3" filter="url(#filter7_f_20300_14972)">
+<circle cx="104.725" cy="4.87754" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 23" opacity="0.3" filter="url(#filter8_f_20300_14972)">
+<circle cx="114.021" cy="7.13925" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 24" opacity="0.3" filter="url(#filter9_f_20300_14972)">
+<circle cx="109.75" cy="15.4361" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 25" opacity="0.3" filter="url(#filter10_f_20300_14972)">
+<circle cx="119.801" cy="12.6705" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 27" opacity="0.3" filter="url(#filter11_f_20300_14972)">
+<circle cx="94.0885" cy="11.0182" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 30" opacity="0.3" filter="url(#filter12_f_20300_14972)">
+<circle cx="154.475" cy="11.6666" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 29" opacity="0.3" filter="url(#filter13_f_20300_14972)">
+<circle cx="146.435" cy="8.90488" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 15" opacity="0.3" filter="url(#filter14_f_20300_14972)">
+<circle cx="24.0103" cy="4.44785" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 33" opacity="0.3" filter="url(#filter15_f_20300_14972)">
+<circle cx="-1.05899" cy="13.6783" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 16" opacity="0.3" filter="url(#filter16_f_20300_14972)">
+<circle cx="17.441" cy="16.4908" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 35" opacity="0.3" filter="url(#filter17_f_20300_14972)">
+<circle cx="36.0553" cy="6.63535" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 32" opacity="0.3" filter="url(#filter18_f_20300_14972)">
+<circle cx="10.8707" cy="14.2994" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 13" opacity="0.3" filter="url(#filter19_f_20300_14972)">
+<circle cx="55.7274" cy="9.65615" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 19" opacity="0.3" filter="url(#filter20_f_20300_14972)">
+<circle cx="87.3886" cy="20.7108" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 26" opacity="0.3" filter="url(#filter21_f_20300_14972)">
+<circle cx="123.82" cy="15.1874" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 36" opacity="0.3" filter="url(#filter22_f_20300_14972)">
+<circle cx="134.876" cy="14.4335" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 28" opacity="0.3" filter="url(#filter23_f_20300_14972)">
+<circle cx="129.6" cy="6.38662" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 14" opacity="0.3" filter="url(#filter24_f_20300_14972)">
+<circle cx="41.6571" cy="14.9335" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 31" opacity="0.3" filter="url(#filter25_f_20300_14972)">
+<circle cx="4.21767" cy="17.9491" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 34" opacity="0.3" filter="url(#filter26_f_20300_14972)">
+<circle cx="12.2177" cy="6.88662" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 17" opacity="0.3" filter="url(#filter27_f_20300_14972)">
+<circle cx="50.2001" cy="3.6249" r="0.753803" fill="#9A9AFF"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_20300_14972" x="-94" y="-88" width="361.085" height="168.176" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="32" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter1_f_20300_14972" x="72.5633" y="2.61993" width="4.01991" height="4.02186" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter2_f_20300_14972" x="80.6029" y="6.13418" width="3.01484" height="3.01679" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter3_f_20300_14972" x="115.278" y="3.12246" width="3.01484" height="3.01679" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter4_f_20300_14972" x="63.2664" y="7.39727" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter5_f_20300_14972" x="94.9246" y="2.36602" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter6_f_20300_14972" x="74.5731" y="13.4285" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter7_f_20300_14972" x="103.218" y="3.36993" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter8_f_20300_14972" x="112.513" y="5.63165" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter9_f_20300_14972" x="108.242" y="13.9285" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter10_f_20300_14972" x="118.294" y="11.1629" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter11_f_20300_14972" x="92.5809" y="9.51055" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter12_f_20300_14972" x="153.47" y="10.6615" width="2.00995" height="2.00898" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter13_f_20300_14972" x="144.928" y="7.39727" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter14_f_20300_14972" x="22.5027" y="2.94024" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter15_f_20300_14972" x="-2.56659" y="12.1707" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter16_f_20300_14972" x="15.9334" y="14.9832" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter17_f_20300_14972" x="35.0502" y="5.63028" width="2.00995" height="2.00898" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter18_f_20300_14972" x="9.86563" y="13.2943" width="2.00995" height="2.00898" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter19_f_20300_14972" x="53.9686" y="7.89727" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter20_f_20300_14972" x="85.6297" y="18.952" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter21_f_20300_14972" x="122.061" y="13.4285" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter22_f_20300_14972" x="133.117" y="12.6746" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter23_f_20300_14972" x="127.842" y="4.62774" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter24_f_20300_14972" x="39.8982" y="13.1746" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter25_f_20300_14972" x="2.4588" y="16.1902" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter26_f_20300_14972" x="10.4588" y="5.12774" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter27_f_20300_14972" x="48.4412" y="1.86602" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+</defs>
+</svg>

scripts/README.md

@@ -0,0 +1,38 @@
+## App Integrations
+### Amplitude
+Analytics service used to collect data to help the dYdX Product team make informed product decisions.
+
+<b>To use with dydxprotocol/v4-web:</b>
+1. Amplitude account with API key.
+2. Add API key in Github > Secrets and Variables > Actions as `AMPLITUDE_API_KEY`
+3. In your deploy scripts add `pnpm run build:inject-amplitude` after your pnpm build / vite build command.
+
+### Bugsnag
+Error handling service used to collect handled/unhandled errors within the app. The information collected is used to help debug and alert the engineering team of crashes/unhandled errors within the app to improve stability.
+
+<b>To use with dydxprotocol/v4-web:</b>
+1. Bugsnag account with API key.
+2. Add API key in Github > Secrets and Variables > Actions as `BUGSNAG_API_KEY`
+3. In your deploy scripts add `pnpm run build:inject-bugsnag` after your pnpm build / vite build command.
+4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-bugsnag`
+
+### StatusPage
+Service used to inform users of any status updates to our platform. These status updates are manually set and updated by the On Call engineers.
+
+<b>To use with dydxprotocol/v4-web:</b>
+1. StatusPage account and script URI
+2. Add API key in Github > Secrets and Variables > Actions as `STATUS_PAGE_SCRIPT_URI`
+3. In your deploy scripts add `pnpm run build:inject-statuspage` after your pnpm build / vite build command.
+4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-statuspage`
+
+### Intercom
+Service used for live customer support (chat/inbox) as well as home for Help Articles.
+
+<b>To use with dydxprotocol/v4-web:</b>
+1. Create Intercom account
+2. In Intercom UI
+Getting started > Set up Messenger > will give you your API Key on Step 2
+Customize Intercom Messenger by adding logo and brand colors
+3. Add API key in Github > Secrets and Variables > Actions as `INTERCOM_APP_ID`
+4. In your deploy scripts add `pnpm run build:inject-intercom` after your pnpm build / vite build command.
+5. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-intercom`

src/App.tsx

@@ -1,7 +1,9 @@
-import { Suspense } from 'react';
+import { lazy, Suspense } from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
 import styled, { AnyStyledComponent, css } from 'styled-components';
 import { WagmiConfig } from 'wagmi';
+import { PrivyProvider } from '@privy-io/react-auth';
+import { PrivyWagmiConnector } from '@privy-io/wagmi-connector';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { GrazProvider } from 'graz';
 
@@ -22,20 +24,9 @@ import { NotificationsProvider } from '@/hooks/useNotifications';
 import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
 import { RestrictionProvider } from '@/hooks/useRestrictions';
 import { SubaccountProvider } from '@/hooks/useSubaccount';
-import { SquidProvider } from '@/hooks/useSquid';
 
 import { GuardedMobileRoute } from '@/components/GuardedMobileRoute';
 
-import MarketsPage from '@/pages/markets/Markets';
-import PortfolioPage from '@/pages/portfolio/Portfolio';
-import { AlertsPage } from '@/pages/AlertsPage';
-import ProfilePage from '@/pages/Profile';
-import { SettingsPage } from '@/pages/settings/Settings';
-import TradePage from '@/pages/trade/Trade';
-import { RewardsPage } from '@/pages/rewards/RewardsPage';
-import { TermsOfUsePage } from '@/pages/TermsOfUsePage';
-import { PrivacyPolicyPage } from '@/pages/PrivacyPolicyPage';
-
 import { HeaderDesktop } from '@/layout/Header/HeaderDesktop';
 import { FooterDesktop } from '@/layout/Footer/FooterDesktop';
 import { FooterMobile } from '@/layout/Footer/FooterMobile';
@@ -43,15 +34,26 @@ import { NotificationsToastArea } from '@/layout/NotificationsToastArea';
 import { DialogManager } from '@/layout/DialogManager';
 import { GlobalCommandDialog } from '@/views/dialogs/GlobalCommandDialog';
 
-import { config } from '@/lib/wagmi';
+import { config, privyConfig } from '@/lib/wagmi';
 
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
+import { LoadingSpace } from './components/Loading/LoadingSpinner';
 
 import '@/styles/constants.css';
 import '@/styles/fonts.css';
 import '@/styles/web3modal.css';
 
+const MarketsPage = lazy(() => import('@/pages/markets/Markets'));
+const PortfolioPage = lazy(() => import('@/pages/portfolio/Portfolio'));
+const AlertsPage = lazy(() => import('@/pages/AlertsPage'));
+const ProfilePage = lazy(() => import('@/pages/Profile'));
+const SettingsPage = lazy(() => import('@/pages/settings/Settings'));
+const TradePage = lazy(() => import('@/pages/trade/Trade'));
+const RewardsPage = lazy(() => import('@/pages/rewards/RewardsPage'));
+const TermsOfUsePage = lazy(() => import('@/pages/TermsOfUsePage'));
+const PrivacyPolicyPage = lazy(() => import('@/pages/PrivacyPolicyPage'));
+
 const queryClient = new QueryClient();
 
 const Content = () => {
@@ -70,7 +72,7 @@ const Content = () => {
       {isNotTablet && <HeaderDesktop />}
 
       <Styled.Main>
-        <Suspense fallback={null}>
+        <Suspense fallback={<LoadingSpace id="main" />}>
           <Routes>
             <Route path={AppRoute.Trade}>
               <Route path=":market" element={<TradePage />} />
@@ -120,15 +122,19 @@ const wrapProvider = (Component: React.ComponentType<any>, props?: any) => {
 };
 
 const providers = [
+  wrapProvider(PrivyProvider, {
+    appId: import.meta.env.VITE_PRIVY_APP_ID,
+    config: privyConfig,
+  }),
   wrapProvider(QueryClientProvider, { client: queryClient }),
   wrapProvider(GrazProvider),
+  wrapProvider(PrivyWagmiConnector, { wagmiChainsConfig: config }),
   wrapProvider(WagmiConfig, { config }),
   wrapProvider(LocaleProvider),
   wrapProvider(RestrictionProvider),
   wrapProvider(DydxProvider),
   wrapProvider(AccountsProvider),
   wrapProvider(SubaccountProvider),
-  wrapProvider(SquidProvider),
   wrapProvider(LocalNotificationsProvider),
   wrapProvider(NotificationsProvider),
   wrapProvider(DialogAreaProvider),

src/abi/erc20_usdt.json

@@ -0,0 +1,390 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [{ "name": "", "type": "string" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "_upgradedAddress", "type": "address" }],
+    "name": "deprecate",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_spender", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "approve",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "deprecated",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "_evilUser", "type": "address" }],
+    "name": "addBlackList",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_from", "type": "address" },
+      { "name": "_to", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "transferFrom",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "upgradedAddress",
+    "outputs": [{ "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "", "type": "address" }],
+    "name": "balances",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "maximumFee",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "_totalSupply",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "unpause",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "_maker", "type": "address" }],
+    "name": "getBlackListStatus",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      { "name": "", "type": "address" },
+      { "name": "", "type": "address" }
+    ],
+    "name": "allowed",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "paused",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "who", "type": "address" }],
+    "name": "balanceOf",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "pause",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "getOwner",
+    "outputs": [{ "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "owner",
+    "outputs": [{ "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [{ "name": "", "type": "string" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_to", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "transfer",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "newBasisPoints", "type": "uint256" },
+      { "name": "newMaxFee", "type": "uint256" }
+    ],
+    "name": "setParams",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "amount", "type": "uint256" }],
+    "name": "issue",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "amount", "type": "uint256" }],
+    "name": "redeem",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      { "name": "_owner", "type": "address" },
+      { "name": "_spender", "type": "address" }
+    ],
+    "name": "allowance",
+    "outputs": [{ "name": "remaining", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "basisPointsRate",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "", "type": "address" }],
+    "name": "isBlackListed",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "_clearedUser", "type": "address" }],
+    "name": "removeBlackList",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "MAX_UINT",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "newOwner", "type": "address" }],
+    "name": "transferOwnership",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "_blackListedUser", "type": "address" }],
+    "name": "destroyBlackFunds",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "name": "_initialSupply", "type": "uint256" },
+      { "name": "_name", "type": "string" },
+      { "name": "_symbol", "type": "string" },
+      { "name": "_decimals", "type": "uint256" }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "amount", "type": "uint256" }],
+    "name": "Issue",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "amount", "type": "uint256" }],
+    "name": "Redeem",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "newAddress", "type": "address" }],
+    "name": "Deprecate",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "name": "feeBasisPoints", "type": "uint256" },
+      { "indexed": false, "name": "maxFee", "type": "uint256" }
+    ],
+    "name": "Params",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "name": "_blackListedUser", "type": "address" },
+      { "indexed": false, "name": "_balance", "type": "uint256" }
+    ],
+    "name": "DestroyedBlackFunds",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "_user", "type": "address" }],
+    "name": "AddedBlackList",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "_user", "type": "address" }],
+    "name": "RemovedBlackList",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "owner", "type": "address" },
+      { "indexed": true, "name": "spender", "type": "address" },
+      { "indexed": false, "name": "value", "type": "uint256" }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "from", "type": "address" },
+      { "indexed": true, "name": "to", "type": "address" },
+      { "indexed": false, "name": "value", "type": "uint256" }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  { "anonymous": false, "inputs": [], "name": "Pause", "type": "event" },
+  { "anonymous": false, "inputs": [], "name": "Unpause", "type": "event" }
+]

src/components/Accordion.stories.tsx

@@ -0,0 +1,26 @@
+import type { Story } from '@ladle/react';
+
+import { Accordion as AccordionComponent, AccordionProps } from '@/components/Accordion';
+
+import { StoryWrapper } from '.ladle/components';
+
+export const Accordion: Story<AccordionProps> = (args) => {
+  return (
+    <StoryWrapper>
+      <AccordionComponent {...args} />
+    </StoryWrapper>
+  );
+};
+
+Accordion.args = {
+  items: [
+    {
+      header: 'Question 1?',
+      content: 'Answer 1.',
+    },
+    {
+      header: 'Question 2?',
+      content: 'Answer 2.',
+    },
+  ],
+};

src/components/Accordion.tsx

@@ -0,0 +1,129 @@
+import styled, { keyframes, type AnyStyledComponent } from 'styled-components';
+
+import { Root, Item, Header, Trigger, Content } from '@radix-ui/react-accordion';
+
+import { layoutMixins } from '@/styles/layoutMixins';
+import { breakpoints } from '@/styles';
+
+import { PlusIcon } from '@/icons';
+
+export type AccordionItem = {
+  header: React.ReactNode;
+  content: React.ReactNode;
+};
+
+export type AccordionProps = {
+  items: AccordionItem[];
+  className?: string;
+};
+
+export const Accordion = ({ items, className }: AccordionProps) => (
+  <Styled.Root className={className} type="single" collapsible>
+    {items.map(({ header, content }, idx) => (
+      <Styled.Item key={idx} value={idx.toString()}>
+        <Header>
+          <Styled.Trigger>
+            {header}
+            <Styled.Icon>
+              <PlusIcon />
+            </Styled.Icon>
+          </Styled.Trigger>
+        </Header>
+        <Styled.Content>{content}</Styled.Content>
+      </Styled.Item>
+    ))}
+  </Styled.Root>
+);
+
+const Styled: Record<string, AnyStyledComponent> = {};
+
+Styled.Root = styled(Root)`
+  --accordion-paddingY: 1rem;
+  --accordion-paddingX: 1rem;
+
+  @media ${breakpoints.notTablet} {
+    --accordion-paddingX: 1.5rem;
+  }
+
+  > *:not(:last-child) {
+    border-bottom: var(--border-width) solid var(--border-color);
+  }
+`;
+
+Styled.Item = styled(Item)``;
+
+Styled.Icon = styled.div`
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+
+  width: 2.25rem;
+  height: 2.25rem;
+
+  --color-border: var(--color-layer-6);
+  color: var(--color-text-1);
+  background-color: var(--color-layer-5);
+  border: solid var(--border-width) var(--color-border);
+  border-radius: 50%;
+  font: var(--font-small-book);
+
+  svg {
+    height: 1.125em;
+    width: 1.125em;
+  }
+`;
+
+Styled.Trigger = styled(Trigger)`
+  ${layoutMixins.spacedRow}
+  width: 100%;
+  padding: var(--accordion-paddingY) var(--accordion-paddingX);
+  gap: 0.5rem;
+
+  color: var(--color-text-1);
+  text-align: start;
+
+  &:hover {
+    ${Styled.Icon} {
+      color: var(--color-text-2);
+      filter: brightness(1.1);
+    }
+  }
+
+  svg {
+    color: var(--color-text-0);
+    transition: transform 0.3s var(--ease-out-expo);
+  }
+
+  &[data-state='open'] svg {
+    transform: rotate(45deg);
+  }
+`;
+
+Styled.Content = styled(Content)`
+  overflow: hidden;
+  margin: 0 var(--accordion-paddingX) var(--accordion-paddingY);
+
+  color: var(--color-text-0);
+
+  &[data-state='open'] {
+    animation: ${keyframes`
+      from {
+        height: 0;
+      }
+      to {
+        height: var(--radix-accordion-content-height);
+      }
+    `} 0.3s var(--ease-out-expo);
+  }
+
+  &[data-state='closed'] {
+    animation: ${keyframes`
+      from {
+        height: var(--radix-accordion-content-height);
+      }
+      to {
+        height: 0;
+      }
+    `} 0.1s var(--ease-in-expo);
+  }
+`;

src/components/AssetIcon.tsx

@@ -45,6 +45,7 @@ const assetIcons = {
   SOL: '/currencies/sol.png',
   SUI: '/currencies/sui.png',
   SUSHI: '/currencies/sushi.png',
+  TIA: '/currencies/tia.png',
   TRX: '/currencies/trx.png',
   UMA: '/currencies/uma.png',
   UNI: '/currencies/uni.png',
@@ -71,8 +72,13 @@ export const AssetIcon = ({
 }: {
   symbol?: Nullable<string>;
   className?: string;
-}) =>
-  isAssetSymbol(symbol) ? <Styled.Img src={assetIcons[symbol]} className={className} /> : null;
+}) => (
+  <Styled.Img
+    src={isAssetSymbol(symbol) ? assetIcons[symbol] : '/currencies/unavailable.png'}
+    className={className}
+    alt={symbol}
+  />
+);
 
 const Styled: Record<string, AnyStyledComponent> = {};
 

src/components/Button.tsx

@@ -61,7 +61,7 @@ export const Button = forwardRef<HTMLButtonElement | HTMLAnchorElement, ButtonPr
 
     return (
       <StyledBaseButton
-        disabled={state[ButtonState.Disabled]}
+        disabled={state[ButtonState.Disabled] || state[ButtonState.Loading]}
         {...{ ref, action, size, shape, state, ...otherProps }}
       >
         {

src/components/Checkbox.stories.tsx

@@ -13,7 +13,9 @@ export const Checkboxes: Story<CheckboxProps> = (args) => {
       <Checkbox
         {...args}
         checked={isChecked}
-        onClick={(e: React.ChangeEvent) => setIsChecked((e.target as HTMLInputElement).checked)}
+        onCheckedChange={setIsChecked}
+        id="story-checkbox"
+        label="example label"
       />
     </StoryWrapper>
   );

src/components/Checkbox.tsx

@@ -1,10 +1,14 @@
 import styled, { type AnyStyledComponent } from 'styled-components';
+import { Root, Indicator } from '@radix-ui/react-checkbox';
+import { CheckIcon } from '@radix-ui/react-icons';
 
-import { breakpoints } from '@/styles';
+import { layoutMixins } from '@/styles/layoutMixins';
 
 type ElementProps = {
   checked: boolean;
-  onClick: (e: React.ChangeEvent) => void;
+  onCheckedChange: (checked: boolean) => void;
+  id?: string;
+  label?: React.ReactNode;
 };
 
 type StyleProps = {
@@ -13,85 +17,54 @@ type StyleProps = {
 
 export type CheckboxProps = ElementProps & StyleProps;
 
-export const Checkbox: React.FC<CheckboxProps> = ({ checked, className, onClick }) => {
-  return (
-    <Styled.CheckboxWrapper className={className}>
-      <Styled.Checkbox
-        type="checkbox"
-        checked={checked}
-        onChange={onClick}
-      />
-      <Styled.CustomCheckbox />
-    </Styled.CheckboxWrapper>
-  );
-};
+export const Checkbox: React.FC<CheckboxProps> = ({
+  checked,
+  className,
+  onCheckedChange,
+  id,
+  label,
+}) => (
+  <Styled.Container>
+    <Styled.Root className={className} checked={checked} onCheckedChange={onCheckedChange} id={id}>
+      <Styled.Indicator>
+        <CheckIcon />
+      </Styled.Indicator>
+    </Styled.Root>
+    {label && <label htmlFor={id}>{label}</label>}
+  </Styled.Container>
+);
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
-Styled.CustomCheckbox = styled.span`
-  width: 1.25em;
-  height: 1.25em;
+Styled.Container = styled.div`
+  ${layoutMixins.row}
+  gap: 1ch;
+  font: var(--font-small-book);
 
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
+  label {
+    cursor: pointer;
+  }
+`;
+
+Styled.Root = styled(Root)`
+  --checkbox-backgroundColor: var(--color-layer-0);
+
+  min-width: 1.25rem;
+  height: 1.25rem;
+
+  border-radius: 0.375rem;
+  border: var(--border-width) solid var(--color-border);
   background-color: var(--checkbox-backgroundColor);
 
-  &::after {
-    position: absolute;
-    content: '';
-    top: 0.25em;
-    left: 0.4375em;
-    width: 0.3125em;
-    height: 0.5em;
-    border: solid var(--checkbox-checkColor);
-    border-width: 0 0.125em 0.125em 0;
-    border-radius: 0.0625em;
-    opacity: 0;
-    transform: rotate(0deg) scale(0);
-    transition: opacity 0.2s ease-in-out, transform 0.2s ease-in-out;
-  }
-
-  @media ${breakpoints.tablet} {
-    width: 1.5em;
-    height: 1.5em;
-
-    &::after {
-      top: 0.25em;
-      left: 0.4375em;
-      width: 0.4375em;
-      height: 0.625em;
-    }
+  &[data-state='checked'] {
+    --checkbox-backgroundColor: var(--color-accent);
   }
 `;
 
-Styled.CheckboxWrapper = styled.div`
-  --checkbox-backgroundColor: var(--color-layer-1);
-  --checkbox-checkColor: var(--color-text-1);
-
+Styled.Indicator = styled(Indicator)`
   display: flex;
-  border-radius: 0.25em;
-  overflow: hidden;
-  position: relative;
-  cursor: pointer;
+  align-items: center;
+  justify-content: center;
 
-  > input:checked ~ ${Styled.CustomCheckbox}::after {
-    opacity: 1;
-    transform: rotate(40deg) scale(1);
-  }
-`;
-
-Styled.Checkbox = styled.input`
-  width: 1.25em;
-  height: 1.25em;
-  z-index: 1;
-  cursor: pointer;
-  opacity: 0;
-
-  @media ${breakpoints.tablet} {
-    width: 1.5em;
-    height: 1.5em;
-  }
+  color: var(--color-text-2);
 `;

src/components/Collapsible.stories.tsx

@@ -1,16 +1,13 @@
 import type { Story } from '@ladle/react';
 
-import { Collapsible } from '@/components/Collapsible';
+import { Collapsible, type CollapsibleProps } from '@/components/Collapsible';
 
 import { StoryWrapper } from '.ladle/components';
 import { IconName } from './Icon';
 
-export const CollapsibleStory: Story<Parameters<typeof Collapsible>> = (args) => (
+export const CollapsibleStory: Story<CollapsibleProps> = (args) => (
   <StoryWrapper>
-    <Collapsible
-      label="Collapsible List of Items"
-      {...args}
-    >
+    <Collapsible {...args}>
       <ul>
         <li>Collapsible Item 1</li>
         <li>Collapsible Item 2</li>
@@ -23,6 +20,8 @@ export const CollapsibleStory: Story<Parameters<typeof Collapsible>> = (args) =>
 
 CollapsibleStory.args = {
   disabled: false,
+  withTrigger: true,
+  label: 'Collapsible List of Items',
 };
 
 CollapsibleStory.argTypes = {

src/components/Collapsible.tsx

@@ -14,6 +14,7 @@ type ElementProps = {
   label: React.ReactNode;
   triggerIcon?: IconName;
   children: React.ReactNode;
+  withTrigger?: boolean;
 };
 
 type StyleProps = {
@@ -23,6 +24,8 @@ type StyleProps = {
   fullWidth?: boolean;
 };
 
+export type CollapsibleProps = ElementProps & StyleProps;
+
 export const Collapsible = ({
   defaultOpen = false,
   disabled,
@@ -35,26 +38,29 @@ export const Collapsible = ({
   triggerIconSide = 'left',
   fullWidth,
   className,
-}: ElementProps & StyleProps) => (
+  withTrigger = true,
+}: CollapsibleProps) => (
   <Styled.Root defaultOpen={defaultOpen} open={open} onOpenChange={onOpenChange}>
-    <Styled.Trigger className={className} disabled={disabled}>
-      {triggerIconSide === 'right' && (
-        <>
-          {label}
-          {fullWidth && <HorizontalSeparatorFiller />}
-        </>
-      )}
+    {withTrigger && (
+      <Styled.Trigger className={className} disabled={disabled}>
+        {triggerIconSide === 'right' && (
+          <>
+            {label}
+            {fullWidth && <HorizontalSeparatorFiller />}
+          </>
+        )}
 
-      <Styled.TriggerIcon>
-        <Icon iconName={triggerIcon} />
-      </Styled.TriggerIcon>
-      {triggerIconSide === 'left' && (
-        <>
-          {fullWidth && <HorizontalSeparatorFiller />}
-          {label}
-        </>
-      )}
-    </Styled.Trigger>
+        <Styled.TriggerIcon>
+          <Icon iconName={triggerIcon} />
+        </Styled.TriggerIcon>
+        {triggerIconSide === 'left' && (
+          <>
+            {fullWidth && <HorizontalSeparatorFiller />}
+            {label}
+          </>
+        )}
+      </Styled.Trigger>
+    )}
     <Styled.Content $transitionDuration={transitionDuration}>{children}</Styled.Content>
   </Styled.Root>
 );
@@ -80,7 +86,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'] & {

src/components/CollapsibleTabs.tsx

@@ -31,10 +31,12 @@ type ElementProps<TabItemsValue> = {
 };
 
 type StyleProps = {
-  fullWidthTabs?: boolean;
   className?: string;
+  fullWidthTabs?: boolean;
 };
 
+export type CollapsibleTabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
+
 export const CollapsibleTabs = <TabItemsValue extends string>({
   defaultValue,
   items,
@@ -43,8 +45,9 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
   onOpenChange,
 
   fullWidthTabs,
+
   className,
-}: ElementProps<TabItemsValue> & StyleProps) => {
+}: CollapsibleTabsProps<TabItemsValue>) => {
   const [value, setValue] = useState(defaultValue);
 
   const currentItem = items.find((item) => item.value === value);
@@ -86,8 +89,8 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
         </Styled.Header>
 
         <Styled.CollapsibleContent>
-          {items.map(({ value, content }) => (
-            <Styled.TabsContent key={value} value={value}>
+          {items.map(({ asChild, value, content }) => (
+            <Styled.TabsContent key={value} asChild={asChild} value={value}>
               {content}
             </Styled.TabsContent>
           ))}
@@ -219,12 +222,12 @@ Styled.Header = styled.header`
 
 Styled.CollapsibleContent = styled(CollapsibleContent)`
   ${layoutMixins.stack}
-  ${layoutMixins.perspectiveArea}
 
   box-shadow: none;
 `;
 
 Styled.IconButton = styled(IconButton)`
+  --button-icon-size: 1em;
   ${Styled.CollapsibleRoot}[data-state='closed'] & {
     rotate: -0.5turn;
   }

src/components/ComboboxDialogMenu.tsx

@@ -22,7 +22,12 @@ type PickComboxMenuProps<
   MenuGroupValue extends string | number
 > = Pick<
   ComboboxMenuProps<MenuItemValue, MenuGroupValue>,
-  'inputPlaceholder' | 'onItemSelected' | 'slotEmpty' | 'withSearch' | 'withStickyLayout'
+  | 'inputPlaceholder'
+  | 'onItemSelected'
+  | 'slotEmpty'
+  | 'withItemBorders'
+  | 'withSearch'
+  | 'withStickyLayout'
 >;
 
 type PickDialogProps = Pick<
@@ -34,6 +39,7 @@ type PickDialogProps = Pick<
   | 'slotHeaderInner'
   | 'slotTrigger'
   | 'slotFooter'
+  | 'preventClose'
 >;
 
 export const ComboboxDialogMenu = <
@@ -52,11 +58,13 @@ export const ComboboxDialogMenu = <
   onItemSelected,
   inputPlaceholder,
   slotEmpty,
+  withItemBorders,
   withSearch,
   withStickyLayout = true,
   children,
 
   placement = DialogPlacement.Default,
+  preventClose,
   className,
 }: ElementProps<MenuItemValue, MenuGroupValue> &
   PickComboxMenuProps<MenuItemValue, MenuGroupValue> &
@@ -72,6 +80,7 @@ export const ComboboxDialogMenu = <
     slotTrigger={slotTrigger}
     slotFooter={slotFooter}
     placement={placement}
+    preventClose={preventClose}
     className={className}
   >
     <Styled.ComboboxMenu
@@ -80,6 +89,7 @@ export const ComboboxDialogMenu = <
       title={title}
       inputPlaceholder={inputPlaceholder}
       slotEmpty={slotEmpty}
+      withItemBorders={withItemBorders}
       withSearch={withSearch}
       withStickyLayout={withStickyLayout}
     />
@@ -92,6 +102,8 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Dialog = styled(Dialog)`
   /* Params */
   --comboboxDialogMenu-backgroundColor: var(--color-layer-2);
+  --comboboxDialogMenu-item-gap: 0.5rem;
+  --comboboxDialogMenu-item-padding: 0.5rem 1rem;
 
   /* Overrides */
   & {
@@ -110,10 +122,12 @@ Styled.Dialog = styled(Dialog)`
 
     /* Net 0 sticky top inset (let stickyArea1 header stick to top) */
     --stickyArea0-topGap: calc(-1 * var(--stickyArea0-topHeight));
+    overflow-x: clip;
   }
 `;
 
 Styled.ComboboxMenu = styled(ComboboxMenu)`
   --comboboxMenu-backgroundColor: var(--comboboxDialogMenu-backgroundColor);
-  --comboboxMenu-item-gap: var(--comboxDialogMenu-item-gap, 0.5rem);
+  --comboboxMenu-item-gap: var(--comboboxDialogMenu-item-gap);
+  --comboboxMenu-item-padding: var(--comboboxDialogMenu-item-padding);
 `;

src/components/ComboboxMenu.tsx

@@ -2,7 +2,7 @@ import { Fragment, type ReactNode, useState } from 'react';
 import styled, { type AnyStyledComponent, css } from 'styled-components';
 import { Command } from 'cmdk';
 
-import { type MenuConfig } from '@/constants/menus';
+import { MenuItem, type MenuConfig } from '@/constants/menus';
 import { popoverMixins } from '@/styles/popoverMixins';
 import { layoutMixins } from '@/styles/layoutMixins';
 
@@ -20,6 +20,7 @@ type ElementProps<MenuItemValue extends string | number, MenuGroupValue extends
 
 type StyleProps = {
   className?: string;
+  withItemBorders?: boolean;
   withStickyLayout?: boolean;
 };
 
@@ -38,17 +39,11 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
   withSearch = true,
 
   className,
+  withItemBorders,
   withStickyLayout,
 }: ComboboxMenuProps<MenuItemValue, MenuGroupValue>) => {
   const [highlightedCommand, setHighlightedCommand] = useState<MenuItemValue>();
   const [searchValue, setSearchValue] = useState('');
-  // const inputRef = useRef<HTMLInputElement | null>(null);
-
-  // console.log({ commandValue: highlightedCommand });
-
-  // useEffect(() => {
-  //   inputRef?.current?.focus();
-  // }, []);
 
   return (
     <Styled.Command
@@ -65,11 +60,14 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
       {withSearch && (
         <Styled.Header $withStickyLayout={withStickyLayout}>
           <Styled.Input
-            // ref={inputRef}
+            /**
+             * Mobile Issue: Search Input will always trigger mobile keyboard drawer. There is no fix.
+             * https://github.com/pacocoursey/cmdk/issues/127
+             */
+            autoFocus
             type="search"
             value={searchValue}
             onValueChange={setSearchValue}
-            autoFocus
             placeholder={inputPlaceholder}
           />
         </Styled.Header>
@@ -80,6 +78,7 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
           <Styled.Group
             key={group.group}
             heading={group.groupLabel}
+            $withItemBorders={withItemBorders}
             $withStickyLayout={withStickyLayout}
           >
             {group.items.map((item) => (
@@ -99,22 +98,31 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
                     }
                   }}
                   disabled={item.disabled}
+                  $withItemBorders={withItemBorders}
                 >
-                  {item.slotBefore}
-                  <Styled.ItemLabel>
-                    <span>
-                      {`${item.label}${item.subitems?.length ? '…' : ''}`}
-                      {item.tag && (
-                        <>
-                          {' '}
-                          <Tag>{item.tag}</Tag>
-                        </>
+                  {
+                    <>
+                      {item.slotBefore}
+                      {item.slotCustomContent ?? (
+                        <Styled.ItemLabel>
+                          <span>
+                            {typeof item.label === 'string'
+                              ? `${item.label}${item.subitems?.length ? '…' : ''}`
+                              : item.label}
+                            {item.tag && (
+                              <>
+                                {' '}
+                                <Tag>{item.tag}</Tag>
+                              </>
+                            )}
+                          </span>
+                          {item.description && <span>{item.description}</span>}
+                        </Styled.ItemLabel>
                       )}
-                    </span>
-                    {item.description && <span>{item.description}</span>}
-                  </Styled.ItemLabel>
-                  {item.slotAfter}
-                  {item.subitems && '→'}
+                      {item.slotAfter}
+                      {item.subitems && '→'}
+                    </>
+                  }
                 </Styled.Item>
 
                 {searchValue &&
@@ -137,6 +145,7 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
                           onItemSelected?.();
                         }}
                         disabled={subitem.disabled}
+                        $withItemBorders={withItemBorders}
                       >
                         {subitem.slotBefore}
                         <Styled.ItemLabel>
@@ -169,14 +178,17 @@ const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Command = styled(Command)<{ $withStickyLayout?: boolean }>`
   --comboboxMenu-backgroundColor: var(--color-layer-2);
+
   --comboboxMenu-input-backgroundColor: var(--color-layer-3);
   --comboboxMenu-input-height: 2.5rem;
+
   --comboboxMenu-item-checked-backgroundColor: ;
   --comboboxMenu-item-checked-textColor: ;
   --comboboxMenu-item-highlighted-backgroundColor: var(--color-layer-3);
   --comboboxMenu-item-highlighted-textColor: var(--color-text-1);
   --comboboxMenu-item-backgroundColor: ;
   --comboboxMenu-item-gap: 0.5rem;
+  --comboboxMenu-item-padding: 0.5em 1em;
 
   display: grid;
   align-content: start;
@@ -225,7 +237,7 @@ Styled.Input = styled(Command.Input)`
   gap: 0.5rem;
 `;
 
-Styled.Group = styled(Command.Group)<{ $withStickyLayout?: boolean }>`
+Styled.Group = styled(Command.Group)<{ $withItemBorders?: boolean; $withStickyLayout?: boolean }>`
   color: var(--color-text-0);
 
   > [cmdk-group-heading] {
@@ -242,12 +254,21 @@ Styled.Group = styled(Command.Group)<{ $withStickyLayout?: boolean }>`
 
       > [cmdk-group-heading] {
         ${layoutMixins.stickyHeader}
+        z-index: 2;
       }
 
       > [cmdk-group-items] {
         ${layoutMixins.stickyArea3}
       }
     `}
+
+  ${({ $withItemBorders }) =>
+    $withItemBorders &&
+    css`
+      > [cmdk-group-items] {
+        padding: var(--border-width) 0;
+      }
+    `}
 `;
 
 Styled.List = styled(Command.List)<{ $withStickyLayout?: boolean }>`
@@ -274,13 +295,14 @@ Styled.List = styled(Command.List)<{ $withStickyLayout?: boolean }>`
     `}
 `;
 
-Styled.Item = styled(Command.Item)`
+Styled.Item = styled(Command.Item)<{ $withItemBorders?: boolean }>`
   ${layoutMixins.scrollSnapItem}
   ${popoverMixins.item}
   --item-checked-backgroundColor: var(--comboboxMenu-item-checked-backgroundColor);
   --item-checked-textColor: var(--comboboxMenu-item-checked-textColor);
   --item-highlighted-textColor: var(--comboboxMenu-item-highlighted-textColor);
   --item-gap: var(--comboboxMenu-item-gap);
+  --item-padding: var(--comboboxMenu-item-padding);
 
   background-color: var(--comboboxMenu-backgroundColor, inherit);
 
@@ -291,6 +313,12 @@ Styled.Item = styled(Command.Item)`
     opacity: 0.75;
     cursor: not-allowed;
   }
+
+  ${({ $withItemBorders }) =>
+    $withItemBorders &&
+    css`
+      ${layoutMixins.withOuterBorder}
+    `}
 `;
 
 Styled.ItemLabel = styled.div`
@@ -309,6 +337,8 @@ Styled.ItemLabel = styled.div`
       opacity: 0.8;
     }
   }
+
+  min-width: 0;
 `;
 
 Styled.Empty = styled(Command.Empty)`

src/components/CopyButton.stories.tsx

@@ -15,10 +15,10 @@ CopyButtonStory.args = {
 };
 
 CopyButtonStory.argTypes = {
-  shownAsText: {
-    options: [true, false],
+  buttonType: {
+    options: ["text", "icon", "default"],
     control: { type: 'select' },
-    defaultValue: false,
+    defaultValue: "default",
   },
   children: {
     options: ['some text to copy'],

src/components/CopyButton.tsx

@@ -9,14 +9,21 @@ import { layoutMixins } from '@/styles/layoutMixins';
 
 import { Button, ButtonProps } from './Button';
 import { Icon, IconName } from './Icon';
+import { IconButton } from './IconButton';
+import { WithTooltip } from './WithTooltip';
 
 export type CopyButtonProps = {
   value?: string;
-  shownAsText?: boolean;
+  buttonType?: 'text' | 'icon' | 'default';
   children?: React.ReactNode;
 } & ButtonProps;
 
-export const CopyButton = ({ value, shownAsText, children, ...buttonProps }: CopyButtonProps) => {
+export const CopyButton = ({
+  value,
+  buttonType = 'default',
+  children,
+  ...buttonProps
+}: CopyButtonProps) => {
   const stringGetter = useStringGetter();
   const [copied, setCopied] = useState(false);
 
@@ -28,11 +35,23 @@ export const CopyButton = ({ value, shownAsText, children, ...buttonProps }: Cop
     setTimeout(() => setCopied(false), 500);
   };
 
-  return shownAsText ? (
+  return buttonType === 'text' ? (
     <Styled.InlineRow onClick={onCopy} copied={copied}>
       {children}
-      <Icon iconName={IconName.Copy} />
+      <Styled.Icon copied={copied} iconName={copied ? IconName.Check : IconName.Copy} />
     </Styled.InlineRow>
+  ) : buttonType === 'icon' ? (
+    <WithTooltip
+      tooltipString={stringGetter({ key: copied ? STRING_KEYS.COPIED : STRING_KEYS.COPY })}
+    >
+      <Styled.IconButton
+        {...buttonProps}
+        copied={copied}
+        action={ButtonAction.Base}
+        iconName={copied ? IconName.Check : IconName.Copy}
+        onClick={onCopy}
+      />
+    </WithTooltip>
   ) : (
     <Button
       {...buttonProps}
@@ -63,3 +82,21 @@ Styled.InlineRow = styled.div<{ copied: boolean }>`
           }
         `}
 `;
+
+Styled.Icon = styled(Icon)<{ copied: boolean }>`
+  ${({ copied }) =>
+    copied &&
+    css`
+      color: var(--color-positive);
+    `}
+`;
+
+Styled.IconButton = styled(IconButton)<{ copied: boolean }>`
+  ${({ copied }) =>
+    copied &&
+    css`
+      svg {
+        color: var(--color-positive);
+      }
+    `}
+`;

src/components/Dialog.tsx

@@ -38,6 +38,7 @@ type ElementProps = {
   slotTrigger?: React.ReactNode;
   slotHeaderInner?: React.ReactNode;
   slotFooter?: React.ReactNode;
+  withClose?: boolean;
 };
 
 type StyleProps = {
@@ -46,6 +47,7 @@ type StyleProps = {
   hasHeaderBorder?: boolean;
   children?: React.ReactNode;
   className?: string;
+  withAnimation?: boolean;
 };
 
 export type DialogProps = ElementProps & StyleProps;
@@ -79,9 +81,11 @@ export const Dialog = ({
   slotTrigger,
   slotHeaderInner,
   slotFooter,
+  withClose = true,
   placement = DialogPlacement.Default,
   portalContainer,
   hasHeaderBorder = false,
+  withAnimation = false,
   children,
   className,
 }: DialogProps) => {
@@ -105,6 +109,7 @@ export const Dialog = ({
               e.preventDefault();
             }
           }}
+          $withAnimation={withAnimation}
         >
           <Styled.Header $withBorder={hasHeaderBorder}>
             <Styled.HeaderTopRow>
@@ -114,7 +119,7 @@ export const Dialog = ({
 
               {title && <Styled.Title>{title}</Styled.Title>}
 
-              {!preventClose && (
+              {!preventClose && withClose && (
                 <Styled.Close ref={closeButtonRef}>
                   <Icon iconName={IconName.Close} />
                 </Styled.Close>
@@ -168,7 +173,7 @@ Styled.Overlay = styled(Overlay)`
   }
 `;
 
-Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
+Styled.Container = styled(Content)<{ placement: DialogPlacement; $withAnimation?: boolean }>`
   /* Params */
   --dialog-inset: 1rem;
   --dialog-width: 30rem;
@@ -224,7 +229,7 @@ Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
 
   outline: none;
 
-  ${({ placement }) =>
+  ${({ placement, $withAnimation }) =>
     ({
       [DialogPlacement.Default]: css`
         inset: var(--dialog-inset);
@@ -260,9 +265,11 @@ Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
           padding-bottom: var(--dialog-radius); */
         }
 
-        @media (prefers-reduced-motion: no-preference) {
-          &[data-state='open'] {
-            animation: ${keyframes`
+        ${$withAnimation &&
+        css`
+          @media (prefers-reduced-motion: no-preference) {
+            &[data-state='open'] {
+              animation: ${keyframes`
               from {
                 opacity: 0;
               }
@@ -270,18 +277,19 @@ Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
                 max-height: 0;
               }
             `} 0.15s var(--ease-out-expo);
-          }
+            }
 
-          &[data-state='closed'] {
-            animation: ${keyframes`
+            &[data-state='closed'] {
+              animation: ${keyframes`
               to {
                 opacity: 0;
                 scale: 0.9;
                 max-height: 0;
               }
             `} 0.15s;
+            }
           }
-        }
+        `}
       `,
       [DialogPlacement.Sidebar]: css`
         --dialog-width: var(--sidebar-width);
@@ -291,50 +299,52 @@ Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
           margin-left: auto;
         }
 
-        @media (prefers-reduced-motion: no-preference) {
-          &[data-state='open'] {
-            animation: ${keyframes`
+        ${$withAnimation &&
+        css`
+          @media (prefers-reduced-motion: no-preference) {
+            &[data-state='open'] {
+              animation: ${keyframes`
               from {
                 translate: 100% 0;
                 opacity: 0;
               }
             `} 0.15s var(--ease-out-expo);
-          }
+            }
 
-          &[data-state='closed'] {
-            animation: ${keyframes`
+            &[data-state='closed'] {
+              animation: ${keyframes`
               to {
                 translate: 100% 0;
                 opacity: 0;
               }
             `} 0.15s var(--ease-out-expo);
+            }
           }
-        }
+        `}
       `,
       [DialogPlacement.Inline]: css`
-        @media (prefers-reduced-motion: no-preference) {
-          &[data-state='open'] {
-            animation: ${keyframes`
+        ${$withAnimation &&
+        css`
+          @media (prefers-reduced-motion: no-preference) {
+            &[data-state='open'] {
+              animation: ${keyframes`
               from {
                 scale: 0.99;
                 opacity: 0;
-                /* filter: blur(2px); */
-                /* backdrop-filter: none; */
               }
             `} 0.15s var(--ease-out-expo);
-          }
+            }
 
-          &[data-state='closed'] {
-            animation: ${keyframes`
+            &[data-state='closed'] {
+              animation: ${keyframes`
               to {
                 scale: 0.99;
                 opacity: 0;
-                /* filter: blur(2px); */
-                /* backdrop-filter: none; */
               }
             `} 0.15s var(--ease-out-expo);
+            }
           }
-        }
+        `}
       `,
       [DialogPlacement.FullScreen]: css`
         --dialog-width: 100vw;

src/components/DropdownHeaderMenu.tsx

@@ -33,9 +33,11 @@ export const DropdownHeaderMenu = <MenuItemValue extends string>({
 
   return (
     <Root>
-      <Styled.Trigger className={className}>
+      <Styled.Trigger className={className} asChild>
+        <div>
         {children}
         <Styled.DropdownIconButton iconName={IconName.Caret} isToggle />
+        </div>
       </Styled.Trigger>
       <Portal>
         <Styled.Content

src/components/DropdownSelectMenu.tsx

@@ -9,6 +9,7 @@ import {
   RadioItem,
   Portal,
 } from '@radix-ui/react-dropdown-menu';
+import { CheckIcon } from '@radix-ui/react-icons';
 
 import { type MenuItem } from '@/constants/menus';
 
@@ -90,7 +91,9 @@ export const DropdownSelectMenu = <MenuItemValue extends string>({
 
                 {slotAfter}
 
-                <Styled.ItemIndicator>✔{/* <CheckIcon /> */}</Styled.ItemIndicator>
+                <Styled.ItemIndicator>
+                  <CheckIcon />
+                </Styled.ItemIndicator>
               </Styled.RadioItem>
             ))}
           </RadioGroup>

src/components/GreenCheckCircle.tsx

@@ -1,43 +1,16 @@
 import styled, { AnyStyledComponent } from 'styled-components';
 
-import { layoutMixins } from '@/styles/layoutMixins';
-
 import { Icon, IconName } from '@/components/Icon';
 
 export const GreenCheckCircle = ({ className }: { className?: string }) => (
-  <Styled.GreenCheckCircle className={className}>
-    <Icon iconName={IconName.Check} />
-  </Styled.GreenCheckCircle>
+  <Styled.Icon className={className} iconName={IconName.CheckCircle} />
 );
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
-Styled.GreenCheckCircle = styled.div`
-  ${layoutMixins.stack}
-
+Styled.Icon = styled(Icon)`
   --icon-size: 1.25rem;
-  --icon-border-width: 3px;
 
   width: var(--icon-size);
   height: var(--icon-size);
-  border-radius: 50%;
-
-  align-items: center;
-
-  &:before {
-    content: '';
-    width: calc(var(--icon-size) - var(--icon-border-width) * 2);
-    height: calc(var(--icon-size) - var(--icon-border-width) * 2);
-    border: solid var(--icon-border-width) var(--color-positive);
-    border-radius: 50%;
-    opacity: 0.6;
-  }
-
-  svg {
-    width: calc(var(--icon-size) / 3);
-    height: calc(var(--icon-size) / 3);
-
-    color: var(--color-positive);
-    justify-self: center;
-  }
 `;

src/components/Icon.tsx

@@ -15,6 +15,7 @@ import {
   CautionCircleIcon,
   ChatIcon,
   CheckIcon,
+  CheckCircleIcon,
   ChevronLeftIcon,
   ChevronRightIcon,
   ClockIcon,
@@ -23,10 +24,10 @@ import {
   CoinsIcon,
   CommentIcon,
   CopyIcon,
-  CubeIcon,
+  DepositIcon,
+  DepthChartIcon,
   DiscordIcon,
   EtherscanIcon,
-  DepthChartIcon,
   ExportKeysIcon,
   FeedbackIcon,
   FileIcon,
@@ -36,6 +37,7 @@ import {
   HelpCircleIcon,
   HideIcon,
   HistoryIcon,
+  LeaderboardIcon,
   LinkOutIcon,
   LockIcon,
   LogoShortIcon,
@@ -51,10 +53,13 @@ import {
   OrderUntriggeredIcon,
   OverviewIcon,
   PencilIcon,
+  PlayIcon,
+  PlusIcon,
   PositionsIcon,
   PriceChartIcon,
   PrivacyIcon,
   QrIcon,
+  RewardStarIcon,
   SearchIcon,
   SendIcon,
   ShareIcon,
@@ -69,6 +74,7 @@ import {
   WarningIcon,
   WebsiteIcon,
   WhitepaperIcon,
+  WithdrawIcon,
 } from '@/icons';
 
 export enum IconName {
@@ -84,6 +90,7 @@ export enum IconName {
   CautionCircleStroked = 'CautionCircleStroked',
   Chat = 'Chat',
   Check = 'Check',
+  CheckCircle = 'CheckCircle',
   ChevronLeft = 'ChevronLeft',
   ChevronRight = 'ChevronRight',
   Clock = 'Clock',
@@ -92,7 +99,7 @@ export enum IconName {
   Coins = 'Coins',
   Comment = 'Comment',
   Copy = 'Copy',
-  Cube = 'Cube',
+  Deposit = 'Deposit',
   DepthChart = 'DepthChart',
   Discord = 'Discord',
   Etherscan = 'Etherscan',
@@ -105,6 +112,7 @@ export enum IconName {
   HelpCircle = 'HelpCircle',
   Hide = 'Hide',
   History = 'History',
+  Leaderboard = 'Leaderboard',
   LinkOut = 'LinkOut',
   Lock = 'Lock',
   LogoShort = 'LogoShort',
@@ -121,10 +129,13 @@ export enum IconName {
   OrderUntriggered = 'OrderUntriggered',
   Overview = 'Overview',
   Pencil = 'Pencil',
+  Play = 'Play',
+  Plus = 'Plus',
   Positions = 'Positions',
   PriceChart = 'PriceChart',
   Privacy = 'Privacy',
   Qr = 'Qr',
+  RewardStar = 'RewardStar',
   Search = 'Search',
   Send = 'Send',
   Share = 'Share',
@@ -139,6 +150,7 @@ export enum IconName {
   Warning = 'Warning',
   Website = 'Website',
   Whitepaper = 'Whitepaper',
+  Withdraw = 'Withdraw',
 }
 
 const icons = {
@@ -154,6 +166,7 @@ const icons = {
   [IconName.CautionCircleStroked]: CautionCircleStrokeIcon,
   [IconName.Chat]: ChatIcon,
   [IconName.Check]: CheckIcon,
+  [IconName.CheckCircle]: CheckCircleIcon,
   [IconName.ChevronLeft]: ChevronLeftIcon,
   [IconName.ChevronRight]: ChevronRightIcon,
   [IconName.Clock]: ClockIcon,
@@ -162,7 +175,7 @@ const icons = {
   [IconName.Coins]: CoinsIcon,
   [IconName.Comment]: CommentIcon,
   [IconName.Copy]: CopyIcon,
-  [IconName.Cube]: CubeIcon,
+  [IconName.Deposit]: DepositIcon,
   [IconName.DepthChart]: DepthChartIcon,
   [IconName.Discord]: DiscordIcon,
   [IconName.Etherscan]: EtherscanIcon,
@@ -175,6 +188,7 @@ const icons = {
   [IconName.HelpCircle]: HelpCircleIcon,
   [IconName.Hide]: HideIcon,
   [IconName.History]: HistoryIcon,
+  [IconName.Leaderboard]: LeaderboardIcon,
   [IconName.LinkOut]: LinkOutIcon,
   [IconName.Lock]: LockIcon,
   [IconName.LogoShort]: LogoShortIcon,
@@ -190,10 +204,13 @@ const icons = {
   [IconName.OrderUntriggered]: OrderUntriggeredIcon,
   [IconName.Overview]: OverviewIcon,
   [IconName.Pencil]: PencilIcon,
+  [IconName.Play]: PlayIcon,
+  [IconName.Plus]: PlusIcon,
   [IconName.Positions]: PositionsIcon,
   [IconName.PriceChart]: PriceChartIcon,
   [IconName.Privacy]: PrivacyIcon,
   [IconName.Qr]: QrIcon,
+  [IconName.RewardStar]: RewardStarIcon,
   [IconName.Search]: SearchIcon,
   [IconName.Send]: SendIcon,
   [IconName.Share]: ShareIcon,
@@ -208,6 +225,7 @@ const icons = {
   [IconName.Warning]: WarningIcon,
   [IconName.Website]: WebsiteIcon,
   [IconName.Whitepaper]: WhitepaperIcon,
+  [IconName.Withdraw]: WithdrawIcon,
 } as Record<IconName, ElementType>;
 
 type ElementProps = {

src/components/IconButton.tsx

@@ -67,6 +67,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
 const buttonMixin = css`
   // Params
   --button-icon-size: 1.125em;
+  --button-padding: 0;
 
   // Rules
   > * {

src/components/Input.tsx

@@ -10,7 +10,7 @@ import {
   USD_DECIMALS,
 } from '@/constants/numbers';
 
-import { BIG_NUMBERS, MustBigNumber } from '@/lib/numbers';
+import { BIG_NUMBERS } from '@/lib/numbers';
 import { useLocaleSeparators } from '@/hooks';
 
 export enum InputType {
@@ -29,31 +29,38 @@ type StyleProps = {
 type ElementProps = {
   type?: InputType;
   value?: string | number | null;
-
-  allowNegative?: boolean;
-  decimals?: number;
   disabled?: boolean;
   id?: string;
-  max?: number;
   onBlur?: () => void;
-  onChange?:
-    | Dispatch<SetStateAction<string>>
-    | React.ReactEventHandler<HTMLInputElement>
-    | ((values: NumberFormatValues, e: SourceInfo) => void);
   onFocus?: () => void;
-  onInput?: ({
-    value,
-    floatValue,
-    formattedValue,
-  }: {
-    value: string;
-    floatValue?: number;
-    formattedValue: string;
-  }) => void;
   placeholder?: string;
 };
 
-export type InputProps = ElementProps & StyleProps;
+type ConditionalProps =
+  | {
+      allowNegative?: boolean;
+      decimals?: number;
+      max?: number;
+      onChange?: (values: NumberFormatValues, e: SourceInfo) => void;
+      onInput?: ({
+        value,
+        floatValue,
+        formattedValue,
+      }: {
+        value: string;
+        floatValue?: number;
+        formattedValue: string;
+      }) => void;
+    }
+  | {
+      allowNegative?: never;
+      decimals?: never;
+      max?: never;
+      onChange?: Dispatch<SetStateAction<string>> | React.ReactEventHandler<HTMLInputElement>;
+      onInput?: (e: SyntheticInputEvent) => void;
+    };
+
+export type InputProps = ElementProps & StyleProps & ConditionalProps;
 
 export const Input = forwardRef<HTMLInputElement, InputProps>(
   (
@@ -129,6 +136,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             placeholder={placeholder}
             value={value}
             // Other
+            data-1p-ignore // prevent 1Password fill
             {...otherProps}
           />
         ) : (
@@ -137,6 +145,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             ref={ref as React.Ref<typeof NumericFormat<unknown>>}
             id={id}
             // NumericFormat
+            valueIsNumericString
             allowNegative={allowNegative}
             decimalScale={decimals}
             decimalSeparator={LOCALE_DECIMAL_SEPARATOR}
@@ -160,7 +169,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
                 ? undefined
                 : Number(formattedValue.replace(',', '.'));
 
-              onInput?.({ value, floatValue, formattedValue });
+              onInput?.({ value, floatValue, formattedValue, ...e });
             }}
             // Native
             disabled={disabled}
@@ -168,6 +177,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             value={formattedValue}
             autoComplete="off"
             autoCorrect="off"
+            data-1p-ignore // prevent 1Password fill
             {...otherProps}
           />
         )}
@@ -188,7 +198,6 @@ Styled.InputContainer = styled.div`
   border-radius: inherit;
 
   input {
-    user-select: all;
     flex: 1;
     width: 100%;
   }

src/components/NavigationMenu.tsx

@@ -1,4 +1,4 @@
-import { forwardRef, Ref, useEffect, useRef, useState } from 'react';
+import { forwardRef, Ref } from 'react';
 import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components';
 import { NavLink, matchPath, useLocation } from 'react-router-dom';
 
@@ -21,8 +21,6 @@ import {
 
 import { layoutMixins } from '@/styles/layoutMixins';
 
-import { isTruthy } from '@/lib/isTruthy';
-
 import { Tag } from './Tag';
 import { Icon, IconName } from './Icon';
 
@@ -61,7 +59,6 @@ const NavItem = forwardRef(
       <>
         {slotBefore}
         <span>
-          {/* {`${label}${subitems?.length ? ' ' : ''}`} */}
           {label}
           {tag && (
             <>
@@ -71,7 +68,7 @@ const NavItem = forwardRef(
           )}
         </span>
         {slotAfter}
-        {subitems?.length && <Styled.Icon iconName={IconName.Caret} />}
+        {subitems?.length && <Styled.Icon iconName={IconName.Triangle} />}
       </>
     );
 
@@ -100,8 +97,6 @@ const NavItem = forwardRef(
   }
 );
 
-type TriggerRef = HTMLAnchorElement | HTMLDivElement | HTMLButtonElement | null;
-
 export const NavigationMenu = <MenuItemValue extends string, MenuGroupValue extends string>({
   onSelectItem,
   onSelectGroup,
@@ -112,33 +107,6 @@ export const NavigationMenu = <MenuItemValue extends string, MenuGroupValue exte
   dir = 'ltr',
   className,
 }: ElementProps<MenuItemValue, MenuGroupValue> & StyleProps) => {
-  // Disable click (close) in the first 500ms after hover (open)
-  // https://github.com/radix-ui/primitives/issues/1630#issuecomment-1545995075
-  const [clickIsDisabled, setClickIsDisabled] = useState(false);
-  const triggerRefs = useRef({} as { [value: string]: TriggerRef });
-
-  useEffect(() => {
-    const observer = new MutationObserver((mutationsList) => {
-      for (const mutation of mutationsList) {
-        if (
-          mutation.type === 'attributes' &&
-          mutation.attributeName === 'data-state' &&
-          (mutation.target as unknown as HTMLOrSVGElement).dataset.state === 'open' &&
-          mutation.target !== document.activeElement
-        ) {
-          setClickIsDisabled(true);
-          setTimeout(() => setClickIsDisabled(false), 500);
-        }
-      }
-    });
-
-    for (const element of Object.values(triggerRefs.current).filter(isTruthy)) {
-      observer.observe(element, { attributes: true });
-    }
-
-    return () => observer.disconnect();
-  }, []);
-
   const renderSubitems = ({
     item,
     depth = 0,
@@ -148,18 +116,18 @@ export const NavigationMenu = <MenuItemValue extends string, MenuGroupValue exte
   }) => (
     <>
       <Styled.SubMenuTrigger
-        asChild={depth > 0}
-        ref={(ref: TriggerRef) => (triggerRefs.current[item.value] = ref)}
-        onClick={(e: MouseEvent) => {
-          if (clickIsDisabled) {
-            e.preventDefault();
-          }
-        }}
+        asChild
+        onPointerMove={(e: MouseEvent) => e.preventDefault()}
+        onPointerLeave={(e: MouseEvent) => e.preventDefault()}
       >
         <Styled.NavItem onSelect={onSelectGroup} orientation={itemOrientation} {...item} />
       </Styled.SubMenuTrigger>
 
-      <Styled.Content data-placement={submenuPlacement}>
+      <Styled.Content
+        onPointerEnter={(e: MouseEvent) => e.preventDefault()}
+        onPointerLeave={(e: MouseEvent) => e.preventDefault()}
+        data-placement={submenuPlacement}
+      >
         <Styled.Sub data-placement={submenuPlacement}>
           <Styled.List
             data-orientation={depth > 0 ? 'menu' : orientation === 'vertical' ? 'vertical' : 'menu'}
@@ -410,25 +378,12 @@ Styled.List = styled(List)`
 `;
 
 Styled.ListItem = styled(Item)`
-  /* display: contents; */
   display: grid;
   position: relative;
 
   ${Styled.List}[data-orientation="horizontal"] > & {
     gap: var(--submenu-side-offset);
   }
-
-  /* ${Styled.List}[data-orientation="menu"] > & {
-    grid-template-columns: 1fr 0;
-    align-items: start;
-    gap: 2rem;
-  } */
-
-  /* &:has([data-state="open"]) {
-    position: sticky;
-    left: 0;
-    right: 0;
-  } */
 `;
 
 Styled.SubMenuTrigger = styled(Trigger)`
@@ -436,11 +391,6 @@ Styled.SubMenuTrigger = styled(Trigger)`
   outline-offset: -2px;
 
   &[data-state='open'] {
-    div {
-      background-color: var(--navigationMenu-item-checked-backgroundColor);
-      color: var(--navigationMenu-item-checked-textColor);
-    }
-
     svg {
       rotate: 0.5turn;
     }
@@ -452,11 +402,10 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
     subitems?.length
       ? css`
           ${popoverMixins.trigger}
-          --trigger-backgroundColor: transparent;
-          --trigger-open-backgroundColor: var(--color-layer-3);
+          --trigger-open-backgroundColor: var(--navigationMenu-item-checked-backgroundColor);
         `
       : css`
-          &:hover:not(.active) {
+          &:hover:not(:active) {
             background-color: var(--navigationMenu-item-highlighted-backgroundColor);
             color: var(--navigationMenu-item-highlighted-textColor);
           }
@@ -470,8 +419,6 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
   --item-radius: var(--navigationMenu-item-radius);
   --item-padding: var(--navigationMenu-item-padding);
 
-  /* ${popoverMixins.backdropOverlay} */
-
   ${layoutMixins.scrollSnapItem}
 
   min-height: var(--navigationMenu-item-height);
@@ -525,6 +472,9 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
 `;
 
 Styled.Icon = styled(Icon)`
+  font-size: 0.375em;
+  transition: rotate 0.3s var(--ease-out-expo);
+
   ${Styled.List}[data-orientation="menu"] & {
     rotate: -0.25turn;
   }

src/components/Notification.tsx

@@ -0,0 +1,201 @@
+import React, { type MouseEvent } from 'react';
+import styled, { css } from 'styled-components';
+
+import { ButtonShape, ButtonSize } from '@/constants/buttons';
+
+import {
+  NotificationStatus,
+  type Notification as NotificationDataType,
+} from '@/constants/notifications';
+
+import { useNotifications } from '@/hooks/useNotifications';
+
+import { popoverMixins } from '@/styles/popoverMixins';
+import { layoutMixins } from '@/styles/layoutMixins';
+
+import { IconButton } from '@/components/IconButton';
+import { IconName } from '@/components/Icon';
+import { Output, OutputType } from '@/components/Output';
+
+type ElementProps = {
+  notification: NotificationDataType;
+  onClick?: () => void;
+  slotIcon?: React.ReactNode;
+  slotTitle?: React.ReactNode;
+  slotTitleLeft?: React.ReactNode;
+  slotTitleRight?: React.ReactNode;
+  slotDescription?: React.ReactNode;
+  slotCustomContent?: React.ReactNode;
+  slotAction?: React.ReactNode;
+  withClose?: boolean;
+};
+
+type StyleProps = {
+  className?: string;
+  isToast?: boolean;
+};
+
+export type NotificationProps = ElementProps & StyleProps;
+
+export const Notification = ({
+  className,
+  isToast,
+  notification,
+  onClick,
+  slotIcon,
+  slotTitle,
+  slotTitleLeft,
+  slotTitleRight,
+  slotDescription,
+  slotCustomContent,
+  slotAction,
+  withClose = !isToast,
+}: NotificationProps) => {
+  const { markCleared, markSeen } = useNotifications();
+
+  return (
+    <$Container className={className} isToast={isToast} onClick={onClick}>
+      <$Header>
+        {slotTitleLeft ?? (slotIcon && <$Icon>{slotIcon}</$Icon>)}
+        <$Title>{slotTitle}</$Title>
+        {slotTitleRight}
+        {withClose && !isToast && (
+          <$ActionItems>
+            <$Output
+              type={OutputType.RelativeTime}
+              value={notification.timestamps[NotificationStatus.Triggered]}
+            />
+
+            {notification.status < NotificationStatus.Seen ? <$UnreadIndicator /> : null}
+
+            {notification.status < NotificationStatus.Cleared ? (
+              <$IconButton
+                iconName={IconName.Close}
+                shape={ButtonShape.Square}
+                size={ButtonSize.XSmall}
+                onClick={(e: MouseEvent) => {
+                  e.stopPropagation();
+
+                  if (notification.status < NotificationStatus.Seen) {
+                    markSeen(notification);
+                  } else if (notification.status < NotificationStatus.Cleared) {
+                    markCleared(notification);
+                  }
+                }}
+              />
+            ) : null}
+          </$ActionItems>
+        )}
+      </$Header>
+      <$Description>{slotCustomContent ?? slotDescription}</$Description>
+      {slotAction && <$Action>{slotAction}</$Action>}
+    </$Container>
+  );
+};
+
+const $Container = styled.div<{ isToast?: boolean }>`
+  // Params
+  --toast-icon-size: 1.75em;
+
+  // Rules
+  ${popoverMixins.popover}
+  overflow: visible;
+  padding: 1rem 1.25rem;
+
+  ${({ isToast }) =>
+    isToast
+      ? css`
+          padding: 1rem;
+          box-shadow: 0 0 0 var(--border-width) var(--color-border),
+            // border
+            0 0 0.5rem 0.1rem var(--color-layer-2); // shadow
+        `
+      : css`
+          flex: 1;
+          background-color: transparent;
+          border-radius: 0;
+          backdrop-filter: none;
+        `}
+`;
+
+const $Header = styled.header`
+  ${layoutMixins.row}
+  position: relative;
+`;
+
+const $Icon = styled.div`
+  ${layoutMixins.row}
+  float: left;
+
+  margin-right: 0.5rem;
+
+  line-height: 1;
+
+  > svg,
+  img {
+    width: 1.5rem;
+    height: 1.5rem;
+  }
+`;
+
+const $Title = styled.div`
+  flex: 1;
+
+  font: var(--font-base-medium);
+  color: var(--color-text-2);
+
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const $Description = styled.div`
+  margin-top: 0.5rem;
+  color: var(--color-text-0);
+  font: var(--font-small-book);
+`;
+
+const $Action = styled.div`
+  margin-top: 0.5rem;
+  font: var(--font-small-book);
+`;
+
+const $ActionItems = styled.div`
+  min-width: fit-content;
+  padding-left: 0.5rem;
+  height: 100%;
+  ${layoutMixins.row};
+  justify-content: end;
+  gap: 0.5rem;
+
+  position: absolute;
+  right: 0;
+  top: 0;
+
+  background-color: var(--color-layer-2);
+  font: var(--font-mini-book);
+
+  display: none;
+  z-index: 1;
+
+  ${$Container}:hover & {
+    display: flex;
+  }
+`;
+
+const $UnreadIndicator = styled.div`
+  width: 0.5rem;
+  height: 0.5rem;
+  border-radius: 50%;
+  background-color: var(--color-accent);
+  border: 1px solid var(--color-layer-2);
+`;
+
+const $Output = styled(Output)`
+  color: var(--color-text-0);
+`;
+
+const $IconButton = styled(IconButton)`
+  --button-border: none;
+  --button-textColor: var(--color-text-0);
+  --button-hover-textColor: var(--color-text-1);
+`;

src/components/Panel.tsx

@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
 import { Icon, IconName } from '@/components/Icon';
 
 import { layoutMixins } from '@/styles/layoutMixins';
+import { breakpoints } from '@/styles';
 
 type PanelProps = {
   slotHeaderContent?: string;
@@ -31,7 +32,7 @@ export const Panel = ({
   hasSeparator,
   className,
 }: PanelProps & PanelStyleProps) => (
-  <Styled.Panel onClick={onClick}>
+  <Styled.Panel onClick={onClick} className={className}>
     <Styled.Left>
       {href ? (
         <Link to={href}>
@@ -53,7 +54,7 @@ export const Panel = ({
           </Styled.Header>
         )
       )}
-      <Styled.Content className={className}>{children}</Styled.Content>
+      <Styled.Content>{children}</Styled.Content>
     </Styled.Left>
     {slotRight}
   </Styled.Panel>
@@ -61,11 +62,35 @@ export const Panel = ({
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
-Styled.Panel = styled.section`
+Styled.Panel = styled.section<{ onClick?: () => void }>`
+  --panel-paddingY: 1rem;
+  --panel-paddingX: 1rem;
+  --panel-content-paddingY: var(--panel-paddingY);
+  --panel-content-paddingX: var(--panel-paddingX);
+
+  @media ${breakpoints.notTablet} {
+    --panel-paddingX: 1.5rem;
+    --panel-paddingY: 1.25rem;
+    --panel-content-paddingY: 1rem;
+  }
+
   ${layoutMixins.row}
 
   background-color: var(--color-layer-3);
   border-radius: 0.875rem;
+
+  ${({ onClick }) =>
+    onClick &&
+    css`
+      cursor: pointer;
+
+      &:hover {
+        button:not(:disabled) {
+          color: var(--button-hover-textColor);
+          filter: var(--button-hover-filter);
+        }
+      }
+    `}
 `;
 
 Styled.Left = styled.div`
@@ -75,7 +100,7 @@ Styled.Left = styled.div`
 
 Styled.Header = styled.header<{ hasSeparator?: boolean }>`
   ${layoutMixins.spacedRow}
-  padding: 1rem 1rem;
+  padding: var(--panel-paddingY) var(--panel-paddingX);
 
   ${({ hasSeparator }) =>
     hasSeparator &&
@@ -94,5 +119,5 @@ Styled.Content = styled.div`
   ${layoutMixins.scrollArea}
   ${layoutMixins.stickyArea0}
   --stickyArea0-background: transparent;
-  padding: 1rem 1rem;
+  padding: var(--panel-content-paddingY) var(--panel-content-paddingX);
 `;

src/components/SearchInput.tsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import styled, { type AnyStyledComponent, css } from 'styled-components';
 
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -22,6 +22,11 @@ export const SearchInput = ({
 }: SearchInputProps) => {
   const [isOpen, setIsOpen] = useState(false);
   const [value, setValue] = useState('');
+  const inputRef = useRef<HTMLInputElement | null>(null);
+
+  useEffect(() => {
+    if (isOpen) inputRef?.current?.focus();
+  }, [inputRef, isOpen]);
 
   return (
     <Styled.Search>
@@ -41,6 +46,7 @@ export const SearchInput = ({
       />
       <Styled.Input
         autoFocus
+        ref={inputRef}
         value={value}
         isOpen={isOpen}
         type={type}

src/components/SearchSelectMenu.tsx

@@ -12,6 +12,8 @@ import { WithDetailsReceipt } from '@/components/WithDetailsReceipt';
 import { WithLabel } from '@/components/WithLabel';
 
 import { layoutMixins } from '@/styles/layoutMixins';
+import { formMixins } from '@/styles/formMixins';
+import breakpoints from '@/styles/breakpoints';
 
 type ElementProps = {
   asChild?: boolean;
@@ -84,27 +86,30 @@ export const SearchSelectMenu = ({
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
+Styled.SearchSelectMenu = styled.div`
+  ${layoutMixins.column}
+`;
+
 Styled.MenuTrigger = styled.div`
   height: var(--form-input-height);
 
   ${layoutMixins.spacedRow}
   align-items: center;
-  padding: 0 1rem;
+  padding: var(--form-input-paddingY) var(--form-input-paddingX);
+
+  @media ${breakpoints.tablet} {
+    height: var(--form-input-height-mobile);
+  }
 `;
 
 Styled.WithLabel = styled(WithLabel)`
-  --label-textColor: var(--color-text-0);
-  gap: 0.25rem;
+  ${formMixins.inputLabel}
 
   label {
     font: var(--font-mini-book);
   }
 `;
 
-Styled.SearchSelectMenu = styled.div`
-  ${layoutMixins.column}
-`;
-
 Styled.WithDetailsReceipt = styled(WithDetailsReceipt)`
   --withReceipt-backgroundColor: var(--color-layer-2);
 

src/components/SelectMenu.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import styled, { type AnyStyledComponent } from 'styled-components';
+import styled, { css, type AnyStyledComponent } from 'styled-components';
 
 import {
   Root,
@@ -13,11 +13,13 @@ import {
   Portal,
   Icon as SelectIcon,
 } from '@radix-ui/react-select';
+import { CheckIcon } from '@radix-ui/react-icons';
 
 import { popoverMixins } from '@/styles/popoverMixins';
 import { formMixins } from '@/styles/formMixins';
 
 import { WithLabel } from '@/components/WithLabel';
+import { Icon, IconName } from './Icon';
 
 export const SelectMenu = <T extends string>({
   children,
@@ -44,7 +46,9 @@ export const SelectMenu = <T extends string>({
         ) : (
           <Value />
         )}
-        {React.Children.toArray(children).length > 1 && <Styled.DropdownIcon />}
+        {React.Children.toArray(children).length > 1 && (
+          <Styled.TriggerIcon iconName={IconName.Triangle} />
+        )}
       </Styled.Trigger>
       <Portal>
         <Styled.Content className={className}>
@@ -68,7 +72,9 @@ export const SelectItem = <T extends string>({
 }) => (
   <Styled.Item className={className} value={value}>
     <ItemText>{label}</ItemText>
-    <Styled.ItemIndicator>✔{/* <CheckIcon /> */}</Styled.ItemIndicator>
+    <Styled.ItemIndicator>
+      <CheckIcon />
+    </Styled.ItemIndicator>
   </Styled.Item>
 );
 
@@ -88,12 +94,6 @@ Styled.Trigger = styled(Trigger)<{ $withBlur?: boolean }>`
   }
 `;
 
-Styled.DropdownIcon = styled(SelectIcon)`
-  font-size: 0.675em;
-  color: var(--color-text-1);
-  margin-left: auto;
-`;
-
 Styled.Content = styled(Content)`
   --select-menu-content-maxWidth: ;
   max-width: var(--select-menu-content-maxWidth);
@@ -116,3 +116,9 @@ Styled.WithLabel = styled(WithLabel)`
   ${formMixins.inputLabel}
   border-radius: 0;
 `;
+
+Styled.TriggerIcon = styled(Icon)`
+  width: 0.625rem;
+  height: 0.375rem;
+  color: var(--color-text-0);
+`;

src/components/Table.tsx

@@ -43,6 +43,7 @@ import { layoutMixins } from '@/styles/layoutMixins';
 
 import { Icon, IconName } from './Icon';
 import { Tag } from './Tag';
+import { MustBigNumber } from '@/lib/numbers';
 
 export { TableCell } from './Table/TableCell';
 export { TableColumnHeader } from './Table/TableColumnHeader';
@@ -161,10 +162,7 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
         ? // String
           collator.compare(first as string, second as string)
         : // Number
-          Math.sign(
-            (parseInt(first as string) || (first as number)) -
-              (parseInt(second as string) || (second as number))
-          )) *
+          MustBigNumber(first).comparedTo(MustBigNumber(second))) *
       // Flip the direction if descending order is specified.
       (sortDirection === 'descending' ? -1 : 1)
     );
@@ -831,6 +829,7 @@ Styled.SortArrow = styled.span<{ sortDirection: 'ascending' | 'descending' }>`
 Styled.Thead = styled.thead<StyleProps>`
   ${layoutMixins.stickyHeader}
   scroll-snap-align: none;
+  font: var(--font-mini-book);
 
   > * {
     height: var(--stickyArea-topHeight);
@@ -839,18 +838,17 @@ Styled.Thead = styled.thead<StyleProps>`
   color: var(--tableHeader-textColor);
   background-color: var(--tableHeader-backgroundColor);
 
-  @media ${breakpoints.notTablet} {
-    ${({ withInnerBorders, withGradientCardRows }) =>
-      withInnerBorders &&
-      !withGradientCardRows &&
-      css`
-        ${layoutMixins.withInnerHorizontalBorders}
-      `}
-  }
+  ${({ withInnerBorders, withGradientCardRows }) =>
+    withInnerBorders &&
+    !withGradientCardRows &&
+    css`
+      ${layoutMixins.withInnerHorizontalBorders}
+    `}
 `;
 
 Styled.Tbody = styled.tbody<StyleProps>`
   ${layoutMixins.stickyArea2}
+  font: var(--font-small-book);
 
   // If <table> height is fixed with not enough rows to overflow, vertically center the rows
   &:before,
@@ -869,6 +867,10 @@ Styled.Tbody = styled.tbody<StyleProps>`
       --stickyArea2-paddingBottom: var(--border-width);
       --stickyArea2-paddingLeft: var(--border-width);
       --stickyArea2-paddingRight: var(--border-width);
+
+      tr:first-of-type {
+        box-shadow: none;
+      }
     `}
 
   ${({ withGradientCardRows }) =>

src/components/Tabs.tsx

@@ -21,6 +21,7 @@ export type TabItem<TabItemsValue> = {
   content?: React.ReactNode;
   subitems?: TabItem<TabItemsValue>[];
   customTrigger?: ReactNode;
+  asChild?: boolean;
 };
 
 type ElementProps<TabItemsValue> = {
@@ -41,6 +42,8 @@ type StyleProps = {
   className?: string;
 };
 
+export type TabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
+
 export const Tabs = <TabItemsValue extends string>({
   defaultValue,
   value,
@@ -107,9 +110,10 @@ export const Tabs = <TabItemsValue extends string>({
         sharedContent
       ) : (
         <Styled.Stack>
-          {items.map(({ value, content, forceMount }) => (
+          {items.map(({ asChild, value, content, forceMount }) => (
             <Styled.Content
               key={value}
+              asChild={asChild}
               value={value}
               forceMount={forceMount}
               $hide={forceMount && currentItem?.value !== value}
@@ -242,7 +246,6 @@ Styled.Trigger = styled(Trigger)<{ $withBorders?: boolean }>`
 
 Styled.Stack = styled.div`
   ${layoutMixins.stack}
-  ${layoutMixins.perspectiveArea}
 
   box-shadow: none;
 `;

src/components/Toast.tsx

@@ -1,24 +1,19 @@
-import React, { useEffect, useRef, useState } from 'react';
-
-import { Root, Title, Description, Action, Close } from '@radix-ui/react-toast';
+import { type MouseEvent, useEffect, useRef, useState } from 'react';
+import styled, { keyframes } from 'styled-components';
+import { Root, Action, Close } from '@radix-ui/react-toast';
 
 import { ButtonShape, ButtonSize } from '@/constants/buttons';
+import { popoverMixins } from '@/styles/popoverMixins';
+import { breakpoints } from '@/styles';
+
+import { Notification, type NotificationProps } from '@/components/Notification';
 
 import { IconButton } from './IconButton';
-import { CloseIcon } from '@/icons';
-
-import styled, { keyframes } from 'styled-components';
-import { popoverMixins } from '@/styles/popoverMixins';
-import { layoutMixins } from '@/styles/layoutMixins';
+import { IconName } from './Icon';
 
 type ElementProps = {
   isOpen?: boolean;
   setIsOpen?: (isOpen: boolean, isClosedFromTimeout?: boolean) => void;
-  slotIcon?: React.ReactNode;
-  slotTitle?: React.ReactNode;
-  slotDescription?: React.ReactNode;
-  slotCustomContent?: React.ReactNode;
-  slotAction?: React.ReactNode;
   actionDescription?: string;
   actionAltText?: string;
   sensitivity?: 'foreground' | 'background';
@@ -26,13 +21,22 @@ type ElementProps = {
   lastUpdated?: number;
 };
 
-type StyleProps = {};
+type StyleProps = {
+  className?: string;
+};
+
+type ToastProps = NotificationProps & ElementProps & StyleProps;
 
 export const Toast = ({
+  className,
   isOpen = true,
+  notification,
+  onClick,
   setIsOpen,
   slotIcon,
   slotTitle,
+  slotTitleLeft,
+  slotTitleRight,
   slotDescription,
   slotCustomContent,
   slotAction,
@@ -41,7 +45,7 @@ export const Toast = ({
   sensitivity = 'background',
   duration = Infinity,
   lastUpdated,
-}: ElementProps & StyleProps) => {
+}: ToastProps) => {
   // Timeout
   const timeout = useRef<number>();
   const [isPaused, setIsPaused] = useState(false);
@@ -58,37 +62,45 @@ export const Toast = ({
 
   return (
     <$Root
+      className={className}
       type={sensitivity}
       duration={Infinity}
       open={isOpen}
       onOpenChange={setIsOpen}
       onPause={() => setIsPaused(true)}
       onResume={() => setIsPaused(false)}
+      onClick={() => {
+        setIsOpen?.(false, false);
+        onClick?.();
+      }}
     >
-      <div>
-        <$Container>
-          <$Header>
-            {slotIcon && <$Icon>{slotIcon}</$Icon>}
+      <Close asChild>
+        <$CloseButton
+          iconName={IconName.Close}
+          shape={ButtonShape.Circle}
+          size={ButtonSize.XSmall}
+          onClick={(e: MouseEvent) => e.stopPropagation()}
+        />
+      </Close>
 
-            <Close asChild>
-              <$CloseButton
-                iconComponent={CloseIcon}
-                shape={ButtonShape.Square}
-                size={ButtonSize.XSmall}
-              />
-            </Close>
-
-            <$Title>{slotTitle}</$Title>
-          </$Header>
-          {!slotCustomContent && <$Description>{slotDescription}</$Description>}
-          {slotCustomContent}
-          {actionDescription && (
-            <$Action asChild altText={actionAltText}>
-              {slotAction}
-            </$Action>
-          )}
-        </$Container>
-      </div>
+      {slotCustomContent ?? (
+        <$Notification
+          isToast
+          notification={notification}
+          slotIcon={slotIcon}
+          slotTitle={slotTitle}
+          slotTitleLeft={slotTitleLeft}
+          slotTitleRight={slotTitleRight}
+          slotDescription={slotDescription}
+          slotAction={
+            actionDescription && (
+              <$Action asChild altText={actionAltText}>
+                {slotAction}
+              </$Action>
+            )
+          }
+        />
+      )}
     </$Root>
   );
 };
@@ -114,7 +126,7 @@ const $Root = styled(Root)`
   translate: var(--x) var(--y);
   will-change: translate, margin-top;
 
-  margin-bottom: var(--toasts-gap);
+  /* margin-bottom: var(--toasts-gap); */
 
   &[data-swipe-direction='right'] {
     &[data-state='open'] {
@@ -163,6 +175,10 @@ const $Root = styled(Root)`
     cursor: n-resize;
   }
 
+  &:focus:not([data-swipe='end']) & {
+    outline: var(--color-accent) 1px solid;
+  }
+
   &[data-swipe='move'] {
     transition-property: opacity;
     opacity: 0.98;
@@ -171,6 +187,10 @@ const $Root = styled(Root)`
     * {
       cursor: inherit;
     }
+
+    & > * {
+      opacity: 0.5;
+    }
   }
 
   &[data-state='closed'],
@@ -198,69 +218,48 @@ const $Root = styled(Root)`
   }
 `;
 
-const $Container = styled.div`
+const $Notification = styled(Notification)`
   // Params
   --toast-icon-size: 1.75em;
 
   // Rules
   ${popoverMixins.popover}
+  overflow: visible;
   padding: 1rem;
   box-shadow: 0 0 0 var(--border-width) var(--color-border),
     // border
     0 0 0.5rem 0.1rem var(--color-layer-2); // shadow
 
-  ${$Root}:focus:not([data-swipe='end']) & {
-    outline: var(--color-accent) 1px solid;
-  }
-
   > * {
     transition: opacity 0.2s;
   }
-  ${$Root}[data-swipe='move'] & > * {
-    opacity: 0.5;
-  }
-`;
-
-const $Header = styled.header`
-  display: block;
-`;
-
-const $Icon = styled.div`
-  ${layoutMixins.row}
-
-  float: left;
-
-  width: 1em;
-  height: 1em;
-
-  margin-right: 0.4em;
-
-  line-height: 1;
 `;
 
 const $CloseButton = styled(IconButton)`
   --button-textColor: var(--color-text-0);
   --button-border: none;
   --button-icon-size: 0.85em;
+  display: none;
 
-  float: right;
+  /* float: right; */
   margin: -0.42rem -0.42rem -0.42rem 0.42rem;
-`;
 
-const $Title = styled(Title)`
-  flex: 1;
+  // Absolute
+  position: absolute;
+  top: 0;
+  right: 0;
 
-  font: var(--font-base-medium);
-  color: var(--color-text-2);
+  border: solid var(--border-width) var(--color-border);
 
-  overflow: hidden;
-  text-overflow: ellipsis;
-`;
+  ${$Root}:hover & {
+    display: block;
+    z-index: 2;
+  }
 
-const $Description = styled(Description)`
-  margin-top: 0.5rem;
-  color: var(--color-text-0);
-  font: var(--font-small-book);
+  @media ${breakpoints.mobile} {
+    display: block;
+    z-index: 2;
+  }
 `;
 
 const $Action = styled(Action)`

src/components/ToastArea.tsx

@@ -1,6 +1,7 @@
+import styled from 'styled-components';
+
 import { Provider, Viewport } from '@radix-ui/react-toast';
 
-import styled from 'styled-components';
 import { layoutMixins } from '@/styles/layoutMixins';
 
 type ElementProps = {
@@ -12,7 +13,9 @@ type StyleProps = {
   className?: string;
 };
 
-export const ToastArea = ({ swipeDirection, children, className }: ElementProps & StyleProps) => (
+type ToastAreaProps = ElementProps & StyleProps;
+
+export const ToastArea = ({ swipeDirection, children, className }: ToastAreaProps) => (
   <$ToastArea className={className}>
     <Provider swipeDirection={swipeDirection}>
       {children}
@@ -24,9 +27,8 @@ export const ToastArea = ({ swipeDirection, children, className }: ElementProps
 const $ToastArea = styled.aside`
   // Params
   --toasts-gap: 0.5rem;
-
+  
   // Rules
-  ${layoutMixins.scrollArea}
   z-index: 1;
 
   pointer-events: none;
@@ -34,6 +36,7 @@ const $ToastArea = styled.aside`
   > * {
     display: contents;
     pointer-events: none;
+    position: relative;
 
     > ol {
       /* display: block; */
@@ -43,6 +46,7 @@ const $ToastArea = styled.aside`
       // Desired display order: latest to earliest (¯\_(ツ)_/¯)
       display: flex;
       flex-direction: column-reverse;
+      position: relative;
 
       pointer-events: none;
 

src/components/ToggleButton.tsx

@@ -52,15 +52,19 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.BaseButton = styled(BaseButton)`
   --button-toggle-off-backgroundColor: var(--color-layer-3);
   --button-toggle-off-textColor: var(--color-text-0);
+  --button-toggle-off-border: solid var(--border-width) var(--border-color);
   --button-toggle-on-backgroundColor: var(--color-layer-1);
   --button-toggle-on-textColor: var(--color-text-2);
+  --button-toggle-on-border: solid var(--border-width) var(--border-color);
 
   --button-backgroundColor: var(--button-toggle-off-backgroundColor);
   --button-textColor: var(--button-toggle-off-textColor);
+  --button-border: var(--button-toggle-off-border);
 
   &[data-state='on'],
   &[data-state='active'] {
     --button-backgroundColor: var(--button-toggle-on-backgroundColor);
     --button-textColor: var(--button-toggle-on-textColor);
+    --button-border: var(--button-toggle-on-border);
   }
 `;

src/components/ToggleGroup.tsx

@@ -7,13 +7,15 @@ import { ButtonShape, ButtonSize } from '@/constants/buttons';
 import { useBreakpoints } from '@/hooks';
 import { layoutMixins } from '@/styles/layoutMixins';
 
-import {  type BaseButtonProps } from '@/components/BaseButton';
+import { type BaseButtonProps } from '@/components/BaseButton';
 import { ToggleButton } from '@/components/ToggleButton';
 
 type ElementProps<MenuItemValue extends string> = {
   items: MenuItem<MenuItemValue>[];
   value: MenuItemValue;
-  onValueChange: (value: MenuItemValue) => void;
+  onValueChange: (value: any) => void;
+  onInteraction?: () => void;
+  ensureSelected?: boolean;
 };
 
 type StyleProps = {
@@ -25,10 +27,14 @@ export const ToggleGroup = forwardRef(
     {
       items,
       value,
+      ensureSelected = true,
       onValueChange,
+      onInteraction,
+
       className,
       size,
       shape = ButtonShape.Pill,
+
       ...buttonProps
     }: ElementProps<MenuItemValue> & StyleProps & BaseButtonProps,
     ref: Ref<HTMLDivElement>
@@ -40,12 +46,17 @@ export const ToggleGroup = forwardRef(
         ref={ref}
         type="single"
         value={value}
-        onValueChange={onValueChange}
+        onValueChange={(newValue: MenuItemValue) => {
+          if ((ensureSelected && newValue) || !ensureSelected) {
+            onValueChange(newValue);
+          }
+          onInteraction?.();
+        }}
         className={className}
         loop
       >
         {items.map((item) => (
-          <Item key={item.value} value={item.value} aria-label={item.label} asChild>
+          <Item key={item.value} value={item.value} asChild>
             <ToggleButton
               size={size ? size : isTablet ? ButtonSize.Small : ButtonSize.XSmall}
               shape={shape}

src/components/WithTooltip.tsx

@@ -2,11 +2,13 @@ import type { ReactNode } from 'react';
 import styled, { AnyStyledComponent } from 'styled-components';
 import { Content, Portal, Provider, Root, Trigger, Arrow } from '@radix-ui/react-tooltip';
 
+import { STRING_KEYS } from '@/constants/localization';
 import { tooltipStrings } from '@/constants/tooltips';
 
-import { useStringGetter } from '@/hooks';
+import { useStringGetter, useURLConfigs } from '@/hooks';
 
 import { Icon, IconName } from '@/components/Icon';
+import { Link } from '@/components/Link';
 
 import { layoutMixins } from '@/styles/layoutMixins';
 import { popoverMixins } from '@/styles/popoverMixins';
@@ -38,20 +40,24 @@ export const WithTooltip = ({
   slotTooltip,
 }: ElementProps & StyleProps) => {
   const stringGetter = useStringGetter();
+  const urlConfigs = useURLConfigs();
 
   const getTooltipStrings = tooltip && tooltipStrings[tooltip];
   if (!getTooltipStrings && !tooltipString && !slotTooltip) return <>{children}</>;
 
   let tooltipTitle;
   let tooltipBody;
+  let tooltipLearnMore;
 
   if (getTooltipStrings) {
-    const { title, body } = getTooltipStrings({
+    const { title, body, learnMoreLink } = getTooltipStrings({
       stringGetter,
       stringParams,
+      urlConfigs,
     });
     tooltipTitle = title;
     tooltipBody = body;
+    tooltipLearnMore = learnMoreLink;
   } else {
     tooltipBody = tooltipString;
   }
@@ -72,6 +78,13 @@ export const WithTooltip = ({
               <dl>
                 {tooltipTitle && <dt>{tooltipTitle}</dt>}
                 {tooltipBody && <dd>{tooltipBody}</dd>}
+                {tooltipLearnMore && (
+                  <dd>
+                    <Styled.LearnMore href={tooltipLearnMore}>
+                      {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
+                    </Styled.LearnMore>
+                  </dd>
+                )}
                 <Styled.Arrow />
               </dl>
             )}
@@ -142,3 +155,7 @@ Styled.Arrow = styled(Arrow)`
 Styled.Icon = styled(Icon)`
   color: var(--color-text-0);
 `;
+
+Styled.LearnMore = styled(Link)`
+  --link-color: var(--color-accent);
+`;

src/components/visx/XYChartWithPointerEvents.tsx

@@ -1,26 +1,33 @@
-import React, { useContext, useState } from 'react';
+import React, { PropsWithChildren, useContext, useState } from 'react';
 
 import { Point } from '@visx/point';
 import { localPoint } from '@visx/event';
-import { XYChart, DataContext } from '@visx/xychart';
+import { XYChart, DataContext, type EventHandlerParams } from '@visx/xychart';
 import { getScaleBandwidth } from '@/components/visx/getScaleBandwidth';
 
 export const XYChartWithPointerEvents = ({
-  onPointerMove, onPointerUp, onPointerPressedChange, ...props
+  onPointerMove,
+  onPointerUp,
+  onPointerPressedChange,
+  ...props
 }: {
-  onPointerMove?: (point: Point) => void;
-  onPointerUp?: (point: Point) => void;
+  onPointerMove?: (point: Point | EventHandlerParams<object>) => void;
+  onPointerUp?: (point: Point | EventHandlerParams<object>) => void;
   onPointerPressedChange?: (isPointerPressed: boolean) => void;
-} & React.PropsWithChildren<Parameters<typeof XYChart>>) => {
+} & PropsWithChildren<Parameters<typeof XYChart>[0]>) => {
   const { xScale, yScale } = useContext(DataContext);
-
   const [lastPointerMoveEvent, setLastPointerMoveEvent] = useState<React.PointerEvent>();
 
   const pointerContainerPosition = lastPointerMoveEvent ? localPoint(lastPointerMoveEvent) : null;
 
-  const pointerChartPosition = xScale && yScale && pointerContainerPosition &&
+  const pointerChartPosition =
+    xScale &&
+    yScale &&
+    pointerContainerPosition &&
     new Point({
+      // @ts-expect-error invert supposedly doesn't exist on AxisScale
       x: xScale.invert(pointerContainerPosition?.x - getScaleBandwidth(xScale) / 2),
+      // @ts-expect-error invert supposedly doesn't exist on AxisScale
       y: yScale.invert(pointerContainerPosition?.y - getScaleBandwidth(yScale) / 2),
     });
 
@@ -29,15 +36,13 @@ export const XYChartWithPointerEvents = ({
       {...props}
       onPointerMove={({ event }) => {
         setLastPointerMoveEvent(event as React.PointerEvent);
-        if (pointerChartPosition)
-          onPointerMove?.(pointerChartPosition);
+        if (pointerChartPosition) onPointerMove?.(pointerChartPosition);
       }}
       onPointerOut={() => setLastPointerMoveEvent(undefined)}
       onPointerDown={() => onPointerPressedChange?.(true)}
       onPointerUp={() => {
         onPointerPressedChange?.(false);
-        if (pointerChartPosition)
-          onPointerUp?.(pointerChartPosition);
+        if (pointerChartPosition) onPointerUp?.(pointerChartPosition);
       }}
     >
       {props.children}

src/constants/abacus.ts

@@ -124,6 +124,8 @@ export type SubaccountPosition = Abacus.exchange.dydx.abacus.output.SubaccountPo
 export type SubaccountOrder = Abacus.exchange.dydx.abacus.output.SubaccountOrder;
 export type OrderStatus = Abacus.exchange.dydx.abacus.output.input.OrderStatus;
 export const AbacusOrderStatus = Abacus.exchange.dydx.abacus.output.input.OrderStatus;
+const abacusOrderStatuses = [...AbacusOrderStatus.values()] as const;
+export type AbacusOrderStatuses = (typeof abacusOrderStatuses)[number];
 export type SubaccountFills = Abacus.exchange.dydx.abacus.output.SubaccountFill[];
 export type SubaccountFill = Abacus.exchange.dydx.abacus.output.SubaccountFill;
 export type SubaccountFundingPayment = Abacus.exchange.dydx.abacus.output.SubaccountFundingPayment;
@@ -140,7 +142,7 @@ const historicalPnlPeriod = [...HistoricalPnlPeriod.values()] as const;
 export type HistoricalPnlPeriods = (typeof historicalPnlPeriod)[number];
 
 // ------ Transfer Items ------ //
-export const TransferInputField = Abacus.exchange.dydx.abacus.state.modal.TransferInputField;
+export const TransferInputField = Abacus.exchange.dydx.abacus.state.model.TransferInputField;
 const transferInputFields = [...TransferInputField.values()] as const;
 export type TransferInputFields = (typeof transferInputFields)[number];
 
@@ -149,7 +151,7 @@ const transferTypes = [...TransferType.values()] as const;
 export type TransferTypes = (typeof transferTypes)[number];
 
 // ------ Trade Items ------ //
-export const TradeInputField = Abacus.exchange.dydx.abacus.state.modal.TradeInputField;
+export const TradeInputField = Abacus.exchange.dydx.abacus.state.model.TradeInputField;
 const tradeInputFields = [...TradeInputField.values()] as const;
 export type TradeInputFields = (typeof tradeInputFields)[number];
 
@@ -160,7 +162,7 @@ export type TradeState<T> = {
 };
 
 export const ClosePositionInputField =
-  Abacus.exchange.dydx.abacus.state.modal.ClosePositionInputField;
+  Abacus.exchange.dydx.abacus.state.model.ClosePositionInputField;
 
 const closePositionInputFields = [...ClosePositionInputField.values()] as const;
 export type ClosePositionInputFields = (typeof closePositionInputFields)[number];
@@ -209,11 +211,13 @@ type ReadonlyKeysOf<T> = {
   [K in keyof T]: IfEquals<{ [_ in K]: T[K] }, { readonly [_ in K]: T[K] }, K, never>;
 }[keyof T];
 
-type KotlinIrEnumValues<T> = Exclude<ReadonlyKeysOf<T>, 'Companion' | '$serializer'>;
+export type KotlinIrEnumValues<T> = Exclude<ReadonlyKeysOf<T>, 'Companion' | '$serializer'>;
 
 export const ORDER_SIDES: Record<KotlinIrEnumValues<typeof AbacusOrderSide>, OrderSide> = {
   [AbacusOrderSide.buy.name]: OrderSide.BUY,
   [AbacusOrderSide.sell.name]: OrderSide.SELL,
+  [AbacusOrderSide.buy.rawValue]: OrderSide.BUY,
+  [AbacusOrderSide.sell.rawValue]: OrderSide.SELL,
 };
 
 export const POSITION_SIDES: Record<KotlinIrEnumValues<typeof AbacusPositionSide>, PositionSide> = {
@@ -234,12 +238,25 @@ export const HISTORICAL_PNL_PERIODS: Record<
 
 export const ORDER_STATUS_STRINGS: Record<KotlinIrEnumValues<typeof AbacusOrderStatus>, string> = {
   [AbacusOrderStatus.open.name]: STRING_KEYS.OPEN_STATUS,
+  [AbacusOrderStatus.open.rawValue]: STRING_KEYS.OPEN_STATUS,
+
   [AbacusOrderStatus.partiallyFilled.name]: STRING_KEYS.PARTIALLY_FILLED,
+  [AbacusOrderStatus.partiallyFilled.rawValue]: STRING_KEYS.PARTIALLY_FILLED,
+
   [AbacusOrderStatus.filled.name]: STRING_KEYS.ORDER_FILLED,
+  [AbacusOrderStatus.filled.rawValue]: STRING_KEYS.ORDER_FILLED,
+
   [AbacusOrderStatus.cancelled.name]: STRING_KEYS.CANCELED,
+  [AbacusOrderStatus.cancelled.rawValue]: STRING_KEYS.CANCELED,
+
   [AbacusOrderStatus.canceling.name]: STRING_KEYS.CANCELING,
+  [AbacusOrderStatus.canceling.rawValue]: STRING_KEYS.CANCELING,
+
   [AbacusOrderStatus.pending.name]: STRING_KEYS.PENDING,
+  [AbacusOrderStatus.pending.rawValue]: STRING_KEYS.PENDING,
+
   [AbacusOrderStatus.untriggered.name]: STRING_KEYS.UNTRIGGERED,
+  [AbacusOrderStatus.untriggered.rawValue]: STRING_KEYS.UNTRIGGERED,
 };
 
 export const TRADE_TYPES: Record<
@@ -247,15 +264,31 @@ export const TRADE_TYPES: Record<
   Nullable<TradeTypes>
 > = {
   [AbacusOrderType.limit.name]: TradeTypes.LIMIT,
+  [AbacusOrderType.limit.rawValue]: TradeTypes.LIMIT,
+
   [AbacusOrderType.market.name]: TradeTypes.MARKET,
+  [AbacusOrderType.market.rawValue]: TradeTypes.MARKET,
+
   [AbacusOrderType.stopLimit.name]: TradeTypes.STOP_LIMIT,
+  [AbacusOrderType.stopLimit.rawValue]: TradeTypes.STOP_LIMIT,
+
   [AbacusOrderType.stopMarket.name]: TradeTypes.STOP_MARKET,
+  [AbacusOrderType.stopMarket.rawValue]: TradeTypes.STOP_MARKET,
+
   [AbacusOrderType.takeProfitLimit.name]: TradeTypes.TAKE_PROFIT,
+  [AbacusOrderType.takeProfitLimit.rawValue]: TradeTypes.TAKE_PROFIT,
+
   [AbacusOrderType.takeProfitMarket.name]: TradeTypes.TAKE_PROFIT_MARKET,
+  [AbacusOrderType.takeProfitMarket.rawValue]: TradeTypes.TAKE_PROFIT_MARKET,
 
   [AbacusOrderType.liquidated.name]: null,
   [AbacusOrderType.liquidation.name]: null,
+
+  [AbacusOrderType.liquidation.name]: null,
+  [AbacusOrderType.liquidation.rawValue]: null,
+
   [AbacusOrderType.trailingStop.name]: null,
+  [AbacusOrderType.trailingStop.rawValue]: null,
 };
 
 // Custom types involving Abacus

src/constants/analytics.ts

@@ -96,6 +96,7 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
         elapsedTime?: number;
         blockHeight?: number;
         indexerBlockHeight?: number;
+        trailingBlocks?: number;
       }
     : // Navigation
     T extends AnalyticsEvent.NavigatePage

src/constants/charts.ts

@@ -0,0 +1,40 @@
+import { OrderSide } from '@dydxprotocol/v4-client-js';
+import { FundingDirection } from './markets';
+
+// ------ Depth Chart ------ //
+export enum DepthChartSeries {
+  Asks = 'Asks',
+  Bids = 'Bids',
+  MidMarket = 'MidMarket',
+}
+
+export type DepthChartDatum = {
+  size: number;
+  price: number;
+  depth: number;
+  seriesKey: DepthChartSeries;
+};
+
+export type DepthChartPoint = {
+  side: OrderSide;
+  price: number;
+  size: number;
+};
+
+export const SERIES_KEY_FOR_ORDER_SIDE = {
+  [OrderSide.BUY]: DepthChartSeries.Bids,
+  [OrderSide.SELL]: DepthChartSeries.Asks,
+};
+
+// ------ Funding Chart ------ //
+export enum FundingRateResolution {
+  OneHour = 'OneHour',
+  EightHour = 'EightHour',
+  Annualized = 'Annualized',
+}
+
+export type FundingChartDatum = {
+  time: number;
+  fundingRate: number;
+  direction: FundingDirection;
+};

src/constants/dialogs.ts

@@ -3,6 +3,7 @@ export enum DialogTypes {
   Deposit = 'Deposit',
   DisconnectWallet = 'DisconnectWallet',
   ExchangeOffline = 'ExchangeOffline',
+  ExternalLink = 'ExternalLink',
   FillDetails = 'FillDetails',
   Help = 'Help',
   ExternalNavKeplr = 'ExternalNavKeplr',
@@ -10,13 +11,14 @@ export enum DialogTypes {
   MobileSignIn = 'MobileSignIn',
   Onboarding = 'Onboarding',
   OrderDetails = 'OrderDetails',
+  Preferences = 'Preferences',
   RateLimit = 'RateLimit',
-  Receive = 'Receive',
   RestrictedGeo = 'RestrictedGeo',
   RestrictedWallet = 'RestrictedWallet',
   Trade = 'Trade',
   Transfer = 'Transfer',
   Withdraw = 'Withdraw',
+  ManageFunds = 'ManageFunds',
 }
 
 export enum TradeBoxDialogTypes {

src/constants/localStorage.ts

@@ -13,6 +13,7 @@ export enum LocalStorageKey {
   PushNotificationsEnabled = 'dydx.PushNotificationsEnabled',
   PushNotificationsLastUpdated = 'dydx.PushNotificationsLastUpdated',
   TransferNotifications = 'dydx.TransferNotifications',
+  NotificationPreferences = 'dydx.NotificationPreferences',
 
   // UI State
   LastViewedMarket = 'dydx.LastViewedMarket',
@@ -21,9 +22,13 @@ export enum LocalStorageKey {
   SelectedTheme = 'dydx.SelectedTheme',
   SelectedTradeLayout = 'dydx.SelectedTradeLayout',
   TradingViewChartConfig = 'dydx.TradingViewChartConfig',
+  HasSeenLaunchIncentives = 'dydx.HasSeenLaunchIncentives',
 }
 
 export const LOCAL_STORAGE_VERSIONS = {
   [LocalStorageKey.EvmDerivedAddresses]: 'v2',
+  [LocalStorageKey.NotificationPreferences]: 'v1',
+  [LocalStorageKey.TransferNotifications]: 'v1',
+  [LocalStorageKey.Notifications]: 'v1',
   // TODO: version all localStorage keys
 };

src/constants/localization.ts

@@ -6,8 +6,12 @@ import {
   LOCALE_DATA,
   TOOLTIPS,
   WARNINGS_STRING_KEYS,
+  NOTIFICATIONS_STRING_KEYS,
+  NOTIFICATIONS,
 } from '@dydxprotocol/v4-localization';
 
+import { type LinksConfigs } from '@/hooks/useURLConfigs';
+
 export { TOOLTIP_STRING_KEYS } from '@dydxprotocol/v4-localization';
 
 export enum SupportedLocales {
@@ -25,6 +29,7 @@ export enum SupportedLocales {
 
 export const EN_LOCALE_DATA = {
   ...LOCALE_DATA[SupportedLocales.EN],
+  ...NOTIFICATIONS[SupportedLocales.EN],
   TOOLTIPS: TOOLTIPS[SupportedLocales.EN],
 };
 
@@ -32,8 +37,13 @@ export const STRING_KEYS = {
   ...APP_STRING_KEYS,
   ...ERRORS_STRING_KEYS,
   ...WARNINGS_STRING_KEYS,
+  ...NOTIFICATIONS_STRING_KEYS,
 };
 
+export const STRING_KEY_VALUES = Object.fromEntries(
+  Object.values(STRING_KEYS).map((key) => [key, key])
+);
+
 export type StringKey = keyof typeof STRING_KEYS;
 
 export type LocaleData = typeof EN_LOCALE_DATA;
@@ -79,9 +89,11 @@ export type TooltipStrings = {
   [key: string]: ({
     stringGetter,
     stringParams,
+    urlConfigs,
   }: {
     stringGetter: StringGetterFunction;
     stringParams?: any;
+    urlConfigs?: LinksConfigs;
   }) => {
     title: string;
     body: string;

src/constants/markets.ts

@@ -25,4 +25,5 @@ export const DEFAULT_MARKETID = 'ETH-USD';
 export enum FundingDirection {
   ToShort = 'ToShort',
   ToLong = 'ToLong',
+  None = 'None',
 }

src/constants/menus.ts

@@ -26,6 +26,7 @@ export type MenuItem<MenuItemValue, MenuItemTypes = string> = {
   tag?: React.ReactNode;
   slotAfter?: React.ReactNode;
   description?: string;
+  slotCustomContent?: React.ReactNode;
 
   href?: string;
   onSelect?: (key: MenuItemValue) => void;

src/constants/networks.ts

@@ -1,12 +1,18 @@
 import environments from '../../public/configs/env.json';
 
-// TODO: Update for Mainnet deployment
-export const AVAILABLE_ENVIRONMENTS =
-  import.meta.env.MODE === 'production'
-    ? environments.deployments.TESTNET
-    : environments.deployments.DEV;
+const CURRENT_MODE = ({
+  production: 'MAINNET',
+  testnet: 'TESTNET',
+  staging: 'DEV',
+  development: 'DEV',
+}[import.meta.env.MODE] ?? 'MAINNET') as 'MAINNET' | 'TESTNET' | 'DEV';
 
-export const CURRENT_ABACUS_DEPLOYMENT = import.meta.env.MODE === 'production' ? 'TESTNET' : 'DEV';
+export const isMainnet = CURRENT_MODE === 'MAINNET';
+export const isTestnet = CURRENT_MODE === 'TESTNET';
+export const isDev = CURRENT_MODE === 'DEV';
+
+export const AVAILABLE_ENVIRONMENTS = environments.deployments[CURRENT_MODE];
+export const CURRENT_ABACUS_DEPLOYMENT = CURRENT_MODE;
 export const ENVIRONMENT_CONFIG_MAP = environments.environments;
 export type DydxNetwork = keyof typeof ENVIRONMENT_CONFIG_MAP;
 export const DEFAULT_APP_ENVIRONMENT = AVAILABLE_ENVIRONMENTS.default as DydxNetwork;

src/constants/notifications.ts

@@ -2,8 +2,9 @@ import { StatusResponse } from '@0xsquid/sdk';
 
 /** implemented in useNotificationTypes */
 export enum NotificationType {
-  OrderStatusChanged = 'OrderStatusChanged',
+  AbacusGenerated = 'AbacusGenerated',
   SquidTransfer = 'SquidTransfer',
+  ReleaseUpdates = 'ReleaseUpdates',
 }
 
 export enum NotificationComponentType {}
@@ -59,7 +60,7 @@ export enum NotificationStatus {
   /** Toast or NotificationsMenu item interacted with or dismissed. "Seen" in NotificationsMenu. */
   Seen,
 
-  /** Notification marked for deletion. "Archived" in NotificationsMenu. */
+  /** Notification marked for deletion. Hidden in NotificationsMenu. */
   Cleared,
 }
 
@@ -80,14 +81,22 @@ export type Notifications = Record<NotificationId, Notification<any>>;
 /** Notification display data derived from app state at runtime. */
 export type NotificationDisplayData = {
   icon?: React.ReactNode;
+  title: string; // Title for Toast, Notification, and Push Notification
+  body?: string; // Description body for Toast, Notification, and Push Notification
 
-  title?: string;
+  slotTitleLeft?: React.ReactNode;
+  slotTitleRight?: React.ReactNode;
 
-  description?: React.ReactNode;
+  groupKey: string; // Grouping key toast notification stacking
 
-  customContent?: React.ReactNode;
-
-  customMenuContent?: React.ReactNode;
+  // Overrides title/body for Notification in NotificationMenu
+  renderCustomBody?: ({
+    isToast,
+    notification,
+  }: {
+    isToast?: boolean;
+    notification: Notification;
+  }) => React.ReactNode; // Custom Notification
 
   actionDescription?: string;
 
@@ -115,12 +124,29 @@ export type NotificationDisplayData = {
   toastDuration?: number;
 };
 
+export enum TransferNotificationTypes {
+  Withdrawal = 'withdrawal',
+  Deposit = 'deposit',
+}
+
 // Notification types
 export type TransferNotifcation = {
   txHash: string;
+  type?: TransferNotificationTypes;
   toChainId?: string;
   fromChainId?: string;
   toAmount?: number;
   triggeredAt?: number;
+  isCctp?: boolean;
+  errorCount?: number;
   status?: StatusResponse;
 };
+
+/**
+ * @description Struct to store whether a NotificationType should be triggered
+ */
+export type NotificationPreferences = {
+  [key in NotificationType]: boolean;
+} & { version: string };
+
+export const DEFAULT_TOAST_AUTO_CLOSE_MS = 5000;

src/constants/numbers.ts

@@ -10,6 +10,7 @@ export const LEVERAGE_DECIMALS = 2;
 export const TOKEN_DECIMALS = 4;
 export const LARGE_TOKEN_DECIMALS = 2;
 export const FEE_DECIMALS = 3;
+export const FUNDING_DECIMALS = 6;
 
 export const QUANTUM_MULTIPLIER = 1_000_000;
 
@@ -18,3 +19,7 @@ export enum NumberSign {
   Negative = 'Negative',
   Neutral = 'Neutral',
 }
+
+// Deposit/Withdraw
+export const MAX_CCTP_TRANSFER_AMOUNT = 1_000_000;
+export const MAX_PRICE_IMPACT = 0.02; // 2%

src/constants/routes.ts

@@ -37,7 +37,3 @@ export const HISTORY_ROUTE = `${AppRoute.Portfolio}/${PortfolioRoute.History}/:s
 export const DEFAULT_TRADE_ROUTE = `${AppRoute.Trade}/${DEFAULT_MARKETID}`;
 export const SETTINGS_ROUTE = `${AppRoute.Settings}/*`;
 export const DEFAULT_DOCUMENT_TITLE = 'dYdX';
-
-export enum ExternalLink {
-  Foundation = 'https://dydx.foundation',
-}

src/constants/tooltips/deposit.ts

@@ -1,6 +1,10 @@
 import { type TooltipStrings, TOOLTIP_STRING_KEYS } from '@/constants/localization';
 
 export const depositTooltips: TooltipStrings = {
+  'minimum-deposit-amount': ({ stringGetter }) => ({
+    title: stringGetter({ key: TOOLTIP_STRING_KEYS.MINIMUM_DEPOSIT_AMOUNT_TITLE }),
+    body: stringGetter({ key: TOOLTIP_STRING_KEYS.MINIMUM_DEPOSIT_AMOUNT_BODY }),
+  }),
   swap: ({ stringGetter }) => ({
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.SWAP_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.SWAP_BODY }),

src/constants/tooltips/trade.ts

@@ -57,10 +57,10 @@ export const tradeTooltips: TooltipStrings = {
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_BODY }),
   }),
-  'initial-margin-fraction': ({ stringGetter }) => ({
+  'initial-margin-fraction': ({ stringGetter, urlConfigs }) => ({
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_BODY }),
-    learnMoreLink: 'https://help.dydx.exchange/articles/5232637-maximum-position-sizes',
+    learnMoreLink: urlConfigs?.initialMarginFractionLearnMore,
   }),
   'initial-stop': ({ stringGetter }) => ({
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_STOP_TITLE }),
@@ -146,10 +146,10 @@ export const tradeTooltips: TooltipStrings = {
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_BODY }),
   }),
-  'reduce-only': ({ stringGetter }) => ({
+  'reduce-only': ({ stringGetter, urlConfigs }) => ({
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_BODY }),
-    learnMoreLink: 'https://help.dydx.exchange/articles/6345793-reduce-only-orders',
+    learnMoreLink: urlConfigs?.reduceOnlyLearnMore,
   }),
   spread: () => ({
     title: 'Spread',

src/constants/tooltips/withdraw.ts

@@ -5,6 +5,10 @@ export const withdrawTooltips: TooltipStrings = {
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.FAST_WITHDRAW_FEE_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.FAST_WITHDRAW_FEE_BODY }),
   }),
+  'minimum-amount-received': ({ stringGetter }) => ({
+    title: stringGetter({ key: TOOLTIP_STRING_KEYS.MINIMUM_AMOUNT_RECEIVED_TITLE }),
+    body: stringGetter({ key: TOOLTIP_STRING_KEYS.MINIMUM_AMOUNT_RECEIVED_BODY }),
+  }),
   'withdraw-types': ({ stringGetter }) => ({
     title: stringGetter({ key: TOOLTIP_STRING_KEYS.WITHDRAW_TYPES_TITLE }),
     body: stringGetter({ key: TOOLTIP_STRING_KEYS.WITHDRAW_TYPES_BODY }),

src/constants/trade.ts

@@ -116,3 +116,15 @@ export enum MobilePlaceOrderSteps {
   PlacingOrder = 'PlacingOrder',
   Confirmation = 'Confirmation',
 }
+
+export const CLEARED_TRADE_INPUTS = {
+  limitPriceInput: '',
+  triggerPriceInput: '',
+  trailingPercentInput: '',
+};
+
+export const CLEARED_SIZE_INPUTS = {
+  amountInput: '',
+  usdAmountInput: '',
+  leverageInput: '',
+};

src/constants/wallets.ts

@@ -31,6 +31,7 @@ import { DydxNetwork, ENVIRONMENT_CONFIG_MAP } from './networks';
 export enum WalletConnectionType {
   CoinbaseWalletSdk = 'coinbaseWalletSdk',
   CosmosSigner = 'CosmosSigner',
+  Privy = 'Privy',
   InjectedEip1193 = 'injectedEip1193',
   WalletConnect2 = 'walletConnect2',
 }
@@ -68,6 +69,9 @@ export const walletConnectionTypes: Record<WalletConnectionType, WalletConnectio
   [WalletConnectionType.CosmosSigner]: {
     name: 'CosmosSigner',
   },
+  [WalletConnectionType.Privy]: {
+    name: 'Privy',
+  },
 };
 
 // Wallets
@@ -90,6 +94,7 @@ export enum WalletType {
   WalletConnect2 = 'WALLETCONNECT_2',
   // TestWallet = 'TEST_WALLET',
   OtherWallet = 'OTHER_WALLET',
+  Privy = 'PRIVY',
 }
 
 const WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS = {
@@ -243,6 +248,12 @@ export const wallets: Record<WalletType, WalletConfig> = {
     icon: KeplrIcon,
     connectionTypes: [WalletConnectionType.CosmosSigner],
   },
+  [WalletType.Privy]: {
+    type: WalletType.Privy,
+    stringKey: STRING_KEYS.KEPLR,
+    icon: GenericWalletIcon,
+    connectionTypes: [WalletConnectionType.Privy],
+  },
 };
 
 // Injected EIP-1193 Providers

src/hooks/index.ts

@@ -22,6 +22,8 @@ import { useShouldShowFooter } from './useShouldShowFooter';
 import { useSelectedNetwork } from './useSelectedNetwork';
 import { useStringGetter } from './useStringGetter';
 import { useSubaccount } from './useSubaccount';
+import { useTradeFormInputs } from './useTradeFormInputs';
+import { useURLConfigs } from './useURLConfigs';
 
 export {
   useApiState,
@@ -48,4 +50,6 @@ export {
   useSelectedNetwork,
   useStringGetter,
   useSubaccount,
+  useTradeFormInputs,
+  useURLConfigs,
 };

src/hooks/useAccounts.tsx

@@ -1,13 +1,19 @@
 import { useCallback, useContext, createContext, useEffect, useState, useMemo } from 'react';
 
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { AES, enc } from 'crypto-js';
-import { LocalWallet, type Subaccount } from '@dydxprotocol/v4-client-js';
+import { NOBLE_BECH32_PREFIX, LocalWallet, type Subaccount } from '@dydxprotocol/v4-client-js';
 
 import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/constants/account';
 import { DialogTypes } from '@/constants/dialogs';
 import { LocalStorageKey, LOCAL_STORAGE_VERSIONS } from '@/constants/localStorage';
-import { DydxAddress, EvmAddress, PrivateInformation } from '@/constants/wallets';
+import {
+  DydxAddress,
+  EvmAddress,
+  PrivateInformation,
+  WalletConnectionType,
+  getSignTypedData,
+} from '@/constants/wallets';
 
 import { setOnboardingState, setOnboardingGuard } from '@/state/account';
 import { forceOpenDialog } from '@/state/dialogs';
@@ -20,6 +26,11 @@ import { useLocalStorage } from './useLocalStorage';
 import { useRestrictions } from './useRestrictions';
 import { useWalletConnection } from './useWalletConnection';
 
+import { useSignTypedData } from 'wagmi';
+import { getSelectedNetwork } from '@/state/appSelectors';
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { usePrivy } from '@privy-io/react-auth';
+
 const AccountsContext = createContext<ReturnType<typeof useAccountsContext> | undefined>(undefined);
 
 AccountsContext.displayName = 'Accounts';
@@ -42,6 +53,7 @@ const useAccountsContext = () => {
     selectedWalletError,
     evmAddress,
     signerWagmi,
+    publicClientWagmi,
     dydxAddress: connectedDydxAddress,
     signerGraz,
   } = useWalletConnection();
@@ -135,8 +147,8 @@ const useAccountsContext = () => {
       getSubaccounts: async ({ dydxAddress }: { dydxAddress: DydxAddress }) => {
         try {
           const response = await compositeClient?.indexerClient.account.getSubaccounts(dydxAddress);
-          setDydxSubaccounts(response.subaccounts);
-          return response.subaccounts;
+          setDydxSubaccounts(response?.subaccounts);
+          return response?.subaccounts ?? [];
         } catch (error) {
           // 404 is expected if the user has no subaccounts
           if (error.status === 404) {
@@ -152,6 +164,7 @@ const useAccountsContext = () => {
 
   // dYdX wallet / onboarding state
   const [localDydxWallet, setLocalDydxWallet] = useState<LocalWallet>();
+  const [localNobleWallet, setLocalNobleWallet] = useState<LocalWallet>();
   const [hdKey, setHdKey] = useState<PrivateInformation>();
 
   const dydxAccounts = useMemo(() => localDydxWallet?.accounts, [localDydxWallet]);
@@ -161,6 +174,11 @@ const useAccountsContext = () => {
     [localDydxWallet]
   );
 
+  const nobleAddress = useMemo(
+    () => localNobleWallet?.address,
+    [localNobleWallet]
+  );
+
   const setWalletFromEvmSignature = async (signature: string) => {
     const { wallet, mnemonic, privateKey, publicKey } = await getWalletFromEvmSignature({
       signature,
@@ -175,6 +193,20 @@ const useAccountsContext = () => {
     }
   }, [evmAddress, dydxAddress]);
 
+  const selectedNetwork = useSelector(getSelectedNetwork);
+
+  const chainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId);
+
+  const signTypedData = getSignTypedData(selectedNetwork);
+  const { signTypedDataAsync } = useSignTypedData({
+    ...signTypedData,
+    domain: {
+      ...signTypedData.domain,
+      chainId,
+    },
+  });
+  const { ready, authenticated } = usePrivy();
+
   useEffect(() => {
     (async () => {
       if (connectedDydxAddress && signerGraz) {
@@ -191,7 +223,17 @@ const useAccountsContext = () => {
 
           const evmDerivedAccount = evmDerivedAddresses[evmAddress];
 
-          if (evmDerivedAccount?.encryptedSignature) {
+          if (walletConnectionType === WalletConnectionType.Privy && authenticated && ready) {
+            try {
+              const signature = await signTypedDataAsync();
+
+              await setWalletFromEvmSignature(signature);
+              dispatch(setOnboardingState(OnboardingState.AccountConnected));
+            } catch (error) {
+              log('useAccounts/decryptSignature', error);
+              forgetEvmSignature();
+            }
+          } else if (evmDerivedAccount?.encryptedSignature) {
             try {
               const signature = decryptSignature(evmDerivedAccount.encryptedSignature);
 
@@ -210,7 +252,15 @@ const useAccountsContext = () => {
         dispatch(setOnboardingState(OnboardingState.Disconnected));
       }
     })();
-  }, [evmAddress, evmDerivedAddresses, signerWagmi, connectedDydxAddress, signerGraz]);
+  }, [
+    evmAddress,
+    evmDerivedAddresses,
+    signerWagmi,
+    connectedDydxAddress,
+    signerGraz,
+    authenticated,
+    ready,
+  ]);
 
   // abacus
   useEffect(() => {
@@ -218,6 +268,17 @@ const useAccountsContext = () => {
     else abacusStateManager.attemptDisconnectAccount();
   }, [localDydxWallet]);
 
+  useEffect(() => {
+    const setNobleWallet = async () => {
+      if (hdKey?.mnemonic) {
+        const nobleWallet = await LocalWallet.fromMnemonic(hdKey.mnemonic, NOBLE_BECH32_PREFIX);
+        abacusStateManager.setNobleWallet(nobleWallet);
+        setLocalNobleWallet(nobleWallet);
+      }
+    };
+    setNobleWallet();
+  }, [hdKey?.mnemonic]);
+
   // clear subaccounts when no dydxAddress is set
   useEffect(() => {
     (async () => {
@@ -296,6 +357,7 @@ const useAccountsContext = () => {
     // Wallet connection (EVM)
     evmAddress,
     signerWagmi,
+    publicClientWagmi,
 
     // Wallet connection (Cosmos)
     signerGraz,
@@ -310,6 +372,7 @@ const useAccountsContext = () => {
     localDydxWallet,
     dydxAccounts,
     dydxAddress,
+    nobleAddress,
 
     // Onboarding state
     saveHasAcknowledgedTerms,

src/hooks/useAnalytics.ts

@@ -97,7 +97,7 @@ export const useAnalytics = () => {
   }, []);
 
   // AnalyticsEvent.NetworkStatus
-  const { height, indexerHeight, status } = useApiState();
+  const { height, indexerHeight, status, trailingBlocks} = useApiState();
 
   useEffect(() => {
     if (status) {
@@ -114,6 +114,7 @@ export const useAnalytics = () => {
         elapsedTime: lastSuccessfulIndexerRpcQuery && Date.now() - lastSuccessfulIndexerRpcQuery,
         blockHeight: height ?? undefined,
         indexerBlockHeight: indexerHeight ?? undefined,
+        trailingBlocks: trailingBlocks ?? undefined
       });
     }
   }, [status]);

src/hooks/useApiState.ts

@@ -71,7 +71,7 @@ export const getIndexerHeight = (apiState: Nullable<AbacusApiState>) => {
 export const useApiState = () => {
   const stringGetter = useStringGetter();
   const apiState = useSelector(getApiState, shallowEqual);
-  const { haltedBlock, height, status, trailingBlocks } = apiState ?? {};
+  const { haltedBlock, height, status, trailingBlocks} = apiState ?? {};
   const statusErrorMessage = getStatusErrorMessage({ apiState, stringGetter });
   const indexerHeight = getIndexerHeight(apiState);
 

src/hooks/useCurrentMarketId.ts

@@ -5,16 +5,15 @@ import { useMatch, useNavigate } from 'react-router-dom';
 import { LocalStorageKey } from '@/constants/localStorage';
 import { DEFAULT_MARKETID } from '@/constants/markets';
 import { AppRoute } from '@/constants/routes';
+import { useLocalStorage } from '@/hooks/useLocalStorage';
 
 import { getSelectedNetwork } from '@/state/appSelectors';
 import { closeDialogInTradeBox } from '@/state/dialogs';
 import { setCurrentMarketId } from '@/state/perpetuals';
+import { getMarketIds } from '@/state/perpetualsSelectors';
 
 import abacusStateManager from '@/lib/abacus';
 
-import { useLocalStorage } from './useLocalStorage';
-import { getMarketIds } from '@/state/perpetualsSelectors';
-
 export const useCurrentMarketId = () => {
   const navigate = useNavigate();
   const match = useMatch(`/${AppRoute.Trade}/:marketId`);
@@ -22,6 +21,8 @@ export const useCurrentMarketId = () => {
   const dispatch = useDispatch();
   const selectedNetwork = useSelector(getSelectedNetwork);
   const marketIds = useSelector(getMarketIds, shallowEqual);
+  const hasMarketIds = marketIds.length > 0;
+
   const [lastViewedMarket, setLastViewedMarket] = useLocalStorage({
     key: LocalStorageKey.LastViewedMarket,
     defaultValue: DEFAULT_MARKETID,
@@ -31,22 +32,40 @@ export const useCurrentMarketId = () => {
     if (marketIds.length === 0) return marketId ?? lastViewedMarket;
     if (!marketIds.includes(marketId ?? lastViewedMarket)) return DEFAULT_MARKETID;
     return marketId ?? lastViewedMarket;
-  }, [marketIds, marketId]);
+  }, [hasMarketIds, marketId]);
 
   useEffect(() => {
-    setLastViewedMarket(validId);
-    dispatch(setCurrentMarketId(validId));
-    dispatch(closeDialogInTradeBox());
+    // If v4_markets has not been subscribed to yet or marketId is not specified, default to validId
+    if (!hasMarketIds || !marketId) {
+      setLastViewedMarket(validId);
+      dispatch(setCurrentMarketId(validId));
+      dispatch(closeDialogInTradeBox());
 
-    navigate(`${AppRoute.Trade}/${validId}`, {
-      replace: true,
-    });
-  }, [validId]);
+      if (validId !== marketId) {
+        navigate(`${AppRoute.Trade}/${validId}`, {
+          replace: true,
+        });
+      }
+    } else {
+      // If v4_markets has been subscribed to, check if marketId is valid
+      if (!marketIds.includes(marketId)) {
+        // If marketId is not valid (i.e. final settlement), navigate to markets page
+        navigate(AppRoute.Markets, {
+          replace: true,
+        });
+      } else {
+        // If marketId is valid, set currentMarketId
+        setLastViewedMarket(marketId);
+        dispatch(setCurrentMarketId(marketId));
+        dispatch(closeDialogInTradeBox());
+      }
+    }
+  }, [hasMarketIds, marketId]);
 
   useEffect(() => {
     // Check for marketIds otherwise Abacus will silently fail its isMarketValid check
     if (marketIds) {
       abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
     }
-  }, [selectedNetwork, marketIds, marketId]);
+  }, [selectedNetwork, hasMarketIds, marketId]);
 };

src/hooks/useDisplayedWallets.ts

@@ -1,3 +1,4 @@
+import { isDev } from '@/constants/networks';
 import { WalletType } from '@/constants/wallets';
 
 import { isTruthy } from '@/lib/isTruthy';
@@ -6,7 +7,7 @@ export const useDisplayedWallets = () => {
   return [
     WalletType.MetaMask,
 
-    import.meta.env.MODE !== 'production' && WalletType.Keplr,
+    isDev && WalletType.Keplr,
 
     WalletType.WalletConnect2,
     
@@ -20,6 +21,7 @@ export const useDisplayedWallets = () => {
     // WalletType.BitKeep,
     // WalletType.Coin98,
 
+    WalletType.Privy,
     WalletType.OtherWallet,
   ].filter(isTruthy);
 };

src/hooks/useLocalNotifications.tsx

@@ -1,12 +1,12 @@
 import { createContext, useContext, useCallback, useEffect, useMemo } from 'react';
 import { useQuery } from 'react-query';
-import type { StatusResponse } from '@0xsquid/sdk';
 
-import { LocalStorageKey } from '@/constants/localStorage';
+import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage';
 import { type TransferNotifcation } from '@/constants/notifications';
-
 import { useAccounts } from '@/hooks/useAccounts';
-import { STATUS_ERROR_GRACE_PERIOD, useSquid } from '@/hooks/useSquid';
+
+import { fetchSquidStatus, STATUS_ERROR_GRACE_PERIOD } from '@/lib/squid';
+
 import { useLocalStorage } from './useLocalStorage';
 
 const LocalNotificationsContext = createContext<
@@ -22,16 +22,32 @@ export const LocalNotificationsProvider = ({ ...props }) => (
 export const useLocalNotifications = () => useContext(LocalNotificationsContext)!;
 
 const TRANSFER_STATUS_FETCH_INTERVAL = 10_000;
+const ERROR_COUNT_THRESHOLD = 3;
 
 const useLocalNotificationsContext = () => {
   // transfer notifications
   const [allTransferNotifications, setAllTransferNotifications] = useLocalStorage<{
     [key: `dydx${string}`]: TransferNotifcation[];
+    version: string;
   }>({
     key: LocalStorageKey.TransferNotifications,
-    defaultValue: {},
+    defaultValue: {
+      version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.TransferNotifications],
+    },
   });
 
+  // Ensure version matches, otherwise wipe
+  useEffect(() => {
+    if (
+      allTransferNotifications?.version !==
+      LOCAL_STORAGE_VERSIONS[LocalStorageKey.TransferNotifications]
+    ) {
+      setAllTransferNotifications({
+        version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.TransferNotifications],
+      });
+    }
+  }, [allTransferNotifications]);
+
   const { dydxAddress } = useAccounts();
 
   const transferNotifications = dydxAddress ? allTransferNotifications[dydxAddress] || [] : [];
@@ -52,49 +68,65 @@ const useLocalNotificationsContext = () => {
     [transferNotifications]
   );
 
-  const squid = useSquid();
-
-  const { data: transferStatuses } = useQuery({
-    queryKey: ['getTransactionStatus', transferNotifications],
+  useQuery({
+    queryKey: 'getTransactionStatus',
     queryFn: async () => {
-      const statuses: { [key: string]: StatusResponse } = {};
-      for (const {
-        txHash,
-        toChainId,
-        fromChainId,
-        triggeredAt,
-        status: currentStatus,
-      } of transferNotifications) {
-        try {
-          if (currentStatus && currentStatus?.squidTransactionStatus !== 'ongoing') continue;
+      const processTransferNotifications = async (transferNotifications: TransferNotifcation[]) => {
+        const newTransferNotifications = await Promise.all(
+          transferNotifications.map(async (transferNotification) => {
+            const {
+              txHash,
+              toChainId,
+              fromChainId,
+              triggeredAt,
+              isCctp,
+              errorCount,
+              status: currentStatus,
+            } = transferNotification;
 
-          const status = await squid?.getStatus({ transactionId: txHash, toChainId, fromChainId });
-          if (status) statuses[txHash] = status;
-        } catch (error) {
-          // ignore errors for the first 120s since the status might not be available yet
-          if (!triggeredAt || Date.now() - triggeredAt > STATUS_ERROR_GRACE_PERIOD) {
-            statuses[txHash] = error;
-          }
-        }
-      }
-      return statuses;
+            // @ts-ignore status.errors is not in the type definition but can be returned
+            // also error can some time come back as an empty object so we need to ignore for that
+            const hasErrors = !!currentStatus?.errors || 
+                 (currentStatus?.error && Object.keys(currentStatus.error).length !== 0);
+
+            if (
+              !hasErrors &&
+              (!currentStatus?.squidTransactionStatus ||
+                currentStatus?.squidTransactionStatus === 'ongoing')
+            ) {
+              try {
+                const status = await fetchSquidStatus({
+                  transactionId: txHash,
+                  toChainId,
+                  fromChainId,
+                }, isCctp);
+
+                if (status) {
+                  transferNotification.status = status;
+                }
+              } catch (error) {
+                if (!triggeredAt || Date.now() - triggeredAt > STATUS_ERROR_GRACE_PERIOD) {
+                  if (errorCount && errorCount > ERROR_COUNT_THRESHOLD) {
+                    transferNotification.status = error;
+                  } else {
+                    transferNotification.errorCount = errorCount ? errorCount + 1 : 1;
+                  }
+                }
+              }
+            }
+
+            return transferNotification;
+          })
+        );
+
+        return newTransferNotifications;
+      };
+      const newTransferNotifications = await processTransferNotifications(transferNotifications);
+      setTransferNotifications(newTransferNotifications);
     },
     refetchInterval: TRANSFER_STATUS_FETCH_INTERVAL,
   });
 
-  useEffect(() => {
-    if (!transferStatuses) return;
-    const newTransferNotifications = transferNotifications.map((notification) => {
-      const status = transferStatuses[notification.txHash];
-      if (!status) return notification;
-      return {
-        ...notification,
-        status,
-      };
-    });
-    setTransferNotifications(newTransferNotifications);
-  }, [transferStatuses]);
-
   return {
     transferNotifications,
     addTransferNotification,

src/hooks/useMarketsData.ts

@@ -6,8 +6,10 @@ import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constant
 import { getAssets } from '@/state/assetsSelectors';
 import { getPerpetualMarkets } from '@/state/perpetualsSelectors';
 
+import { isTruthy } from '@/lib/isTruthy';
+
 const filterFunctions = {
-  [MarketFilters.ALL]: (market: MarketData) => true,
+  [MarketFilters.ALL]: () => true,
   [MarketFilters.LAYER_1]: (market: MarketData) => {
     return market.asset.tags?.toArray().includes('Layer 1');
   },
@@ -28,13 +30,15 @@ export const useMarketsData = (
   const allAssets = useSelector(getAssets, shallowEqual) || {};
 
   const markets = useMemo(() => {
-    return Object.values(allPerpetualMarkets).map((marketData) => ({
-      asset: allAssets[marketData.assetId],
-      tickSizeDecimals: marketData.configs?.tickSizeDecimals,
-      ...marketData,
-      ...marketData.perpetual,
-      ...marketData.configs,
-    })) as MarketData[];
+    return Object.values(allPerpetualMarkets)
+      .filter(isTruthy)
+      .map((marketData) => ({
+        asset: allAssets[marketData.assetId],
+        tickSizeDecimals: marketData.configs?.tickSizeDecimals,
+        ...marketData,
+        ...marketData.perpetual,
+        ...marketData.configs,
+      })) as MarketData[];
   }, [allPerpetualMarkets, allAssets]);
 
   const filteredMarkets = useMemo(() => {

src/hooks/useMatchingEvmNetwork.ts

@@ -1,5 +1,9 @@
 import { useCallback, useEffect, useMemo } from 'react';
 import { useNetwork, useSwitchNetwork } from 'wagmi';
+import { useSwitchNetwork as useSwitchNetworkPrivy } from '@privy-io/wagmi-connector';
+import { WalletConnectionType } from '@/constants/wallets';
+
+import { useWalletConnection } from './useWalletConnection';
 
 export const useMatchingEvmNetwork = ({
   chainId,
@@ -11,7 +15,10 @@ export const useMatchingEvmNetwork = ({
   onError?: (error: Error) => void;
 }) => {
   const { chain } = useNetwork();
+  const { walletConnectionType } = useWalletConnection();
   const { isLoading, switchNetworkAsync } = useSwitchNetwork({ onError });
+  const { isLoading: isLoadingPrivy, switchNetworkAsync: switchNetworkAsyncPrivy } =
+    useSwitchNetworkPrivy({ onError });
 
   // If chainId is not a number, we can assume it is a non EVM compatible chain
   const isMatchingNetwork = useMemo(
@@ -21,7 +28,11 @@ export const useMatchingEvmNetwork = ({
 
   const matchNetwork = useCallback(async () => {
     if (!isMatchingNetwork) {
-      await switchNetworkAsync?.(Number(chainId));
+      if (walletConnectionType === WalletConnectionType.Privy) {
+        await switchNetworkAsyncPrivy?.(Number(chainId));
+      } else {
+        await switchNetworkAsync?.(Number(chainId));
+      }
     }
   }, [chainId, chain]);
 
@@ -34,6 +45,6 @@ export const useMatchingEvmNetwork = ({
   return {
     isMatchingNetwork,
     matchNetwork,
-    isSwitchingNetwork: isLoading,
+    isSwitchingNetwork: isLoading || isLoadingPrivy,
   };
 };

src/hooks/useNotificationTypes.tsx

@@ -1,205 +1,291 @@
-import { useCallback, useEffect, useMemo } from 'react';
-import styled, { type AnyStyledComponent } from 'styled-components';
-import { useSelector, shallowEqual, useDispatch } from 'react-redux';
-import { groupBy } from 'lodash';
+import { type ReactNode, useEffect } from 'react';
+import styled from 'styled-components';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
+import { isEqual, groupBy } from 'lodash';
+import { useNavigate } from 'react-router-dom';
 
-import { AlertType } from '@/constants/alerts';
-import { AbacusOrderStatus, ORDER_SIDES } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
-import { STRING_KEYS, StringKey } from '@/constants/localization';
-import { type NotificationTypeConfig, NotificationType } from '@/constants/notifications';
-import { ORDER_SIDE_STRINGS } from '@/constants/trade';
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { AppRoute } from '@/constants/routes';
+import { DydxChainAsset } from '@/constants/wallets';
 
+import {
+  STRING_KEYS,
+  STRING_KEY_VALUES,
+  type StringGetterFunction,
+  type StringKey,
+} from '@/constants/localization';
+
+import {
+  type NotificationTypeConfig,
+  NotificationType,
+  DEFAULT_TOAST_AUTO_CLOSE_MS,
+  TransferNotificationTypes,
+} from '@/constants/notifications';
+
+import { useSelectedNetwork, useStringGetter } from '@/hooks';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 
+import { AssetIcon } from '@/components/AssetIcon';
 import { Icon, IconName } from '@/components/Icon';
-import { Output, OutputType } from '@/components/Output';
-import { TransferStatusToast } from '@/views/TransferStatus';
+import { BlockRewardNotification } from '@/views/notifications/BlockRewardNotification';
+import { TradeNotification } from '@/views/notifications/TradeNotification';
+import { TransferStatusNotification } from '@/views/notifications/TransferStatusNotification';
 
 import { getSubaccountFills, getSubaccountOrders } from '@/state/accountSelectors';
 import { openDialog } from '@/state/dialogs';
+import { getAbacusNotifications } from '@/state/notificationsSelectors';
+import { getMarketIds } from '@/state/perpetualsSelectors';
 
-import { OrderStatusIcon } from '@/views/OrderStatusIcon';
+import { formatSeconds } from '@/lib/timeUtils';
 
-import { useStringGetter } from './useStringGetter';
-import { TransferStatusSteps } from '@/views/TransferStatusSteps';
-import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
+const parseStringParamsForNotification = ({
+  stringGetter,
+  value,
+}: {
+  stringGetter: StringGetterFunction;
+  value: unknown;
+}): ReactNode => {
+  if (STRING_KEY_VALUES[value as StringKey]) {
+    return stringGetter({ key: value as StringKey });
+  }
 
-export const notificationTypes = [
+  return value as ReactNode;
+};
+
+export const notificationTypes: NotificationTypeConfig[] = [
   {
-    type: NotificationType.OrderStatusChanged,
-
-    useTrigger: ({ trigger, lastUpdated }) => {
+    type: NotificationType.AbacusGenerated,
+    useTrigger: ({ trigger }) => {
       const stringGetter = useStringGetter();
-
-      const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
-      const ordersByOrderId = Object.fromEntries(orders.map((order) => [order.id, order]));
-
-      const fills = useSelector(getSubaccountFills, shallowEqual) || [];
-      const fillsByOrderId = groupBy(fills, (fill) => fill.orderId);
-
-      const orderIds = useMemo(
-        () => [...Object.keys(ordersByOrderId), ...Object.keys(fillsByOrderId)],
-        [orders, fills]
-      );
+      const abacusNotifications = useSelector(getAbacusNotifications, isEqual);
 
       useEffect(() => {
-        for (const orderId of orderIds) {
-          const fills = fillsByOrderId[orderId];
+        for (const abacusNotif of abacusNotifications) {
+          const [abacusNotificationType = '', id = ''] = abacusNotif.id.split(':');
+          const parsedData = abacusNotif.data ? JSON.parse(abacusNotif.data) : {};
 
-          const order =
-            ordersByOrderId[orderId] ??
-            (fills?.length
-              ? {
-                  ...fills[fills.length - 1],
-                  id: orderId,
-                  createdAtMilliseconds: Math.max(
-                    ...fills.map((fill) => fill.createdAtMilliseconds)
+          const params = Object.fromEntries(
+            Object.entries(parsedData).map(([key, value]) => {
+              return [key, parseStringParamsForNotification({ stringGetter, value })];
+            })
+          );
+
+          switch (abacusNotificationType) {
+            case 'order': {
+              trigger(
+                abacusNotif.id,
+                {
+                  icon: abacusNotif.image && <$Icon src={abacusNotif.image} alt="" />,
+                  title: stringGetter({ key: abacusNotif.title }),
+                  body: abacusNotif.text ? stringGetter({ key: abacusNotif.text, params }) : '',
+                  toastDuration: DEFAULT_TOAST_AUTO_CLOSE_MS,
+                  toastSensitivity: 'foreground',
+                  groupKey: abacusNotificationType,
+                  renderCustomBody: ({ isToast, notification }) => (
+                    <TradeNotification
+                      isToast={isToast}
+                      data={parsedData}
+                      notification={notification}
+                    />
                   ),
-                  status: AbacusOrderStatus.filled,
-                }
-              : undefined);
-
-          if (order)
-            trigger(
-              order.id,
-              {
-                icon: (
-                  <OrderStatusIcon status={order.status} totalFilled={order.totalFilled ?? 0} />
-                ),
-                title: `${stringGetter({
-                  key: order.resources.typeStringKey as StringKey,
-                })} ${
-                  order.status === AbacusOrderStatus.open && (order?.totalFilled ?? 0) > 0
-                    ? stringGetter({ key: STRING_KEYS.PARTIALLY_FILLED })
-                    : stringGetter({ key: order.resources.statusStringKey as StringKey })
-                }`,
-                description: `${stringGetter({
-                  key: ORDER_SIDE_STRINGS[ORDER_SIDES[order.side.name]],
-                })} ${order.size} ${order.marketId} @ $${order.price}`,
-                actionDescription: 'View Order',
-                actionAltText: 'View this order in the Orders tab or the Notifications menu.',
-                toastSensitivity:
-                  order.status === AbacusOrderStatus.pending ? 'foreground' : 'background',
-                toastDuration: 5000,
-              },
-              [order.status.name, order.size],
-              !order.createdAtMilliseconds || order.createdAtMilliseconds > lastUpdated
-            );
+                },
+                [abacusNotif.updateTimeInMilliseconds, abacusNotif.data],
+                true
+              );
+              break;
+            }
+            case 'blockReward': {
+              trigger(
+                abacusNotif.id,
+                {
+                  icon: abacusNotif.image && <$Icon src={abacusNotif.image} alt="" />,
+                  title: stringGetter({ key: abacusNotif.title }),
+                  body: abacusNotif.text ? stringGetter({ key: abacusNotif.text, params }) : '',
+                  toastDuration: DEFAULT_TOAST_AUTO_CLOSE_MS,
+                  toastSensitivity: 'foreground',
+                  groupKey: abacusNotificationType,
+                  renderCustomBody: ({ isToast, notification }) => (
+                    <BlockRewardNotification
+                      isToast={isToast}
+                      data={parsedData}
+                      notification={notification}
+                    />
+                  ),
+                },
+                [abacusNotif.updateTimeInMilliseconds, abacusNotif.data],
+                true
+              );
+              break;
+            }
+            default:
+              trigger(
+                abacusNotif.id,
+                {
+                  icon: abacusNotif.image && <$Icon src={abacusNotif.image} alt="" />,
+                  title: stringGetter({ key: abacusNotif.title }),
+                  body: abacusNotif.text ? stringGetter({ key: abacusNotif.text, params }) : '',
+                  toastDuration: DEFAULT_TOAST_AUTO_CLOSE_MS,
+                  toastSensitivity: 'foreground',
+                  groupKey: abacusNotificationType,
+                },
+                [abacusNotif.updateTimeInMilliseconds, abacusNotif.data]
+              );
+              break;
+          }
         }
-      }, [orderIds]);
+      }, [abacusNotifications, stringGetter]);
     },
+    useNotificationAction: () => {
+      const dispatch = useDispatch();
+      const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
+      const ordersById = groupBy(orders, 'id');
+      const fills = useSelector(getSubaccountFills, shallowEqual) || [];
+      const fillsById = groupBy(fills, 'id');
+      const marketIds = useSelector(getMarketIds, shallowEqual);
+      const navigate = useNavigate();
 
-    // useNotificationAction: () => {
-    //   const dispatch = useDispatch();
-    //   const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
-    //   const ordersByOrderId = Object.fromEntries(orders.map((order) => [order.id, order]));
+      return (notificationId: string) => {
+        const [abacusNotificationType = '', id = ''] = notificationId.split(':');
 
-    //   const fills = useSelector(getSubaccountFills, shallowEqual) || [];
-    //   const fillsByOrderId = groupBy(fills, (fill) => fill.orderId);
-
-    //   return (id) => {
-    //     if (ordersByOrderId[id]) {
-    //       dispatch(
-    //         openDialog({
-    //           type: DialogTypes.OrderDetails,
-    //           dialogProps: { orderId: id },
-    //         })
-    //       );
-    //     } else if (fillsByOrderId[id]) {
-    //       const fillId = fillsByOrderId[id][0].id;
-
-    //       dispatch(
-    //         openDialog({
-    //           type: DialogTypes.FillDetails,
-    //           dialogProps: { fillId },
-    //         })
-    //       );
-    //     }
-    //   };
-    // },
-  } as NotificationTypeConfig<string, [string, number]>,
+        if (ordersById[id]) {
+          dispatch(
+            openDialog({
+              type: DialogTypes.OrderDetails,
+              dialogProps: { orderId: id },
+            })
+          );
+        } else if (fillsById[id]) {
+          dispatch(
+            openDialog({
+              type: DialogTypes.FillDetails,
+              dialogProps: { fillId: id },
+            })
+          );
+        } else if (marketIds.includes(id)) {
+          navigate(`${AppRoute.Trade}/${id}`, {
+            replace: true,
+          });
+        }
+      };
+    },
+  },
   {
     type: NotificationType.SquidTransfer,
     useTrigger: ({ trigger }) => {
       const stringGetter = useStringGetter();
       const { transferNotifications } = useLocalNotifications();
-
-      const getTitleStringKey = useCallback((type: 'deposit' | 'withdrawal', finished: boolean) => {
-        if (type === 'deposit' && !finished) return STRING_KEYS.DEPOSIT_IN_PROGRESS;
-        if (type === 'deposit' && finished) return STRING_KEYS.DEPOSIT;
-        if (type === 'withdrawal' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
-        return STRING_KEYS.WITHDRAW;
-      }, []);
+      const { selectedNetwork } = useSelectedNetwork();
 
       useEffect(() => {
         for (const transfer of transferNotifications) {
-          const { fromChainId, status, txHash, toAmount } = transfer;
-          const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
-          const type = fromChainId === TESTNET_CHAIN_ID ? 'withdrawal' : 'deposit';
-          // @ts-ignore status.errors is not in the type definition but can be returned
-          const error = status?.errors?.length ? status?.errors[0] : status?.error;
+          const { fromChainId, status, txHash, toAmount, type } = transfer;
+          const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
+          const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />;
 
-          // TODO: confirm with design what the description should be
-          const description = (
-            <div>
-              <Styled.TransferText>
-                {type === 'deposit' ? 'Deposit of ' : 'Withdraw of '}
-                <Output type={OutputType.Fiat} value={toAmount} />
-              </Styled.TransferText>
+          const transferType =
+            type ?? fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
+              ? TransferNotificationTypes.Withdrawal
+              : TransferNotificationTypes.Deposit;
 
-              {error && (
-                <Styled.ErrorMessage type={AlertType.Error}>
-                  {stringGetter({
-                    key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-                    params: {
-                      ERROR_MESSAGE:
-                        error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
-                    },
-                  })}
-                </Styled.ErrorMessage>
-              )}
-            </div>
-          );
+          const title = stringGetter({
+            key: {
+              deposit: isFinished ? STRING_KEYS.DEPOSIT : STRING_KEYS.DEPOSIT_IN_PROGRESS,
+              withdrawal: isFinished ? STRING_KEYS.WITHDRAW : STRING_KEYS.WITHDRAW_IN_PROGRESS,
+            }[transferType],
+          });
+
+          const toChainEta = status?.toChain?.chainData?.estimatedRouteDuration || 0;
+          const estimatedDuration = formatSeconds(Math.max(toChainEta, 0));
+          const body = stringGetter({
+            key: STRING_KEYS.DEPOSIT_STATUS,
+            params: {
+              AMOUNT_USD: `${toAmount} ${DydxChainAsset.USDC.toUpperCase()}`,
+              ESTIMATED_DURATION: estimatedDuration,
+            },
+          });
 
           trigger(
             txHash,
             {
-              icon: <Icon iconName={finished ? IconName.Transfer : IconName.Clock} />,
-              title: stringGetter({ key: getTitleStringKey(type, finished) }),
-              description: description,
-              customContent: (
-                <TransferStatusToast
-                  type={type}
-                  toAmount={transfer.toAmount}
+              icon,
+              title,
+              body,
+              renderCustomBody: ({ isToast, notification }) => (
+                <TransferStatusNotification
+                  isToast={isToast}
+                  slotIcon={icon}
+                  slotTitle={title}
+                  transfer={transfer}
+                  type={transferType}
                   triggeredAt={transfer.triggeredAt}
-                  status={transfer.status}
+                  notification={notification}
                 />
               ),
-              customMenuContent: !finished && (
-                <div>
-                  {description}
-                  <TransferStatusSteps status={transfer.status} type={type} />
-                </div>
-              ),
               toastSensitivity: 'foreground',
+              groupKey: NotificationType.SquidTransfer,
             },
-            []
+            [isFinished]
           );
         }
-      }, [transferNotifications]);
+      }, [transferNotifications, stringGetter]);
+    },
+    useNotificationAction: () => {
+      return () => {};
     },
   },
-] satisfies NotificationTypeConfig[];
+  {
+    type: NotificationType.ReleaseUpdates,
+    useTrigger: ({ trigger }) => {
+      const stringGetter = useStringGetter();
 
-const Styled: Record<string, AnyStyledComponent> = {};
+      useEffect(() => {
+        trigger(
+          'rewards-and-full-trading-live',
+          {
+            icon: <AssetIcon symbol="DYDX" />,
+            title: stringGetter({ key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.TITLE' }),
+            body: stringGetter({
+              key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.BODY',
+              params: {
+                DOS_BLOGPOST: (
+                  <$Link
+                    href="https://www.dydxopsdao.com/blog/deep-dive-full-trading"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    {stringGetter({ key: STRING_KEYS.HERE })}
+                  </$Link>
+                ),
+                TRADING_BLOGPOST: (
+                  <$Link
+                    href="https://dydx.exchange/blog/v4-full-trading"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    {stringGetter({ key: STRING_KEYS.HERE })}
+                  </$Link>
+                ),
+              },
+            }),
+            toastSensitivity: 'foreground',
+            groupKey: NotificationType.ReleaseUpdates,
+          },
+          []
+        );
+      }, [stringGetter]);
+    },
+    useNotificationAction: () => {
+      return () => {};
+    },
+  },
+];
 
-Styled.TransferText = styled.span`
-  display: inline-flex;
-  align-items: center;
-  gap: 0.5ch;
+const $Icon = styled.img`
+  height: 1.5rem;
+  width: 1.5rem;
 `;
 
-Styled.ErrorMessage = styled.div`
-  max-width: 13rem;
+const $Link = styled.a`
+  --link-color: var(--color-text-2);
 `;

src/hooks/useNotifications.tsx

@@ -1,11 +1,13 @@
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
-import { LocalStorageKey } from '@/constants/localStorage';
+import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage';
 import {
   type Notification,
   type NotificationDisplayData,
+  type NotificationPreferences,
   type Notifications,
   NotificationStatus,
+  NotificationType,
 } from '@/constants/notifications';
 
 import { useLocalStorage } from './useLocalStorage';
@@ -13,8 +15,10 @@ import { notificationTypes } from './useNotificationTypes';
 
 import { renderSvgToDataUrl } from '../lib/renderSvgToDataUrl';
 
-const NotificationsContext = createContext<ReturnType<typeof useNotificationsContext> | undefined>(
-  undefined
+type NotificationsContextType = ReturnType<typeof useNotificationsContext>;
+
+const NotificationsContext = createContext<NotificationsContextType>(
+  {} as NotificationsContextType
 );
 
 NotificationsContext.displayName = 'Notifications';
@@ -27,6 +31,7 @@ export const useNotifications = () => useContext(NotificationsContext)!;
 
 const useNotificationsContext = () => {
   // Local storage
+  // const [notifications, setNotifications] = useState<Notifications>({});
   const [notifications, setNotifications] = useLocalStorage<Notifications>({
     key: LocalStorageKey.Notifications,
     defaultValue: {},
@@ -37,12 +42,25 @@ const useNotificationsContext = () => {
     defaultValue: Date.now(),
   });
 
+  const [notificationPreferences, setNotificationPreferences] =
+    useLocalStorage<NotificationPreferences>({
+      key: LocalStorageKey.NotificationPreferences,
+      defaultValue: {
+        [NotificationType.AbacusGenerated]: true,
+        [NotificationType.SquidTransfer]: true,
+        version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.NotificationPreferences],
+      },
+    });
+
   useEffect(() => {
     setNotificationsLastUpdated(Date.now());
   }, [notifications]);
 
-  const getKey = <T extends string | number>(notification: Pick<Notification<T>, 'type' | 'id'>) =>
-    `${notification.type}/${notification.id}`;
+  const getKey = useCallback(
+    <T extends string | number>(notification: Pick<Notification<T>, 'type' | 'id'>) =>
+      `${notification.type}/${notification.id}`,
+    []
+  );
 
   // Display data
   const [notificationsDisplayData, setNotificationsDisplayData] = useState(
@@ -54,29 +72,47 @@ const useNotificationsContext = () => {
     [notificationsDisplayData]
   );
 
+  // Check for version changes
+  useEffect(() => {
+    if (
+      notificationPreferences.version !==
+      LOCAL_STORAGE_VERSIONS[LocalStorageKey.NotificationPreferences]
+    ) {
+      setNotificationPreferences({
+        [NotificationType.AbacusGenerated]: true,
+        [NotificationType.SquidTransfer]: true,
+        [NotificationType.ReleaseUpdates]: true,
+        version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.NotificationPreferences],
+      });
+    }
+  }, []);
+
   // Status changes
   const updateStatus = useCallback(
     (notification: Notification, status: NotificationStatus) => {
       notification.status = status;
       notification.timestamps[notification.status] = Date.now();
-      setNotifications({ ...notifications });
+      setNotifications({ ...notifications, [getKey(notification)]: notification });
     },
-    [notifications]
+    [notifications, getKey]
   );
 
   const { markUnseen, markSeen, markCleared } = useMemo(
     () => ({
       markUnseen: (notification: Notification) => {
-        if (notification.status < NotificationStatus.Unseen)
+        if (notification.status < NotificationStatus.Unseen) {
           updateStatus(notification, NotificationStatus.Unseen);
+        }
       },
       markSeen: (notification: Notification) => {
-        if (notification.status < NotificationStatus.Seen)
+        if (notification.status < NotificationStatus.Seen) {
           updateStatus(notification, NotificationStatus.Seen);
+        }
       },
       markCleared: (notification: Notification) => {
-        if (notification.status < NotificationStatus.Cleared)
+        if (notification.status < NotificationStatus.Cleared) {
           updateStatus(notification, NotificationStatus.Cleared);
+        }
       },
     }),
     [updateStatus]
@@ -97,33 +133,37 @@ const useNotificationsContext = () => {
 
           const notification = notifications[key];
 
-          // New unique key - create new notification
-          if (!notification) {
-            const notification = (notifications[key] = {
-              id,
-              type,
-              timestamps: {},
-              updateKey,
-            } as Notification);
+          // Filter out notifications that are not enabled
+          if (notificationPreferences[type] !== false) {
+            // New unique key - create new notification
+            if (!notification) {
+              const notification = (notifications[key] = {
+                id,
+                type,
+                timestamps: {},
+                updateKey,
+              } as Notification);
+              updateStatus(
+                notification,
+                isNew ? NotificationStatus.Triggered : NotificationStatus.Cleared
+              );
+            } else if (JSON.stringify(updateKey) !== JSON.stringify(notification.updateKey)) {
+              // updateKey changed - update existing notification
 
-            updateStatus(
-              notification,
-              isNew ? NotificationStatus.Triggered : NotificationStatus.Cleared
-            );
-          }
+              const notification = notifications[key];
 
-          // updateKey changed - update existing notification
-          else if (JSON.stringify(updateKey) !== JSON.stringify(notification.updateKey)) {
-            const notification = notifications[key];
-
-            notification.updateKey = updateKey;
-            updateStatus(notification, NotificationStatus.Updated);
+              notification.updateKey = updateKey;
+              updateStatus(notification, NotificationStatus.Updated);
+            }
+          } else {
+            // Notification is disabled - remove it
+            delete notifications[key];
           }
 
           notificationsDisplayData[key] = displayData;
           setNotificationsDisplayData({ ...notificationsDisplayData });
         },
-        [notifications, updateStatus]
+        [notifications, updateStatus, notificationPreferences[type]]
       ),
 
       lastUpdated: notificationsLastUpdated,
@@ -136,10 +176,8 @@ const useNotificationsContext = () => {
     )
   );
 
-  const onNotificationAction = useCallback(
-    async (notification: Notification) => await actions[notification.type]?.(notification.id),
-    [actions]
-  );
+  const onNotificationAction = async (notification: Notification) =>
+    await actions[notification.type]?.(notification.id);
 
   // Push notifications
   const [hasEnabledPush, setHasEnabledPush] = useLocalStorage({
@@ -186,7 +224,7 @@ const useNotificationsContext = () => {
             renotify: true,
             tag: getKey(notification),
             data: notification,
-            body: displayData.description,
+            description: displayData.body,
             icon: iconUrl ?? '/favicon.svg',
             badge: iconUrl ?? '/favicon.svg',
             image: iconUrl ?? '/favicon.svg',
@@ -208,7 +246,7 @@ const useNotificationsContext = () => {
 
       setPushNotificationsLastUpdated(Date.now());
     })();
-  }, [hasEnabledPush, notifications, onNotificationAction, markSeen]);
+  }, [hasEnabledPush, notifications, markSeen]);
 
   // Menu state
   const [isMenuOpen, setIsMenuOpen] = useState(false);
@@ -239,5 +277,13 @@ const useNotificationsContext = () => {
     // Menu state
     isMenuOpen,
     setIsMenuOpen,
+
+    // Notification Preferences
+    notificationPreferences,
+    setNotificationPreferences,
+    getNotificationPreferenceForType: useCallback(
+      (type: NotificationType) => notificationPreferences[type],
+      [notificationPreferences]
+    ),
   };
 };

src/hooks/useOrderbookValues.ts

@@ -0,0 +1,44 @@
+import { useMemo } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+
+import { DepthChartSeries, DepthChartDatum } from '@/constants/charts';
+
+import { getCurrentMarketOrderbook } from '@/state/perpetualsSelectors';
+
+import { MustBigNumber } from '@/lib/numbers';
+
+export const useOrderbookValuesForDepthChart = () => {
+  const orderbook = useSelector(getCurrentMarketOrderbook, shallowEqual);
+
+  return useMemo(() => {
+    const bids = (orderbook?.bids?.toArray() ?? [])
+      .filter(Boolean)
+      .map((datum) => ({ ...datum, seriesKey: DepthChartSeries.Bids } as DepthChartDatum));
+
+    const asks = (orderbook?.asks?.toArray() ?? [])
+      .filter(Boolean)
+      .map((datum) => ({ ...datum, seriesKey: DepthChartSeries.Asks } as DepthChartDatum));
+
+    const lowestBid = bids[bids.length - 1];
+    const highestBid = bids[0];
+    const lowestAsk = asks[0];
+    const highestAsk = asks[asks.length - 1];
+
+    const midMarketPrice = orderbook?.midPrice;
+    const spread = MustBigNumber(lowestAsk?.price ?? 0).minus(highestBid?.price ?? 0);
+    const spreadPercent = orderbook?.spreadPercent;
+
+    return {
+      bids,
+      asks,
+      lowestBid,
+      highestBid,
+      lowestAsk,
+      highestAsk,
+      midMarketPrice,
+      spread,
+      spreadPercent,
+      orderbook,
+    };
+  }, [orderbook]);
+};

src/hooks/useSquid.tsx

@@ -1,46 +0,0 @@
-import { createContext, useContext, useEffect, useMemo, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { Squid } from '@0xsquid/sdk';
-
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-
-import { getSelectedNetwork } from '@/state/appSelectors';
-
-export const NATIVE_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
-
-export const STATUS_ERROR_GRACE_PERIOD = 120_000;
-
-const useSquidContext = () => {
-  const selectedNetwork = useSelector(getSelectedNetwork);
-  const [_, setInitialized] = useState(false);
-
-  const initializeClient = async () => {
-    setInitialized(false);
-    if (!squid) return;
-    await squid.init();
-    setInitialized(true);
-  };
-
-  const squid = useMemo(
-    () => new Squid({ baseUrl: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.endpoints['0xsquid'] }),
-    [selectedNetwork]
-  );
-
-  useEffect(() => {
-    if (squid) {
-      initializeClient();
-    }
-  }, [squid]);
-
-  return squid;
-};
-
-type SquidContextType = ReturnType<typeof useSquidContext>;
-const SquidContext = createContext<SquidContextType | undefined>(undefined);
-SquidContext.displayName = '0xSquid';
-
-export const SquidProvider = ({ ...props }) => (
-  <SquidContext.Provider value={useSquidContext()} {...props} />
-);
-
-export const useSquid = () => useContext(SquidContext);

src/hooks/useSubaccount.tsx

@@ -31,6 +31,7 @@ import { log } from '@/lib/telemetry';
 import { useAccounts } from './useAccounts';
 import { useTokenConfigs } from './useTokenConfigs';
 import { useDydxClient } from './useDydxClient';
+import { hashFromTx } from '@/lib/hashfromTx';
 
 type SubaccountContextType = ReturnType<typeof useSubaccountContext>;
 const SubaccountContext = createContext<SubaccountContextType>({} as SubaccountContextType);
@@ -48,7 +49,7 @@ export const useSubaccount = () => useContext(SubaccountContext);
 
 export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: LocalWallet }) => {
   const dispatch = useDispatch();
-  const { usdcDenom } = useTokenConfigs();
+  const { usdcDenom, usdcDecimals } = useTokenConfigs();
   const { compositeClient, faucetClient } = useDydxClient();
 
   const { getFaucetFunds } = useMemo(
@@ -79,16 +80,34 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         subaccountClient: SubaccountClient;
         assetId?: number;
         amount: number;
-      }) => await compositeClient?.depositToSubaccount(subaccountClient, amount.toString()),
-
+      }) => {
+        try {
+          return await compositeClient?.depositToSubaccount(
+            subaccountClient,
+            amount.toFixed(usdcDecimals)
+          );
+        } catch (error) {
+          log('useSubaccount/depositToSubaccount', error);
+          throw error;
+        }
+      },
       withdrawFromSubaccount: async ({
         subaccountClient,
         amount,
       }: {
         subaccountClient: SubaccountClient;
         amount: number;
-      }) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount.toString()),
-
+      }) => {
+        try {
+          return await compositeClient?.withdrawFromSubaccount(
+            subaccountClient,
+            amount.toFixed(usdcDecimals)
+          );
+        } catch (error) {
+          log('useSubaccount/withdrawFromSubaccount', error);
+          throw error;
+        }
+      },
       transferFromSubaccountToAddress: async ({
         subaccountClient,
         assetId = 0,
@@ -99,27 +118,33 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         assetId?: number;
         amount: number;
         recipient: string;
-      }) =>
-        await compositeClient?.validatorClient.post.send(
-          subaccountClient?.wallet,
-          () =>
-            new Promise((resolve) => {
-              const msg =
-                compositeClient?.validatorClient.post.composer.composeMsgWithdrawFromSubaccount(
-                  subaccountClient.address,
-                  subaccountClient.subaccountNumber,
-                  assetId,
-                  Long.fromNumber(amount * QUANTUM_MULTIPLIER),
-                  recipient
-                );
+      }) => {
+        try {
+          return await compositeClient?.validatorClient.post.send(
+            subaccountClient?.wallet,
+            () =>
+              new Promise((resolve) => {
+                const msg =
+                  compositeClient?.validatorClient.post.composer.composeMsgWithdrawFromSubaccount(
+                    subaccountClient.address,
+                    subaccountClient.subaccountNumber,
+                    assetId,
+                    Long.fromNumber(amount * QUANTUM_MULTIPLIER),
+                    recipient
+                  );
 
-              resolve([msg]);
-            }),
-          false,
-          undefined,
-          undefined,
-          Method.BroadcastTxCommit
-        ),
+                resolve([msg]);
+              }),
+            false,
+            undefined,
+            undefined,
+            Method.BroadcastTxCommit
+          );
+        } catch (error) {
+          log('useSubaccount/transferFromSubaccountToAddress', error);
+          throw error;
+        }
+      },
 
       transferNativeToken: async ({
         subaccountClient,
@@ -129,24 +154,30 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         subaccountClient: SubaccountClient;
         amount: number;
         recipient: string;
-      }) =>
-        await compositeClient?.validatorClient.post.send(
-          subaccountClient.wallet,
-          () =>
-            new Promise((resolve) => {
-              const msg = compositeClient?.sendTokenMessage(
-                subaccountClient.wallet,
-                amount.toString(),
-                recipient,
-              );
+      }) => {
+        try {
+          return await compositeClient?.validatorClient.post.send(
+            subaccountClient.wallet,
+            () =>
+              new Promise((resolve) => {
+                const msg = compositeClient?.sendTokenMessage(
+                  subaccountClient.wallet,
+                  amount.toString(),
+                  recipient
+                );
 
-              resolve([msg]);
-            }),
-          false,
-          compositeClient?.validatorClient?.post.defaultDydxGasPrice,
-          undefined,
-          Method.BroadcastTxCommit
-        ),
+                resolve([msg]);
+              }),
+            false,
+            compositeClient?.validatorClient?.post.defaultDydxGasPrice,
+            undefined,
+            Method.BroadcastTxCommit
+          );
+        } catch (error) {
+          log('useSubaccount/transferNativeToken', error);
+          throw error;
+        }
+      },
 
       sendSquidWithdrawFromSubaccount: async ({
         subaccountClient,
@@ -158,20 +189,27 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         payload: string;
       }) => {
         if (!compositeClient) throw new Error('client not initialized');
+        try {
+          const transaction = JSON.parse(payload);
 
-        const transaction = JSON.parse(payload);
+          const msg = compositeClient.withdrawFromSubaccountMessage(
+            subaccountClient,
+            amount.toFixed(usdcDecimals)
+          );
+          const ibcMsg: EncodeObject = {
+            typeUrl: transaction.msgTypeUrl,
+            value: transaction.msg,
+          };
 
-        const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount.toString());
-        const ibcMsg: EncodeObject = {
-          typeUrl: transaction.msgTypeUrl,
-          value: transaction.msg,
-        };
-
-        return await compositeClient.send(
-          subaccountClient.wallet,
-          () => Promise.resolve([msg, ibcMsg]),
-          false
-        );
+          return await compositeClient.send(
+            subaccountClient.wallet,
+            () => Promise.resolve([msg, ibcMsg]),
+            false
+          );
+        } catch (error) {
+          log('useSubaccount/sendSquidWithdrawFromSubaccount', error);
+          throw error;
+        }
       },
     }),
     [compositeClient]
@@ -256,12 +294,29 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
   );
 
   const sendSquidWithdraw = useCallback(
-    async (amount: number, payload: string) => {
+    async (amount: number, payload: string, isCctp?: boolean) => {
+      
+      const cctpWithdraw = () => {
+        return new Promise<string>((resolve, reject) => 
+          abacusStateManager.cctpWithdraw((success, error, data) => {
+            const parsedData = JSON.parse(data);
+            if (success && parsedData?.code == 0) {
+              resolve(parsedData?.transactionHash);
+            } else {
+              reject(error);
+            }
+          })
+        )
+      }
+      if (isCctp) {
+        return await cctpWithdraw();
+      }
+
       if (!subaccountClient) {
         return;
       }
-
-      return await sendSquidWithdrawFromSubaccount({ subaccountClient, amount, payload });
+      const tx = await sendSquidWithdrawFromSubaccount({ subaccountClient, amount, payload });
+      return hashFromTx(tx?.hash);
     },
     [subaccountClient, sendSquidWithdrawFromSubaccount]
   );
@@ -313,11 +368,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         placeOrderParams = abacusStateManager.placeOrder(callback);
       }
 
-      track(AnalyticsEvent.TradePlaceOrder, {
-        ...placeOrderParams,
-        isClosePosition,
-      } as HumanReadablePlaceOrderPayload & { isClosePosition: boolean });
-
       return placeOrderParams;
     },
     [subaccountClient]
@@ -346,7 +396,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
     }) => {
       const callback = (success: boolean, parsingError?: Nullable<ParsingError>) => {
         if (success) {
-          track(AnalyticsEvent.TradeCancelOrder);
           onSuccess?.();
         } else {
           onError?.({ errorStringKey: parsingError?.stringKey });

src/hooks/useTokenConfigs.ts

@@ -19,8 +19,10 @@ export const useTokenConfigs = (): {
     },
   };
   usdcDenom: string;
+  usdcDecimals: number;
   usdcLabel: string;
   chainTokenDenom: string;
+  chainTokenDecimals: number;
   chainTokenLabel: string;
 } => {
   const { selectedNetwork } = useSelectedNetwork();
@@ -29,8 +31,10 @@ export const useTokenConfigs = (): {
   return { 
     tokensConfigs,
     usdcDenom: tokensConfigs[DydxChainAsset.USDC].denom, 
+    usdcDecimals: tokensConfigs[DydxChainAsset.USDC].decimals, 
     usdcLabel: tokensConfigs[DydxChainAsset.USDC].name,
     chainTokenDenom: tokensConfigs[DydxChainAsset.CHAINTOKEN].denom,
+    chainTokenDecimals: tokensConfigs[DydxChainAsset.CHAINTOKEN].decimals, 
     chainTokenLabel: tokensConfigs[DydxChainAsset.CHAINTOKEN].name,
   };
 };

src/hooks/useTradeFormInputs.ts

@@ -0,0 +1,30 @@
+import { getTradeFormInputs } from '@/state/inputsSelectors';
+import { useEffect } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+
+import { TradeInputField } from '@/constants/abacus';
+
+import abacusStateManager from '@/lib/abacus';
+
+export const useTradeFormInputs = () => {
+  const tradeFormInputValues = useSelector(getTradeFormInputs, shallowEqual);
+  const { limitPriceInput, triggerPriceInput, trailingPercentInput } = tradeFormInputValues;
+
+  useEffect(() => {
+    abacusStateManager.setTradeValue({
+      value: triggerPriceInput,
+      field: TradeInputField.triggerPrice,
+    });
+  }, [triggerPriceInput]);
+
+  useEffect(() => {
+    abacusStateManager.setTradeValue({ value: limitPriceInput, field: TradeInputField.limitPrice });
+  }, [limitPriceInput]);
+
+  useEffect(() => {
+    abacusStateManager.setTradeValue({
+      value: trailingPercentInput,
+      field: TradeInputField.trailingPercent,
+    });
+  }, [trailingPercentInput]);
+};

src/hooks/useURLConfigs.ts

@@ -0,0 +1,50 @@
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+
+import { useSelectedNetwork } from '@/hooks';
+
+const FALLBACK_URL = 'https://help.dydx.exchange/';
+
+export interface LinksConfigs {
+  tos: string,
+  privacy: string,
+  mintscan: string,
+  mintscanBase: string,
+  feedback?: string,
+  help?: string,
+  blogs?: string,
+  foundation?: string,
+  initialMarginFractionLearnMore?: string,
+  reduceOnlyLearnMore?: string,
+  documentation?: string,
+  community?: string,
+  governanceLearnMore?: string,
+  stakingLearnMore?: string,
+  keplrDashboard?: string,
+  accountExportLearnMore?: string,
+  walletLearnMore?: string
+}
+
+export const useURLConfigs = (): LinksConfigs => {
+  const { selectedNetwork } = useSelectedNetwork();
+  const linksConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].links as LinksConfigs;
+
+  return {
+    tos: linksConfigs.tos,
+    privacy: linksConfigs.privacy,
+    mintscan: linksConfigs.mintscan,
+    mintscanBase: linksConfigs.mintscanBase,
+    feedback: linksConfigs.feedback || FALLBACK_URL,
+    help: linksConfigs.help || FALLBACK_URL,
+    blogs: linksConfigs.blogs || FALLBACK_URL,
+    foundation: linksConfigs.foundation || FALLBACK_URL,
+    initialMarginFractionLearnMore: linksConfigs.initialMarginFractionLearnMore || FALLBACK_URL,
+    reduceOnlyLearnMore: linksConfigs.reduceOnlyLearnMore || FALLBACK_URL,
+    documentation: linksConfigs.documentation || FALLBACK_URL,
+    community: linksConfigs.community || FALLBACK_URL,
+    governanceLearnMore: linksConfigs.governanceLearnMore || FALLBACK_URL,
+    stakingLearnMore: linksConfigs.stakingLearnMore || FALLBACK_URL,
+    keplrDashboard: linksConfigs.keplrDashboard || FALLBACK_URL,
+    accountExportLearnMore: linksConfigs.accountExportLearnMore || FALLBACK_URL,
+    walletLearnMore: linksConfigs.walletLearnMore || FALLBACK_URL,
+  };
+};

src/hooks/useWalletConnection.ts

@@ -1,5 +1,6 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState, useMemo } from 'react';
 import { useSelector } from 'react-redux';
+import { usePrivy, useLogout } from '@privy-io/react-auth';
 
 import { LocalStorageKey } from '@/constants/localStorage';
 import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
@@ -90,20 +91,24 @@ export const useWalletConnection = () => {
 
   const selectedNetwork = useSelector(getSelectedNetwork);
   const walletConnectConfig = ENVIRONMENT_CONFIG_MAP[selectedNetwork].wallets.walletconnect;
-
-  const { connectAsync: connectWagmi } =
-    walletType && walletConnectionType
-      ? useConnectWagmi({
-          connector: resolveWagmiConnector({
+  const wagmiConnector = useMemo(
+    () =>
+      walletType && walletConnectionType
+        ? resolveWagmiConnector({
             walletType,
             walletConnection: {
               type: walletConnectionType,
             },
             walletConnectConfig,
-          }),
-        })
-      : useConnectWagmi();
+          })
+        : undefined,
+    [walletConnectConfig, walletType, walletConnectionType]
+  );
+
+  const { connectAsync: connectWagmi } = useConnectWagmi({ connector: wagmiConnector });
   const { suggestAndConnect: connectGraz } = useConnectGraz();
+  const { login, ready, authenticated } = usePrivy();
+  const { logout } = useLogout();
 
   const connectWallet = useCallback(
     async ({ walletType }: { walletType: WalletType }) => {
@@ -112,6 +117,11 @@ export const useWalletConnection = () => {
       try {
         if (!walletConnection) {
           throw new Error('Onboarding: No wallet connection found.');
+        } else if (walletConnection.type === WalletConnectionType.Privy) {
+
+          if (!isConnectedWagmi && !authenticated && ready) {
+            login();
+          }
         } else if (walletConnection.type === WalletConnectionType.CosmosSigner) {
           const cosmosWalletType = {
             [WalletType.Keplr as string]: CosmosWalletType.KEPLR,
@@ -154,7 +164,7 @@ export const useWalletConnection = () => {
         walletConnectionType: walletConnection.type,
       };
     },
-    [isConnectedGraz, signerGraz, isConnectedWagmi, signerWagmi]
+    [isConnectedGraz, signerGraz, isConnectedWagmi, signerWagmi, login, ready, authenticated]
   );
 
   const disconnectWallet = useCallback(async () => {
@@ -163,6 +173,7 @@ export const useWalletConnection = () => {
 
     if (isConnectedWagmi) await disconnectWagmi();
     if (isConnectedGraz) await disconnectGraz();
+    if (authenticated) await logout();
   }, [isConnectedGraz, isConnectedWagmi]);
 
   // Wallet selection

src/icons/caret-down.svg

@@ -1,3 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M14 6L7.83335 10.5L2 6" stroke="currentColor" stroke-width="2.25" stroke-linecap="round"/>
-</svg>
+<svg fill="none" height="10" viewBox="0 0 15 10" width="15" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m.321829 1.09389c.200562-.192959.469529-.298401.747791-.29315.27827.00525.54307.120763.73621.32115l5.194 5.5132 5.19397-5.5132c.0944-.10408.2088-.188152.3363-.247234.1275-.059081.2655-.091968.406-.096713.1404-.004746.2804.018748.4116.069088s.2509.126504.3522.223979c.1012.09747.1818.21427.2371.34347.0552.12921.084.26819.0845.40871.0006.14052-.0271.27972-.0813.40936s-.1339.24707-.2344.34534l-5.94997 6.3c-.09795.10163-.21538.18245-.34527.23766-.1299.05521-.26959.08367-.41073.08367s-.28083-.02846-.41073-.08367c-.12989-.05521-.24732-.13603-.34527-.23766l-5.950001-6.3c-.192962-.20056-.29840394-.46953-.29315364-.74779.00525031-.27827.12076264-.54307.32115364-.73621z" fill="currentColor" fill-rule="evenodd"/></svg>

src/icons/check-circle.svg

@@ -0,0 +1,6 @@
+<svg width="27" height="28" viewBox="0 0 27 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame">
+<path id="Vector" d="M9.5 15L12.5 18L17.5 11M25.5 14C25.5 15.5759 25.1896 17.1363 24.5866 18.5922C23.9835 20.0481 23.0996 21.371 21.9853 22.4853C20.871 23.5996 19.5481 24.4835 18.0922 25.0866C16.6363 25.6896 15.0759 26 13.5 26C11.9241 26 10.3637 25.6896 8.9078 25.0866C7.45189 24.4835 6.12902 23.5996 5.01472 22.4853C3.90042 21.371 3.0165 20.0481 2.41345 18.5922C1.81039 17.1363 1.5 15.5759 1.5 14C1.5 10.8174 2.76428 7.76516 5.01472 5.51472C7.26516 3.26428 10.3174 2 13.5 2C16.6826 2 19.7348 3.26428 21.9853 5.51472C24.2357 7.76516 25.5 10.8174 25.5 14Z" stroke="#3ED9A4" stroke-opacity="0.5" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_2" d="M9.5 15L12.5 18L17.5 11" stroke="#3ED9A4" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>

src/icons/check.svg

@@ -1,4 +1,4 @@
 <svg width="13" height="12" viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M2 6.39098L5.68182 10L11 2" stroke="currentColor" stroke-width="3" stroke-linecap="round"
+  <path d="M2 6.39098L5.68182 10L11 2" stroke="currentColor" stroke-width="2" stroke-linecap="round"
     stroke-linejoin="round" />
 </svg>

src/icons/cube.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.95513 1.00169C7.89506 1.00645 7.83628 1.02054 7.78124 1.04337L1.31971 3.71042C1.2243 3.74983 1.14329 3.81414 1.08653 3.89553C1.02977 3.97691 0.999705 4.07186 1 4.16883V11.8366C1.00078 11.9327 1.03135 12.0265 1.08805 12.1069C1.14474 12.1873 1.22517 12.2508 1.31971 12.2898L7.78124 14.9568C7.85011 14.9853 7.92463 15 8 15C8.07536 15 8.14989 14.9853 8.21876 14.9568L14.6803 12.2898C14.7748 12.2508 14.8552 12.1873 14.9119 12.1069C14.9686 12.0265 14.9992 11.9327 15 11.8366V4.16883C15.0003 4.07186 14.9702 3.97691 14.9134 3.89553C14.8567 3.81414 14.7756 3.74983 14.6803 3.71042L8.21876 1.04337C8.13605 1.00911 8.04538 0.994778 7.95513 1.00169ZM8 2.04351L13.1378 4.16883L8 6.28894L2.86219 4.16883L8 2.04351ZM2.07693 4.93457L7.46153 7.15886V13.7328L2.07693 11.5084V4.93457ZM13.923 4.93457V11.5084L8.53846 13.7328V7.15886L13.923 4.93457Z" fill="currentColor"/>
-</svg>

src/icons/deposit.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+  <g clip-path="url(#clip0_18204_36775)">
+    <path d="M13.2426 6.25736C14.0817 7.09647 14.6531 8.16557 14.8846 9.32946C15.1162 10.4933 14.9973 11.6997 14.5432 12.7961C14.0891 13.8925 13.32 14.8295 12.3334 15.4888C11.3467 16.1481 10.1866 16.5 8.99993 16.5C7.81324 16.5 6.6532 16.1481 5.66651 15.4888C4.67981 14.8295 3.91078 13.8925 3.45665 12.7961C3.00253 11.6997 2.88371 10.4933 3.11522 9.32946C3.34673 8.16557 3.91817 7.09647 4.75729 6.25736" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round"/>
+    <path d="M11.25 9L9 11.25M9 11.25L6.75 9M9 11.25V1.6875" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round" stroke-linejoin="round"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_18204_36775">
+      <rect width="18" height="18" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>

src/icons/index.ts

@@ -10,6 +10,7 @@ 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 CheckCircleIcon } from './check-circle.svg';
 export { default as ChevronLeftIcon } from './chevron-left.svg';
 export { default as ChevronRightIcon } from './chevron-right.svg';
 export { default as ClockIcon } from './clock.svg';
@@ -18,7 +19,7 @@ export { default as CoinMarketCapIcon } from './logos/coinmarketcap.svg';
 export { default as CoinsIcon } from './coins.svg';
 export { default as CommentIcon } from './comment.svg';
 export { default as CopyIcon } from './copy.svg';
-export { default as CubeIcon } from './cube.svg';
+export { default as DepositIcon } from './deposit.svg';
 export { default as DepthChartIcon } from './depth-chart.svg';
 export { default as DiscordIcon } from './discord.svg';
 export { default as ExportKeysIcon } from './export-keys.svg';
@@ -30,6 +31,7 @@ export { default as GiftboxIcon } from './giftbox.svg';
 export { default as HelpCircleIcon } from './help-circle.svg';
 export { default as HideIcon } from './hide.svg';
 export { default as HistoryIcon } from './history.svg';
+export { default as LeaderboardIcon } from './leaderboard.svg';
 export { default as LinkOutIcon } from './link-out.svg';
 export { default as LockIcon } from './lock.svg';
 export { default as LogoShortIcon } from './logo-short';
@@ -41,12 +43,14 @@ export { default as OrderbookIcon } from './orderbook.svg';
 export { default as OverviewIcon } from './overview.svg';
 export { default as PencilIcon } from './pencil.svg';
 export { default as PlayIcon } from './play.svg';
+export { default as PlusIcon } from './plus.svg';
 export { default as PortfolioIcon } from './portfolio.svg';
 export { default as PositionsIcon } from './positions.svg';
 export { default as PriceChartIcon } from './price-chart.svg';
 export { default as PrivacyIcon } from './privacy.svg';
 export { default as ProfileIcon } from './profile.svg';
 export { default as QrIcon } from './qr.svg';
+export { default as RewardStarIcon } from './reward-star.svg';
 export { default as SearchIcon } from './search.svg';
 export { default as SendIcon } from './send.svg';
 export { default as ShareIcon } from './share.svg';
@@ -59,6 +63,7 @@ export { default as TransferIcon } from './transfer.svg';
 export { default as TriangleIcon } from './triangle.svg';
 export { default as TryAgainIcon } from './try-again.svg';
 export { default as WarningIcon } from './warning.svg';
+export { default as WithdrawIcon } from './withdraw.svg';
 
 // Wallets
 export { default as BitkeepIcon } from './wallets/bitkeep.svg';

src/icons/leaderboard.svg

@@ -0,0 +1,3 @@
+<svg width="13" height="14" viewBox="0 0 13 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.0996094 2.60156C0.0996094 2.07113 0.310323 1.56242 0.685396 1.18735C1.06047 0.812276 1.56918 0.601563 2.09961 0.601562H10.8996C11.43 0.601563 11.9387 0.812276 12.3138 1.18735C12.6889 1.56242 12.8996 2.07113 12.8996 2.60156C12.8996 3.132 12.6889 3.6407 12.3138 4.01578C11.9387 4.39085 11.43 4.60156 10.8996 4.60156H2.09961C1.56918 4.60156 1.06047 4.39085 0.685396 4.01578C0.310323 3.6407 0.0996094 3.132 0.0996094 2.60156ZM0.699609 6.26796C0.540479 6.26796 0.387867 6.33118 0.275345 6.4437C0.162823 6.55622 0.0996094 6.70883 0.0996094 6.86796C0.0996094 7.02709 0.162823 7.1797 0.275345 7.29223C0.387867 7.40475 0.540479 7.46796 0.699609 7.46796H12.2996C12.4587 7.46796 12.6114 7.40475 12.7239 7.29223C12.8364 7.1797 12.8996 7.02709 12.8996 6.86796C12.8996 6.70883 12.8364 6.55622 12.7239 6.4437C12.6114 6.33118 12.4587 6.26796 12.2996 6.26796H0.699609ZM0.699609 9.13196C0.540479 9.13196 0.387867 9.19518 0.275345 9.3077C0.162823 9.42022 0.0996094 9.57283 0.0996094 9.73196C0.0996094 9.89109 0.162823 10.0437 0.275345 10.1562C0.387867 10.2687 0.540479 10.332 0.699609 10.332H12.2996C12.4587 10.332 12.6114 10.2687 12.7239 10.1562C12.8364 10.0437 12.8996 9.89109 12.8996 9.73196C12.8996 9.57283 12.8364 9.42022 12.7239 9.3077C12.6114 9.19518 12.4587 9.13196 12.2996 9.13196H0.699609ZM0.699609 12.0016C0.540479 12.0016 0.387867 12.0648 0.275345 12.1773C0.162823 12.2898 0.0996094 12.4424 0.0996094 12.6016C0.0996094 12.7607 0.162823 12.9133 0.275345 13.0258C0.387867 13.1383 0.540479 13.2016 0.699609 13.2016H12.2996C12.4587 13.2016 12.6114 13.1383 12.7239 13.0258C12.8364 12.9133 12.8996 12.7607 12.8996 12.6016C12.8996 12.4424 12.8364 12.2898 12.7239 12.1773C12.6114 12.0648 12.4587 12.0016 12.2996 12.0016H0.699609Z" fill="currentColor"/>
+</svg>

src/icons/plus.svg

@@ -0,0 +1 @@
+<svg fill="none" height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6.75.75c0-.198912-.07902-.389678-.21967-.53033-.14065-.1406525-.33142-.21967-.53033-.21967s-.38968.0790175-.53033.21967c-.14065.140652-.21967.331418-.21967.53033v4.5h-4.5c-.198912 0-.389678.07902-.53033.21967-.1406525.14065-.21967.33142-.21967.53033s.0790175.38968.21967.53033c.140652.14065.331418.21967.53033.21967h4.5v4.5c0 .1989.07902.3897.21967.5303.14065.1407.33142.2197.53033.2197s.38968-.079.53033-.2197c.14065-.1406.21967-.3314.21967-.5303v-4.5h4.5c.1989 0 .3897-.07902.5303-.21967.1407-.14065.2197-.33142.2197-.53033s-.079-.38968-.2197-.53033c-.1406-.14065-.3314-.21967-.5303-.21967h-4.5z" fill="currentColor"/></svg>

src/icons/wallets/generic-wallet.svg

@@ -1,5 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-  <g fill="#FFFFFF">
-    <path d="M461.2 128H80c-8.84 0-16-7.16-16-16s7.16-16 16-16h384c8.84 0 16-7.16 16-16 0-26.51-21.49-48-48-48H64C28.65 32 0 60.65 0 96v320c0 35.35 28.65 64 64 64h397.2c28.02 0 50.8-21.53 50.8-48V176c0-26.47-22.78-48-50.8-48zM416 336c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32z"/>
-  </g>
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Wallet" clip-path="url(#clip0_14122_34311)">
+<g id="Group 151">
+<path id="Exclude" fill-rule="evenodd" clip-rule="evenodd" d="M11.4979 10.9976C11.1764 11.3193 10.7404 11.5 10.2857 11.5L1.71429 11.5C1.25963 11.5 0.823594 11.3193 0.502102 10.9976C0.180612 10.6758 -4.76837e-07 10.2395 -4.76837e-07 9.78455L-4.76837e-07 2.06502C-4.76837e-07 2.51999 0.180612 2.95632 0.502102 3.27803C0.823594 3.59974 1.25963 3.78047 1.71429 3.78047L10.2857 3.78047C10.7404 3.78047 11.1764 3.96121 11.4979 4.28292C11.8194 4.60462 12 5.04096 12 5.49592V9.78455C12 10.2395 11.8194 10.6758 11.4979 10.9976ZM9.64294 8.7126C10.2347 8.7126 10.7144 8.23258 10.7144 7.64044C10.7144 7.0483 10.2347 6.56828 9.64294 6.56828C9.05121 6.56828 8.57151 7.0483 8.57151 7.64044C8.57151 8.23258 9.05121 8.7126 9.64294 8.7126Z" fill="#C8C7D8"/>
+<path id="Vector" d="M8.57031 2.92186V2.06413C8.57031 1.60917 8.3897 1.17284 8.06821 0.851128C7.74672 0.529419 7.31068 0.348684 6.85603 0.348684L2.14174 0.348684C1.80075 0.348684 1.47372 0.484235 1.2326 0.725517C0.991486 0.966799 0.856028 1.29405 0.856028 1.63527C0.856028 1.9765 0.991486 2.30374 1.2326 2.54503C1.47372 2.78631 1.80075 2.92186 2.14174 2.92186L8.57031 2.92186Z" fill="#C8C7D8"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_14122_34311">
+<rect width="12" height="12" fill="white"/>
+</clipPath>
+</defs>
 </svg>