privy theme

PWA
Noble deposit
2024-01-18 21:22:44 -08:00 · 2024-01-18 19:55:43 -08:00 · 2024-01-18 19:10:16 -08:00 · 2024-01-18 12:36:10 -08:00 · 2024-01-18 12:28:57 -08:00 · 2024-01-18 12:21:47 -08:00
102 changed files with 6463 additions and 2042 deletions
@@ -0,0 +1 @@
 if('serviceWorker' in navigator) navigator.serviceWorker.register('/dev-sw.js?dev-sw', { scope: '/', type: 'classic' })
@@ -39,11 +39,14 @@
    "@cosmjs/proto-signing": "^0.31.0",
    "@cosmjs/stargate": "^0.31.0",
    "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^1.1.4",
+    "@dydxprotocol/v4-abacus": "^1.2.5",
-    "@dydxprotocol/v4-client-js": "^1.0.6",
+    "@dydxprotocol/v4-client-js": "^1.0.11",
-    "@dydxprotocol/v4-localization": "^1.0.17",
+    "@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",
@@ -110,8 +113,8 @@
    "reselect": "^4.1.8",
    "styled-components": "^5.3.11",
    "use-latest": "^1.2.1",
-    "viem": "^1.12.2",
+    "viem": "^1.20.0",
-    "wagmi": "^1.4.5"
+    "wagmi": "^1.4.12"
  },
  "devDependencies": {
    "@babel/core": "^7.22.5",
@@ -150,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",
@@ -1,61 +1,12 @@
 [
    {
        "chainId": "42161",
        "tokenAddress": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
        "name": "Arbitrum"
    },
    {
        "chainId": "43114",
        "tokenAddress": "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
        "name": "Avalanche"
    },
    {
        "chainId": "8453",
        "tokenAddress": "0x66627F389ae46D881773B7131139b2411980E09E",
        "name": "Base"
    },
    {
        "chainId": "1",
        "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
        "name": "Ethereum"
    },
    {
        "chainId": "10",
        "tokenAddress": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
        "name": "OP Mainnet"
    },
    {
        "chainId": "421613",
        "tokenAddress": "0xfd064a18f3bf249cf1f87fc203e90d8f650f2d63",
        "name": "Arbitrum Goerli"
    },
    {
        "chainId": "43113",
        "tokenAddress": "0x5425890298aed601595a70AB815c96711a31Bc65",
        "name": "Avalanche Fuji"
    },
    {
        "chainId": "84531",
        "tokenAddress": "0xf175520c52418dfe19c8098071a252da48cd1c19",
        "name": "Base Goerli"
    },
    {
        "chainId": "5",
        "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
        "name": "Ethereum Goerli"
    },
    {
        "chainId": "grand-1",
        "tokenAddress": "uusdc",
        "name": "Noble Testnet"
    },
    {
        "chainId": "420",
        "tokenAddress": "0xe05606174bac4a6364b31bd0eca4bf4dd368f8c6",
        "name": "OP Goerli"
    },
    {
        "chainId": "103",
        "name": "Solana Devnet"
    }
 ]
@@ -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"
        }
    ]
 }
@@ -39,10 +39,10 @@
   "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": {
@@ -71,7 +71,7 @@
               "https://validator.v4dev.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.0xsquid.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4dev.dydx.exchange"
         },
         "links": {
@@ -89,7 +89,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -113,10 +113,10 @@
      },
      "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": {
@@ -145,7 +145,7 @@
               "http://54.92.118.111"
            ],
            "0xsquid": "https://testnet.api.0xsquid.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love"
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
@@ -162,7 +162,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -186,10 +186,10 @@
      },
      "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": {
@@ -218,7 +218,7 @@
               "http://validator.v4dev4.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.0xsquid.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love"
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
@@ -235,7 +235,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -259,10 +259,10 @@
      },
      "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": {
@@ -291,7 +291,7 @@
               "http://18.223.78.50"
            ],
            "0xsquid": "https://testnet.api.0xsquid.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love"
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
@@ -308,7 +308,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -332,10 +332,10 @@
      },
      "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": {
@@ -365,7 +365,7 @@
               "https://validator.v4staging.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love"
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
@@ -383,7 +383,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -407,10 +407,10 @@
      },
      "dydxprotocol-staging-forced-update": {
         "name": "v4 Staging Forced Update",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
@@ -440,7 +440,7 @@
               "https://validator.v4staging.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love"
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
@@ -480,10 +480,10 @@
      },
      "dydxprotocol-staging-west": {
         "name": "v4 Staging West",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
@@ -513,7 +513,7 @@
               "https://validator-uswest1.v4staging.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love"
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
@@ -531,7 +531,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -555,10 +555,10 @@
      },
      "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": {
@@ -579,8 +579,8 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
@@ -591,7 +591,7 @@
               "https://dydx-rpc.liquify.com/api=8878132/dydx"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -610,7 +610,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -634,10 +634,10 @@
      },
      "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": {
@@ -666,7 +666,7 @@
               "https://validator.v4testnet.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -686,7 +686,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -710,10 +710,10 @@
      },
      "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": {
@@ -734,15 +734,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
               "https://dydx-testnet.nodefleet.org"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -762,7 +762,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -786,10 +786,10 @@
      },
      "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": {
@@ -810,15 +810,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
               "https://test-dydx.kingnodes.com"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -838,7 +838,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -862,10 +862,10 @@
      },
      "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": {
@@ -886,15 +886,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
               "https://dydx-rpc.liquify.com/api=8878132/dydx"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -914,7 +914,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -938,10 +938,10 @@
      },
      "dydxprotocol-testnet-polkachu": {
         "name": "v4 Public Testnet/Polkahcu",
-         "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": {
@@ -962,15 +962,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
               "https://dydx-testnet-rpc.polkachu.com/"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -1005,10 +1005,10 @@
      },
      "dydxprotocol-testnet-bware": {
         "name": "v4 Public Testnet/BWare",
-         "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": {
@@ -1029,15 +1029,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
               "https://dydx-testnet-full-rpc.public.blastapi.io/"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
-            "nobleValidator": "https://rpc.testnet.noble.strange.love",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -1084,7 +1084,7 @@
         "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": {
@@ -1126,7 +1126,7 @@
            "blogs": "[HTTP link to blogs, can be null]",
            "foundation": "[HTTP link to foundation, can be null]",
            "initialMarginFractionLearnMore": "[HTTP link to initial margin fraction learn more, can be null]",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "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]",
@@ -1,454 +1,360 @@
 {
-    "1INCH-USD":{
+  "1INCH-USD": {
-       "name":"1inch",
+    "name": "1inch",
-       "tags":[
+    "tags": ["Defi"],
-          "Defi"
+    "websiteLink": "https://1inch.io/",
-       ],
+    "whitepaperLink": "https://github.com/1inch",
-       "websiteLink":"https://1inch.io/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/1inch/"
-       "whitepaperLink":"https://github.com/1inch",
+  },
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/1inch/"
+  "AAVE-USD": {
-    },
+    "name": "Aave",
-    "AAVE-USD":{
+    "tags": ["Defi"],
-       "name":"Aave",
+    "websiteLink": "https://aave.com/",
-       "tags":[
+    "whitepaperLink": "https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
-          "Defi"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/aave/"
-       ],
+  },
-       "websiteLink":"https://aave.com/",
+  "ADA-USD": {
-       "whitepaperLink":"https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
+    "name": "Cardano",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aave/"
+    "tags": ["Layer 1"],
-    },
+    "websiteLink": "https://cardano.org/",
-    "ADA-USD":{
+    "whitepaperLink": "https://why.cardano.org/en/introduction/motivation/",
-       "name":"Cardano",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cardano/"
-       "tags":[
+  },
-          "Layer 1"
+  "ALGO-USD": {
-       ],
+    "name": "Algorand",
-       "websiteLink":"https://cardano.org/",
+    "tags": ["Layer 1"],
-       "whitepaperLink":"https://why.cardano.org/en/introduction/motivation/",
+    "websiteLink": "https://algorand.com/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cardano/"
+    "whitepaperLink": "https://algorand.com/technology/white-papers",
-    },
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/algorand/"
-    "ALGO-USD":{
+  },
-       "name":"Algorand",
+  "APE-USD": {
-       "tags":[
+    "name": "ApeCoin",
-          "Layer 1"
+    "tags": [],
-       ],
+    "websiteLink": "https://apecoin.com/",
-       "websiteLink":"https://algorand.com/",
+    "whitepaperLink": "https://apecoin.com/about",
-       "whitepaperLink":"https://algorand.com/technology/white-papers",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/apecoin-ape/"
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/algorand/"
+  },
-    },
+  "APT-USD": {
-    "APE-USD":{
+    "name": "Aptos",
-       "name":"ApeCoin",
+    "tags": ["Layer 1"],
-       "tags":[
+    "websiteLink": "https://aptoslabs.com/",
-          
+    "whitepaperLink": "https://aptos.dev/aptos-white-paper/",
-       ],
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/aptos/"
-       "websiteLink":"https://apecoin.com/",
+  },
-       "whitepaperLink":"https://apecoin.com/about",
+  "ARB-USD": {
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/apecoin-ape/"
+    "name": "Arbitrum",
-    },
+    "tags": [],
-    "APT-USD":{
+    "websiteLink": "https://arbitrum.io/",
-       "name":"Aptos",
+    "whitepaperLink": "https://github.com/OffchainLabs/nitro",
-       "tags":[
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/arbitrum/"
-          "Layer 1"
+  },
-       ],
+  "ATOM-USD": {
-       "websiteLink":"https://aptoslabs.com/",
+    "name": "Cosmos",
-       "whitepaperLink":"https://aptos.dev/aptos-white-paper/",
+    "tags": ["Layer 1"],
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aptos/"
+    "websiteLink": "https://cosmos.network/",
-    },
+    "whitepaperLink": "https://v1.cosmos.network/resources/whitepaper",
-    "ARB-USD":{
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cosmos/"
-       "name":"Arbitrum",
+  },
-       "tags":[
+  "AVAX-USD": {
-          
+    "name": "Avalanche",
-       ],
+    "tags": ["Layer 1"],
-       "websiteLink":"https://arbitrum.io/",
+    "websiteLink": "https://www.avalabs.org/",
-       "whitepaperLink":"https://github.com/OffchainLabs/nitro",
+    "whitepaperLink": "https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/arbitrum/"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/avalanche/"
-    },
+  },
-    "ATOM-USD":{
+  "BCH-USD": {
-       "name":"Cosmos",
+    "name": "Bitcoin Cash",
-       "tags":[
+    "tags": ["Layer 1"],
-          "Layer 1"
+    "websiteLink": "https://bitcoincash.org/",
-       ],
+    "whitepaperLink": "https://bitcoincash.org/",
-       "websiteLink":"https://cosmos.network/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin-cash/"
-       "whitepaperLink":"https://v1.cosmos.network/resources/whitepaper",
+  },
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cosmos/"
+  "BLUR-USD": {
-    },
+    "name": "Blur",
-    "AVAX-USD":{
+    "tags": [],
-       "name":"Avalanche",
+    "websiteLink": "https://blur.io/",
-       "tags":[
+    "whitepaperLink": "https://docs.blur.foundation/",
-          "Layer 1"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/blur-token/"
-       ],
+  },
-       "websiteLink":"https://www.avalabs.org/",
+  "CELO-USD": {
-       "whitepaperLink":"https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
+    "name": "Celo",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/avalanche/"
+    "tags": [],
-    },
+    "websiteLink": "https://celo.org",
-    "BCH-USD":{
+    "whitepaperLink": "https://docs.celo.org",
-       "name":"Bitcoin Cash",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/celo/"
-       "tags":[
+  },
-          "Layer 1"
+  "BTC-USD": {
-       ],
+    "name": "Bitcoin",
-       "websiteLink":"https://bitcoincash.org/",
+    "tags": ["Layer 1"],
-       "whitepaperLink":"https://bitcoincash.org/",
+    "websiteLink": "https://bitcoin.org/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin-cash/"
+    "whitepaperLink": "https://bitcoin.org/bitcoin.pdf",
-    },
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin/"
-    "BLUR-USD":{
+  },
-       "name":"Blur",
+  "COMP-USD": {
-       "tags":[
+    "name": "Compound",
-          
+    "tags": ["Defi"],
-       ],
+    "websiteLink": "https://compound.finance/",
-       "websiteLink":"https://blur.io/",
+    "whitepaperLink": "https://compound.finance/documents/Compound.Whitepaper.pdf",
-       "whitepaperLink":"https://docs.blur.foundation/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/compound/"
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/blur-token/"
+  },
-    },
+  "CRV-USD": {
-    "CELO-USD":{
+    "name": "Curve",
-       "name":"Celo",
+    "tags": ["Governance"],
-       "tags":[
+    "websiteLink": "https://curve.fi/",
-          
+    "whitepaperLink": "https://curve.fi/whitepaper",
-       ],
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/curve-dao-token/"
-       "websiteLink":"https://celo.org",
+  },
-       "whitepaperLink":"https://docs.celo.org",
+  "DOGE-USD": {
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/celo/"
+    "name": "Dogecoin",
-    },
+    "tags": ["Layer 1"],
-    "BTC-USD":{
+    "websiteLink": "https://dogecoin.com/",
-       "name":"Bitcoin",
+    "whitepaperLink": "https://github.com/dogecoin/dogecoin",
-       "tags":[
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/dogecoin/"
-          "Layer 1"
+  },
-       ],
+  "DOT-USD": {
-       "websiteLink":"https://bitcoin.org/",
+    "name": "Polkadot",
-       "whitepaperLink":"https://bitcoin.org/bitcoin.pdf",
+    "tags": ["Layer 1"],
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin/"
+    "websiteLink": "https://polkadot.network/",
-    },
+    "whitepaperLink": "https://polkadot.network/PolkaDotPaper.pdf",
-    "COMP-USD":{
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polkadot-new/"
-       "name":"Compound",
+  },
-       "tags":[
+  "ENJ-USD": {
-          "Defi"
+    "name": "Enjin",
-       ],
+    "tags": [],
-       "websiteLink":"https://compound.finance/",
+    "websiteLink": "https://enjin.io/",
-       "whitepaperLink":"https://compound.finance/documents/Compound.Whitepaper.pdf",
+    "whitepaperLink": "https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/compound/"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/enjin-coin/"
-    },
+  },
-    "CRV-USD":{
+  "EOS-USD": {
-       "name":"Curve",
+    "name": "EOS",
-       "tags":[
+    "tags": ["Layer 1"],
-          "Governance"
+    "websiteLink": "https://eos.io/",
-       ],
+    "whitepaperLink": "https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
-       "websiteLink":"https://curve.fi/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/eos/"
-       "whitepaperLink":"https://curve.fi/whitepaper",
+  },
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/curve-dao-token/"
+  "ETC-USD": {
-    },
+    "name": "Ethereum Classic",
-    "DOGE-USD":{
+    "tags": ["Layer 1"],
-       "name":"Dogecoin",
+    "websiteLink": "https://ethereumclassic.org/",
-       "tags":[
+    "whitepaperLink": "https://ethereumclassic.org/why-classic",
-          "Layer 1"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum-classic/"
-       ],
+  },
-       "websiteLink":"https://dogecoin.com/",
+  "ETH-USD": {
-       "whitepaperLink":"https://github.com/dogecoin/dogecoin",
+    "name": "Ethereum",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/dogecoin/"
+    "tags": ["Layer 1"],
-    },
+    "websiteLink": "https://ethereum.org/",
-    "DOT-USD":{
+    "whitepaperLink": "https://ethereum.org/whitepaper/",
-       "name":"Polkadot",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum/",
-       "tags":[
+    "displayStepSize": "0.001",
-          "Layer 1"
+    "displayTickSize": "0.1"
-       ],
+  },
-       "websiteLink":"https://polkadot.network/",
+  "FIL-USD": {
-       "whitepaperLink":"https://polkadot.network/PolkaDotPaper.pdf",
+    "name": "Filecoin",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polkadot-new/"
+    "tags": ["Layer 1"],
-    },
+    "websiteLink": "https://filecoin.io/",
-    "ENJ-USD":{
+    "whitepaperLink": "https://filecoin.io/filecoin.pdf",
-       "name":"Enjin",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/filecoin/"
-       "tags":[
+  },
-          
+  "HNT-USD": {
-       ],
+    "name": "Helium",
-       "websiteLink":"https://enjin.io/",
+    "tags": ["Layer 1"],
-       "whitepaperLink":"https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
+    "websiteLink": "https://www.helium.com",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/enjin-coin/"
+    "whitepaperLink": "http://whitepaper.helium.com",
-    },
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/helium/"
-    "EOS-USD":{
+  },
-       "name":"EOS",
+  "ICP-USD": {
-       "tags":[
+    "name": "Internet Computer",
-          "Layer 1"
+    "tags": ["Layer 1"],
-       ],
+    "websiteLink": "https://dfinity.org",
-       "websiteLink":"https://eos.io/",
+    "whitepaperLink": "https://dfinity.org/whitepaper.pdf",
-       "whitepaperLink":"https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/internet-computer/"
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/eos/"
+  },
-    },
+  "LDO-USD": {
-    "ETC-USD":{
+    "name": "Lido DAO",
-       "name":"Ethereum Classic",
+    "tags": ["Defi"],
-       "tags":[
+    "websiteLink": "https://lido.fi/",
-          "Layer 1"
+    "whitepaperLink": "https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
-       ],
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/lido-dao/"
-       "websiteLink":"https://ethereumclassic.org/",
+  },
-       "whitepaperLink":"https://ethereumclassic.org/why-classic",
+  "LINK-USD": {
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum-classic/"
+    "name": "Chainlink",
-    },
+    "tags": ["Defi"],
-    "ETH-USD":{
+    "websiteLink": "https://chain.link/",
-       "name":"Ethereum",
+    "whitepaperLink": "https://link.smartcontract.com/whitepaper",
-       "tags":[
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/chainlink/"
-          "Layer 1"
+  },
-       ],
+  "LTC-USD": {
-       "websiteLink":"https://ethereum.org/",
+    "name": "Litecoin",
-       "whitepaperLink":"https://ethereum.org/whitepaper/",
+    "tags": ["Layer 1"],
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum/",
+    "websiteLink": "https://litecoin.org/",
-       "displayStepSize":"0.001",
+    "whitepaperLink": "https://litecoin.info/index.php/Main_Page",
-       "displayTickSize":"0.1"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/litecoin/"
-    },
+  },
-    "FIL-USD":{
+  "MATIC-USD": {
-       "name":"Filecoin",
+    "name": "Polygon",
-       "tags":[
+    "tags": ["Layer 2"],
-          "Layer 1"
+    "websiteLink": "https://polygon.technology/",
-       ],
+    "whitepaperLink": "https://polygon.technology/lightpaper-polygon.pdf",
-       "websiteLink":"https://filecoin.io/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polygon/"
-       "whitepaperLink":"https://filecoin.io/filecoin.pdf",
+  },
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/filecoin/"
+  "MKR-USD": {
-    },
+    "name": "Maker",
-    "HNT-USD":{
+    "tags": ["Governance"],
-       "name":"Helium",
+    "websiteLink": "https://makerdao.com",
-       "tags":[
+    "whitepaperLink": "https://makerdao.com/whitepaper",
-          "Layer 1"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/maker/"
-       ],
+  },
-       "websiteLink":"https://www.helium.com",
+  "NEAR-USD": {
-       "whitepaperLink":"http://whitepaper.helium.com",
+    "name": "NEAR Protocol",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/helium/"
+    "tags": ["Layer 1"],
-    },
+    "websiteLink": "https://near.org",
-    "ICP-USD":{
+    "whitepaperLink": "https://near.org/papers/the-official-near-white-paper/",
-       "name":"Internet Computer",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/near-protocol/"
-       "tags":[
+  },
-          "Layer 1"
+  "OP-USD": {
-       ],
+    "name": "Optimism",
-       "websiteLink":"https://dfinity.org",
+    "tags": [],
-       "whitepaperLink":"https://dfinity.org/whitepaper.pdf",
+    "websiteLink": "https://www.optimism.io/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/internet-computer/"
+    "whitepaperLink": "https://github.com/ethereum-optimism",
-    },
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/optimism-ethereum/"
-    "LDO-USD":{
+  },
-       "name":"Lido DAO",
+  "PEPE-USD": {
-       "tags":[
+    "name": "Pepe",
-          "Defi"
+    "tags": [],
-       ],
+    "websiteLink": "https://www.pepe.vip/",
-       "websiteLink":"https://lido.fi/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/pepe/"
-       "whitepaperLink":"https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
+  },
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/lido-dao/"
+  "RUNE-USD": {
-    },
+    "name": "THORChain",
-    "LINK-USD":{
+    "tags": ["Layer 1"],
-       "name":"Chainlink",
+    "websiteLink": "https://thorchain.org",
-       "tags":[
+    "whitepaperLink": "https://whitepaper.io/document/709/thorchain-whitepaper",
-          "Defi"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/thorchain/"
-       ],
+  },
-       "websiteLink":"https://chain.link/",
+  "SEI-USD": {
-       "whitepaperLink":"https://link.smartcontract.com/whitepaper",
+    "name": "Sei",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/chainlink/"
+    "tags": ["Layer 1", "Defi"],
-    },
+    "websiteLink": "https://www.sei.io/",
-    "LTC-USD":{
+    "whitepaperLink": "https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
-       "name":"Litecoin",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sei/"
-       "tags":[
+  },
-          "Layer 1"
+  "SHIB-USD": {
-       ],
+    "name": "Shiba Inu",
-       "websiteLink":"https://litecoin.org/",
+    "tags": [],
-       "whitepaperLink":"https://litecoin.info/index.php/Main_Page",
+    "websiteLink": "https://shibatoken.com/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/litecoin/"
+    "whitepaperLink": "https://docs.shibatoken.com/",
-    },
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/shiba-inu/"
-    "MATIC-USD":{
+  },
-       "name":"Polygon",
+  "SNX-USD": {
-       "tags":[
+    "name": "Synthetix",
-          "Layer 2"
+    "tags": ["Defi"],
-       ],
+    "websiteLink": "https://synthetix.io/",
-       "websiteLink":"https://polygon.technology/",
+    "whitepaperLink": "https://docs.synthetix.io/litepaper",
-       "whitepaperLink":"https://polygon.technology/lightpaper-polygon.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/synthetix-network-token/"
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polygon/"
+  },
-    },
+  "SOL-USD": {
-    "MKR-USD":{
+    "name": "Solana",
-       "name":"Maker",
+    "tags": ["Layer 1"],
-       "tags":[
+    "websiteLink": "https://solana.com/",
-          "Governance"
+    "whitepaperLink": "https://solana.com/solana-whitepaper.pdf",
-       ],
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/"
-       "websiteLink":"https://makerdao.com",
+  },
-       "whitepaperLink":"https://makerdao.com/whitepaper",
+  "SUI-USD": {
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/maker/"
+    "name": "Sui",
-    },
+    "tags": ["Layer 1"],
-    "NEAR-USD":{
+    "websiteLink": "https://sui.io/",
-       "name":"NEAR Protocol",
+    "whitepaperLink": "https://github.com/MystenLabs",
-       "tags":[
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sui/"
-          "Layer 1"
+  },
-       ],
+  "SUSHI-USD": {
-       "websiteLink":"https://near.org",
+    "name": "Sushi",
-       "whitepaperLink":"https://near.org/papers/the-official-near-white-paper/",
+    "tags": ["Defi"],
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/near-protocol/"
+    "websiteLink": "https://sushi.com/",
-    },
+    "whitepaperLink": "https://docs.sushi.com/",
-    "OP-USD":{
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sushiswap/"
-       "name":"Optimism",
+  },
-       "tags":[
+  "TIA-USD": {
-          
+    "name": "Celestia",
-       ],
+    "tags": ["Layer 1"],
-       "websiteLink":"https://www.optimism.io/",
+    "websiteLink": "https://celestia.org/",
-       "whitepaperLink":"https://github.com/ethereum-optimism",
+    "whitepaperLink": "https://arxiv.org/pdf/1905.09274.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/optimism-ethereum/"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/celestia/"
-    },
+  },
-    "PEPE-USD":{
+  "TRX-USD": {
-       "name":"Pepe",
+    "name": "TRON",
-       "tags":[
+    "tags": ["Defi"],
-          
+    "websiteLink": "https://tron.network/",
-       ],
+    "whitepaperLink": "https://tron.network/static/doc/white_paper_v_2_0.pdf",
-       "websiteLink":"https://www.pepe.vip/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/tron/"
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/pepe/"
+  },
-    },
+  "UMA-USD": {
-    "RUNE-USD":{
+    "name": "UMA",
-       "name":"THORChain",
+    "tags": ["Defi"],
-       "tags":[
+    "websiteLink": "https://umaproject.org/",
-          "Layer 1"
+    "whitepaperLink": "https://github.com/UMAprotocol/whitepaper",
-       ],
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/uma/"
-       "websiteLink":"https://thorchain.org",
+  },
-       "whitepaperLink":"https://whitepaper.io/document/709/thorchain-whitepaper",
+  "UNI-USD": {
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/thorchain/"
+    "name": "Uniswap",
-    },
+    "tags": ["Defi"],
-    "SEI-USD":{
+    "websiteLink": "https://uniswap.org/",
-       "name":"Sei",
+    "whitepaperLink": "https://uniswap.org/whitepaper-v3.pdf",
-       "tags":[
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/uniswap/"
-          "Layer 1",
+  },
-          "Defi"
+  "WLD-USD": {
-       ],
+    "name": "Worldcoin",
-       "websiteLink":"https://www.sei.io/",
+    "tags": [],
-       "whitepaperLink":"https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
+    "websiteLink": "https://worldcoin.org/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sei/"
+    "whitepaperLink": "https://whitepaper.worldcoin.org/",
-    },
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/worldcoin-org/"
-    "SHIB-USD":{
+  },
-       "name":"Shiba Inu",
+  "XLM-USD": {
-       "tags":[
+    "name": "Stellar",
-          
+    "tags": ["Layer 1"],
-       ],
+    "websiteLink": "https://www.stellar.org/",
-       "websiteLink":"https://shibatoken.com/",
+    "whitepaperLink": "https://www.stellar.org/papers/stellar-consensus-protocol",
-       "whitepaperLink":"https://docs.shibatoken.com/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/stellar/"
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/shiba-inu/"
+  },
-    },
+  "XMR-USD": {
-    "SNX-USD":{
+    "name": "Monero",
-       "name":"Synthetix",
+    "tags": ["Layer 1"],
-       "tags":[
+    "websiteLink": "https://www.getmonero.org/",
-          "Defi"
+    "whitepaperLink": "https://www.getmonero.org/resources/research-lab/",
-       ],
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/monero/"
-       "websiteLink":"https://synthetix.io/",
+  },
-       "whitepaperLink":"https://docs.synthetix.io/litepaper",
+  "XRP-USD": {
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/synthetix-network-token/"
+    "name": "Ripple",
-    },
+    "tags": ["Layer 1"],
-    "SOL-USD":{
+    "websiteLink": "https://ripple.com/currency/",
-       "name":"Solana",
+    "whitepaperLink": "https://github.com/ripple",
-       "tags":[
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/xrp/"
-          "Layer 1"
+  },
-       ],
+  "XTZ-USD": {
-       "websiteLink":"https://solana.com/",
+    "name": "Tezos",
-       "whitepaperLink":"https://solana.com/solana-whitepaper.pdf",
+    "tags": ["Layer 1"],
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/solana/"
+    "websiteLink": "https://tezos.com",
-    },
+    "whitepaperLink": "https://tezos.com/whitepaper.pdf",
-    "SUI-USD":{
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/tezos/"
-       "name":"Sui",
+  },
-       "tags":[
+  "YFI-USD": {
-          "Layer 1"
+    "name": "Yearn",
-       ],
+    "tags": ["Defi"],
-       "websiteLink":"https://sui.io/",
+    "websiteLink": "https://yearn.finance/",
-       "whitepaperLink":"https://github.com/MystenLabs",
+    "whitepaperLink": "https://docs.yearn.finance/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sui/"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/yearn-finance/"
-    },
+  },
-    "SUSHI-USD":{
+  "ZEC-USD": {
-       "name":"Sushi",
+    "name": "Zcash",
-       "tags":[
+    "tags": ["Layer 1"],
-          "Defi"
+    "websiteLink": "https://z.cash/",
-       ],
+    "whitepaperLink": "https://z.cash/technology/",
-       "websiteLink":"https://sushi.com/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/zcash/"
-       "whitepaperLink":"https://docs.sushi.com/",
+  },
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sushiswap/"
+  "ZRX-USD": {
-    },
+    "name": "0x",
-    "TRX-USD":{
+    "tags": ["Defi"],
-       "name":"TRON",
+    "websiteLink": "https://0x.org/",
-       "tags":[
+    "whitepaperLink": "https://0x.org/pdfs/0x_white_paper.pdf",
-          "Defi"
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/0x/"
-       ],
+  }
-       "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/"
    }
 }
@@ -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>
@@ -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';
@@ -25,16 +27,6 @@ import { SubaccountProvider } from '@/hooks/useSubaccount';
 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';
@@ -42,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 = () => {
@@ -69,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 />} />
@@ -119,8 +122,13 @@ 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),
@@ -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.',
    },
  ],
 };
@@ -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);
  }
 `;
@@ -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> = {};
@@ -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 }) => (
+          {items.map(({ asChild, value, content }) => (
-            <Styled.TabsContent key={value} value={value}>
+            <Styled.TabsContent key={value} asChild={asChild} value={value}>
              {content}
            </Styled.TabsContent>
          ))}
@@ -219,7 +222,6 @@ Styled.Header = styled.header`
 Styled.CollapsibleContent = styled(CollapsibleContent)`
  ${layoutMixins.stack}
  ${layoutMixins.perspectiveArea}
  box-shadow: none;
 `;
@@ -24,7 +24,6 @@ import {
  CoinsIcon,
  CommentIcon,
  CopyIcon,
  CubeIcon,
  DepositIcon,
  DepthChartIcon,
  DiscordIcon,
@@ -55,10 +54,12 @@ import {
  OverviewIcon,
  PencilIcon,
  PlayIcon,
  PlusIcon,
  PositionsIcon,
  PriceChartIcon,
  PrivacyIcon,
  QrIcon,
  RewardStarIcon,
  SearchIcon,
  SendIcon,
  ShareIcon,
@@ -98,7 +99,6 @@ export enum IconName {
  Coins = 'Coins',
  Comment = 'Comment',
  Copy = 'Copy',
  Cube = 'Cube',
  Deposit = 'Deposit',
  DepthChart = 'DepthChart',
  Discord = 'Discord',
@@ -130,10 +130,12 @@ export enum IconName {
  Overview = 'Overview',
  Pencil = 'Pencil',
  Play = 'Play',
  Plus = 'Plus',
  Positions = 'Positions',
  PriceChart = 'PriceChart',
  Privacy = 'Privacy',
  Qr = 'Qr',
  RewardStar = 'RewardStar',
  Search = 'Search',
  Send = 'Send',
  Share = 'Share',
@@ -173,7 +175,6 @@ const icons = {
  [IconName.Coins]: CoinsIcon,
  [IconName.Comment]: CommentIcon,
  [IconName.Copy]: CopyIcon,
  [IconName.Cube]: CubeIcon,
  [IconName.Deposit]: DepositIcon,
  [IconName.DepthChart]: DepthChartIcon,
  [IconName.Discord]: DiscordIcon,
@@ -204,10 +205,12 @@ const icons = {
  [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,
@@ -198,7 +198,6 @@ Styled.InputContainer = styled.div`
  border-radius: inherit;
  input {
    user-select: all;
    flex: 1;
    width: 100%;
  }
@@ -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;
@@ -67,6 +68,12 @@ Styled.Panel = styled.section<{ onClick?: () => void }>`
  --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);
@@ -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(
+          MustBigNumber(first).comparedTo(MustBigNumber(second))) *
            (parseInt(first as string) || (first as number)) -
              (parseInt(second as string) || (second as number))
          )) *
      // Flip the direction if descending order is specified.
      (sortDirection === 'descending' ? -1 : 1)
    );
@@ -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;
 `;
@@ -27,9 +27,8 @@ export const ToastArea = ({ swipeDirection, children, className }: ToastAreaProp
 const $ToastArea = styled.aside`
  // Params
  --toasts-gap: 0.5rem;
-
+  
  // Rules
  ${layoutMixins.scrollArea}
  z-index: 1;
  pointer-events: none;
@@ -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;
+  onPointerMove?: (point: Point | EventHandlerParams<object>) => void;
-  onPointerUp?: (point: Point) => 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)
+        if (pointerChartPosition) onPointerMove?.(pointerChartPosition);
          onPointerMove?.(pointerChartPosition);
      }}
      onPointerOut={() => setLastPointerMoveEvent(undefined)}
      onPointerDown={() => onPointerPressedChange?.(true)}
      onPointerUp={() => {
        onPointerPressedChange?.(false);
-        if (pointerChartPosition)
+        if (pointerChartPosition) onPointerUp?.(pointerChartPosition);
          onPointerUp?.(pointerChartPosition);
      }}
    >
      {props.children}
@@ -142,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];
@@ -151,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];
@@ -162,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];
@@ -96,6 +96,7 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
        elapsedTime?: number;
        blockHeight?: number;
        indexerBlockHeight?: number;
        trailingBlocks?: number;
      }
    : // Navigation
    T extends AnalyticsEvent.NavigatePage
@@ -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;
 };
@@ -25,40 +25,5 @@ export const DEFAULT_MARKETID = 'ETH-USD';
 export enum FundingDirection {
  ToShort = 'ToShort',
  ToLong = 'ToLong',
  None = 'None',
 }
 export const MARKETS_TO_DISPLAY = [
  'BTC-USD',
  'ETH-USD',
  'LINK-USD',
  'SOL-USD',
  'MATIC-USD',
  'ATOM-USD',
  'AVAX-USD',
  'APE-USD',
  'XRP-USD',
  'UNI-USD',
  'ADA-USD',
  'TRX-USD',
  'OP-USD',
  'MKR-USD',
  'DOGE-USD',
  'SHIB-USD',
  'COMP-USD',
  'LDO-USD',
  'NEAR-USD',
  'APT-USD',
  'SUI-USD',
  'DOT-USD',
  'ETC-USD',
  'ARB-USD',
  'CRV-USD',
  'BLUR-USD',
  'FIL-USD',
  'XLM-USD',
  'PEPE-USD',
  'WLD-USD',
  'SEI-USD',
  'LTC-USD',
  'BCH-USD',
 ];
@@ -87,6 +87,8 @@ export type NotificationDisplayData = {
  slotTitleLeft?: React.ReactNode;
  slotTitleRight?: React.ReactNode;
  groupKey: string; // Grouping key toast notification stacking
  // Overrides title/body for Notification in NotificationMenu
  renderCustomBody?: ({
    isToast,
@@ -122,9 +124,15 @@ 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;
@@ -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%
@@ -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 }),
@@ -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 }),
@@ -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
@@ -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 { 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';
@@ -153,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]);
@@ -162,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,
@@ -176,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) {
@@ -192,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);
@@ -211,7 +252,15 @@ const useAccountsContext = () => {
        dispatch(setOnboardingState(OnboardingState.Disconnected));
      }
    })();
-  }, [evmAddress, evmDerivedAddresses, signerWagmi, connectedDydxAddress, signerGraz]);
+  }, [
    evmAddress,
    evmDerivedAddresses,
    signerWagmi,
    connectedDydxAddress,
    signerGraz,
    authenticated,
    ready,
  ]);
  // abacus
  useEffect(() => {
@@ -224,6 +273,7 @@ const useAccountsContext = () => {
      if (hdKey?.mnemonic) {
        const nobleWallet = await LocalWallet.fromMnemonic(hdKey.mnemonic, NOBLE_BECH32_PREFIX);
        abacusStateManager.setNobleWallet(nobleWallet);
        setLocalNobleWallet(nobleWallet);
      }
    };
    setNobleWallet();
@@ -322,6 +372,7 @@ const useAccountsContext = () => {
    localDydxWallet,
    dydxAccounts,
    dydxAddress,
    nobleAddress,
    // Onboarding state
    saveHasAcknowledgedTerms,
@@ -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]);
@@ -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);
@@ -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`);
@@ -33,17 +32,35 @@ 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);
+    // If v4_markets has not been subscribed to yet or marketId is not specified, default to validId
-    dispatch(setCurrentMarketId(validId));
+    if (!hasMarketIds || !marketId) {
-    dispatch(closeDialogInTradeBox());
+      setLastViewedMarket(validId);
      dispatch(setCurrentMarketId(validId));
      dispatch(closeDialogInTradeBox());
-    navigate(`${AppRoute.Trade}/${validId}`, {
+      if (validId !== marketId) {
-      replace: true,
+        navigate(`${AppRoute.Trade}/${validId}`, {
-    });
+          replace: true,
-  }, [validId]);
+        });
      }
    } 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
@@ -21,6 +21,7 @@ export const useDisplayedWallets = () => {
    // WalletType.BitKeep,
    // WalletType.Coin98,
    WalletType.Privy,
    WalletType.OtherWallet,
  ].filter(isTruthy);
 };
@@ -1,14 +1,7 @@
 import { useMemo } from 'react';
 import { useSelector, shallowEqual } from 'react-redux';
-import {
+import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constants/markets';
  MarketFilters,
  MARKET_FILTER_LABELS,
  type MarketData,
  MARKETS_TO_DISPLAY,
 } from '@/constants/markets';
 import { testFlags } from '@/lib/testFlags';
 import { getAssets } from '@/state/assetsSelectors';
 import { getPerpetualMarkets } from '@/state/perpetualsSelectors';
@@ -49,9 +42,7 @@ export const useMarketsData = (
  }, [allPerpetualMarkets, allAssets]);
  const filteredMarkets = useMemo(() => {
-    const filtered = markets
+    const filtered = markets.filter(filterFunctions[filter]);
      .filter(filterFunctions[filter])
      .filter(({ id }) => (testFlags.displayAllMarkets ? true : MARKETS_TO_DISPLAY.includes(id)));
    if (searchFilter) {
      return filtered.filter(
@@ -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,
  };
 };
@@ -20,6 +20,7 @@ import {
  type NotificationTypeConfig,
  NotificationType,
  DEFAULT_TOAST_AUTO_CLOSE_MS,
  TransferNotificationTypes,
 } from '@/constants/notifications';
 import { useSelectedNetwork, useStringGetter } from '@/hooks';
@@ -27,6 +28,7 @@ import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 import { AssetIcon } from '@/components/AssetIcon';
 import { Icon, IconName } from '@/components/Icon';
 import { BlockRewardNotification } from '@/views/notifications/BlockRewardNotification';
 import { TradeNotification } from '@/views/notifications/TradeNotification';
 import { TransferStatusNotification } from '@/views/notifications/TransferStatusNotification';
@@ -79,6 +81,7 @@ export const notificationTypes: NotificationTypeConfig[] = [
                  body: abacusNotif.text ? stringGetter({ key: abacusNotif.text, params }) : '',
                  toastDuration: DEFAULT_TOAST_AUTO_CLOSE_MS,
                  toastSensitivity: 'foreground',
                  groupKey: abacusNotificationType,
                  renderCustomBody: ({ isToast, notification }) => (
                    <TradeNotification
                      isToast={isToast}
@@ -92,6 +95,29 @@ export const notificationTypes: NotificationTypeConfig[] = [
              );
              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,
@@ -101,6 +127,7 @@ export const notificationTypes: NotificationTypeConfig[] = [
                  body: abacusNotif.text ? stringGetter({ key: abacusNotif.text, params }) : '',
                  toastDuration: DEFAULT_TOAST_AUTO_CLOSE_MS,
                  toastSensitivity: 'foreground',
                  groupKey: abacusNotificationType,
                },
                [abacusNotif.updateTimeInMilliseconds, abacusNotif.data]
              );
@@ -152,20 +179,20 @@ export const notificationTypes: NotificationTypeConfig[] = [
      useEffect(() => {
        for (const transfer of transferNotifications) {
-          const { fromChainId, status, txHash, toAmount } = transfer;
+          const { fromChainId, status, txHash, toAmount, type } = transfer;
          const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
          const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />;
-          const type =
+          const transferType =
-            fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
+            type ?? fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
-              ? 'withdrawal'
+              ? TransferNotificationTypes.Withdrawal
-              : 'deposit';
+              : TransferNotificationTypes.Deposit;
          const title = stringGetter({
            key: {
              deposit: isFinished ? STRING_KEYS.DEPOSIT : STRING_KEYS.DEPOSIT_IN_PROGRESS,
              withdrawal: isFinished ? STRING_KEYS.WITHDRAW : STRING_KEYS.WITHDRAW_IN_PROGRESS,
-            }[type],
+            }[transferType],
          });
          const toChainEta = status?.toChain?.chainData?.estimatedRouteDuration || 0;
@@ -190,12 +217,13 @@ export const notificationTypes: NotificationTypeConfig[] = [
                  slotIcon={icon}
                  slotTitle={title}
                  transfer={transfer}
-                  type={type}
+                  type={transferType}
                  triggeredAt={transfer.triggeredAt}
                  notification={notification}
                />
              ),
              toastSensitivity: 'foreground',
              groupKey: NotificationType.SquidTransfer,
            },
            [isFinished]
          );
@@ -241,6 +269,7 @@ export const notificationTypes: NotificationTypeConfig[] = [
              },
            }),
            toastSensitivity: 'foreground',
            groupKey: NotificationType.ReleaseUpdates,
          },
          []
        );
@@ -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]);
 };
@@ -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);
@@ -293,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;
      }
-
+      const tx = await sendSquidWithdrawFromSubaccount({ subaccountClient, amount, payload });
-      return await sendSquidWithdrawFromSubaccount({ subaccountClient, amount, payload });
+      return hashFromTx(tx?.hash);
    },
    [subaccountClient, sendSquidWithdrawFromSubaccount]
  );
@@ -1,5 +1,6 @@
 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';
@@ -104,8 +105,10 @@ export const useWalletConnection = () => {
    [walletConnectConfig, walletType, walletConnectionType]
  );
-  const { connectAsync: connectWagmi } = useConnectWagmi({ connector: wagmiConnector })
+  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 }) => {
@@ -114,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,
@@ -156,7 +164,7 @@ export const useWalletConnection = () => {
        walletConnectionType: walletConnection.type,
      };
    },
-    [isConnectedGraz, signerGraz, isConnectedWagmi, signerWagmi]
+    [isConnectedGraz, signerGraz, isConnectedWagmi, signerWagmi, login, ready, authenticated]
  );
  const disconnectWallet = useCallback(async () => {
@@ -165,6 +173,7 @@ export const useWalletConnection = () => {
    if (isConnectedWagmi) await disconnectWagmi();
    if (isConnectedGraz) await disconnectGraz();
    if (authenticated) await logout();
  }, [isConnectedGraz, isConnectedWagmi]);
  // Wallet selection
@@ -1,3 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/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>
  <path d="M14 6L7.83335 10.5L2 6" stroke="currentColor" stroke-width="2.25" stroke-linecap="round"/>
 </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>
@@ -19,7 +19,6 @@ 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';
@@ -44,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';
@@ -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>
@@ -1,7 +1,11 @@
-import { useMemo, useState } from 'react';
+import { useState } from 'react';
 import styled, { css } from 'styled-components';
-import { NotificationStatus } from '@/constants/notifications';
+import {
  type Notification,
  type NotificationDisplayData,
  NotificationStatus,
 } from '@/constants/notifications';
 import { ButtonShape, ButtonSize } from '@/constants/buttons';
 import { useNotifications } from '@/hooks/useNotifications';
 import { useBreakpoints } from '@/hooks/useBreakpoints';
@@ -13,54 +17,31 @@ import { Toast } from '@/components/Toast';
 import { ToastArea } from '@/components/ToastArea';
 import { ToggleButton } from '@/components/ToggleButton';
 type ElementProps = {
  notifications: {
    notification: Notification<any, any>;
    key: string;
    displayData: NotificationDisplayData;
  }[];
 };
 type StyleProps = {
  className?: string;
 };
-const MAX_TOASTS = 10;
+export const NotificationStack = ({ notifications, className }: ElementProps & StyleProps) => {
 export const NotificationsToastArea = ({ className }: StyleProps) => {
  const [shouldStackNotifications, setshouldStackNotifications] = useState(true);
-  const {
+  const { markUnseen, markSeen, onNotificationAction } = useNotifications();
    notifications,
    getKey,
    getDisplayData,
    markUnseen,
    markSeen,
    isMenuOpen,
    onNotificationAction,
  } = useNotifications();
  const { isMobile } = useBreakpoints();
-  const notificationMap = useMemo(() => {
+  const hasMultipleToasts = notifications.length > 1;
    return (
      Object.values(notifications)
        // Sort by time of first trigger
        .sort(
          (n1, n2) =>
            n1.timestamps[NotificationStatus.Triggered]! -
            n2.timestamps[NotificationStatus.Triggered]!
        )
        .map((notification) => ({
          notification,
          key: getKey(notification),
          displayData: getDisplayData(notification),
        }))
        .filter(
          ({ displayData, notification }) =>
            displayData && notification.status < NotificationStatus.Unseen
        )
        .slice(-MAX_TOASTS)
    );
  }, [notifications, getKey, getDisplayData]);
  if (isMenuOpen) return null;
  const hasMultipleToasts = notificationMap.length > 1;
  return (
-    <StyledToastArea swipeDirection={isMobile ? 'up' : 'right'} className={className}>
+    <StyledToastArea
      swipeDirection={isMobile ? 'up' : 'right'}
      className={className}
      size={notifications.length}
    >
      {hasMultipleToasts && (
        <StyledToggleButton
          shape={ButtonShape.Pill}
@@ -72,12 +53,12 @@ export const NotificationsToastArea = ({ className }: StyleProps) => {
        </StyledToggleButton>
      )}
-      {notificationMap.map(({ notification, key, displayData }, idx) => (
+      {notifications.map(({ notification, key, displayData }, idx) => (
        <StyledToast
          key={key}
-          isStacked={shouldStackNotifications}
+          isStacked={idx > 0 && shouldStackNotifications}
          isOpen={notification.status < NotificationStatus.Unseen}
-          layer={notificationMap.length - 1 - idx}
+          layer={idx}
          notification={notification}
          slotIcon={displayData.icon}
          slotTitle={displayData.title}
@@ -110,19 +91,13 @@ export const NotificationsToastArea = ({ className }: StyleProps) => {
  );
 };
-const StyledToastArea = styled(ToastArea)`
+const StyledToastArea = styled(ToastArea)<{ size: number }>`
-  position: absolute;
+  position: relative;
-  width: min(17.5rem, 100%);
+  ${({ size }) =>
-  inset: 0 0 0 auto;
+    size &&
-
+    css`
-  padding: 0.75rem 0.75rem 0.75rem 0;
+      padding-bottom: calc(${size - 1} * 2px);
-
+    `}
  mask-image: linear-gradient(to left, transparent, white 0.5rem);
  @media ${breakpoints.mobile} {
    width: 100%;
    position: fixed;
  }
 `;
 const StyledToast = styled(Toast)<{ isStacked?: boolean; layer: number }>`
@@ -133,7 +108,7 @@ const StyledToast = styled(Toast)<{ isStacked?: boolean; layer: number }>`
          position: absolute;
          left: 0;
          top: calc(${layer} * 2px);
-          right: calc(${layer} * -2px);
+          right: 0;
        `
      : css`
          margin-bottom: 0.75rem;
@@ -145,7 +120,7 @@ const StyledToggleButton = styled(ToggleButton)<{ isPressed: boolean }>`
  pointer-events: auto;
  display: none;
  position: absolute;
-  top: 4px;
+  top: -0.5rem;
  left: calc(50% - 0.75rem);
  --button-width: 2rem;
  --button-height: 1rem;
@@ -0,0 +1,71 @@
 import { useMemo } from 'react';
 import { groupBy } from 'lodash';
 import styled from 'styled-components';
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { NotificationStatus } from '@/constants/notifications';
 import { useNotifications } from '@/hooks/useNotifications';
 import { NotificationStack } from './NotifcationStack';
 type StyleProps = {
  className?: string;
 };
 const MAX_TOASTS = 10;
 export const NotificationsToastArea = ({ className }: StyleProps) => {
  const { notifications, getKey, getDisplayData, isMenuOpen } = useNotifications();
  const notificationMapByType = useMemo(() => {
    const notificationMap = Object.values(notifications)
      // Sort by time of first trigger
      .sort(
        (n1, n2) =>
          n1.timestamps[NotificationStatus.Triggered]! -
          n2.timestamps[NotificationStatus.Triggered]!
      )
      .map((notification) => ({
        notification,
        key: getKey(notification),
        displayData: getDisplayData(notification),
      }))
      .filter(
        ({ displayData, notification }) =>
          displayData && notification.status < NotificationStatus.Unseen
      )
      .slice(-MAX_TOASTS);
    return groupBy(notificationMap, (notification) => notification.displayData?.groupKey);
  }, [notifications, getKey, getDisplayData]);
  if (isMenuOpen) return null;
  return (
    <StyledToastArea className={className}>
      {Object.keys(notificationMapByType).map((groupKey) => (
        <NotificationStack notifications={notificationMapByType[groupKey]} key={groupKey} />
      ))}
    </StyledToastArea>
  );
 };
 const StyledToastArea = styled.div`
  ${layoutMixins.scrollArea}
  position: absolute;
  width: min(17.5rem, 100%);
  inset: 0 0 0 auto;
  padding: 0.75rem 0.75rem 0.75rem 0;
  mask-image: linear-gradient(to left, transparent, white 0.5rem);
  pointer-events: none;
  @media ${breakpoints.mobile} {
    width: 100%;
    position: fixed;
  }
 `;
@@ -2,6 +2,7 @@ import Abacus, { type Nullable } from '@dydxprotocol/v4-abacus';
 import Long from 'long';
 import type { IndexedTx } from '@cosmjs/stargate';
 import { GAS_MULTIPLIER, encodeJson } from '@dydxprotocol/v4-client-js';
 import { EncodeObject } from '@cosmjs/proto-signing';
 import {
  CompositeClient,
@@ -41,6 +42,7 @@ import { openDialog } from '@/state/dialogs';
 import { StatefulOrderError } from '../errors';
 import { bytesToBigInt } from '../numbers';
 import { log } from '../telemetry';
 import { hashFromTx } from '../hashfromTx';
 class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
  private compositeClient: CompositeClient | undefined;
@@ -63,9 +65,13 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
  }
  setNobleWallet(nobleWallet: LocalWallet) {
-    this.nobleWallet = nobleWallet;
+    try {
-    if (this.nobleClient) {
+      this.nobleWallet = nobleWallet;
-      this.nobleClient.connect(nobleWallet);
+      if (this.nobleClient) {
        this.nobleClient.connect(nobleWallet);
      }
    } catch (e) {
      log('DydxChainTransactions/setNobleWallet', e);
    }
  }
@@ -112,10 +118,15 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
      this.compositeClient = compositeClient;
-      if (nobleValidatorUrl) {
+      try {
-        this.nobleClient = new NobleClient(nobleValidatorUrl);
+        if (nobleValidatorUrl) {
-        if (this.nobleWallet) await this.nobleClient.connect(this.nobleWallet);
+          this.nobleClient = new NobleClient(nobleValidatorUrl);
          if (this.nobleWallet) await this.nobleClient.connect(this.nobleWallet);
        }
      } catch (e) {
        log('DydxChainTransactions/connectNetwork/NobleClient', e);
      }
      // Dispatch custom event to notify other parts of the app that the network has been connected
      const customEvent = new CustomEvent('abacus:connectNetwork', {
        detail: parsedParams,
@@ -201,8 +212,8 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
        timeInForce as OrderTimeInForce,
        goodTilTimeInSeconds ?? 0,
        execution as OrderExecution,
-        postOnly,
+        postOnly ?? undefined,
-        reduceOnly,
+        reduceOnly ?? undefined,
        triggerPrice ?? undefined
      );
@@ -340,12 +351,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    }
  }
-  async sendNobleIBC(
+  async sendNobleIBC(params: { msgTypeUrl: string; msg: any }): Promise<string> {
    params: {
      msgTypeUrl: string,
      msg: any,
    }
  ): Promise<string> {
    if (!this.nobleClient?.isConnected) {
      throw new Error('Missing nobleClient or localWallet');
    }
@@ -356,15 +362,16 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
        value: params.msg,
      };
      const fee = await this.nobleClient.simulateTransaction([ibcMsg]);
-  
+
      // take out fee from amount before sweeping
-      const amount = parseInt(ibcMsg.value.token.amount, 10) -
+      const amount =
        parseInt(ibcMsg.value.token.amount, 10) -
        Math.floor(parseInt(fee.amount[0].amount, 10) * GAS_MULTIPLIER);
-  
+
      if (amount <= 0) {
        throw new Error('noble balance does not cover fees');
      }
-  
+
      ibcMsg.value.token.amount = amount.toString();
      const tx = await this.nobleClient.send([ibcMsg]);
@@ -380,6 +387,86 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    }
  }
  async withdrawToNobleIBC(params: {
    subaccountNumber: number;
    amount: string;
    ibcPayload: string;
  }): Promise<string> {
    if (!this.compositeClient || !this.localWallet) {
      throw new Error('Missing compositeClient or localWallet');
    }
    const { subaccountNumber, amount, ibcPayload } = params ?? {};
    const parsedIbcPayload: {
      msgTypeUrl: string;
      msg: any;
    } = ibcPayload ? JSON.parse(atob(ibcPayload)) : undefined;
    try {
      const msg = this.compositeClient.withdrawFromSubaccountMessage(
        new SubaccountClient(this.localWallet, subaccountNumber),
        parseFloat(amount).toFixed(this.compositeClient.validatorClient.config.denoms.USDC_DECIMALS)
      );
      const ibcMsg: EncodeObject = {
        typeUrl: parsedIbcPayload.msgTypeUrl,
        value: parsedIbcPayload.msg,
      };
      const tx = await this.compositeClient.send(
        this.localWallet,
        () => Promise.resolve([msg, ibcMsg]),
        false
      );
      return JSON.stringify({
        txHash: hashFromTx(tx?.hash),
      });
    } catch (error) {
      log('DydxChainTransactions/withdrawToNobleIBC', error);
      return JSON.stringify({
        error,
      });
    }
  }
  async cctpWithdraw(params: { typeUrl: string; value: any }): Promise<string> {
    if (!this.nobleClient?.isConnected) {
      throw new Error('Missing nobleClient or localWallet');
    }
    try {
      const ibcMsg = {
        typeUrl: params.typeUrl, // '/circle.cctp.v1.MsgDepositForBurn',
        value: params.value,
      };
      const fee = await this.nobleClient.simulateTransaction([ibcMsg]);
      // take out fee from amount before sweeping
      const amount =
        parseInt(ibcMsg.value.amount, 10) -
        Math.floor(parseInt(fee.amount[0].amount, 10) * GAS_MULTIPLIER);
      if (amount <= 0) {
        throw new Error('noble balance does not cover fees');
      }
      ibcMsg.value.amount = amount.toString();
      const tx = await this.nobleClient.send([ibcMsg]);
      const parsedTx = this.parseToPrimitives(tx);
      return JSON.stringify(parsedTx);
    } catch (error) {
      log('DydxChainTransactions/cctpWithdraw', error);
      return JSON.stringify({
        error,
      });
    }
  }
  async transaction(
    type: TransactionTypes,
    paramsInJson: Abacus.Nullable<string>,
@@ -414,6 +501,17 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
          callback(result);
          break;
        }
        case TransactionType.WithdrawToNobleIBC: {
          const result = await this.withdrawToNobleIBC(params);
          callback(result);
          break;
        }
        case TransactionType.CctpWithdraw: {
          const result = await this.cctpWithdraw(params);
          callback(result);
          break;
          break;
        }
        default: {
          break;
        }
@@ -84,8 +84,7 @@ class AbacusStateManager {
    );
    const appConfigs = AbacusAppConfig.Companion.forWeb;
-    if (!isMainnet || testFlags.withCCTP)
+    appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2;
      appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2DepositOnly;
    this.stateManager = new AsyncAbacusStateManager(
      '',
@@ -262,6 +261,14 @@ class AbacusStateManager {
    ) => void
  ) => this.stateManager.cancelOrder(orderId, callback);
  cctpWithdraw = (
    callback: (
      success: boolean,
      parsingError: Nullable<ParsingError>,
      data: string,
    ) => void
  ): void => this.stateManager.commitCCTPWithdraw(callback);
  // ------ Utils ------ //
  getHistoricalPnlPeriod = (): Nullable<HistoricalPnlPeriods> =>
    this.stateManager.historicalPnlPeriod;
@@ -0,0 +1,3 @@
 export const hashFromTx = (
  txHash: string | Uint8Array
 ): string => `0x${Buffer.from(txHash).toString('hex')}`;
@@ -5,26 +5,22 @@ class TestFlags {
    this.queryParams = {};
    const hash = window.location.hash;
    const queryIndex = hash.indexOf('?');
-    if (queryIndex === -1) return
+    if (queryIndex === -1) return;
    const queryParamsString = hash.substring(queryIndex + 1);
    const params = new URLSearchParams(queryParamsString);
    for (const [key, value] of params) {
-        this.queryParams[key] = value;
+      this.queryParams[key.toLowerCase()] = value;
    }
  }
  get displayInitializingMarkets() {
-    return !!this.queryParams.displayInitializingMarkets;
+    return !!this.queryParams.displayinitializingmarkets;
  }
-  get displayAllMarkets() {
+  get showMobileSignInOption() {
-    return !!this.queryParams.displayAllMarkets;
+    return !!this.queryParams.mobilesignin;
  }
  get withCCTP() {
    return !!this.queryParams.withCCTP;
  }
 }
@@ -1,5 +1,6 @@
-import { createConfig, configureChains, mainnet, Chain, Connector, usePublicClient } from 'wagmi';
+import { createConfig, configureChains, mainnet, Chain } from 'wagmi';
 import { goerli } from 'wagmi/chains';
 import type { PrivyClientConfig } from '@privy-io/react-auth';
 import {
  arbitrum,
@@ -26,6 +27,9 @@ import {
  fantomTestnet,
  celo,
  celoAlfajores,
  scroll,
  kava,
  sepolia,
 } from 'viem/chains';
 import { alchemyProvider } from 'wagmi/providers/alchemy';
@@ -53,7 +57,7 @@ import { isTruthy } from './isTruthy';
 export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
  mainnet,
  goerli,
-
+  sepolia,
  arbitrum,
  arbitrumGoerli,
  avalanche,
@@ -78,8 +82,23 @@ export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
  fantomTestnet,
  celo,
  celoAlfajores,
  scroll,
  kava,
 ];
 export const privyConfig: PrivyClientConfig = {
  embeddedWallets: {
    createOnLogin: 'users-without-wallets',
    requireUserPasswordOnCreate: true,
    noPromptOnSignature: true,
  },
  loginMethods: ['email', 'sms', 'twitter', 'google', 'apple'],
  appearance: {
    theme: '#28283c',
  },
  defaultChain: sepolia
 };
 const { chains, publicClient, webSocketPublicClient } = configureChains(
  WAGMI_SUPPORTED_CHAINS,
  [
@@ -146,7 +165,7 @@ const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
  new CoinbaseWalletConnector({
    chains,
    options: {
-      appName: 'wagmi',
+      appName: 'dYdX',
      reloadOnDisconnect: false,
    },
  }),
@@ -62,6 +62,12 @@ export const getWalletConnection = ({
          type: WalletConnectionType.CosmosSigner,
        };
      }
      case WalletConnectionType.Privy: {
        return {
          type: WalletConnectionType.Privy,
        };
      }
    }
  }
 };
@@ -1,4 +1,6 @@
 import { DialogPlacement } from '@/components/Dialog';
 import { NotificationsMenu } from '@/views/menus/NotificationsMenu';
-export const AlertsPage = () => <NotificationsMenu placement={DialogPlacement.Inline} />;
+const AlertsPage = () => <NotificationsMenu placement={DialogPlacement.Inline} />;
 export default AlertsPage;
@@ -2,7 +2,7 @@ import styled, { AnyStyledComponent } from 'styled-components';
 import { articleMixins } from '@/styles/articleMixins';
-export const PrivacyPolicyPage = () => (
+const PrivacyPolicyPage = () => (
  <Styled.Article>
    <header>
      <h1>Privacy Policy</h1>
@@ -10,6 +10,8 @@ export const PrivacyPolicyPage = () => (
  </Styled.Article>
 );
 export default PrivacyPolicyPage;
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Article = styled.article`
@@ -30,6 +30,9 @@ import abacusStateManager from '@/lib/abacus';
 import { isTruthy } from '@/lib/isTruthy';
 import { truncateAddress } from '@/lib/wallet';
 import { DYDXBalancePanel } from './rewards/DYDXBalancePanel';
 import { MigratePanel } from './rewards/MigratePanel';
 const ENS_CHAIN_ID = 1; // Ethereum
 const Profile = () => {
@@ -175,8 +178,27 @@ const Profile = () => {
          onClick={() => dispatch(openDialog({ type: DialogTypes.Help }))}
        />
      </Styled.EqualGrid>
      <MigratePanel />
      <DYDXBalancePanel />
      <Styled.EqualGrid>
        <Styled.RewardsPanel
          slotHeaderContent="Trading Rewards"
          href={`/${chainTokenLabel}`}
          hasSeparator
        >
          <Styled.Details
            items={[
              {
                key: 'week-rewards',
                label: stringGetter({ key: STRING_KEYS.THIS_WEEK }),
                value: '-',
              },
            ]}
            layout="grid"
          />
        </Styled.RewardsPanel>
        <Panel
          slotHeaderContent={stringGetter({ key: STRING_KEYS.FEES })}
          href={`${AppRoute.Portfolio}/${PortfolioRoute.Fees}`}
@@ -191,19 +213,6 @@ const Profile = () => {
            layout="grid"
          />
        </Panel>
        <Styled.RewardsPanel
          slotHeaderContent={stringGetter({ key: STRING_KEYS.REWARDS })}
          href={`/${chainTokenLabel}`}
          hasSeparator
        >
          <Styled.Details
            items={[
              { key: 'maker', label: stringGetter({ key: STRING_KEYS.YOU_WILL_EARN }), value: '-' },
              { key: 'taker', label: stringGetter({ key: STRING_KEYS.EPOCH_ENDS_IN }), value: '-' },
            ]}
            layout="grid"
          />
        </Styled.RewardsPanel>
      </Styled.EqualGrid>
      <Styled.TablePanel
@@ -327,6 +336,13 @@ Styled.Details = styled(Details)`
 `;
 Styled.RewardsPanel = styled(Panel)`
  align-self: flex-start;
  &,
  > * {
    height: 100%;
  }
  dl {
    --details-grid-numColumns: 1;
  }
@@ -2,7 +2,7 @@ import styled, { AnyStyledComponent } from 'styled-components';
 import { articleMixins } from '@/styles/articleMixins';
-export const TermsOfUsePage = () => (
+const TermsOfUsePage = () => (
  <Styled.Article>
    <header>
      <h1>Sample Terms of Use</h1>
@@ -1076,6 +1076,8 @@ export const TermsOfUsePage = () => (
  </Styled.Article>
 );
 export default TermsOfUsePage;
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Article = styled.article`
@@ -1,34 +1,40 @@
 import { lazy, Suspense } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { Navigate, Route, Routes } from 'react-router-dom';
 import { OnboardingState } from '@/constants/account';
 import { ButtonAction } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { HistoryRoute, PortfolioRoute } from '@/constants/routes';
 import { useAccountBalance, useBreakpoints, useDocumentTitle, useStringGetter } from '@/hooks';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { FillsTable, FillsTableColumnKey } from '@/views/tables/FillsTable';
 import { FundingPaymentsTable } from '@/views/tables/FundingPaymentsTable';
 import { TransferHistoryTable } from '@/views/tables/TransferHistoryTable';
 import { Button } from '@/components/Button';
 import { Icon, IconName } from '@/components/Icon';
 import { NavigationMenu } from '@/components/NavigationMenu';
 import { Tag, TagType } from '@/components/Tag';
 import { WithSidebar } from '@/components/WithSidebar';
-import { getOnboardingState, getSubaccount } from '@/state/accountSelectors';
+import { getOnboardingState, getSubaccount, getTradeInfoNumbers } from '@/state/accountSelectors';
 import { openDialog } from '@/state/dialogs';
-import { PortfolioNavMobile } from './PortfolioNavMobile';
+import { shortenNumberForDisplay } from '@/lib/numbers';
 import { Overview } from './Overview';
 import { Positions } from './Positions';
 import { Orders } from './Orders';
 import { Fees } from './Fees';
 import { History } from './History';
-import { layoutMixins } from '@/styles/layoutMixins';
+import { PortfolioNavMobile } from './PortfolioNavMobile';
-import { Button } from '@/components/Button';
+import { LoadingSpace } from '@/components/Loading/LoadingSpinner';
-import { ButtonAction } from '@/constants/buttons';
+
 const Overview = lazy(() => import('./Overview').then((module) => ({ default: module.Overview })));
 const Positions = lazy(() =>
  import('./Positions').then((module) => ({ default: module.Positions }))
 );
 const Orders = lazy(() => import('./Orders').then((module) => ({ default: module.Orders })));
 const Fees = lazy(() => import('./Fees').then((module) => ({ default: module.Fees })));
 const History = lazy(() => import('./History').then((module) => ({ default: module.History })));
 export default () => {
  const dispatch = useDispatch();
@@ -39,54 +45,60 @@ export default () => {
  const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {};
  const { nativeTokenBalance } = useAccountBalance();
  const { numTotalPositions, numTotalOpenOrders } = useSelector(getTradeInfoNumbers, shallowEqual) || {};
  const numPositions = shortenNumberForDisplay(numTotalPositions);
  const numOrders = shortenNumberForDisplay(numTotalOpenOrders);
  const usdcBalance = freeCollateral?.current || 0;
  useDocumentTitle(stringGetter({ key: STRING_KEYS.PORTFOLIO }));
  const routesComponent = (
-    <Routes>
+    <Suspense fallback={<LoadingSpace id="portfolio" />}>
-      <Route path={PortfolioRoute.Overview} element={<Overview />} />
+      <Routes>
-      <Route path={PortfolioRoute.Positions} element={<Positions />} />
+        <Route path={PortfolioRoute.Overview} element={<Overview />} />
-      <Route path={PortfolioRoute.Orders} element={<Orders />} />
+        <Route path={PortfolioRoute.Positions} element={<Positions />} />
-      <Route path={PortfolioRoute.Fees} element={<Fees />} />
+        <Route path={PortfolioRoute.Orders} element={<Orders />} />
-      <Route path={PortfolioRoute.History} element={<History />}>
+        <Route path={PortfolioRoute.Fees} element={<Fees />} />
-        <Route index path="*" element={<Navigate to={HistoryRoute.Trades} />} />
+        <Route path={PortfolioRoute.History} element={<History />}>
-        <Route
+          <Route index path="*" element={<Navigate to={HistoryRoute.Trades} />} />
-          path={HistoryRoute.Trades}
+          <Route
-          element={
+            path={HistoryRoute.Trades}
-            <FillsTable
+            element={
-              columnKeys={
+              <FillsTable
-                isTablet
+                columnKeys={
-                  ? [
+                  isTablet
-                      FillsTableColumnKey.Time,
+                    ? [
-                      FillsTableColumnKey.TypeAmount,
+                        FillsTableColumnKey.Time,
-                      FillsTableColumnKey.PriceFee,
+                        FillsTableColumnKey.TypeAmount,
-                    ]
+                        FillsTableColumnKey.PriceFee,
-                  : [
+                      ]
-                      FillsTableColumnKey.Time,
+                    : [
-                      FillsTableColumnKey.Market,
+                        FillsTableColumnKey.Time,
-                      FillsTableColumnKey.Side,
+                        FillsTableColumnKey.Market,
-                      FillsTableColumnKey.AmountPrice,
+                        FillsTableColumnKey.Side,
-                      FillsTableColumnKey.TotalFee,
+                        FillsTableColumnKey.AmountPrice,
-                      FillsTableColumnKey.Type,
+                        FillsTableColumnKey.TotalFee,
-                      FillsTableColumnKey.Liquidity,
+                        FillsTableColumnKey.Type,
-                    ]
+                        FillsTableColumnKey.Liquidity,
-              }
+                      ]
-              withOuterBorder={isNotTablet}
+                }
-            />
+                withOuterBorder={isNotTablet}
-          }
+              />
-        />
+            }
-        <Route
+          />
-          path={HistoryRoute.Transfers}
+          <Route
-          element={<TransferHistoryTable withOuterBorder={isNotTablet} />}
+            path={HistoryRoute.Transfers}
-        />
+            element={<TransferHistoryTable withOuterBorder={isNotTablet} />}
-        <Route
+          />
-          path={HistoryRoute.Payments}
+          <Route
-          element={<FundingPaymentsTable withOuterBorder={isNotTablet} />}
+            path={HistoryRoute.Payments}
-        />
+            element={<FundingPaymentsTable withOuterBorder={isNotTablet} />}
-      </Route>
+          />
-      <Route path="*" element={<Navigate to={PortfolioRoute.Overview} replace />} />
+        </Route>
-    </Routes>
+        <Route path="*" element={<Navigate to={PortfolioRoute.Overview} replace />} />
      </Routes>
    </Suspense>
  );
  return isTablet ? (
@@ -113,14 +125,28 @@ export default () => {
                    },
                    {
                      value: PortfolioRoute.Positions,
-                      slotBefore: <Styled.Icon iconName={IconName.Cube} />,
+                      slotBefore: <Styled.Icon iconName={IconName.Positions} />,
-                      label: stringGetter({ key: STRING_KEYS.POSITIONS }),
+                      label: (
                        <>
                          {stringGetter({ key: STRING_KEYS.POSITIONS })}
                          {numPositions > 0 && (
                            <Tag type={TagType.Number}> {numPositions} </Tag>
                          )}
                        </>
                      ),
                      href: PortfolioRoute.Positions,
                    },
                    {
                      value: PortfolioRoute.Orders,
                      slotBefore: <Styled.Icon iconName={IconName.OrderPending} />,
-                      label: stringGetter({ key: STRING_KEYS.ORDERS }),
+                      label: (
                        <>
                          {stringGetter({ key: STRING_KEYS.ORDERS })}
                          {numOrders > 0 && (
                            <Tag type={TagType.Number}> {numOrders} </Tag>
                          )}
                        </>
                      ),
                      href: PortfolioRoute.Orders,
                    },
                    {
@@ -191,7 +217,7 @@ Styled.SideBar = styled.div`
 Styled.Footer = styled.div`
  ${layoutMixins.row}
  flex-wrap: wrap;
-  
+
  padding: 1rem;
  gap: 0.5rem;
@@ -2,7 +2,6 @@ import type { ElementType } from 'react';
 import styled, { AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import breakpoints from '@/styles/breakpoints';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { useAccountBalance, useAccounts, useTokenConfigs, useStringGetter } from '@/hooks';
@@ -33,7 +32,7 @@ export const DYDXBalancePanel = () => {
  const { chainTokenLabel } = useTokenConfigs();
  return (
-    <Styled.Panel
+    <Panel
      slotHeader={
        <Styled.Header>
          <Styled.Title>
@@ -109,21 +108,12 @@ export const DYDXBalancePanel = () => {
          ]}
        />
      </Styled.Content>
-    </Styled.Panel>
+    </Panel>
  );
 };
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Panel = styled(Panel)`
  --panel-paddingX: 1.5rem;
  @media ${breakpoints.tablet} {
    --panel-paddingY: 1.5rem;
    --panel-content-paddingY: 1rem;
  }
 `;
 Styled.Header = styled.div`
  ${layoutMixins.spacedRow}
  gap: 1rem;
@@ -24,6 +24,8 @@ import { openDialog } from '@/state/dialogs';
 import { log } from '@/lib/telemetry';
 const SEASON_NUMBER = 2;
 export const LaunchIncentivesPanel = () => {
  const { isNotTablet } = useBreakpoints();
  const dispatch = useDispatch();
@@ -68,10 +70,12 @@ const EstimatedRewards = () => {
  const { data, isLoading } = useQuery({
    enabled: !!dydxAddress,
-    queryKey: `launch_incentives_rewards_${dydxAddress ?? ''}`,
+    queryKey: `launch_incentives_rewards_${dydxAddress ?? ''}_${SEASON_NUMBER}`,
    queryFn: async () => {
      if (!dydxAddress) return undefined;
-      const resp = await fetch(`https://cloud.chaoslabs.co/query/api/dydx/points/${dydxAddress}`);
+      const resp = await fetch(
        `https://cloud.chaoslabs.co/query/api/dydx/points/${dydxAddress}?n=${SEASON_NUMBER}`
      );
      return (await resp.json())?.incentivePoints;
    },
    onError: (error: Error) => log('LaunchIncentives/fetchPoints', error),
@@ -85,9 +89,7 @@ const EstimatedRewards = () => {
          <Styled.Season>
            {stringGetter({
              key: STRING_KEYS.LAUNCH_INCENTIVES_SEASON_NUM,
-              params: {
+              params: { SEASON_NUMBER },
                SEASON_NUMBER: 1,
              },
            })}
          </Styled.Season>
        </div>
@@ -151,15 +153,8 @@ const LaunchIncentivesContent = () => {
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Panel = styled(Panel)`
  --panel-paddingY: 1rem;
  --panel-paddingX: 1.5rem;
  background-color: var(--color-layer-4);
  width: 100%;
  @media ${breakpoints.tablet} {
    --panel-paddingY: 1.5rem;
  }
 `;
 Styled.ForV4 = styled.span`
@@ -223,7 +218,7 @@ Styled.Column = styled.div`
 Styled.EstimatedRewardsCard = styled.div`
  ${layoutMixins.spacedRow}
  padding: 1rem 1.25rem;
-  min-width: 21.25rem;
+  min-width: 19rem;
  height: calc(100% - calc(1.5rem * 2));
  margin: 1.5rem;
@@ -7,8 +7,6 @@ import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons';
 import { useAccountBalance, useBreakpoints, useStringGetter } from '@/hooks';
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { Details } from '@/components/Details';
@@ -28,7 +26,7 @@ import { MustBigNumber } from '@/lib/numbers';
 const TOKEN_MIGRATION_LEARN_MORE_LINK =
  'https://www.dydx.foundation/blog/update-on-exploring-the-future-of-dydx';
-export const MigratePanel = () => {
+export const MigratePanel = ({ className }: { className?: string }) => {
  const { isNotTablet } = useBreakpoints();
  const stringGetter = useStringGetter();
@@ -45,6 +43,7 @@ export const MigratePanel = () => {
  return isNotTablet ? (
    <Styled.MigratePanel
      className={className}
      slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.MIGRATE })}</Styled.Title>}
      slotRight={
        <Styled.MigrateAction>
@@ -74,6 +73,7 @@ export const MigratePanel = () => {
    </Styled.MigratePanel>
  ) : (
    <Styled.MigratePanel
      className={className}
      slotHeader={
        <Styled.MobileMigrateHeader>
          <h3>
@@ -134,17 +134,11 @@ export const MigratePanel = () => {
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.MigratePanel = styled(Panel)`
  --panel-paddingX: 1.5rem;
  width: 100%;
  background-image: url('/dots-background.svg');
  background-position: right;
  background-repeat: no-repeat;
  @media ${breakpoints.tablet} {
    --panel-paddingY: 1.5rem;
    --panel-content-paddingY: 1rem;
  }
 `;
 Styled.Title = styled.h3`
@@ -157,7 +151,7 @@ Styled.Title = styled.h3`
 Styled.MigrateAction = styled.div`
  ${layoutMixins.flexEqualColumns}
  align-items: center;
-  margin-right: 1rem;
+  margin: 1rem;
  gap: 1rem;
  padding: 1rem;
  width: 100%;
@@ -197,7 +191,7 @@ Styled.MobileMigrateHeader = styled.div`
  font: var(--font-small-book);
  color: var(--color-text-0);
-  padding: 1rem 1.5rem 0;
+  padding: 1rem 1rem 0;
  h3 {
    ${layoutMixins.inlineRow}
@@ -0,0 +1,86 @@
 import styled, { AnyStyledComponent } from 'styled-components';
 import { breakpoints } from '@/styles';
 import { STRING_KEYS } from '@/constants/localization';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { useStringGetter } from '@/hooks';
 import { Accordion } from '@/components/Accordion';
 import { Link } from '@/components/Link';
 import { Panel } from '@/components/Panel';
 const REWARDS_LEARN_MORE_LINK = ''; // to be configured
 export const RewardsHelpPanel = () => {
  const stringGetter = useStringGetter();
  return (
    <Styled.HelpCard
      slotHeader={
        <Styled.Header>
          <h3>{stringGetter({ key: STRING_KEYS.HELP })}</h3>
          {REWARDS_LEARN_MORE_LINK && (
            <Link withIcon href={REWARDS_LEARN_MORE_LINK}>
              {stringGetter({ key: STRING_KEYS.LEARN_MORE })}
            </Link>
          )}
        </Styled.Header>
      }
    >
      <Accordion
        items={[
          {
            header: 'Who is eligible for trading rewards?',
            content: 'All traders are eligible for trading rewards.',
          },
          {
            header: 'How do trading rewards work?',
            content:
              'Immediately after each fill, trading rewards are sent directly to the trader’s dYdX Chain address, based on the amount of fees paid by the trader.',
          },
          {
            header: 'How do I claim my rewards?',
            content:
              'Each block, trading rewards are automatically sent directly to the trader’s dYdX Chain address.',
          },
        ]}
      />
    </Styled.HelpCard>
  );
 };
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.HelpCard = styled(Panel)`
  --panel-content-paddingX: 0;
  --panel-content-paddingY: 0;
  width: 100%;
  height: max-content;
  padding: 0;
  gap: 0;
  text-align: start;
 `;
 Styled.Header = styled.div`
  ${layoutMixins.spacedRow}
  gap: 1ch;
  padding: 1rem 1rem;
  border-bottom: var(--border-width) solid var(--border-color);
  font: var(--font-small-book);
  @media ${breakpoints.notTablet} {
    padding: 1.5rem 1.25rem;
  }
  h3 {
    font: var(--font-medium-book);
    color: var(--color-text-2);
  }
 `;
 Styled.Link = styled(Link)`
  display: inline-flex;
 `;
@@ -1,15 +1,18 @@
 import styled, { AnyStyledComponent } from 'styled-components';
 import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import { STRING_KEYS } from '@/constants/localization';
 import { ButtonAction, ButtonSize } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
 import { AppRoute } from '@/constants/routes';
 import { useBreakpoints, useStringGetter, useURLConfigs } from '@/hooks';
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { BackButton } from '@/components/BackButton';
 import { Panel } from '@/components/Panel';
 import { IconName } from '@/components/Icon';
 import { IconButton } from '@/components/IconButton';
@@ -20,12 +23,14 @@ import { openDialog } from '@/state/dialogs';
 import { DYDXBalancePanel } from './DYDXBalancePanel';
 import { MigratePanel } from './MigratePanel';
 import { LaunchIncentivesPanel } from './LaunchIncentivesPanel';
 import { RewardsHelpPanel } from './RewardsHelpPanel';
-export const RewardsPage = () => {
+const RewardsPage = () => {
  const dispatch = useDispatch();
  const stringGetter = useStringGetter();
  const { governanceLearnMore, stakingLearnMore } = useURLConfigs();
  const { isTablet, isNotTablet } = useBreakpoints();
  const navigate = useNavigate();
  const panelArrow = (
    <Styled.Arrow>
@@ -39,13 +44,16 @@ export const RewardsPage = () => {
  return (
    <Styled.Page>
-      {import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}
+      {isTablet && (
        <Styled.MobileHeader>
          <BackButton onClick={() => navigate(AppRoute.Profile)} />
          {stringGetter({ key: STRING_KEYS.TRADING_REWARDS })}
        </Styled.MobileHeader>
      )}
      {import.meta.env.VITE_V3_TOKEN_ADDRESS && isNotTablet && <MigratePanel />}
      {isTablet ? (
-        <>
+        <LaunchIncentivesPanel />
          <LaunchIncentivesPanel />
          <DYDXBalancePanel />
        </>
      ) : (
        <Styled.PanelRowIncentivesAndBalance>
          <LaunchIncentivesPanel />
@@ -55,7 +63,9 @@ export const RewardsPage = () => {
      <Styled.PanelRow>
        <Styled.Panel
-          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
+          slotHeaderContent={
            <Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>
          }
          slotRight={panelArrow}
          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
        >
@@ -68,7 +78,9 @@ export const RewardsPage = () => {
        </Styled.Panel>
        <Styled.Panel
-          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>}
+          slotHeaderContent={
            <Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>
          }
          slotRight={panelArrow}
          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
        >
@@ -80,10 +92,14 @@ export const RewardsPage = () => {
          </Styled.Description>
        </Styled.Panel>
      </Styled.PanelRow>
      <RewardsHelpPanel />
    </Styled.Page>
  );
 };
 export default RewardsPage;
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Page = styled.div`
@@ -93,33 +109,41 @@ Styled.Page = styled.div`
  align-items: center;
  > * {
-    --content-max-width: 70rem;
+    --content-max-width: 80rem;
    max-width: min(calc(100vw - 4rem), var(--content-max-width));
  }
  @media ${breakpoints.tablet} {
-    padding: 1.25rem;
+    --stickyArea-topHeight: var(--page-header-height-mobile);
    padding: 0 1rem 1rem;
    > * {
-      max-width: calc(100vw - 2.5rem);
+      max-width: calc(100vw - 2rem);
      width: 100%;
    }
  }
 `;
-Styled.Panel = styled(Panel)`
+Styled.MobileHeader = styled.header`
-  --panel-paddingX: 1.5rem;
+  ${layoutMixins.contentSectionDetachedScrollable}
  ${layoutMixins.stickyHeader}
  z-index: 2;
  padding: 1.25rem 0;
  margin-bottom: -1.5rem;
-  @media ${breakpoints.tablet} {
+  font: var(--font-large-medium);
-    --panel-paddingY: 1.5rem;
+  color: var(--color-text-2);
-    --panel-content-paddingY: 1rem;
+  background-color: var(--color-layer-2);
-  }
+`;
 Styled.Panel = styled(Panel)`
  height: fit-content;
 `;
 Styled.Title = styled.h3`
  font: var(--font-medium-book);
  color: var(--color-text-2);
-  padding: 1rem 1.5rem 0;
+  margin-bottom: -1rem;
 `;
 Styled.Description = styled.div`
@@ -25,7 +25,7 @@ import { useNetworks } from '@/views/menus/useNetworks';
 import { SettingsHeader } from './SettingsHeader';
 import { ComingSoonSpace } from '@/components/ComingSoon';
-export const SettingsPage = () => {
+const SettingsPage = () => {
  const stringGetter = useStringGetter();
  const { pathname } = useLocation();
  const dispatch = useDispatch();
@@ -105,3 +105,5 @@ export const SettingsPage = () => {
    </>
  );
 };
 export default SettingsPage;
@@ -1,8 +1,7 @@
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { AbacusOrderStatus } from '@/constants/abacus';
 import { STRING_KEYS } from '@/constants/localization';
 import { useBreakpoints, useStringGetter } from '@/hooks';
@@ -28,7 +27,6 @@ import {
  getCurrentMarketTradeInfoNumbers,
  getHasUnseenFillUpdates,
  getHasUnseenOrderUpdates,
  getLatestOrderStatus,
  getTradeInfoNumbers,
 } from '@/state/accountSelectors';
@@ -82,125 +80,141 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
    showCurrentMarket ? numOpenOrders : numTotalOpenOrders
  );
-  const tabItems = [
+  const tabItems = useMemo(
-    {
+    () => [
-      value: InfoSection.Position,
+      {
-      label: stringGetter({
+        value: InfoSection.Position,
-        key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
+        label: stringGetter({
-      }),
+          key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
        }),
-      tag: showCurrentMarket ? null : shortenNumberForDisplay(numTotalPositions),
+        tag: showCurrentMarket ? null : shortenNumberForDisplay(numTotalPositions),
-      content: showCurrentMarket ? (
+        content: showCurrentMarket ? (
-        <PositionInfo showNarrowVariation={isTablet} />
+          <PositionInfo showNarrowVariation={isTablet} />
-      ) : (
+        ) : (
-        <PositionsTable
+          <PositionsTable
-          columnKeys={
+            columnKeys={
-            isTablet
+              isTablet
-              ? [
+                ? [
-                  PositionsTableColumnKey.Details,
+                    PositionsTableColumnKey.Details,
-                  PositionsTableColumnKey.IndexEntry,
+                    PositionsTableColumnKey.IndexEntry,
-                  PositionsTableColumnKey.PnL,
+                    PositionsTableColumnKey.PnL,
-                ]
+                  ]
-              : [
+                : [
-                  PositionsTableColumnKey.Market,
+                    PositionsTableColumnKey.Market,
-                  PositionsTableColumnKey.Side,
+                    PositionsTableColumnKey.Side,
-                  PositionsTableColumnKey.Size,
+                    PositionsTableColumnKey.Size,
-                  PositionsTableColumnKey.Leverage,
+                    PositionsTableColumnKey.Leverage,
-                  PositionsTableColumnKey.LiquidationAndOraclePrice,
+                    PositionsTableColumnKey.LiquidationAndOraclePrice,
-                  PositionsTableColumnKey.UnrealizedPnl,
+                    PositionsTableColumnKey.UnrealizedPnl,
-                  PositionsTableColumnKey.RealizedPnl,
+                    PositionsTableColumnKey.RealizedPnl,
-                  PositionsTableColumnKey.AverageOpenAndClose,
+                    PositionsTableColumnKey.AverageOpenAndClose,
-                ]
+                  ]
-          }
+            }
-          onNavigate={() => setView(PanelView.CurrentMarket)}
+            onNavigate={() => setView(PanelView.CurrentMarket)}
-        />
+          />
-      ),
+        ),
-    },
+      },
-    {
+      {
-      value: InfoSection.Orders,
+        asChild: true,
-      label: stringGetter({ key: STRING_KEYS.ORDERS }),
+        value: InfoSection.Orders,
        label: stringGetter({ key: STRING_KEYS.ORDERS }),
-      slotRight: isWaitingForOrderToIndex ? (
+        slotRight: isWaitingForOrderToIndex ? (
-        <Styled.LoadingSpinner />
+          <Styled.LoadingSpinner />
-      ) : (
+        ) : (
-        ordersTagNumber && (
+          ordersTagNumber && (
-          <Tag type={TagType.Number} isHighlighted={hasUnseenOrderUpdates}>
+            <Tag type={TagType.Number} isHighlighted={hasUnseenOrderUpdates}>
-            {ordersTagNumber}
+              {ordersTagNumber}
            </Tag>
          )
        ),
        content: (
          <OrdersTable
            currentMarket={showCurrentMarket ? currentMarketId : undefined}
            columnKeys={
              isTablet
                ? [OrdersTableColumnKey.StatusFill, OrdersTableColumnKey.PriceType]
                : [
                    !showCurrentMarket && OrdersTableColumnKey.Market,
                    OrdersTableColumnKey.Status,
                    OrdersTableColumnKey.Side,
                    OrdersTableColumnKey.AmountFill,
                    OrdersTableColumnKey.Price,
                    OrdersTableColumnKey.Trigger,
                    OrdersTableColumnKey.GoodTil,
                    !isAccountViewOnly && OrdersTableColumnKey.Actions,
                  ].filter(isTruthy)
            }
          />
        ),
      },
      {
        asChild: true,
        value: InfoSection.Fills,
        label: stringGetter({ key: STRING_KEYS.FILLS }),
        slotRight: fillsTagNumber && (
          <Tag type={TagType.Number} isHighlighted={hasUnseenFillUpdates}>
            {fillsTagNumber}
          </Tag>
-        )
+        ),
      ),
-      content: (
+        content: (
-        <OrdersTable
+          <FillsTable
-          currentMarket={showCurrentMarket ? currentMarketId : undefined}
+            currentMarket={showCurrentMarket ? currentMarketId : undefined}
-          columnKeys={
+            columnKeys={
-            isTablet
+              isTablet
-              ? [OrdersTableColumnKey.StatusFill, OrdersTableColumnKey.PriceType]
+                ? [
-              : [
+                    FillsTableColumnKey.Time,
-                  !showCurrentMarket && OrdersTableColumnKey.Market,
+                    FillsTableColumnKey.TypeAmount,
-                  OrdersTableColumnKey.Status,
+                    FillsTableColumnKey.PriceFee,
-                  OrdersTableColumnKey.Side,
+                  ]
-                  OrdersTableColumnKey.AmountFill,
+                : [
-                  OrdersTableColumnKey.Price,
+                    !showCurrentMarket && FillsTableColumnKey.Market,
-                  OrdersTableColumnKey.Trigger,
+                    FillsTableColumnKey.Time,
-                  OrdersTableColumnKey.GoodTil,
+                    FillsTableColumnKey.Type,
-                  !isAccountViewOnly && OrdersTableColumnKey.Actions,
+                    FillsTableColumnKey.Side,
-                ].filter(isTruthy)
+                    FillsTableColumnKey.AmountTag,
-          }
+                    FillsTableColumnKey.Price,
-        />
+                    FillsTableColumnKey.TotalFee,
-      ),
+                    FillsTableColumnKey.Liquidity,
-    },
+                  ].filter(isTruthy)
-    {
+            }
-      value: InfoSection.Fills,
+            columnWidths={{
-      label: stringGetter({ key: STRING_KEYS.FILLS }),
+              [FillsTableColumnKey.TypeAmount]: '100%',
            }}
          />
        ),
      },
      // TODO - TRCL-1693 - re-enable when funding payments are supported
      // {
      //   value: InfoSection.Payments,
      //   label: stringGetter({ key: STRING_KEYS.PAYMENTS }),
-      slotRight: fillsTagNumber && (
+      //   tag: shortenNumberForDisplay(
-        <Tag type={TagType.Number} isHighlighted={hasUnseenFillUpdates}>
+      //     showCurrentMarket ? numFundingPayments : numTotalFundingPayments
-          {fillsTagNumber}
+      //   ),
-        </Tag>
+      //   content: (
-      ),
+      //     <FundingPaymentsTable currentMarket={showCurrentMarket ? currentMarket?.id : undefined} />
-
+      //   ),
-      content: (
+      // },
-        <FillsTable
+    ],
-          currentMarket={showCurrentMarket ? currentMarketId : undefined}
+    [
-          columnKeys={
+      stringGetter,
-            isTablet
+      currentMarketId,
-              ? [
+      showCurrentMarket,
-                  FillsTableColumnKey.Time,
+      isTablet,
-                  FillsTableColumnKey.TypeAmount,
+      isWaitingForOrderToIndex,
-                  FillsTableColumnKey.PriceFee,
+      isAccountViewOnly,
-                ]
+      ordersTagNumber,
-              : [
+      fillsTagNumber,
-                  !showCurrentMarket && FillsTableColumnKey.Market,
+      hasUnseenFillUpdates,
-                  FillsTableColumnKey.Time,
+      hasUnseenOrderUpdates,
-                  FillsTableColumnKey.Type,
+    ]
-                  FillsTableColumnKey.Side,
+  );
                  FillsTableColumnKey.AmountTag,
                  FillsTableColumnKey.Price,
                  FillsTableColumnKey.TotalFee,
                  FillsTableColumnKey.Liquidity,
                ].filter(isTruthy)
          }
          columnWidths={{
            [FillsTableColumnKey.TypeAmount]: '100%',
          }}
        />
      ),
    },
    // TODO - TRCL-1693 - re-enable when funding payments are supported
    // {
    //   value: InfoSection.Payments,
    //   label: stringGetter({ key: STRING_KEYS.PAYMENTS }),
    //   tag: shortenNumberForDisplay(
    //     showCurrentMarket ? numFundingPayments : numTotalFundingPayments
    //   ),
    //   content: (
    //     <FundingPaymentsTable currentMarket={showCurrentMarket ? currentMarket?.id : undefined} />
    //   ),
    // },
  ];
  return isTablet ? (
    <MobileTabs defaultValue={InfoSection.Position} items={tabItems} withBorders={false} />
@@ -1,10 +1,8 @@
 import { createSelector } from 'reselect';
 import { SubaccountPosition } from '@/constants/abacus';
 import { OnboardingState, OnboardingSteps } from '@/constants/account';
 import {
  getExistingOpenPositions,
  getOnboardingGuards,
  getOnboardingState,
  getSubaccountId,
@@ -60,13 +58,8 @@ export const calculateIsAccountViewOnly = createSelector(
 );
 /**
- * @description calculate whether the subaccount has open positions
+ * @description calculate whether the subaccount has uncommitted positions
 */
 export const calculateHasOpenPositions = createSelector(
  [getExistingOpenPositions],
  (openPositions?: SubaccountPosition[]) => (openPositions?.length || 0) > 0
 );
 export const calculateHasUncommittedOrders = createSelector(
  [getUncommittedOrderClientIds],
  (uncommittedOrderClientIds: number[]) => uncommittedOrderClientIds.length > 0
@@ -2,6 +2,7 @@ import { OrderSide } from '@dydxprotocol/v4-client-js';
 import { createSelector } from 'reselect';
 import {
  type AbacusOrderStatuses,
  type SubaccountOrder,
  type SubaccountFill,
  type SubaccountFundingPayment,
@@ -43,7 +44,6 @@ export const getSubaccountBuyingPower = (state: RootState) => state.account.suba
 export const getSubaccountEquity = (state: RootState) => state.account.subaccount?.equity;
 export const getSubaccountHistoricalPnl = (state: RootState) => state.account?.historicalPnl;
 /**
 * @param state
 * @returns list of a subaccount's open positions. Each item in the list is an open position in a different market.
@@ -258,6 +258,14 @@ export const getCurrentMarketFundingPayments = createSelector(
    !currentMarketId ? [] : marketFundingPayments[currentMarketId]
 );
 /**
 * @param state
 * @returns boolean on whether an order status is considered open
 */
 const isOpenOrderStatus = (status: AbacusOrderStatuses) => {
  return status !== AbacusOrderStatus.filled && status !== AbacusOrderStatus.cancelled;
 };
 /**
 * @param state
 * @returns Total numbers of the subaccount's open positions, open orders and fills
@@ -266,8 +274,7 @@ export const getTradeInfoNumbers = createSelector(
  [getExistingOpenPositions, getSubaccountOrders, getSubaccountFills, getSubaccountFundingPayments],
  (positions, orders, fills, fundingPayments) => ({
    numTotalPositions: positions?.length,
-    numTotalOpenOrders: orders?.filter((order) => order.status !== AbacusOrderStatus.cancelled)
+    numTotalOpenOrders: orders?.filter((order) => isOpenOrderStatus(order.status)).length,
      .length,
    numTotalFills: fills?.length,
    numTotalFundingPayments: fundingPayments?.length,
  })
@@ -281,8 +288,7 @@ export const getCurrentMarketTradeInfoNumbers = createSelector(
  [getCurrentMarketOrders, getCurrentMarketFills, getCurrentMarketFundingPayments],
  (marketOrders, marketFills, marketFundingPayments) => {
    return {
-      numOpenOrders: marketOrders?.filter((order) => order.status !== AbacusOrderStatus.cancelled)
+      numOpenOrders: marketOrders?.filter((order) => isOpenOrderStatus(order.status)).length,
        .length,
      numFills: marketFills?.length,
      numFundingPayments: marketFundingPayments?.length,
    };
@@ -26,7 +26,12 @@ export const calculateFundingRateHistory = createSelector(
    return data.map(({ effectiveAtMilliseconds, rate }) => ({
      time: effectiveAtMilliseconds,
      fundingRate: rate,
-      direction: rate < 0 ? FundingDirection.ToLong : FundingDirection.ToShort,
+      direction:
        rate === 0
          ? FundingDirection.None
          : rate < 0
          ? FundingDirection.ToLong
          : FundingDirection.ToShort,
    }));
  }
 );
@@ -877,11 +877,6 @@ export const layoutMixins: Record<
    }
  `,
  perspectiveArea: css`
    perspective: 100rem;
    transform-style: preserve-3d;
  `,
  absolute: css`
    position: absolute;
    top: 0;
@@ -63,7 +63,6 @@ Styled.AccountInfoSectionContainer = styled.div<{ showAccountInfo?: boolean }>`
  ${layoutMixins.column}
  height: var(--account-info-section-height);
  min-height: var(--account-info-section-height);
  overflow-x: clip;
  ${({ showAccountInfo }) =>
    !showAccountInfo &&
@@ -203,7 +203,6 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Stack = styled.div`
  ${layoutMixins.stack}
  ${layoutMixins.perspectiveArea}
 `;
 Styled.CornerButton = styled(Button)`
@@ -293,7 +292,14 @@ Styled.TransferButtons = styled.div`
 Styled.ConnectedAccountInfoContainer = styled.div<{ $showHeader?: boolean }>`
  ${layoutMixins.column}
-  ${layoutMixins.withOuterAndInnerBorders}
+
  @media ${breakpoints.notTablet} {
    ${layoutMixins.withOuterAndInnerBorders}
  }
  @media ${breakpoints.tablet} {
    ${layoutMixins.withInnerBorder}
  }
  ${({ $showHeader }) =>
    $showHeader &&
@@ -2,9 +2,7 @@ import styled, { type AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';
 import { STRING_KEYS } from '@/constants/localization';
 import { MARKETS_TO_DISPLAY } from '@/constants/markets';
 import { useBreakpoints, useStringGetter } from '@/hooks';
 import { testFlags } from '@/lib/testFlags';
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -34,7 +32,6 @@ export const ExchangeBillboards: React.FC<ExchangeBillboardsProps> = ({
  Object.values(perpetualMarkets)
    .filter(Boolean)
    .filter(({ id }) => (testFlags.displayAllMarkets ? true : MARKETS_TO_DISPLAY.includes(id)))
    .forEach(({ oraclePrice, perpetual }) => {
      const { volume24H, trades24H, openInterest = 0 } = perpetual || {};
      volume24HUSDC += volume24H ?? 0;
@@ -29,7 +29,6 @@ export const MarketDetails: React.FC = () => {
  if (!configs) return null;
  const {
    basePositionNotional,
    tickSize,
    stepSize,
    initialMarginFraction,
@@ -114,17 +113,11 @@ export const MarketDetails: React.FC = () => {
      ),
    },
    {
-      key: 'base-initial-margin-fraction',
+      key: 'initial-margin-fraction',
-      label: stringGetter({ key: STRING_KEYS.BASE_INITIAL_MARGIN_FRACTION }),
+      label: stringGetter({ key: STRING_KEYS.INITIAL_MARGIN_FRACTION }),
      tooltip: 'initial-margin-fraction',
      value: <Output useGrouping value={initialMarginFraction} type={OutputType.SmallPercent} />,
    },
    {
      key: 'base-position-notional',
      label: stringGetter({ key: STRING_KEYS.BASE_POSITION_NOTIONAL }),
      tooltip: 'base-position-notional',
      value: <Output useGrouping value={basePositionNotional} type={OutputType.Number} />,
    },
  ];
  return (
@@ -213,13 +206,8 @@ Styled.MarketDetails = styled.div`
 `;
 Styled.Header = styled.header`
  /* max-width: fit-content; */
  ${layoutMixins.column}
  gap: 1.25rem;
  position: sticky;
  bottom: 3rem;
 `;
 Styled.WrapRow = styled.div`
@@ -453,13 +453,6 @@ Styled.Actions = styled.footer`
  > :last-child {
    flex: 2;
  }
  position: sticky;
  bottom: clamp(0.5rem, 7.5%, 2rem);
  @media ${breakpoints.tablet} {
    bottom: 0;
  }
 `;
 Styled.Output = styled(Output)<{ sign: NumberSign; smallText?: boolean; margin?: string }>`
@@ -514,6 +507,7 @@ Styled.PositionInfo = styled.div`
 Styled.DetachedSection = styled(DetachedSection)`
  padding: 0 1.5rem;
  position: relative;
 `;
 Styled.DetachedScrollableSection = styled(DetachedScrollableSection)`
@@ -0,0 +1,220 @@
 import { useMemo } from 'react';
 import { OrderSide } from '@dydxprotocol/v4-client-js';
 import type { RenderTooltipParams } from '@visx/xychart/lib/components/Tooltip';
 import { shallowEqual, useSelector } from 'react-redux';
 import type { Nullable } from '@/constants/abacus';
 import {
  DepthChartDatum,
  DepthChartPoint,
  DepthChartSeries,
  SERIES_KEY_FOR_ORDER_SIDE,
 } from '@/constants/charts';
 import { STRING_KEYS } from '@/constants/localization';
 import { useStringGetter } from '@/hooks';
 import { useOrderbookValuesForDepthChart } from '@/hooks/useOrderbookValues';
 import { TooltipContent } from '@/components/visx/TooltipContent';
 import { Details } from '@/components/Details';
 import { Output, OutputType } from '@/components/Output';
 import { getCurrentMarketAssetData } from '@/state/assetsSelectors';
 import { MustBigNumber } from '@/lib/numbers';
 type DepthChartTooltipProps = {
  chartPointAtPointer: DepthChartPoint;
  isEditingOrder?: boolean;
  stepSizeDecimals: Nullable<number>;
  tickSizeDecimals: Nullable<number>;
 } & Pick<RenderTooltipParams<DepthChartDatum>, 'colorScale' | 'tooltipData'>;
 export const DepthChartTooltipContent = ({
  chartPointAtPointer,
  colorScale,
  isEditingOrder,
  stepSizeDecimals,
  tickSizeDecimals,
  tooltipData,
 }: DepthChartTooltipProps) => {
  const { nearestDatum } = tooltipData || {};
  const stringGetter = useStringGetter();
  const { spread, spreadPercent, midMarketPrice } = useOrderbookValuesForDepthChart();
  const { id = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
  const priceImpact = useMemo(() => {
    if (nearestDatum) {
      const depthChartSeries = nearestDatum.key as DepthChartSeries;
      return {
        [DepthChartSeries.Bids]: MustBigNumber(nearestDatum?.datum.price)
          .minus(chartPointAtPointer.price)
          .div(nearestDatum?.datum.price),
        [DepthChartSeries.Asks]: MustBigNumber(chartPointAtPointer.price)
          .minus(nearestDatum?.datum.price)
          .div(chartPointAtPointer.price),
        [DepthChartSeries.MidMarket]: undefined,
      }[depthChartSeries];
    }
    return undefined;
  }, [nearestDatum, chartPointAtPointer.price]);
  if (!isEditingOrder && !nearestDatum?.datum) return null;
  return (
    <TooltipContent
      accentColor={
        nearestDatum?.key &&
        colorScale?.(
          isEditingOrder ? SERIES_KEY_FOR_ORDER_SIDE[chartPointAtPointer.side] : nearestDatum.key
        )
      }
    >
      <h4>
        {isEditingOrder
          ? stringGetter({ key: STRING_KEYS.RELEASE_TO_EDIT })
          : nearestDatum &&
            {
              [DepthChartSeries.Bids]: stringGetter({ key: STRING_KEYS.BIDS }),
              [DepthChartSeries.Asks]: stringGetter({ key: STRING_KEYS.ASKS }),
              [DepthChartSeries.MidMarket]: stringGetter({ key: STRING_KEYS.MID_MARKET }),
            }[nearestDatum.key]}
      </h4>
      <Details
        layout="column"
        items={
          isEditingOrder
            ? [
                {
                  key: 'side',
                  label: stringGetter({ key: STRING_KEYS.SIDE }),
                  value: (
                    <Output
                      type={OutputType.Text}
                      value={
                        {
                          [OrderSide.BUY]: stringGetter({
                            key: STRING_KEYS.BUY,
                          }),
                          [OrderSide.SELL]: stringGetter({
                            key: STRING_KEYS.SELL,
                          }),
                        }[chartPointAtPointer.side]
                      }
                    />
                  ),
                },
                {
                  key: 'limitPrice',
                  label: stringGetter({ key: STRING_KEYS.LIMIT_PRICE }),
                  value: (
                    <Output
                      type={OutputType.Fiat}
                      value={chartPointAtPointer.price}
                      useGrouping={false}
                    />
                  ),
                },
                {
                  key: 'size',
                  label: stringGetter({ key: STRING_KEYS.AMOUNT }),
                  value: (
                    <Output
                      type={OutputType.Asset}
                      value={chartPointAtPointer.size}
                      fractionDigits={stepSizeDecimals}
                      tag={id}
                      useGrouping={false}
                    />
                  ),
                },
              ]
            : nearestDatum?.key === DepthChartSeries.MidMarket
            ? [
                {
                  key: 'midMarketPrice',
                  label: stringGetter({ key: STRING_KEYS.PRICE }),
                  value: (
                    <Output type={OutputType.Fiat} value={midMarketPrice} useGrouping={false} />
                  ),
                },
                {
                  key: 'spread',
                  label: stringGetter({ key: STRING_KEYS.ORDERBOOK_SPREAD }),
                  value: (
                    <>
                      <Output
                        type={OutputType.Fiat}
                        value={spread}
                        fractionDigits={tickSizeDecimals}
                        useGrouping={false}
                      />
                      <Output
                        type={OutputType.SmallPercent}
                        value={spreadPercent}
                        withParentheses
                      />
                    </>
                  ),
                },
              ]
            : [
                {
                  key: 'price',
                  label: stringGetter({ key: STRING_KEYS.PRICE }),
                  value: (
                    <>
                      {nearestDatum &&
                        {
                          [DepthChartSeries.Bids]: '≥',
                          [DepthChartSeries.Asks]: '≤',
                        }[nearestDatum.key]}
                      <Output
                        type={OutputType.Fiat}
                        value={nearestDatum?.datum.price}
                        useGrouping={false}
                      />
                    </>
                  ),
                },
                {
                  key: 'depth',
                  label: stringGetter({ key: STRING_KEYS.TOTAL_SIZE }),
                  value: (
                    <Output
                      type={OutputType.Asset}
                      value={nearestDatum?.datum.depth}
                      fractionDigits={stepSizeDecimals}
                      tag={id}
                      useGrouping={false}
                    />
                  ),
                },
                {
                  key: 'cost',
                  label: stringGetter({ key: STRING_KEYS.TOTAL_COST }),
                  value: (
                    <Output
                      useGrouping
                      type={OutputType.Fiat}
                      value={
                        nearestDatum
                          ? nearestDatum?.datum.price * nearestDatum?.datum.depth
                          : undefined
                      }
                    />
                  ),
                },
                {
                  key: 'priceImpact',
                  label: stringGetter({ key: STRING_KEYS.PRICE_IMPACT }),
                  value: <Output useGrouping type={OutputType.Percent} value={priceImpact} />,
                },
              ]
        }
      />
    </TooltipContent>
  );
 };
@@ -1,14 +1,20 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import styled, { AnyStyledComponent, css, keyframes } from 'styled-components';
 import { useSelector, shallowEqual } from 'react-redux';
 import { OrderSide } from '@dydxprotocol/v4-client-js';
-import { StringGetterFunction, STRING_KEYS } from '@/constants/localization';
+import {
  DepthChartDatum,
  DepthChartPoint,
  DepthChartSeries,
  SERIES_KEY_FOR_ORDER_SIDE,
 } from '@/constants/charts';
 import { StringGetterFunction } from '@/constants/localization';
 import { useBreakpoints } from '@/hooks';
 import { useOrderbookValuesForDepthChart } from '@/hooks/useOrderbookValues';
-import { MustBigNumber } from '@/lib/numbers';
+import { getCurrentMarketConfig } from '@/state/perpetualsSelectors';
 import { getCurrentMarketConfig, getCurrentMarketOrderbook } from '@/state/perpetualsSelectors';
 import { getCurrentMarketAssetData } from '@/state/assetsSelectors';
 import { XYChartWithPointerEvents } from '@/components/visx/XYChartWithPointerEvents';
@@ -21,24 +27,25 @@ import {
  darkTheme,
  DataProvider,
  EventEmitterProvider,
  type EventHandlerParams,
 } from '@visx/xychart';
 import { LinearGradient } from '@visx/gradient';
 import { curveStepAfter } from '@visx/curve';
-import type { Point } from '@visx/point';
+import { Point } from '@visx/point';
 import Tooltip from '@/components/visx/XYChartTooltipWithBounds';
 import { TooltipContent } from '@/components/visx/TooltipContent';
 import { AxisLabelOutput } from '@/components/visx/AxisLabelOutput';
 import { Details } from '@/components/Details';
 import { LoadingSpace } from '@/components/Loading/LoadingSpinner';
-import { Output, OutputType } from '@/components/Output';
+import { OutputType } from '@/components/Output';
-import { OrderSide } from '@dydxprotocol/v4-client-js';
+import { MustBigNumber } from '@/lib/numbers';
 import { DepthChartTooltipContent } from './Tooltip';
 // @ts-ignore
 const theme = buildChartTheme({
  ...darkTheme,
-  colors: ['var(--color-positive)', 'var(--color-negative)', 'white'], // categorical colors, mapped to series via `dataKey`s
+  colors: ['var(--color-positive)', 'var(--color-negative)', 'var(--color-layer-6)'], // categorical colors, mapped to series via `dataKey`s
 });
 const clamp = (n: number, min: number, max: number) => Math.max(min, Math.min(max, n));
@@ -58,30 +65,6 @@ const formatNumber = (n: number, selectedLocale: string, isCompact: boolean = n
    : formattedNumber;
 };
 enum DepthChartSeries {
  Asks = 'Asks',
  Bids = 'Bids',
  MidMarket = 'MidMarket',
 }
 type DepthChartDatum = {
  size: number;
  price: number;
  depth: number;
  seriesKey: DepthChartSeries;
 };
 const seriesKeyForOrderSide = {
  [OrderSide.BUY]: DepthChartSeries.Bids,
  [OrderSide.SELL]: DepthChartSeries.Asks,
 };
 type DepthChartPoint = {
  side: OrderSide;
  price: number;
  size: number;
 };
 export const DepthChart = ({
  onChartClick,
  stringGetter,
@@ -96,8 +79,6 @@ export const DepthChart = ({
  const { isMobile } = useBreakpoints();
  // Chart data
  const orderbook = useSelector(getCurrentMarketOrderbook, shallowEqual);
  const { id = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
  const { stepSizeDecimals, tickSizeDecimals } =
    useSelector(getCurrentMarketConfig, shallowEqual) ?? {};
@@ -112,43 +93,15 @@ export const DepthChart = ({
    midMarketPrice,
    spread,
    spreadPercent,
-  } = useMemo(() => {
+    orderbook,
-    const bids = (orderbook?.bids?.toArray() ?? [])
+  } = useOrderbookValuesForDepthChart();
      .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]);
  // Chart state
  const [isPointerPressed, setIsPointerPressed] = useState(false);
  const [chartPointAtPointer, setChartPointAtPointer] = useState<DepthChartPoint>();
-  const isEditingOrder = isPointerPressed && chartPointAtPointer;
+  const isEditingOrder = Boolean(isPointerPressed && chartPointAtPointer);
  const [zoomDomain, setZoomDomain] = useState<undefined | number>();
@@ -193,12 +146,24 @@ export const DepthChart = ({
  }, [orderbook, zoomDomain]);
  const getChartPoint = useCallback(
-    ({ x: price, y: size }: Point) =>
+    (point: Point | EventHandlerParams<object>) => {
-      ({
+      let price, size;
-        side: price < midMarketPrice! ? OrderSide.BUY : OrderSide.SELL,
+      if (point instanceof Point) {
        const { x, y } = point as Point;
        price = x;
        size = y;
      } else {
        const { svgPoint: { x, y } = {} } = point as EventHandlerParams<object>;
        price = x;
        size = y;
      }
      return {
        side: MustBigNumber(price).lt(midMarketPrice!) ? OrderSide.BUY : OrderSide.SELL,
        price,
        size,
-      } as DepthChartPoint),
+      } as DepthChartPoint;
    },
    [midMarketPrice]
  );
@@ -256,7 +221,7 @@ export const DepthChart = ({
            }}
            onPointerUp={(point) => point && onChartClick?.(getChartPoint(point))}
            onPointerMove={(point) => point && setChartPointAtPointer(getChartPoint(point))}
-            onPointerPressedChange={setIsPointerPressed}
+            onPointerPressedChange={(isPointerPressed) => setIsPointerPressed(isPointerPressed)}
          >
            <Axis
              orientation="bottom"
@@ -363,7 +328,7 @@ export const DepthChart = ({
                <Styled.XAxisLabelOutput
                  type={OutputType.Fiat}
                  value={
-                    isEditingOrder
+                    isEditingOrder && chartPointAtPointer
                      ? chartPointAtPointer.price
                      : tooltipData!.nearestDatum?.datum.price
                  }
@@ -374,8 +339,8 @@ export const DepthChart = ({
                      [DepthChartSeries.Bids]: 'var(--color-positive)',
                      [DepthChartSeries.MidMarket]: 'var(--color-layer-6)',
                    }[
-                      isEditingOrder
+                      isEditingOrder && chartPointAtPointer
-                        ? seriesKeyForOrderSide[chartPointAtPointer.side]
+                        ? SERIES_KEY_FOR_ORDER_SIDE[chartPointAtPointer.side]
                        : (tooltipData!.nearestDatum?.key as DepthChartSeries)
                    ]
                  }
@@ -389,7 +354,7 @@ export const DepthChart = ({
                  <Styled.YAxisLabelOutput
                    type={OutputType.Asset}
                    value={
-                      isEditingOrder
+                      isEditingOrder && chartPointAtPointer
                        ? chartPointAtPointer.size
                        : tooltipData!.nearestDatum?.datum.depth
                    }
@@ -400,8 +365,8 @@ export const DepthChart = ({
                        [DepthChartSeries.Bids]: 'var(--color-positive)',
                        [DepthChartSeries.MidMarket]: 'var(--color-layer-6)',
                      }[
-                        isEditingOrder
+                        isEditingOrder && chartPointAtPointer
-                          ? seriesKeyForOrderSide[chartPointAtPointer.side]
+                          ? SERIES_KEY_FOR_ORDER_SIDE[chartPointAtPointer.side]
                          : (tooltipData!.nearestDatum?.key as DepthChartSeries)
                      ]
                    }
@@ -410,181 +375,22 @@ export const DepthChart = ({
              }
              snapTooltipToDatumX={!isEditingOrder}
              snapTooltipToDatumY={isEditingOrder ? false : isMobile}
-              renderTooltip={({ tooltipData, colorScale }) => {
+              renderTooltip={({ tooltipData, colorScale }) =>
-                const { nearestDatum } = tooltipData || {};
+                chartPointAtPointer && (
-
+                  <DepthChartTooltipContent
-                if (!isEditingOrder && !nearestDatum?.datum) return null;
+                    {...{
-
+                      tooltipData,
-                return (
+                      colorScale,
-                  <TooltipContent
+                      isEditingOrder,
-                    accentColor={colorScale?.(
+                      chartPointAtPointer,
-                      isEditingOrder
+                      stringGetter,
-                        ? seriesKeyForOrderSide[chartPointAtPointer.side]
+                      selectedLocale,
-                        : nearestDatum.key
+                      stepSizeDecimals,
-                    )}
+                      tickSizeDecimals,
-                  >
+                    }}
-                    <h4>
+                  />
-                      {isEditingOrder
+                )
-                        ? 'Release mouse to edit order'
+              }
                        : {
                            [DepthChartSeries.Bids]: 'Bids',
                            [DepthChartSeries.Asks]: 'Asks',
                            [DepthChartSeries.MidMarket]: 'Mid-Market',
                          }[nearestDatum.key]}
                    </h4>
                    <Details
                      layout="column"
                      items={
                        isEditingOrder
                          ? [
                              {
                                key: 'side',
                                label: stringGetter({ key: STRING_KEYS.SIDE }),
                                value: (
                                  <Output
                                    type={OutputType.Text}
                                    value={
                                      {
                                        [OrderSide.BUY]: stringGetter({
                                          key: STRING_KEYS.BUY,
                                        }),
                                        [OrderSide.SELL]: stringGetter({
                                          key: STRING_KEYS.SELL,
                                        }),
                                      }[chartPointAtPointer.side]
                                    }
                                  />
                                ),
                              },
                              {
                                key: 'limitPrice',
                                label: stringGetter({ key: STRING_KEYS.LIMIT_PRICE }),
                                value: (
                                  <Output
                                    type={OutputType.Fiat}
                                    value={chartPointAtPointer.price}
                                    useGrouping={false}
                                  />
                                ),
                              },
                              {
                                key: 'size',
                                label: stringGetter({ key: STRING_KEYS.AMOUNT }),
                                value: (
                                  <Output
                                    type={OutputType.Asset}
                                    value={chartPointAtPointer.size}
                                    fractionDigits={stepSizeDecimals}
                                    tag={id}
                                    useGrouping={false}
                                  />
                                ),
                              },
                            ]
                          : nearestDatum?.key === DepthChartSeries.MidMarket
                          ? [
                              {
                                key: 'midMarketPrice',
                                // label: stringGetter({ key: STRING_KEYS.ORDERBOOK_MID_MARKET_PRICE }),
                                label: stringGetter({ key: STRING_KEYS.PRICE }),
                                value: (
                                  <Output
                                    type={OutputType.Fiat}
                                    value={midMarketPrice}
                                    useGrouping={false}
                                  />
                                ),
                              },
                              {
                                key: 'spread',
                                label: stringGetter({ key: STRING_KEYS.ORDERBOOK_SPREAD }),
                                value: (
                                  <>
                                    <Output
                                      type={OutputType.Fiat}
                                      value={spread}
                                      fractionDigits={tickSizeDecimals}
                                      useGrouping={false}
                                    />
                                    <Output
                                      type={OutputType.SmallPercent}
                                      value={spreadPercent}
                                      withParentheses
                                    />
                                  </>
                                ),
                              },
                            ]
                          : [
                              {
                                key: 'price',
                                label: stringGetter({ key: STRING_KEYS.PRICE }),
                                value: (
                                  <>
                                    {nearestDatum &&
                                      {
                                        [DepthChartSeries.Bids]: '≥',
                                        [DepthChartSeries.Asks]: '≤',
                                      }[nearestDatum.key]}
                                    <Output
                                      type={OutputType.Fiat}
                                      value={nearestDatum?.datum.price}
                                      useGrouping={false}
                                    />
                                  </>
                                ),
                              },
                              {
                                key: 'depth',
                                label: stringGetter({ key: STRING_KEYS.TOTAL_SIZE }),
                                value: (
                                  <Output
                                    type={OutputType.Asset}
                                    value={nearestDatum?.datum.depth}
                                    fractionDigits={stepSizeDecimals}
                                    tag={id}
                                    useGrouping={false}
                                  />
                                ),
                              },
                              {
                                key: 'cost',
                                label: stringGetter({ key: STRING_KEYS.TOTAL_COST }),
                                value: (
                                  <Output
                                    useGrouping
                                    type={OutputType.Fiat}
                                    value={nearestDatum?.datum.price * nearestDatum?.datum.depth}
                                  />
                                ),
                              },
                              {
                                key: 'priceImpact',
                                label: stringGetter({ key: STRING_KEYS.PRICE_IMPACT }),
                                value: (
                                  <Output
                                    useGrouping
                                    type={OutputType.Percent}
                                    value={{
                                      [DepthChartSeries.Asks]: () =>
                                        MustBigNumber(nearestDatum.datum.price)
                                          .minus(lowestAsk.price)
                                          .div(nearestDatum.datum.price),
                                      [DepthChartSeries.Bids]: () =>
                                        MustBigNumber(highestBid.price)
                                          .minus(nearestDatum.datum.price)
                                          .div(highestBid.price),
                                    }[nearestDatum.key]()}
                                  />
                                ),
                              },
                            ]
                      }
                    />
                  </TooltipContent>
                );
              }}
            />
          </XYChartWithPointerEvents>
        </EventEmitterProvider>
@@ -0,0 +1,107 @@
 import type { RenderTooltipParams } from '@visx/xychart/lib/components/Tooltip';
 import { TooltipContent } from '@/components/visx/TooltipContent';
 import { FundingRateResolution, type FundingChartDatum } from '@/constants/charts';
 import { STRING_KEYS } from '@/constants/localization';
 import { FundingDirection } from '@/constants/markets';
 import { useStringGetter } from '@/hooks';
 import { Details, DetailsItem } from '@/components/Details';
 import { Output, OutputType, ShowSign } from '@/components/Output';
 type FundingChartTooltipProps = {
  fundingRateView: FundingRateResolution;
  latestDatum: FundingChartDatum;
 } & Pick<RenderTooltipParams<FundingChartDatum>, 'tooltipData'>;
 export const FundingChartTooltipContent = ({
  fundingRateView,
  latestDatum,
  tooltipData,
 }: FundingChartTooltipProps) => {
  const { nearestDatum } = tooltipData || {};
  const stringGetter = useStringGetter();
  const tooltipDatum = nearestDatum?.datum ?? latestDatum;
  const isShowingCurrentFundingRate = tooltipDatum === latestDatum;
  return (
    <TooltipContent
      accentColor={
        {
          [FundingDirection.ToLong]: 'var(--color-negative)',
          [FundingDirection.ToShort]: 'var(--color-positive)',
          [FundingDirection.None]: 'var(--color-layer-6)',
        }[tooltipDatum.direction]
      }
    >
      <h4>
        {isShowingCurrentFundingRate
          ? stringGetter({ key: STRING_KEYS.CURRENT_FUNDING_RATE })
          : stringGetter({ key: STRING_KEYS.HISTORICAL_FUNDING_RATE })}
      </h4>
      <Details
        layout="column"
        items={
          [
            {
              key: 'direction',
              label: stringGetter({ key: STRING_KEYS.DIRECTION }),
              value: (
                <Output
                  type={OutputType.Text}
                  value={
                    {
                      [FundingDirection.ToLong]: `${stringGetter({
                        key: STRING_KEYS.SHORT_POSITION_SHORT,
                      })} → ${stringGetter({
                        key: STRING_KEYS.LONG_POSITION_SHORT,
                      })}`,
                      [FundingDirection.ToShort]: `${stringGetter({
                        key: STRING_KEYS.LONG_POSITION_SHORT,
                      })} → ${stringGetter({
                        key: STRING_KEYS.SHORT_POSITION_SHORT,
                      })}`,
                      [FundingDirection.None]: undefined,
                    }[tooltipDatum.direction]
                  }
                />
              ),
            },
            {
              key: 'fundingRate',
              label: stringGetter({
                key: {
                  [FundingRateResolution.OneHour]: STRING_KEYS.RATE_1H,
                  [FundingRateResolution.EightHour]: STRING_KEYS.RATE_8H,
                  [FundingRateResolution.Annualized]: STRING_KEYS.ANNUALIZED,
                }[fundingRateView],
              }),
              value: (
                <Output
                  type={OutputType.SmallPercent}
                  value={
                    {
                      [FundingRateResolution.OneHour]: tooltipDatum.fundingRate,
                      [FundingRateResolution.EightHour]: tooltipDatum.fundingRate * 8,
                      [FundingRateResolution.Annualized]: tooltipDatum.fundingRate * (24 * 365),
                    }[fundingRateView]
                  }
                  showSign={ShowSign.Both}
                />
              ),
            },
            {
              key: 'time',
              label: isShowingCurrentFundingRate
                ? 'Time Remaining'
                : stringGetter({ key: STRING_KEYS.TIME }),
              value: <Output type={OutputType.DateTime} value={tooltipDatum.time} />,
            },
          ].filter(Boolean) as Array<DetailsItem>
        }
      />
    </TooltipContent>
  );
 };
@@ -3,39 +3,27 @@ import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent, css } from 'styled-components';
 import { curveMonotoneX, curveStepAfter } from '@visx/curve';
 import { useBreakpoints, useStringGetter } from '@/hooks';
 import { ButtonSize } from '@/constants/buttons';
 import { FundingRateResolution, type FundingChartDatum } from '@/constants/charts';
 import { STRING_KEYS } from '@/constants/localization';
 import { SMALL_PERCENT_DECIMALS, TINY_PERCENT_DECIMALS } from '@/constants/numbers';
 import { FundingDirection } from '@/constants/markets';
 import { SMALL_PERCENT_DECIMALS, TINY_PERCENT_DECIMALS } from '@/constants/numbers';
 import { useBreakpoints, useStringGetter } from '@/hooks';
 import { breakpoints } from '@/styles';
-import { Details, DetailsItem } from '@/components/Details';
+import { Output, OutputType } from '@/components/Output';
 import { Output, OutputType, ShowSign } from '@/components/Output';
 import { LoadingSpace } from '@/components/Loading/LoadingSpinner';
 import { ToggleGroup } from '@/components/ToggleGroup';
 import { TimeSeriesChart } from '@/components/visx/TimeSeriesChart';
 import { AxisLabelOutput } from '@/components/visx/AxisLabelOutput';
 import { TooltipContent } from '@/components/visx/TooltipContent';
 import type { TooltipContextType } from '@visx/xychart';
 import { calculateFundingRateHistory } from '@/state/perpetualsCalculators';
 import { MustBigNumber } from '@/lib/numbers';
-
+import { FundingChartTooltipContent } from './Tooltip';
 enum FundingRateResolution {
  OneHour = 'OneHour',
  EightHour = 'EightHour',
  Annualized = 'Annualized',
 }
 type FundingChartDatum = {
  time: number;
  fundingRate: number;
  direction: FundingDirection;
 };
 const FUNDING_RATE_TIME_RESOLUTION = 60 * 60 * 1000; // 1 hour
@@ -116,114 +104,20 @@ export const FundingChart = ({ selectedLocale }: ElementProps) => {
              {
                [FundingDirection.ToLong]: 'var(--color-negative)',
                [FundingDirection.ToShort]: 'var(--color-positive)',
                [FundingDirection.None]: 'var(--color-layer-6)',
              }[tooltipDatum.direction]
            }
          />
        );
      }}
-      renderTooltip={({ tooltipData }) => {
+      renderTooltip={({ tooltipData }) => (
-        const { nearestDatum } = tooltipData || {};
+        <FundingChartTooltipContent
-
+          fundingRateView={fundingRateView}
-        const tooltipDatum = nearestDatum?.datum ?? latestDatum;
+          tooltipData={tooltipData}
-        const isShowingCurrentFundingRate = tooltipDatum === latestDatum;
+          latestDatum={latestDatum}
-
+        />
-        return (
+      )}
-          <TooltipContent
+      onTooltipContext={(tooltipContext) => setTooltipContext(tooltipContext)}
            accentColor={
              {
                [FundingDirection.ToLong]: 'var(--color-negative)',
                [FundingDirection.ToShort]: 'var(--color-positive)',
              }[tooltipDatum.direction]
            }
          >
            <h4>
              {isShowingCurrentFundingRate
                ? stringGetter({ key: STRING_KEYS.CURRENT_FUNDING_RATE })
                : stringGetter({ key: STRING_KEYS.HISTORICAL_FUNDING_RATE })}
            </h4>
            <Details
              layout="column"
              items={
                [
                  {
                    key: 'direction',
                    label: stringGetter({ key: STRING_KEYS.DIRECTION }),
                    value: (
                      <Output
                        type={OutputType.Text}
                        value={
                          {
                            [FundingDirection.ToLong]: `${stringGetter({
                              key: STRING_KEYS.SHORT_POSITION_SHORT,
                            })} → ${stringGetter({
                              key: STRING_KEYS.LONG_POSITION_SHORT,
                            })}`,
                            [FundingDirection.ToShort]: `${stringGetter({
                              key: STRING_KEYS.LONG_POSITION_SHORT,
                            })} → ${stringGetter({
                              key: STRING_KEYS.SHORT_POSITION_SHORT,
                            })}`,
                          }[tooltipDatum.direction]
                        }
                      />
                    ),
                  },
                  {
                    key: 'fundingRate1h',
                    label: stringGetter({ key: STRING_KEYS.RATE_1H }),
                    value: (
                      <Output
                        type={OutputType.SmallPercent}
                        value={tooltipDatum.fundingRate}
                        showSign={ShowSign.Both}
                      />
                    ),
                  },
                  {
                    key: 'fundingRate8h',
                    label: stringGetter({ key: STRING_KEYS.RATE_8H }),
                    value: (
                      <Output
                        type={OutputType.SmallPercent}
                        value={tooltipDatum.fundingRate * 8}
                        // value={
                        //   Math.sign(tooltipDatum.fundingRate) *
                        //   ((Math.abs(tooltipDatum.fundingRate) + 1) ** 8 - 1)
                        // }
                        showSign={ShowSign.Both}
                      />
                    ),
                  },
                  {
                    key: 'fundingRateAnnualized',
                    label: stringGetter({ key: STRING_KEYS.ANNUALIZED }),
                    value: (
                      <Output
                        type={OutputType.SmallPercent}
                        value={tooltipDatum.fundingRate * (24 * 365)}
                        // value={
                        //   Math.sign(tooltipDatum.fundingRate) *
                        //   ((Math.abs(tooltipDatum.fundingRate) + 1) ** (24 * 365) - 1)
                        // }
                        showSign={ShowSign.Both}
                      />
                    ),
                  },
                  {
                    key: 'time',
                    label: isShowingCurrentFundingRate
                      ? 'Time Remaining'
                      : stringGetter({ key: STRING_KEYS.TIME }),
                    value: <Output type={OutputType.DateTime} value={tooltipDatum.time} />,
                  },
                ].filter(Boolean) as Array<DetailsItem>
              }
            />
          </TooltipContent>
        );
      }}
      onTooltipContext={setTooltipContext}
      minZoomDomain={FUNDING_RATE_TIME_RESOLUTION * 4}
      numGridLines={1}
      slotEmpty={<LoadingSpace id="funding-chart-loading" />}
@@ -290,6 +184,7 @@ Styled.FundingRateToggle = styled.div`
 Styled.CurrentFundingRate = styled.div<{ isShowing?: boolean }>`
  place-self: start center;
  padding: clamp(1.5rem, 9rem - 15%, 4rem);
  pointer-events: none;
  font: var(--font-large-book);
@@ -82,7 +82,6 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.PriceChart = styled.div<{ isChartReady?: boolean }>`
  ${layoutMixins.stack}
  ${layoutMixins.perspectiveArea}
  height: 100%;
@@ -94,7 +94,7 @@ export const FillDetailsDialog = ({ fillId, setIsOpen }: ElementProps) => {
  return (
    <DetailsDialog
-      slotIcon={<Styled.AssetIcon symbol={asset.id} />}
+      slotIcon={<Styled.AssetIcon symbol={asset?.id} />}
      title={resources.typeStringKey && stringGetter({ key: resources.typeStringKey })}
      items={detailItems}
      setIsOpen={setIsOpen}
@@ -194,7 +194,7 @@ export const OrderDetailsDialog = ({ orderId, setIsOpen }: ElementProps) => {
  return (
    <DetailsDialog
-      slotIcon={<Styled.AssetIcon symbol={asset.id} />}
+      slotIcon={<Styled.AssetIcon symbol={asset?.id} />}
      title={!resources.typeStringKey ? '' : stringGetter({ key: resources.typeStringKey })}
      slotFooter={
        isAccountViewOnly ? null : isOrderStatusClearable(status) ? (
@@ -8,6 +8,7 @@ import { ComboboxDialogMenu } from '@/components/ComboboxDialogMenu';
 import { Icon, IconName } from '@/components/Icon';
 import { isTruthy } from '@/lib/isTruthy';
 import { breakpoints } from '@/styles';
 type ElementProps = {
  setIsOpen: (open: boolean) => void;
@@ -72,8 +73,11 @@ export const HelpDialog = ({ setIsOpen }: ElementProps) => {
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.ComboboxDialogMenu = styled(ComboboxDialogMenu)`
  --dialog-width: var(--dialog-small-width);
  --dialog-content-paddingTop: 1rem;
  --dialog-content-paddingBottom: 1rem;
  --comboxDialogMenu-item-gap: 1rem;
  @media ${breakpoints.notMobile} {
    --dialog-width: var(--dialog-small-width);
  }
 `;
@@ -1,6 +1,4 @@
 import { useState } from 'react';
 import styled, { AnyStyledComponent } from 'styled-components';
 import { useDispatch } from 'react-redux';
 import { AlertType } from '@/constants/alerts';
 import { STRING_KEYS } from '@/constants/localization';
@@ -13,7 +11,7 @@ import { Button } from '@/components/Button';
 import { Icon } from '@/components/Icon';
 import { Link } from '@/components/Link';
-import { useAccounts, useStringGetter, useURLConfigs } from '@/hooks';
+import { useAccounts, useBreakpoints, useStringGetter, useURLConfigs } from '@/hooks';
 import { useDisplayedWallets } from '@/hooks/useDisplayedWallets';
 import { breakpoints } from '@/styles';
@@ -27,6 +25,8 @@ export const ChooseWallet = () => {
  const { selectWalletType, selectedWalletType, selectedWalletError } = useAccounts();
  const { isMobile } = useBreakpoints();
  return (
    <>
      {selectedWalletType && selectedWalletError && (
@@ -56,7 +56,11 @@ export const ChooseWallet = () => {
            slotLeft={<Styled.Icon iconComponent={wallets[walletType].icon} />}
            size={ButtonSize.Small}
          >
-            <div>{stringGetter({ key: wallets[walletType].stringKey })}</div>
+            <div>
              {walletType !== WalletType.Privy && import.meta.env.VITE_PRIVY_APP_ID
                ? stringGetter({ key: wallets[walletType].stringKey })
                : `Socials ${isMobile ? '' : '(Email, SMS, etc.)'}`}
            </div>
          </Styled.WalletButton>
        ))}
      </Styled.Wallets>
@@ -18,11 +18,7 @@ type ElementProps = {
  onSelectChain: (chain: string) => void;
 };
-export const ChainSelectMenu = ({
+export const ChainSelectMenu = ({ label, selectedChain, onSelectChain }: ElementProps) => {
  label,
  selectedChain,
  onSelectChain,
 }: ElementProps) => {
  const stringGetter = useStringGetter();
  const { type, depositOptions, withdrawalOptions, resources } =
    useSelector(getTransferInputs, shallowEqual) || {};
@@ -38,11 +34,30 @@ export const ChainSelectMenu = ({
    slotBefore: <Styled.Img src={chain.iconUrl} alt="" />,
  }));
-  const selectedOption = chains.find((item) => item.type === selectedChain); 
+  const selectedOption = selectedChain === 'coinbase' ?  {
    stringKey: 'Coinbase',
    iconUrl: '/wallets/coinbase-wallet.png',
  } : chains.find((item) => item.type === selectedChain);
  const exchanges = [
    {
      value: 'coinbase',
      label: 'Coinbase',
      onSelect: () => {
        onSelectChain('coinbase');
      },
      slotBefore: <Styled.Img src="/wallets/coinbase-wallet.png" alt="" />,
    }
  ];
  return (
    <SearchSelectMenu
      items={[
        {
          group: 'exchanges',
          groupLabel: 'Exchanges',
          items: exchanges,
        },
        {
          group: 'chains',
          groupLabel: stringGetter({ key: STRING_KEYS.CHAINS }),
@@ -81,4 +96,4 @@ Styled.ChainRow = styled.div`
  gap: 0.5rem;
  color: var(--color-text-2);
  font: var(--font-base-book);
-`;
+`;
@@ -10,9 +10,8 @@ import { TransferInputField, TransferInputTokenResource, TransferType } from '@/
 import { AlertType } from '@/constants/alerts';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { ENVIRONMENT_CONFIG_MAP, isMainnet } from '@/constants/networks';
-import { NotificationStatus } from '@/constants/notifications';
+import { MAX_CCTP_TRANSFER_AMOUNT, MAX_PRICE_IMPACT, NumberSign } from '@/constants/numbers';
 import { NumberSign } from '@/constants/numbers';
 import type { EvmAddress } from '@/constants/wallets';
 import { useAccounts, useDebounce, useStringGetter, useSelectedNetwork } from '@/hooks';
@@ -39,12 +38,14 @@ import abacusStateManager from '@/lib/abacus';
 import { MustBigNumber } from '@/lib/numbers';
 import { getNobleChainId, NATIVE_TOKEN_ADDRESS } from '@/lib/squid';
 import { log } from '@/lib/telemetry';
-import { parseWalletError } from '@/lib/wallet';
+import { parseWalletError, truncateAddress } from '@/lib/wallet';
 import { ChainSelectMenu } from './ChainSelectMenu';
 import { TokenSelectMenu } from './TokenSelectMenu';
 import { DepositButtonAndReceipt } from './DepositForm/DepositButtonAndReceipt';
 import { QrCode } from '@/components/QrCode';
 import { CopyButton } from '@/components/CopyButton';
 type DepositFormProps = {
  onDeposit?: () => void;
@@ -56,8 +57,9 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
  const [error, setError] = useState<Error | null>(null);
  const [isLoading, setIsLoading] = useState(false);
  const { selectedNetwork } = useSelectedNetwork();
  const [isCoinbase, setIsCoinbase] = useState(false);
-  const { evmAddress, signerWagmi, publicClientWagmi } = useAccounts();
+  const { evmAddress, signerWagmi, publicClientWagmi, nobleAddress } = useAccounts();
  const { addTransferNotification } = useLocalNotifications();
@@ -134,7 +136,10 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
  }, [error]);
  const onSelectChain = useCallback((chain: string) => {
-    if (chain) {
+    if (chain === 'coinbase') {
      setIsCoinbase(true);
    } else if (chain) {
      setIsCoinbase(false);
      abacusStateManager.clearTransferInputValues();
      abacusStateManager.setTransferValue({
        field: TransferInputField.chain,
@@ -253,7 +258,9 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
        if (txHash) {
          addTransferNotification({
            txHash: txHash,
-            toChainId: !isCctp ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId : getNobleChainId(),
+            toChainId: !isCctp
              ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
              : getNobleChainId(),
            fromChainId: chainIdStr || undefined,
            toAmount: summary?.usdcSize || undefined,
            triggeredAt: Date.now(),
@@ -324,6 +331,21 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
      return stringGetter({ key: STRING_KEYS.DEPOSIT_MORE_THAN_BALANCE });
    }
    if (isCctp) {
      if (MustBigNumber(debouncedAmountBN).gte(MAX_CCTP_TRANSFER_AMOUNT)) {
        return stringGetter({
          key: STRING_KEYS.MAX_CCTP_TRANSFER_LIMIT_EXCEEDED,
          params: {
            MAX_CCTP_TRANSFER_AMOUNT: MAX_CCTP_TRANSFER_AMOUNT,
          },
        });
      }
    }
    if (isMainnet && MustBigNumber(summary?.aggregatePriceImpact).gte(MAX_PRICE_IMPACT)) {
      return stringGetter({ key: STRING_KEYS.PRICE_IMPACT_TOO_HIGH });
    }
    return undefined;
  }, [
    error,
@@ -334,6 +356,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
    fromAmount,
    sourceToken,
    stringGetter,
    summary,
  ]);
  const isDisabled =
@@ -347,9 +370,43 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
    return <LoadingSpace id="DepositForm" />;
  }
  if (isCoinbase) {
    return (
      <Styled.Form onSubmit={onSubmit}>
        <ChainSelectMenu
          selectedChain={isCoinbase ? 'coinbase' : chainIdStr || undefined}
          onSelectChain={onSelectChain}
        />
        {nobleAddress && (
          <>
            <Styled.ReceiveQr
              side="bottom"
              detailItems={[
                {
                  key: 'nobleAddress',
                  label: "Noble Address",
                  value: nobleAddress,
                },
              ]}
            >
              <QrCode size={432} value={nobleAddress} />
            </Styled.ReceiveQr>
            <p>
              * This address only supports transfers of USDC to the Noble chain.
            </p>
            <CopyButton value={nobleAddress} />
          </>
        )}
      </Styled.Form>
    );
  }
  return (
    <Styled.Form onSubmit={onSubmit}>
-      <ChainSelectMenu selectedChain={chainIdStr || undefined} onSelectChain={onSelectChain} />
+      <ChainSelectMenu
        selectedChain={isCoinbase ? 'coinbase' : chainIdStr || undefined}
        onSelectChain={onSelectChain}
      />
      <TokenSelectMenu selectedToken={sourceToken || undefined} onSelectToken={onSelectToken} />
      <Styled.WithDetailsReceipt side="bottom" detailItems={amountInputReceipt}>
        <FormInput
@@ -410,3 +467,13 @@ Styled.TransactionInfo = styled.span`
 Styled.FormInputButton = styled(Button)`
  ${formMixins.inputInnerButton}
 `;
 Styled.Exchange = styled.div`
  ${layoutMixins.flexColumn}
  gap: 1rem;
  align-items: center;
 `;
 Styled.ReceiveQr = styled(WithDetailsReceipt)`
 `;
@@ -1,21 +1,16 @@
-import { type Dispatch, type SetStateAction, useState, type ReactNode } from 'react';
+import { type Dispatch, type ReactNode, type SetStateAction, useState, useMemo } from 'react';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';
 import type { RouteData } from '@0xsquid/sdk';
 import { formatUnits } from 'viem';
-import {
+import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons';
  ButtonAction,
  ButtonShape,
  ButtonSize,
  ButtonState,
  ButtonType,
 } from '@/constants/buttons';
 import { TransferInputTokenResource } from '@/constants/abacus';
 import { STRING_KEYS } from '@/constants/localization';
-import { NumberSign } from '@/constants/numbers';
+import { NumberSign, TOKEN_DECIMALS } from '@/constants/numbers';
-import { useStringGetter } from '@/hooks';
+import { useStringGetter, useTokenConfigs } from '@/hooks';
 import { useMatchingEvmNetwork } from '@/hooks/useMatchingEvmNetwork';
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -34,6 +29,7 @@ import { calculateCanAccountTrade } from '@/state/accountCalculators';
 import { getSubaccountBuyingPower, getSubaccountEquity } from '@/state/accountSelectors';
 import { getTransferInputs } from '@/state/inputsSelectors';
 import { isTruthy } from '@/lib/isTruthy';
 import { MustBigNumber } from '@/lib/numbers';
 import { SlippageEditor } from '../SlippageEditor';
@@ -83,7 +79,8 @@ export const DepositButtonAndReceipt = ({
  const { current: buyingPower, postOrder: newBuyingPower } =
    useSelector(getSubaccountBuyingPower, shallowEqual) || {};
-  const { summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
+  const { isCctp, summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
  const { usdcDecimals, usdcLabel } = useTokenConfigs();
  const feeSubitems: DetailsItem[] = [];
@@ -98,7 +95,7 @@ export const DepositButtonAndReceipt = ({
  if (typeof summary?.bridgeFee === 'number') {
    feeSubitems.push({
      key: 'bridge-fees',
-      label: <span>Bridge Fee</span>,
+      label: <span>{stringGetter({ key: STRING_KEYS.BRIDGE_FEE })}</span>,
      value: <Output type={OutputType.Fiat} value={summary?.bridgeFee} />,
    });
  }
@@ -112,11 +109,53 @@ export const DepositButtonAndReceipt = ({
  const totalFees = (summary?.bridgeFee || 0) + (summary?.gasFee || 0);
  const submitButtonReceipt = [
    {
      key: 'expected-deposit-amount',
      label: (
        <span>
          {stringGetter({ key: STRING_KEYS.EXPECTED_DEPOSIT_AMOUNT })} <Tag>{usdcLabel}</Tag>
        </span>
      ),
      value: <Output type={OutputType.Fiat} fractionDigits={TOKEN_DECIMALS} value={summary?.toAmount} />,
      subitems: [
        {
          key: 'minimum-deposit-amount',
          label: (
            <span>
              {stringGetter({ key: STRING_KEYS.MINIMUM_DEPOSIT_AMOUNT })} <Tag>{usdcLabel}</Tag>
            </span>
          ),
          value: (
            <Output type={OutputType.Fiat} fractionDigits={TOKEN_DECIMALS} value={summary?.toAmountMin} />
          ),
          tooltip: 'minimum-deposit-amount',
        },
      ],
    },
    {
      key: 'exchange-rate',
      label: <span>{stringGetter({ key: STRING_KEYS.EXCHANGE_RATE })}</span>,
      value:
        typeof summary?.exchangeRate === 'number' ? (
          <Styled.ExchangeRate>
            <Output
              type={OutputType.Asset}
              value={1}
              fractionDigits={0}
              tag={sourceToken?.symbol}
            />
            =
            <Output type={OutputType.Asset} value={summary?.exchangeRate} tag={usdcLabel} />
          </Styled.ExchangeRate>
        ) : (
          <Output type={OutputType.Asset} />
        ),
    },
    {
      key: 'equity',
      label: (
        <span>
-          {stringGetter({ key: STRING_KEYS.EQUITY })} <Tag>USDC</Tag>
+          {stringGetter({ key: STRING_KEYS.EQUITY })} <Tag>{usdcLabel}</Tag>
        </span>
      ),
      value: (
@@ -133,7 +172,7 @@ export const DepositButtonAndReceipt = ({
      key: 'buying-power',
      label: (
        <span>
-          {stringGetter({ key: STRING_KEYS.BUYING_POWER })} <Tag>USDC</Tag>
+          {stringGetter({ key: STRING_KEYS.BUYING_POWER })} <Tag>{usdcLabel}</Tag>
        </span>
      ),
      value: (
@@ -146,18 +185,7 @@ export const DepositButtonAndReceipt = ({
        />
      ),
    },
-    {
+    !isCctp && {
      key: 'exchange-rate',
      label: <span>{stringGetter({ key: STRING_KEYS.EXCHANGE_RATE })}</span>,
      value: typeof summary?.exchangeRate === 'number' && (
        <Styled.ExchangeRate>
          <Output type={OutputType.Asset} value={1} fractionDigits={0} tag={sourceToken?.symbol} />
          =
          <Output type={OutputType.Asset} value={summary?.exchangeRate} tag="USDC" />
        </Styled.ExchangeRate>
      ),
    },
    {
      key: 'total-fees',
      label: <span>{stringGetter({ key: STRING_KEYS.TOTAL_FEES })}</span>,
      value: <Output type={OutputType.Fiat} value={totalFees} />,
@@ -165,7 +193,7 @@ export const DepositButtonAndReceipt = ({
    },
    {
      key: 'slippage',
-      label: <span>{stringGetter({ key: STRING_KEYS.SLIPPAGE })}</span>,
+      label: <span>{stringGetter({ key: STRING_KEYS.MAX_SLIPPAGE })}</span>,
      value: (
        <SlippageEditor
          disabled
@@ -178,22 +206,26 @@ export const DepositButtonAndReceipt = ({
    {
      key: 'estimatedRouteDuration',
      label: <span>{stringGetter({ key: STRING_KEYS.ESTIMATED_TIME })}</span>,
-      value: typeof summary?.estimatedRouteDuration === 'number' && (
+      value: (
        <Output
          type={OutputType.Text}
-          value={stringGetter({
+          value={
-            key: STRING_KEYS.X_MINUTES_LOWERCASED,
+            typeof summary?.estimatedRouteDuration === 'number'
-            params: {
+              ? stringGetter({
-              X:
+                  key: STRING_KEYS.X_MINUTES_LOWERCASED,
-                summary?.estimatedRouteDuration < 60
+                  params: {
-                  ? '< 1'
+                    X:
-                  : Math.round(summary?.estimatedRouteDuration / 60),
+                      summary?.estimatedRouteDuration < 60
-            },
+                        ? '< 1'
-          })}
+                        : Math.round(summary?.estimatedRouteDuration / 60),
                  },
                })
              : null
          }
        />
      ),
    },
-  ];
+  ].filter(isTruthy);
  const isFormValid = !isDisabled && !isEditingSlippage;
@@ -34,6 +34,7 @@ export const TokenSelectMenu = ({ selectedToken, onSelectToken }: ElementProps)
      selectedToken && onSelectToken(selectedToken);
    },
    slotBefore: <Styled.Img src={token.iconUrl} alt="" />,
    tag: resources?.tokenResources?.get(token.type)?.symbol,
  }));
  return (
@@ -57,7 +58,6 @@ export const TokenSelectMenu = ({ selectedToken, onSelectToken }: ElementProps)
              <Tag>{type === TransferType.deposit ? 'USDC' : selectedToken?.symbol}</Tag>
            </>
          ),
          tooltip: 'swap',
        },
      ]}
    >
@@ -9,9 +9,9 @@ import { TransferInputField, TransferInputTokenResource, TransferType } from '@/
 import { AlertType } from '@/constants/alerts';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { ENVIRONMENT_CONFIG_MAP, isMainnet } from '@/constants/networks';
-import { NotificationStatus } from '@/constants/notifications';
+import { TransferNotificationTypes } from '@/constants/notifications';
-import { NumberSign } from '@/constants/numbers';
+import { MAX_CCTP_TRANSFER_AMOUNT, MAX_PRICE_IMPACT, NumberSign } from '@/constants/numbers';
 import {
  useAccounts,
@@ -45,6 +45,7 @@ import { getTransferInputs } from '@/state/inputsSelectors';
 import abacusStateManager from '@/lib/abacus';
 import { MustBigNumber } from '@/lib/numbers';
 import { getNobleChainId } from '@/lib/squid';
 import { TokenSelectMenu } from './TokenSelectMenu';
 import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt';
@@ -66,7 +67,8 @@ export const WithdrawForm = () => {
    resources,
    errors: routeErrors,
    errorMessage: routeErrorMessage,
-    isCctp
+    isCctp,
    summary,
  } = useSelector(getTransferInputs, shallowEqual) || {};
  // User input
@@ -74,7 +76,6 @@ export const WithdrawForm = () => {
  const [slippage, setSlippage] = useState(isCctp ? 0 : 0.01); // 0.1% slippage
  const debouncedAmount = useDebounce<string>(withdrawAmount, 500);
  const isValidAddress = toAddress && isAddress(toAddress);
  const toToken = useMemo(
@@ -167,16 +168,22 @@ export const WithdrawForm = () => {
            })
          );
        } else {
-          const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data);
+          const txHash = await sendSquidWithdraw(
-          if (txHash?.hash) {
+            debouncedAmountBN.toNumber(),
-            const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
+            requestPayload.data,
            isCctp
          );
          if (txHash) {
            addTransferNotification({
-              txHash: hash,
+              txHash: txHash,
-              fromChainId: ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId,
+              type: TransferNotificationTypes.Withdrawal,
              fromChainId: !isCctp
                ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
                : getNobleChainId(),
              toChainId: chainIdStr || undefined,
              toAmount: debouncedAmountBN.toNumber(),
              triggeredAt: Date.now(),
-              notificationStatus: NotificationStatus.Triggered,
+              isCctp,
            });
            abacusStateManager.clearTransferInputValues();
            setWithdrawAmount('');
@@ -282,10 +289,7 @@ export const WithdrawForm = () => {
  const errorMessage = useMemo(() => {
    if (error) {
-      return stringGetter({
+      return error;
        key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
        params: { ERROR_MESSAGE: error },
      });
    }
    if (routeErrors) {
@@ -316,6 +320,21 @@ export const WithdrawForm = () => {
      return stringGetter({ key: STRING_KEYS.WITHDRAW_MORE_THAN_FREE });
    }
    if (isCctp) {
      if (MustBigNumber(debouncedAmountBN).gte(MAX_CCTP_TRANSFER_AMOUNT)) {
        return stringGetter({
          key: STRING_KEYS.MAX_CCTP_TRANSFER_LIMIT_EXCEEDED,
          params: {
            MAX_CCTP_TRANSFER_AMOUNT: MAX_CCTP_TRANSFER_AMOUNT,
          },
        });
      }
    }
    if (isMainnet && MustBigNumber(summary?.aggregatePriceImpact).gte(MAX_PRICE_IMPACT)) {
      return stringGetter({ key: STRING_KEYS.PRICE_IMPACT_TOO_HIGH });
    }
    return undefined;
  }, [
    error,
@@ -328,6 +347,7 @@ export const WithdrawForm = () => {
    toAddress,
    sanctionedAddresses,
    stringGetter,
    summary,
  ]);
  const isDisabled =
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { formatUnits } from 'viem';
@@ -6,14 +6,11 @@ import { formatUnits } from 'viem';
 import { TransferInputTokenResource } from '@/constants/abacus';
 import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { NumberSign } from '@/constants/numbers';
+import { NumberSign, TOKEN_DECIMALS } from '@/constants/numbers';
 import { formatSeconds } from '@/lib/timeUtils';
 import { layoutMixins } from '@/styles/layoutMixins';
-import { useStringGetter } from '@/hooks';
+import { useStringGetter, useTokenConfigs } from '@/hooks';
 import { useAccountBalance } from '@/hooks/useAccountBalance';
 import { Button } from '@/components/Button';
@@ -60,11 +57,7 @@ export const WithdrawButtonAndReceipt = ({
  const { leverage } = useSelector(getSubaccount, shallowEqual) || {};
  const { summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
  const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
-
+  const { usdcLabel } = useTokenConfigs();
  const toAmount =
    summary?.toAmount &&
    withdrawToken?.decimals &&
    formatUnits(BigInt(summary.toAmount), withdrawToken?.decimals);
  const feeSubitems: DetailsItem[] = [];
@@ -89,7 +82,7 @@ export const WithdrawButtonAndReceipt = ({
  const showSubitemsToggle = showFeeBreakdown
    ? stringGetter({ key: STRING_KEYS.HIDE_ALL_DETAILS })
    : stringGetter({ key: STRING_KEYS.SHOW_ALL_DETAILS });
-  
+
  const totalFees = (summary?.bridgeFee || 0) + (summary?.gasFee || 0);
  const submitButtonReceipt = [
@@ -99,43 +92,12 @@ export const WithdrawButtonAndReceipt = ({
      value: <Output type={OutputType.Fiat} value={totalFees} />,
      subitems: feeSubitems,
    },
    {
      key: 'wallet',
      label: (
        <span>
          {stringGetter({ key: STRING_KEYS.AMOUNT_RECEIVED })}{' '}
          {withdrawToken && <Tag>{withdrawToken?.symbol}</Tag>}
        </span>
      ),
      value: (
        <Styled.DiffOutput
          type={OutputType.Asset}
          value={'0'}
          newValue={toAmount}
          sign={NumberSign.Positive}
          withDiff={Boolean(toAmount)}
        />
      ),
    },
    {
      key: 'leverage',
      label: <span>{stringGetter({ key: STRING_KEYS.ACCOUNT_LEVERAGE })}</span>,
      value: (
        <Styled.DiffOutput
          type={OutputType.Multiple}
          value={leverage?.current}
          newValue={leverage?.postOrder}
          sign={NumberSign.Negative}
          withDiff={Boolean(leverage?.current && leverage.current !== leverage?.postOrder)}
        />
      ),
    },
    {
      key: 'exchange-rate',
      label: <span>{stringGetter({ key: STRING_KEYS.EXCHANGE_RATE })}</span>,
      value: withdrawToken && typeof summary?.exchangeRate === 'number' && (
        <Styled.ExchangeRate>
-          <Output type={OutputType.Asset} value={1} fractionDigits={0} tag="USDC" />
+          <Output type={OutputType.Asset} value={1} fractionDigits={0} tag={usdcLabel} />
          =
          <Output
            type={OutputType.Asset}
@@ -146,19 +108,7 @@ export const WithdrawButtonAndReceipt = ({
      ),
    },
    {
-      key: 'slippage',
+      key: 'estimated-route-duration',
      label: <span>{stringGetter({ key: STRING_KEYS.SLIPPAGE })}</span>,
      value: (
        <SlippageEditor
          disabled
          slippage={slippage}
          setIsEditing={setIsEditingSlipapge}
          setSlippage={setSlippage}
        />
      ),
    },
    {
      key: 'estimatedRouteDuration',
      label: <span>{stringGetter({ key: STRING_KEYS.ESTIMATED_TIME })}</span>,
      value: typeof summary?.estimatedRouteDuration === 'number' && (
        <Output
@@ -175,6 +125,56 @@ export const WithdrawButtonAndReceipt = ({
        />
      ),
    },
    {
      key: 'expected-amount-received',
      label: (
        <span>
          {stringGetter({ key: STRING_KEYS.EXPECTED_AMOUNT_RECEIVED })}{' '}
          {withdrawToken && <Tag>{withdrawToken?.symbol}</Tag>}
        </span>
      ),
      value: <Output type={OutputType.Asset} value={summary?.toAmount} fractionDigits={TOKEN_DECIMALS} />,
      subitems: [
        {
          key: 'minimum-amount-received',
          label: (
            <span>
              {stringGetter({ key: STRING_KEYS.MINIMUM_AMOUNT_RECEIVED })}{' '}
              {withdrawToken && <Tag>{withdrawToken?.symbol}</Tag>}
            </span>
          ),
          value: (
            <Output type={OutputType.Asset} value={summary?.toAmountMin} fractionDigits={TOKEN_DECIMALS} />
          ),
          tooltip: 'minimum-amount-received',
        },
      ],
    },
    {
      key: 'slippage',
      label: <span>{stringGetter({ key: STRING_KEYS.MAX_SLIPPAGE })}</span>,
      value: (
        <SlippageEditor
          disabled
          slippage={slippage}
          setIsEditing={setIsEditingSlipapge}
          setSlippage={setSlippage}
        />
      ),
    },
    {
      key: 'leverage',
      label: <span>{stringGetter({ key: STRING_KEYS.ACCOUNT_LEVERAGE })}</span>,
      value: (
        <Styled.DiffOutput
          type={OutputType.Multiple}
          value={leverage?.current}
          newValue={leverage?.postOrder}
          sign={NumberSign.Negative}
          withDiff={Boolean(leverage?.current && leverage.current !== leverage?.postOrder)}
        />
      ),
    },
  ];
  const isFormValid = !isDisabled && !isEditingSlippage;
@@ -1,10 +1,10 @@
-import { type Dispatch, type SetStateAction, useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import styled, { AnyStyledComponent, css } from 'styled-components';
 import { Root, Thumb, Track } from '@radix-ui/react-slider';
 import _ from 'lodash';
 import { OrderSide } from '@dydxprotocol/v4-client-js';
-import { type Nullable, TradeInputField } from '@/constants/abacus';
+import { TradeInputField } from '@/constants/abacus';
 import { PositionSide } from '@/constants/trade';
 import { MustBigNumber, type BigNumberish } from '@/lib/numbers';
@@ -12,11 +12,11 @@ import abacusStateManager from '@/lib/abacus';
 type ElementProps = {
  leverage?: BigNumberish | null;
-  leverageInputValue: Nullable<number>;
+  leverageInputValue: string;
  maxLeverage: BigNumberish | null;
  orderSide: OrderSide;
  positionSide: PositionSide;
-  setLeverageInputValue: Dispatch<SetStateAction<Nullable<number>>>;
+  setLeverageInputValue: (value: string) => void;
 };
 type StyleProps = { className?: string };
@@ -33,6 +33,7 @@ export const LeverageSlider = ({
  const leverageBN = MustBigNumber(leverage);
  const maxLeverageBN = MustBigNumber(maxLeverage);
  const leverageInputBN = MustBigNumber(leverageInputValue || leverage);
  const leverageInputNumber = isNaN(leverageInputBN.toNumber()) ? 0 : leverageInputBN.toNumber();
  const sliderConfig = useMemo(
    () => ({
@@ -79,12 +80,12 @@ export const LeverageSlider = ({
  );
  const onSliderDrag = ([newLeverage]: number[]) => {
-    setLeverageInputValue(newLeverage);
+    setLeverageInputValue(`${newLeverage}`);
    debouncedSetAbacusLeverage(newLeverage);
  };
  const onValueCommit = ([newLeverage]: number[]) => {
-    setLeverageInputValue(newLeverage);
+    setLeverageInputValue(`${newLeverage}`);
    // Ensure Abacus is updated with the latest, committed value
    debouncedSetAbacusLeverage.cancel();
@@ -102,7 +103,7 @@ export const LeverageSlider = ({
        min={min}
        max={max}
        step={0.1}
-        value={[Math.min(Math.max(leverageInputBN.toNumber(), min), max)]}
+        value={[Math.min(Math.max(leverageInputNumber, min), max)]}
        onValueChange={onSliderDrag}
        onValueCommit={onValueCommit}
      >
@@ -1,9 +1,8 @@
 import type { Dispatch, SetStateAction } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import styled, { AnyStyledComponent } from 'styled-components';
 import { OrderSide } from '@dydxprotocol/v4-client-js';
-import { TradeInputField, Nullable } from '@/constants/abacus';
+import { TradeInputField } from '@/constants/abacus';
 import { ButtonShape } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
 import { LEVERAGE_DECIMALS } from '@/constants/numbers';
@@ -62,21 +61,7 @@ export const MarketLeverageInput = ({
  const leveragePosition = postOrderLeverage ? newPositionSide : currentPositionSide;
-  const onLeverageInput = ({ value, floatValue }: { value: string; floatValue?: number }) => {
+  const getSignedLeverage = (newLeverage: string | number) => {
    const newLeverage = MustBigNumber(floatValue).toFixed();
    if (value === '' || newLeverage === 'NaN' || !floatValue) {
      setLeverageInputValue('');
      abacusStateManager.setTradeValue({
        value: null,
        field: TradeInputField.leverage,
      });
    } else {
      updateLeverage(floatValue);
    }
  };
  const updateLeverage = (newLeverage: string | number) => {
    const newLeverageBN = MustBigNumber(newLeverage);
    const newLeverageSignedBN =
      leveragePosition === PositionSide.Short ||
@@ -84,10 +69,33 @@ export const MarketLeverageInput = ({
        ? newLeverageBN.abs().negated()
        : newLeverageBN.abs();
-    setLeverageInputValue(newLeverageSignedBN.toString());
+    return newLeverageSignedBN.toFixed(LEVERAGE_DECIMALS);
  };
  const onLeverageInput = ({
    floatValue,
    formattedValue,
  }: {
    floatValue?: number;
    formattedValue: string;
  }) => {
    setLeverageInputValue(formattedValue);
    const newLeverage = MustBigNumber(floatValue).toFixed();
    abacusStateManager.setTradeValue({
-      value: newLeverageSignedBN.toFixed(LEVERAGE_DECIMALS),
+      value:
        formattedValue === '' || newLeverage === 'NaN' ? null : getSignedLeverage(formattedValue),
      field: TradeInputField.leverage,
    });
  };
  const updateLeverage = (newLeverage: string | number) => {
    const newLeverageSigned = getSignedLeverage(newLeverage);
    setLeverageInputValue(newLeverageSigned);
    abacusStateManager.setTradeValue({
      value: newLeverageSigned,
      field: TradeInputField.leverage,
    });
  };
@@ -130,7 +138,7 @@ export const MarketLeverageInput = ({
        >
          <Styled.LeverageSlider
            leverage={currentLeverage}
-            leverageInputValue={leverageInputValue}
+            leverageInputValue={getSignedLeverage(leverageInputValue)}
            maxLeverage={maxLeverage}
            orderSide={orderSide}
            positionSide={currentPositionSide}
@@ -77,7 +77,7 @@ export const TradeSizeInputs = () => {
    floatValue?: number;
    formattedValue: string;
  }) => {
-    dispatch(setTradeFormInputs({ amountInput: MustBigNumber(floatValue).toString() }));
+    dispatch(setTradeFormInputs({ amountInput: formattedValue }));
    const newAmount = MustBigNumber(floatValue).toFixed(decimals);
    abacusStateManager.setTradeValue({
@@ -93,7 +93,7 @@ export const TradeSizeInputs = () => {
    floatValue?: number;
    formattedValue: string;
  }) => {
-    dispatch(setTradeFormInputs({ usdAmountInput: MustBigNumber(floatValue).toString() }));
+    dispatch(setTradeFormInputs({ usdAmountInput: formattedValue }));
    const newUsdcAmount = MustBigNumber(floatValue).toFixed(tickSizeDecimals || USD_DECIMALS);
    abacusStateManager.setTradeValue({
@@ -10,6 +10,9 @@ import { STRING_KEYS, StringGetterFunction, TOOLTIP_STRING_KEYS } from '@/consta
 import { isMainnet } from '@/constants/networks';
 import { DydxChainAsset, wallets } from '@/constants/wallets';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { headerMixins } from '@/styles/headerMixins';
 import {
  useAccounts,
  useBreakpoints,
@@ -35,10 +38,8 @@ import { getOnboardingState, getSubaccount } from '@/state/accountSelectors';
 import { isTruthy } from '@/lib/isTruthy';
 import { truncateAddress } from '@/lib/wallet';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { headerMixins } from '@/styles/headerMixins';
 import { MustBigNumber } from '@/lib/numbers';
 import { testFlags } from '@/lib/testFlags';
 export const AccountMenu = () => {
  const stringGetter = useStringGetter();
@@ -178,7 +179,7 @@ export const AccountMenu = () => {
        },
        ...(onboardingState === OnboardingState.AccountConnected && hdKey
          ? [
-              !isMainnet && {
+              (!isMainnet || testFlags.showMobileSignInOption) && {
                value: 'MobileQrSignIn',
                icon: <Icon iconName={IconName.Qr} />,
                label: stringGetter({ key: STRING_KEYS.TITLE_SIGN_INTO_MOBILE }),
@@ -0,0 +1,78 @@
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { STRING_KEYS } from '@/constants/localization';
 import { useStringGetter } from '@/hooks';
 import { Details } from '@/components/Details';
 import { Notification, NotificationProps } from '@/components/Notification';
 import { Output, OutputType } from '@/components/Output';
 import { Icon, IconName } from '@/components/Icon';
 type ElementProps = {
  data: {
    BLOCK_REWARD_AMOUNT: string;
    BLOCK_REWARD_HEIGHT: string;
    BLOCK_REWARD_TIME_MILLISECONDS: string;
    TOKEN_NAME: string;
  };
 };
 export type BlockRewardNotificationProps = NotificationProps & ElementProps;
 export const BlockRewardNotification = ({
  isToast,
  data,
  notification,
 }: BlockRewardNotificationProps) => {
  const stringGetter = useStringGetter();
  const { BLOCK_REWARD_AMOUNT, TOKEN_NAME } = data;
  return (
    <Styled.Notification
      isToast={isToast}
      notification={notification}
      slotIcon={<Icon iconName={IconName.RewardStar} />}
      slotTitle={stringGetter({ key: STRING_KEYS.TRADING_REWARD_RECEIVED })}
      slotCustomContent={
        <Styled.Details
          items={[
            {
              key: 'block_reward',
              label: stringGetter({ key: STRING_KEYS.BLOCK_REWARD }),
              value: (
                <Styled.Output
                  type={OutputType.Asset}
                  value={BLOCK_REWARD_AMOUNT}
                  tag={TOKEN_NAME}
                />
              ),
            },
          ]}
        />
      }
    />
  );
 };
 const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Details = styled(Details)`
  --details-item-height: 1.5rem;
  dd {
    color: var(--color-text-2);
  }
 `;
 Styled.Notification = styled(Notification)`
  background-image: url('/dots-background-2.svg');
  background-size: cover;
 `;
 Styled.Output = styled(Output)`
  &:before {
    content: '+';
    color: var(--color-positive);
    margin-right: 0.5ch;
  }
 `;
@@ -12,10 +12,11 @@ import { LoadingSpinner } from '@/components/Loading/LoadingSpinner';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { STRING_KEYS } from '@/constants/localization';
 import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 import { TransferNotificationTypes } from '@/constants/notifications';
 type ElementProps = {
  status?: StatusResponse;
-  type: 'withdrawal' | 'deposit';
+  type: TransferNotificationTypes;
 };
 type StyleProps = {
@@ -46,11 +47,13 @@ export const TransferStatusSteps = ({ className, status, type }: ElementProps &
      {
        label: stringGetter({
          key:
-            type === 'deposit' ? STRING_KEYS.INITIATED_DEPOSIT : STRING_KEYS.INITIATED_WITHDRAWAL,
+            type === TransferNotificationTypes.Deposit
              ? STRING_KEYS.INITIATED_DEPOSIT
              : STRING_KEYS.INITIATED_WITHDRAWAL,
        }),
        step: TransferStatusStep.FromChain,
-        link: 
+        link:
-          type === 'deposit'
+          type === TransferNotificationTypes.Deposit
            ? status?.fromChain?.transactionUrl
            : routeStatus?.[0]?.chainId === dydxChainId && routeStatus[0].txHash
            ? `${mintscanTxUrl?.replace('{tx_hash}', routeStatus[0].txHash.replace('0x', ''))}`
@@ -63,14 +66,20 @@ export const TransferStatusSteps = ({ className, status, type }: ElementProps &
      },
      {
        label: stringGetter({
-          key: type === 'deposit' ? STRING_KEYS.DEPOSIT_TO_CHAIN : STRING_KEYS.WITHDRAW_TO_CHAIN,
+          key:
            type === TransferNotificationTypes.Deposit
              ? STRING_KEYS.DEPOSIT_TO_CHAIN
              : STRING_KEYS.WITHDRAW_TO_CHAIN,
          params: {
-            CHAIN: type === 'deposit' ? 'dYdX' : status?.toChain?.chainData?.chainName,
+            CHAIN:
              type === TransferNotificationTypes.Deposit
                ? 'dYdX'
                : status?.toChain?.chainData?.chainName,
          },
        }),
        step: TransferStatusStep.ToChain,
        link:
-          type === 'withdrawal'
+          type === TransferNotificationTypes.Withdrawal
            ? status?.toChain?.transactionUrl
            : currentStatus?.chainId === dydxChainId && currentStatus?.txHash
            ? `${mintscanTxUrl?.replace('{tx_hash}', currentStatus.txHash.replace('0x', ''))}`
@@ -5,7 +5,7 @@ import { useInterval, useStringGetter } from '@/hooks';
 import { AlertType } from '@/constants/alerts';
 import { STRING_KEYS } from '@/constants/localization';
-import { TransferNotifcation } from '@/constants/notifications';
+import { TransferNotifcation, TransferNotificationTypes } from '@/constants/notifications';
 import { formatSeconds } from '@/lib/timeUtils';
@@ -22,7 +22,7 @@ import { layoutMixins } from '@/styles/layoutMixins';
 import { TransferStatusSteps } from './TransferStatusSteps';
 type ElementProps = {
-  type: 'withdrawal' | 'deposit';
+  type: TransferNotificationTypes;
  transfer: TransferNotifcation;
  triggeredAt?: number;
 };
@@ -55,7 +55,7 @@ export const TransferStatusNotification = ({
  useInterval({ callback: updateSecondsLeft });
  const inProgressStatusString =
-    type === 'deposit'
+    type === TransferNotificationTypes.Deposit
      ? secondsLeft > 0
        ? STRING_KEYS.DEPOSIT_STATUS
        : STRING_KEYS.DEPOSIT_STATUS_SHORTLY
@@ -64,7 +64,7 @@ export const TransferStatusNotification = ({
      : STRING_KEYS.WITHDRAW_STATUS_SHORTLY;
  const statusString =
-    type === 'deposit'
+    type === TransferNotificationTypes.Deposit
      ? status?.squidTransactionStatus === 'success'
        ? STRING_KEYS.DEPOSIT_COMPLETE
        : inProgressStatusString
@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 import { STRING_KEYS } from '@/constants/localization';
 import { MarketFilters, type MarketData } from '@/constants/markets';
-import { LARGE_TOKEN_DECIMALS } from '@/constants/numbers';
+import { FUNDING_DECIMALS, LARGE_TOKEN_DECIMALS } from '@/constants/numbers';
 import { AppRoute } from '@/constants/routes';
 import { useBreakpoints, useStringGetter } from '@/hooks';
@@ -128,7 +128,8 @@ export const MarketsTable = ({ className }: { className?: string }) => {
              label: stringGetter({ key: STRING_KEYS.FUNDING_RATE_1H_SHORT }),
              renderCell: (row) => (
                <Styled.Output
-                  type={OutputType.SmallPercent}
+                  type={OutputType.Percent}
                  fractionDigits={FUNDING_DECIMALS}
                  value={row.nextFundingRate}
                  isPositive={MustBigNumber(row.nextFundingRate).gt(0)}
                  isNegative={MustBigNumber(row.nextFundingRate).isNegative()}
@@ -230,14 +230,7 @@ const getOrdersTableColumnDef = ({
        label: `${stringGetter({ key: STRING_KEYS.STATUS })} / ${stringGetter({
          key: STRING_KEYS.FILL,
        })}`,
-        renderCell: ({
+        renderCell: ({ asset, createdAtMilliseconds, size, status, totalFilled, resources }) => {
          asset,
          createdAtMilliseconds,
          size,
          status,
          totalFilled,
          resources,
        }) => {
          const { statusIconColor, statusStringKey } = getStatusIconInfo({
            status,
            totalFilled,
@@ -345,9 +338,7 @@ export const OrdersTable = ({
    if (hasUnseenOrderUpdates) dispatch(viewedOrders());
  }, [hasUnseenOrderUpdates]);
-  const symbol = currentMarket
+  const symbol = currentMarket ? allAssets[allPerpetualMarkets[currentMarket]?.assetId]?.id : null;
    ? allAssets[allPerpetualMarkets[currentMarket]?.assetId]?.symbol
    : null;
  const ordersData = orders.map((order: SubaccountOrder) =>
    getHydratedTradingData({
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bill He	849bda8e8e	privy theme	2024-01-18 21:22:44 -08:00
Bill He	57edb711d5	PWA	2024-01-18 19:55:43 -08:00
Bill He	8235c64c93	Noble deposit	2024-01-18 19:10:16 -08:00
Bill He	750fb077f5	remove debugs	2024-01-18 12:36:10 -08:00
Bill He	d781cb3199	conditions	2024-01-18 12:28:57 -08:00
Bill He	f6bf635b0d	debug	2024-01-18 12:21:47 -08:00
Bill He	56187f7a84	ignore ready	2024-01-18 12:18:44 -08:00
Bill He	93c76f1c3f	Privy integration [WIP]	2024-01-18 11:58:21 -08:00
aleka	521b6d6135	test flag for sign in option (#236 )	2024-01-17 16:22:17 -08:00
aleka	94772bf4dc	bump abacus to remove base position notional (#235 )	2024-01-17 15:52:02 -08:00
Adam Fraser	149f21e7e0	Add trailing blocks to NetworkStatus analytics event (#230 )	2024-01-17 10:34:04 -05:00
aleka	0a3ef3a7ab	bump abacus (#233 )	2024-01-17 10:33:29 -05:00
Bill	fef9935883	Support notification for trading rewards (#224 ) * Support notification for trading rewards * bump abacus * Stack notifications based on notification type * address comments	2024-01-16 10:19:48 -08:00
Bill	c7a5b706e1	Fix toAmount/toAmountMin on withdraw (#232 )	2024-01-15 10:31:23 -08:00
moo-onthelawn	f304bb069a	TRCL-1979 Show open positions / orders in portfolio sidebar (#228 ) * add tags for open orders + positions * clean up, use new num selector function * update logic for open orders	2024-01-12 14:44:09 -05:00
Bill	ad6aa1af49	Bump abacus, fix onboarding toAmount (#229 )	2024-01-11 11:52:02 -08:00
Jared Vu	55b2c3fb4a	Update Funding Chart Tooltip (#225 ) * 🚧 depth chart * ✨ Fixed types and shortened FundingRateTooltip * 💄 update depth chart color scale to use css var * 💄 use layer-6 instead of text-1 * 🌐 Add localization, fix nits	2024-01-11 10:31:53 -08:00
moo-onthelawn	83bcde00eb	TRCL-1623 Update Positions icon in nav sidebar (#226 ) * update icon * remove unused cube icon	2024-01-11 11:02:23 -05:00
Jared Vu	e8024b9337	Add Sepolia (#222 )	2024-01-09 16:35:19 -08:00
Jared Vu	8280e512bc	Remove BasePositionNotional DetailItem (#223 )	2024-01-09 14:01:38 -08:00
aleka	b2234cb969	reorganize rewards vs. profile, update panel and accordion styling (#221 ) * reorganize rewards vs. profile, update panel and accordion styling * feedback	2024-01-09 16:57:02 -05:00
Bill	4bcb1f64ac	Add Kava support for onboarding, and add token symbol to token select (#220 ) * Add Kava support for onboarding, and add token symbol to token select * bump abacus	2024-01-09 11:51:31 -08:00
BillandAleka Cheung	4a64d59546	Update launch incentives to season 2 (#218 ) * Update launch incentives to season 2 * update api url --------- Co-authored-by: Aleka Cheung <aforaleka@gmail.com>	2024-01-04 19:14:23 -08:00
Jared Vu	3fc43e8a12	Remove base from baseInitialMarginFraction (#209 )	2024-01-04 15:35:05 -08:00
Jared Vu	c24a9229a6	Imperator testnet indexer to be scaled down (#219 )	2024-01-04 15:34:18 -08:00
aleka	90329d44d0	update lock file (#217 )	2024-01-03 13:57:21 -08:00
Bill	9a02bd3f1c	remove testnet cctp chains (#216 )	2024-01-03 12:55:58 -08:00
aleka	adba11b462	add accordion component and rewards help panel (#214 )	2024-01-03 14:20:30 -05:00
Jared Vu	29526b927f	Update deposit and withdrawal receipts (#212 ) * Update receipts * Remove duplicate const * Restore env * format * Try using raw * Use 3 spaces T.T * copy from main * Update abacus, display proper toAmount and toAmountMin * nits	2024-01-03 09:56:01 -08:00
Jared Vu	503e089efa	temp hide fees for cctp route (#213 )	2023-12-23 01:17:41 -08:00
Jared Vu	c3495f462c	Additional Withdraw/Deposit validation (#211 ) * Add cctp amount check and price impact check * 2.5% -> 2%	2023-12-22 17:31:32 -08:00
Billandjaredvu	6da6eeb2a4	Enable CCTP (#194 ) * Enable CCTP * Handle base64 encode * Update localization package --------- Co-authored-by: jaredvu <jaredvu@gmail.com>	2023-12-22 11:12:41 -08:00
mike-dydx	0cf3e81bd7	Create documentation.json (#205 )	2023-12-21 15:08:08 -05:00
aleka	f8cf1d364b	update coinbase connect app name (#208 )	2023-12-21 10:58:57 -08:00
Jared Vu	6f344c6b5d	Update comparison function in Table (#207 )	2023-12-21 10:53:56 -08:00
Jared Vu	133856afca	Export secret phrase help article (#206 ) * Update config with correct article link * Remove auto-format of json	2023-12-21 10:49:52 -08:00
Jared Vu	33c543daaf	Update bridgeFee in Withdraw/Deposit forms (#202 ) * Update Withdraw form receipt * Bump abacus 1.1.27 * pnpm-lock * bump v4-localization	2023-12-19 23:36:13 -08:00
Jared Vu	c77e727d2b	TRCL-3406: firefox mobile position table row has stretched icon (#204 ) * Fix PositionsTable assetIcon * Mobile width of HelpDialog	2023-12-19 23:33:36 -08:00
Jared Vu	b94538711d	Lazy load Pages (#203 ) * Lazy import pages * Fix import order	2023-12-19 23:30:51 -08:00
Jared Vu	b83479f45c	Handle New Markets added by Gov (#201 ) * Add celestia assets * Handle symbol not yet added	2023-12-19 23:25:14 -08:00
Jared Vu	001aad3abc	Navigate to the Markets page if the current marketId is not included in subscribed markets (#198 ) * Navigate to markets if current url is invalid * nits	2023-12-19 15:58:49 -08:00
Jared Vu	f8db5e1ba0	Update abacus to 1.1.25: Good til time fix (#199 )	2023-12-19 09:49:51 -08:00
Jared Vu	f8bec0fb3d	Update Withdraw form receipt (#200 )	2023-12-19 09:49:37 -08:00
Bill	8bf23b7e9c	bump abacus (#197 )	2023-12-15 15:12:35 -08:00
Jared Vu	3f10e045f4	bump abacus & wagmi (#196 )	2023-12-15 09:26:41 -08:00
Bill	71d1a0321b	Do not block website if NobleClient cannot init, and other onboarding fixes (#193 )	2023-12-13 08:11:19 -08:00
Bill	0f16396c8d	Implement CCTP withdraw (#188 ) * Implement CCTP withdraw * bump packages * address comments	2023-12-12 10:12:37 -08:00
Jared Vu	2709d79f59	Firefox issues (#190 ) * remove row flicker on hover * Fix border for AccountInfoConnectedState on mobile * Remove sticky position to allow button click * Fix: AccountInfo not displaying on mobile firefox * Fix css var name * Restore filter on Table row hover * Remove PerspectiveArea. broken on firefox * Symbol no longer exists on AbacusType * HorizontalPanel: memoize tabConfig * input: firefox cant click between chars	2023-12-12 08:37:50 -08:00
Bill	ab0eec5d4f	Update noble tesnet rpc (#192 )	2023-12-12 11:35:21 -05:00
Jared Vu	4a044da38f	Size inputs (#191 ) * use formattedValue to update redux state * Separate updateLeverage and onLeverageInput * Remove console.log	2023-12-12 07:11:51 -08:00
Jared Vu	fbbfbc6580	Bump v4-abacus and v4-localization (#189 )	2023-12-08 15:41:07 -08:00
Rui	2714c2b084	Fix path to chainLogo (#187 )	2023-12-07 13:03:44 -08:00
		`@@ -0,0 +1 @@`
							`if('serviceWorker' in navigator) navigator.serviceWorker.register('/dev-sw.js?dev-sw', { scope: '/', type: 'classic' })`
		`@@ -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>