Fix import order

Lazy import pages
2023-12-19 16:24:49 -08:00 · 2023-12-19 16:23:50 -08:00
92 changed files with 2110 additions and 3054 deletions
@@ -5,35 +5,29 @@ import styled from 'styled-components';

 import { store } from '@/state/_store';

-import { GlobalStyle } from '@/styles/globalStyle';
-
 import { SelectMenu, SelectItem } from '@/components/SelectMenu';

-import { AppThemeProvider } from '@/hooks/useAppTheme';
-
-import { AppTheme, setAppTheme } from '@/state/configs';
 import { setLocaleLoaded } from '@/state/localization';

 import '@/index.css';
 import './ladle.css';

 export const StoryWrapper: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-  const [theme, setTheme] = useState(AppTheme.Classic);
+  const [theme, setTheme] = useState('Default theme');

  useEffect(() => {
-    store.dispatch(setAppTheme(theme));
    switch (theme) {
-      case AppTheme.Dark: {
+      case 'Dark theme': {
        document?.documentElement?.classList.remove('theme-light');
        document?.documentElement?.classList.add('theme-dark');
        break;
      }
-      case AppTheme.Light: {
+      case 'Light theme': {
        document?.documentElement?.classList.remove('theme-dark');
        document?.documentElement?.classList.add('theme-light');
        break;
      }
-      case AppTheme.Classic: {
+      default: {
        document?.documentElement?.classList.remove('theme-dark', 'theme-light');
        break;
      }
@@ -54,15 +48,15 @@ export const StoryWrapper: React.FC<{ children: React.ReactNode }> = ({ children
        >
          {[
            {
-              value: AppTheme.Classic,
+              value: 'Default theme',
              label: 'Default theme',
            },
            {
-              value: AppTheme.Dark,
+              value: 'Dark theme',
              label: 'Dark theme',
            },
            {
-              value: AppTheme.Light,
+              value: 'Light theme',
              label: 'Light theme',
            },
          ].map(({ value, label }) => (
@@ -75,11 +69,8 @@ export const StoryWrapper: React.FC<{ children: React.ReactNode }> = ({ children
        </SelectMenu>
      </StoryHeader>
      <hr />
-      <AppThemeProvider>
-        <GlobalStyle />
-        <StoryContent>{children}</StoryContent>
-      </AppThemeProvider>
-      </Provider>
+      <StoryContent>{children}</StoryContent>
+    </Provider>
  );
 };

@@ -39,12 +39,11 @@
    "@cosmjs/proto-signing": "^0.31.0",
    "@cosmjs/stargate": "^0.31.0",
    "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^1.2.5",
+    "@dydxprotocol/v4-abacus": "^1.1.25",
    "@dydxprotocol/v4-client-js": "^1.0.11",
-    "@dydxprotocol/v4-localization": "^1.1.11",
+    "@dydxprotocol/v4-localization": "^1.0.18",
    "@ethersproject/providers": "^5.7.2",
    "@js-joda/core": "^5.5.3",
-    "@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",
@@ -111,7 +110,7 @@
    "reselect": "^4.1.8",
    "styled-components": "^5.3.11",
    "use-latest": "^1.2.1",
-    "viem": "^1.20.0",
+    "viem": "^1.12.2",
    "wagmi": "^1.4.12"
  },
  "devDependencies": {
@@ -4,9 +4,38 @@
        "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
        "name": "Ethereum"
    },
+    {
+        "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"
    }
 ]
@@ -1,16 +0,0 @@
-{
-    "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,7 +39,7 @@
   "environments": {
      "dydxprotocol-dev": {
         "name": "v4 Dev",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -89,7 +89,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -113,7 +113,7 @@
      },
      "dydxprotocol-dev-2": {
         "name": "v4 Dev 2",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -162,7 +162,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -186,7 +186,7 @@
      },
      "dydxprotocol-dev-4": {
         "name": "v4 Dev 4",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -235,7 +235,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -259,7 +259,7 @@
      },
      "dydxprotocol-dev-5": {
         "name": "v4 Dev 5",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -308,7 +308,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -332,7 +332,7 @@
      },
      "dydxprotocol-staging": {
         "name": "v4 Staging",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -383,7 +383,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -407,7 +407,7 @@
      },
      "dydxprotocol-staging-forced-update": {
         "name": "v4 Staging Forced Update",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -480,7 +480,7 @@
      },
      "dydxprotocol-staging-west": {
         "name": "v4 Staging West",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -531,7 +531,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -555,7 +555,7 @@
      },
      "dydxprotocol-testnet": {
         "name": "v4 Public Testnet",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -579,8 +579,8 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
               }
            ],
            "validators": [
@@ -610,7 +610,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -634,7 +634,7 @@
      },
      "dydxprotocol-testnet-dydx": {
         "name": "v4 Public Testnet/dYdX",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -686,7 +686,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -710,7 +710,7 @@
      },
      "dydxprotocol-testnet-nodefleet": {
         "name": "v4 Public Testnet/nodefleet",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -734,8 +734,8 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
               }
            ],
            "validators": [
@@ -762,7 +762,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -786,7 +786,7 @@
      },
      "dydxprotocol-testnet-kingnodes": {
         "name": "v4 Public Testnet/KingNodes",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -810,8 +810,8 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
               }
            ],
            "validators": [
@@ -838,7 +838,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -862,7 +862,7 @@
      },
      "dydxprotocol-testnet-liquify": {
         "name": "v4 Public Testnet/Liquify",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -886,8 +886,8 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
               }
            ],
            "validators": [
@@ -914,7 +914,7 @@
            "governanceLearnMore": "https://help.dydx.exchange",
            "stakingLearnMore": "https://help.dydx.exchange",
            "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "accountExportLearnMore": "https://help.dydx.exchange",
            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
@@ -938,7 +938,7 @@
      },
      "dydxprotocol-testnet-polkachu": {
         "name": "v4 Public Testnet/Polkahcu",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -962,8 +962,8 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
               }
            ],
            "validators": [
@@ -1005,7 +1005,7 @@
      },
      "dydxprotocol-testnet-bware": {
         "name": "v4 Public Testnet/BWare",
-         "ethereumChainId": "11155111",
+         "ethereumChainId": "5",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
         "chainLogo": "/dydx-chain.png",
@@ -1029,8 +1029,8 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+                  "api": "https://dydx-testnet.imperator.co",
+                  "socket": "wss://dydx-testnet.imperator.co"
               }
            ],
            "validators": [
@@ -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": "[HTTP link to reduce-only learn more, can be null]",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
            "documentation": "[HTTP link to documentation, can be null]",
            "community": "[HTTP link to community, can be null]",
            "help": "[HTTP link to help page, can be null]",
@@ -1,360 +1,454 @@
 {
-  "1INCH-USD": {
-    "name": "1inch",
-    "tags": ["Defi"],
-    "websiteLink": "https://1inch.io/",
-    "whitepaperLink": "https://github.com/1inch",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/1inch/"
-  },
-  "AAVE-USD": {
-    "name": "Aave",
-    "tags": ["Defi"],
-    "websiteLink": "https://aave.com/",
-    "whitepaperLink": "https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/aave/"
-  },
-  "ADA-USD": {
-    "name": "Cardano",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://cardano.org/",
-    "whitepaperLink": "https://why.cardano.org/en/introduction/motivation/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cardano/"
-  },
-  "ALGO-USD": {
-    "name": "Algorand",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://algorand.com/",
-    "whitepaperLink": "https://algorand.com/technology/white-papers",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/algorand/"
-  },
-  "APE-USD": {
-    "name": "ApeCoin",
-    "tags": [],
-    "websiteLink": "https://apecoin.com/",
-    "whitepaperLink": "https://apecoin.com/about",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/apecoin-ape/"
-  },
-  "APT-USD": {
-    "name": "Aptos",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://aptoslabs.com/",
-    "whitepaperLink": "https://aptos.dev/aptos-white-paper/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/aptos/"
-  },
-  "ARB-USD": {
-    "name": "Arbitrum",
-    "tags": [],
-    "websiteLink": "https://arbitrum.io/",
-    "whitepaperLink": "https://github.com/OffchainLabs/nitro",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/arbitrum/"
-  },
-  "ATOM-USD": {
-    "name": "Cosmos",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://cosmos.network/",
-    "whitepaperLink": "https://v1.cosmos.network/resources/whitepaper",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cosmos/"
-  },
-  "AVAX-USD": {
-    "name": "Avalanche",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://www.avalabs.org/",
-    "whitepaperLink": "https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/avalanche/"
-  },
-  "BCH-USD": {
-    "name": "Bitcoin Cash",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://bitcoincash.org/",
-    "whitepaperLink": "https://bitcoincash.org/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin-cash/"
-  },
-  "BLUR-USD": {
-    "name": "Blur",
-    "tags": [],
-    "websiteLink": "https://blur.io/",
-    "whitepaperLink": "https://docs.blur.foundation/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/blur-token/"
-  },
-  "CELO-USD": {
-    "name": "Celo",
-    "tags": [],
-    "websiteLink": "https://celo.org",
-    "whitepaperLink": "https://docs.celo.org",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/celo/"
-  },
-  "BTC-USD": {
-    "name": "Bitcoin",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://bitcoin.org/",
-    "whitepaperLink": "https://bitcoin.org/bitcoin.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin/"
-  },
-  "COMP-USD": {
-    "name": "Compound",
-    "tags": ["Defi"],
-    "websiteLink": "https://compound.finance/",
-    "whitepaperLink": "https://compound.finance/documents/Compound.Whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/compound/"
-  },
-  "CRV-USD": {
-    "name": "Curve",
-    "tags": ["Governance"],
-    "websiteLink": "https://curve.fi/",
-    "whitepaperLink": "https://curve.fi/whitepaper",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/curve-dao-token/"
-  },
-  "DOGE-USD": {
-    "name": "Dogecoin",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://dogecoin.com/",
-    "whitepaperLink": "https://github.com/dogecoin/dogecoin",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/dogecoin/"
-  },
-  "DOT-USD": {
-    "name": "Polkadot",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://polkadot.network/",
-    "whitepaperLink": "https://polkadot.network/PolkaDotPaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polkadot-new/"
-  },
-  "ENJ-USD": {
-    "name": "Enjin",
-    "tags": [],
-    "websiteLink": "https://enjin.io/",
-    "whitepaperLink": "https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/enjin-coin/"
-  },
-  "EOS-USD": {
-    "name": "EOS",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://eos.io/",
-    "whitepaperLink": "https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/eos/"
-  },
-  "ETC-USD": {
-    "name": "Ethereum Classic",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://ethereumclassic.org/",
-    "whitepaperLink": "https://ethereumclassic.org/why-classic",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum-classic/"
-  },
-  "ETH-USD": {
-    "name": "Ethereum",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://ethereum.org/",
-    "whitepaperLink": "https://ethereum.org/whitepaper/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum/",
-    "displayStepSize": "0.001",
-    "displayTickSize": "0.1"
-  },
-  "FIL-USD": {
-    "name": "Filecoin",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://filecoin.io/",
-    "whitepaperLink": "https://filecoin.io/filecoin.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/filecoin/"
-  },
-  "HNT-USD": {
-    "name": "Helium",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://www.helium.com",
-    "whitepaperLink": "http://whitepaper.helium.com",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/helium/"
-  },
-  "ICP-USD": {
-    "name": "Internet Computer",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://dfinity.org",
-    "whitepaperLink": "https://dfinity.org/whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/internet-computer/"
-  },
-  "LDO-USD": {
-    "name": "Lido DAO",
-    "tags": ["Defi"],
-    "websiteLink": "https://lido.fi/",
-    "whitepaperLink": "https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/lido-dao/"
-  },
-  "LINK-USD": {
-    "name": "Chainlink",
-    "tags": ["Defi"],
-    "websiteLink": "https://chain.link/",
-    "whitepaperLink": "https://link.smartcontract.com/whitepaper",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/chainlink/"
-  },
-  "LTC-USD": {
-    "name": "Litecoin",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://litecoin.org/",
-    "whitepaperLink": "https://litecoin.info/index.php/Main_Page",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/litecoin/"
-  },
-  "MATIC-USD": {
-    "name": "Polygon",
-    "tags": ["Layer 2"],
-    "websiteLink": "https://polygon.technology/",
-    "whitepaperLink": "https://polygon.technology/lightpaper-polygon.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polygon/"
-  },
-  "MKR-USD": {
-    "name": "Maker",
-    "tags": ["Governance"],
-    "websiteLink": "https://makerdao.com",
-    "whitepaperLink": "https://makerdao.com/whitepaper",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/maker/"
-  },
-  "NEAR-USD": {
-    "name": "NEAR Protocol",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://near.org",
-    "whitepaperLink": "https://near.org/papers/the-official-near-white-paper/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/near-protocol/"
-  },
-  "OP-USD": {
-    "name": "Optimism",
-    "tags": [],
-    "websiteLink": "https://www.optimism.io/",
-    "whitepaperLink": "https://github.com/ethereum-optimism",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/optimism-ethereum/"
-  },
-  "PEPE-USD": {
-    "name": "Pepe",
-    "tags": [],
-    "websiteLink": "https://www.pepe.vip/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/pepe/"
-  },
-  "RUNE-USD": {
-    "name": "THORChain",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://thorchain.org",
-    "whitepaperLink": "https://whitepaper.io/document/709/thorchain-whitepaper",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/thorchain/"
-  },
-  "SEI-USD": {
-    "name": "Sei",
-    "tags": ["Layer 1", "Defi"],
-    "websiteLink": "https://www.sei.io/",
-    "whitepaperLink": "https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sei/"
-  },
-  "SHIB-USD": {
-    "name": "Shiba Inu",
-    "tags": [],
-    "websiteLink": "https://shibatoken.com/",
-    "whitepaperLink": "https://docs.shibatoken.com/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/shiba-inu/"
-  },
-  "SNX-USD": {
-    "name": "Synthetix",
-    "tags": ["Defi"],
-    "websiteLink": "https://synthetix.io/",
-    "whitepaperLink": "https://docs.synthetix.io/litepaper",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/synthetix-network-token/"
-  },
-  "SOL-USD": {
-    "name": "Solana",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://solana.com/",
-    "whitepaperLink": "https://solana.com/solana-whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/"
-  },
-  "SUI-USD": {
-    "name": "Sui",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://sui.io/",
-    "whitepaperLink": "https://github.com/MystenLabs",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sui/"
-  },
-  "SUSHI-USD": {
-    "name": "Sushi",
-    "tags": ["Defi"],
-    "websiteLink": "https://sushi.com/",
-    "whitepaperLink": "https://docs.sushi.com/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sushiswap/"
-  },
-  "TIA-USD": {
-    "name": "Celestia",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://celestia.org/",
-    "whitepaperLink": "https://arxiv.org/pdf/1905.09274.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/celestia/"
-  },
-  "TRX-USD": {
-    "name": "TRON",
-    "tags": ["Defi"],
-    "websiteLink": "https://tron.network/",
-    "whitepaperLink": "https://tron.network/static/doc/white_paper_v_2_0.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/tron/"
-  },
-  "UMA-USD": {
-    "name": "UMA",
-    "tags": ["Defi"],
-    "websiteLink": "https://umaproject.org/",
-    "whitepaperLink": "https://github.com/UMAprotocol/whitepaper",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/uma/"
-  },
-  "UNI-USD": {
-    "name": "Uniswap",
-    "tags": ["Defi"],
-    "websiteLink": "https://uniswap.org/",
-    "whitepaperLink": "https://uniswap.org/whitepaper-v3.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/uniswap/"
-  },
-  "WLD-USD": {
-    "name": "Worldcoin",
-    "tags": [],
-    "websiteLink": "https://worldcoin.org/",
-    "whitepaperLink": "https://whitepaper.worldcoin.org/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/worldcoin-org/"
-  },
-  "XLM-USD": {
-    "name": "Stellar",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://www.stellar.org/",
-    "whitepaperLink": "https://www.stellar.org/papers/stellar-consensus-protocol",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/stellar/"
-  },
-  "XMR-USD": {
-    "name": "Monero",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://www.getmonero.org/",
-    "whitepaperLink": "https://www.getmonero.org/resources/research-lab/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/monero/"
-  },
-  "XRP-USD": {
-    "name": "Ripple",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://ripple.com/currency/",
-    "whitepaperLink": "https://github.com/ripple",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/xrp/"
-  },
-  "XTZ-USD": {
-    "name": "Tezos",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://tezos.com",
-    "whitepaperLink": "https://tezos.com/whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/tezos/"
-  },
-  "YFI-USD": {
-    "name": "Yearn",
-    "tags": ["Defi"],
-    "websiteLink": "https://yearn.finance/",
-    "whitepaperLink": "https://docs.yearn.finance/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/yearn-finance/"
-  },
-  "ZEC-USD": {
-    "name": "Zcash",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://z.cash/",
-    "whitepaperLink": "https://z.cash/technology/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/zcash/"
-  },
-  "ZRX-USD": {
-    "name": "0x",
-    "tags": ["Defi"],
-    "websiteLink": "https://0x.org/",
-    "whitepaperLink": "https://0x.org/pdfs/0x_white_paper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/0x/"
-  }
-}
+    "1INCH-USD":{
+       "name":"1inch",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://1inch.io/",
+       "whitepaperLink":"https://github.com/1inch",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/1inch/"
+    },
+    "AAVE-USD":{
+       "name":"Aave",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://aave.com/",
+       "whitepaperLink":"https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aave/"
+    },
+    "ADA-USD":{
+       "name":"Cardano",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://cardano.org/",
+       "whitepaperLink":"https://why.cardano.org/en/introduction/motivation/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cardano/"
+    },
+    "ALGO-USD":{
+       "name":"Algorand",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://algorand.com/",
+       "whitepaperLink":"https://algorand.com/technology/white-papers",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/algorand/"
+    },
+    "APE-USD":{
+       "name":"ApeCoin",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://apecoin.com/",
+       "whitepaperLink":"https://apecoin.com/about",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/apecoin-ape/"
+    },
+    "APT-USD":{
+       "name":"Aptos",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://aptoslabs.com/",
+       "whitepaperLink":"https://aptos.dev/aptos-white-paper/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aptos/"
+    },
+    "ARB-USD":{
+       "name":"Arbitrum",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://arbitrum.io/",
+       "whitepaperLink":"https://github.com/OffchainLabs/nitro",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/arbitrum/"
+    },
+    "ATOM-USD":{
+       "name":"Cosmos",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://cosmos.network/",
+       "whitepaperLink":"https://v1.cosmos.network/resources/whitepaper",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cosmos/"
+    },
+    "AVAX-USD":{
+       "name":"Avalanche",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://www.avalabs.org/",
+       "whitepaperLink":"https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/avalanche/"
+    },
+    "BCH-USD":{
+       "name":"Bitcoin Cash",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://bitcoincash.org/",
+       "whitepaperLink":"https://bitcoincash.org/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin-cash/"
+    },
+    "BLUR-USD":{
+       "name":"Blur",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://blur.io/",
+       "whitepaperLink":"https://docs.blur.foundation/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/blur-token/"
+    },
+    "CELO-USD":{
+       "name":"Celo",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://celo.org",
+       "whitepaperLink":"https://docs.celo.org",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/celo/"
+    },
+    "BTC-USD":{
+       "name":"Bitcoin",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://bitcoin.org/",
+       "whitepaperLink":"https://bitcoin.org/bitcoin.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin/"
+    },
+    "COMP-USD":{
+       "name":"Compound",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://compound.finance/",
+       "whitepaperLink":"https://compound.finance/documents/Compound.Whitepaper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/compound/"
+    },
+    "CRV-USD":{
+       "name":"Curve",
+       "tags":[
+          "Governance"
+       ],
+       "websiteLink":"https://curve.fi/",
+       "whitepaperLink":"https://curve.fi/whitepaper",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/curve-dao-token/"
+    },
+    "DOGE-USD":{
+       "name":"Dogecoin",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://dogecoin.com/",
+       "whitepaperLink":"https://github.com/dogecoin/dogecoin",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/dogecoin/"
+    },
+    "DOT-USD":{
+       "name":"Polkadot",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://polkadot.network/",
+       "whitepaperLink":"https://polkadot.network/PolkaDotPaper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polkadot-new/"
+    },
+    "ENJ-USD":{
+       "name":"Enjin",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://enjin.io/",
+       "whitepaperLink":"https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/enjin-coin/"
+    },
+    "EOS-USD":{
+       "name":"EOS",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://eos.io/",
+       "whitepaperLink":"https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/eos/"
+    },
+    "ETC-USD":{
+       "name":"Ethereum Classic",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://ethereumclassic.org/",
+       "whitepaperLink":"https://ethereumclassic.org/why-classic",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum-classic/"
+    },
+    "ETH-USD":{
+       "name":"Ethereum",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://ethereum.org/",
+       "whitepaperLink":"https://ethereum.org/whitepaper/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum/",
+       "displayStepSize":"0.001",
+       "displayTickSize":"0.1"
+    },
+    "FIL-USD":{
+       "name":"Filecoin",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://filecoin.io/",
+       "whitepaperLink":"https://filecoin.io/filecoin.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/filecoin/"
+    },
+    "HNT-USD":{
+       "name":"Helium",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://www.helium.com",
+       "whitepaperLink":"http://whitepaper.helium.com",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/helium/"
+    },
+    "ICP-USD":{
+       "name":"Internet Computer",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://dfinity.org",
+       "whitepaperLink":"https://dfinity.org/whitepaper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/internet-computer/"
+    },
+    "LDO-USD":{
+       "name":"Lido DAO",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://lido.fi/",
+       "whitepaperLink":"https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/lido-dao/"
+    },
+    "LINK-USD":{
+       "name":"Chainlink",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://chain.link/",
+       "whitepaperLink":"https://link.smartcontract.com/whitepaper",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/chainlink/"
+    },
+    "LTC-USD":{
+       "name":"Litecoin",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://litecoin.org/",
+       "whitepaperLink":"https://litecoin.info/index.php/Main_Page",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/litecoin/"
+    },
+    "MATIC-USD":{
+       "name":"Polygon",
+       "tags":[
+          "Layer 2"
+       ],
+       "websiteLink":"https://polygon.technology/",
+       "whitepaperLink":"https://polygon.technology/lightpaper-polygon.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polygon/"
+    },
+    "MKR-USD":{
+       "name":"Maker",
+       "tags":[
+          "Governance"
+       ],
+       "websiteLink":"https://makerdao.com",
+       "whitepaperLink":"https://makerdao.com/whitepaper",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/maker/"
+    },
+    "NEAR-USD":{
+       "name":"NEAR Protocol",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://near.org",
+       "whitepaperLink":"https://near.org/papers/the-official-near-white-paper/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/near-protocol/"
+    },
+    "OP-USD":{
+       "name":"Optimism",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://www.optimism.io/",
+       "whitepaperLink":"https://github.com/ethereum-optimism",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/optimism-ethereum/"
+    },
+    "PEPE-USD":{
+       "name":"Pepe",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://www.pepe.vip/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/pepe/"
+    },
+    "RUNE-USD":{
+       "name":"THORChain",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://thorchain.org",
+       "whitepaperLink":"https://whitepaper.io/document/709/thorchain-whitepaper",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/thorchain/"
+    },
+    "SEI-USD":{
+       "name":"Sei",
+       "tags":[
+          "Layer 1",
+          "Defi"
+       ],
+       "websiteLink":"https://www.sei.io/",
+       "whitepaperLink":"https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sei/"
+    },
+    "SHIB-USD":{
+       "name":"Shiba Inu",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://shibatoken.com/",
+       "whitepaperLink":"https://docs.shibatoken.com/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/shiba-inu/"
+    },
+    "SNX-USD":{
+       "name":"Synthetix",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://synthetix.io/",
+       "whitepaperLink":"https://docs.synthetix.io/litepaper",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/synthetix-network-token/"
+    },
+    "SOL-USD":{
+       "name":"Solana",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://solana.com/",
+       "whitepaperLink":"https://solana.com/solana-whitepaper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/solana/"
+    },
+    "SUI-USD":{
+       "name":"Sui",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://sui.io/",
+       "whitepaperLink":"https://github.com/MystenLabs",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sui/"
+    },
+    "SUSHI-USD":{
+       "name":"Sushi",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://sushi.com/",
+       "whitepaperLink":"https://docs.sushi.com/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sushiswap/"
+    },
+    "TRX-USD":{
+       "name":"TRON",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://tron.network/",
+       "whitepaperLink":"https://tron.network/static/doc/white_paper_v_2_0.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/tron/"
+    },
+    "UMA-USD":{
+       "name":"UMA",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://umaproject.org/",
+       "whitepaperLink":"https://github.com/UMAprotocol/whitepaper",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/uma/"
+    },
+    "UNI-USD":{
+       "name":"Uniswap",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://uniswap.org/",
+       "whitepaperLink":"https://uniswap.org/whitepaper-v3.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/uniswap/"
+    },
+    "WLD-USD":{
+       "name":"Worldcoin",
+       "tags":[
+          
+       ],
+       "websiteLink":"https://worldcoin.org/",
+       "whitepaperLink":"https://whitepaper.worldcoin.org/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/worldcoin-org/"
+    },
+    "XLM-USD":{
+       "name":"Stellar",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://www.stellar.org/",
+       "whitepaperLink":"https://www.stellar.org/papers/stellar-consensus-protocol",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/stellar/"
+    },
+    "XMR-USD":{
+       "name":"Monero",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://www.getmonero.org/",
+       "whitepaperLink":"https://www.getmonero.org/resources/research-lab/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/monero/"
+    },
+    "XRP-USD":{
+       "name":"Ripple",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://ripple.com/currency/",
+       "whitepaperLink":"https://github.com/ripple",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/xrp/"
+    },
+    "XTZ-USD":{
+       "name":"Tezos",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://tezos.com",
+       "whitepaperLink":"https://tezos.com/whitepaper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/tezos/"
+    },
+    "YFI-USD":{
+       "name":"Yearn",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://yearn.finance/",
+       "whitepaperLink":"https://docs.yearn.finance/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/yearn-finance/"
+    },
+    "ZEC-USD":{
+       "name":"Zcash",
+       "tags":[
+          "Layer 1"
+       ],
+       "websiteLink":"https://z.cash/",
+       "whitepaperLink":"https://z.cash/technology/",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/zcash/"
+    },
+    "ZRX-USD":{
+       "name":"0x",
+       "tags":[
+          "Defi"
+       ],
+       "websiteLink":"https://0x.org/",
+       "whitepaperLink":"https://0x.org/pdfs/0x_white_paper.pdf",
+       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/0x/"
+    }
+ }
@@ -1,230 +0,0 @@
-<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>
@@ -16,7 +16,6 @@ import {
 } from '@/hooks';
 import { DydxProvider } from '@/hooks/useDydxClient';
 import { AccountsProvider } from '@/hooks/useAccounts';
-import { AppThemeProvider } from '@/hooks/useAppTheme';
 import { DialogAreaProvider, useDialogArea } from '@/hooks/useDialogArea';
 import { LocaleProvider } from '@/hooks/useLocaleSeparators';
 import { NotificationsProvider } from '@/hooks/useNotifications';
@@ -36,7 +35,6 @@ import { GlobalCommandDialog } from '@/views/dialogs/GlobalCommandDialog';
 import { config } from '@/lib/wagmi';

 import { breakpoints } from '@/styles';
-import { GlobalStyle } from '@/styles/globalStyle';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { LoadingSpace } from './components/Loading/LoadingSpinner';

@@ -68,52 +66,49 @@ const Content = () => {
  const { chainTokenLabel } = useTokenConfigs();

  return (
-    <>
-      <GlobalStyle />
-      <Styled.Content isShowingHeader={isShowingHeader} isShowingFooter={isShowingFooter}>
-        {isNotTablet && <HeaderDesktop />}
+    <Styled.Content isShowingHeader={isShowingHeader} isShowingFooter={isShowingFooter}>
+      {isNotTablet && <HeaderDesktop />}

-        <Styled.Main>
-          <Suspense fallback={<LoadingSpace id="main" />}>
-            <Routes>
-              <Route path={AppRoute.Trade}>
-                <Route path=":market" element={<TradePage />} />
-                <Route path={AppRoute.Trade} element={<TradePage />} />
-              </Route>
+      <Styled.Main>
+        <Suspense fallback={<LoadingSpace id="main" />}>
+          <Routes>
+            <Route path={AppRoute.Trade}>
+              <Route path=":market" element={<TradePage />} />
+              <Route path={AppRoute.Trade} element={<TradePage />} />
+            </Route>

-              <Route path={AppRoute.Markets} element={<MarketsPage />} />
-              <Route path={`/${chainTokenLabel}`} element={<RewardsPage />} />
-              {isTablet && (
-                <>
-                  <Route path={AppRoute.Alerts} element={<AlertsPage />} />
-                  <Route path={AppRoute.Profile} element={<ProfilePage />} />
-                  <Route path={`${AppRoute.Settings}/*`} element={<SettingsPage />} />
-                </>
-              )}
+            <Route path={AppRoute.Markets} element={<MarketsPage />} />
+            <Route path={`/${chainTokenLabel}`} element={<RewardsPage />} />
+            {isTablet && (
+              <>
+                <Route path={AppRoute.Alerts} element={<AlertsPage />} />
+                <Route path={AppRoute.Profile} element={<ProfilePage />} />
+                <Route path={`${AppRoute.Settings}/*`} element={<SettingsPage />} />
+              </>
+            )}

-              <Route element={<GuardedMobileRoute />}>
-                <Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
-              </Route>
+            <Route element={<GuardedMobileRoute />}>
+              <Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
+            </Route>

-              <Route path={AppRoute.Terms} element={<TermsOfUsePage />} />
-              <Route path={AppRoute.Privacy} element={<PrivacyPolicyPage />} />
+            <Route path={AppRoute.Terms} element={<TermsOfUsePage />} />
+            <Route path={AppRoute.Privacy} element={<PrivacyPolicyPage />} />

-              <Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
-            </Routes>
-          </Suspense>
-        </Styled.Main>
+            <Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
+          </Routes>
+        </Suspense>
+      </Styled.Main>

-        {isTablet ? <FooterMobile /> : <FooterDesktop />}
+      {isTablet ? <FooterMobile /> : <FooterDesktop />}

-        <Styled.NotificationsToastArea />
+      <Styled.NotificationsToastArea />

-        <Styled.DialogArea ref={setDialogArea}>
-          <DialogManager />
-        </Styled.DialogArea>
+      <Styled.DialogArea ref={setDialogArea}>
+        <DialogManager />
+      </Styled.DialogArea>

-        <GlobalCommandDialog />
-      </Styled.Content>
-    </>
+      <GlobalCommandDialog />
+    </Styled.Content>
  );
 };

@@ -136,7 +131,6 @@ const providers = [
  wrapProvider(LocalNotificationsProvider),
  wrapProvider(NotificationsProvider),
  wrapProvider(DialogAreaProvider),
-  wrapProvider(AppThemeProvider),
 ];

 const App = () => {
@@ -1,26 +0,0 @@
-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.',
-    },
-  ],
-};
@@ -1,129 +0,0 @@
-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,7 +45,6 @@ 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',
@@ -72,13 +71,8 @@ export const AssetIcon = ({
 }: {
  symbol?: Nullable<string>;
  className?: string;
-}) => (
-  <Styled.Img
-    src={isAssetSymbol(symbol) ? assetIcons[symbol] : '/currencies/unavailable.png'}
-    className={className}
-    alt={symbol}
-  />
-);
+}) =>
+  isAssetSymbol(symbol) ? <Styled.Img src={assetIcons[symbol]} className={className} /> : null;

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

@@ -24,6 +24,7 @@ import {
  CoinsIcon,
  CommentIcon,
  CopyIcon,
+  CubeIcon,
  DepositIcon,
  DepthChartIcon,
  DiscordIcon,
@@ -54,12 +55,10 @@ import {
  OverviewIcon,
  PencilIcon,
  PlayIcon,
-  PlusIcon,
  PositionsIcon,
  PriceChartIcon,
  PrivacyIcon,
  QrIcon,
-  RewardStarIcon,
  SearchIcon,
  SendIcon,
  ShareIcon,
@@ -99,6 +98,7 @@ export enum IconName {
  Coins = 'Coins',
  Comment = 'Comment',
  Copy = 'Copy',
+  Cube = 'Cube',
  Deposit = 'Deposit',
  DepthChart = 'DepthChart',
  Discord = 'Discord',
@@ -130,12 +130,10 @@ 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',
@@ -175,6 +173,7 @@ const icons = {
  [IconName.Coins]: CoinsIcon,
  [IconName.Comment]: CommentIcon,
  [IconName.Copy]: CopyIcon,
+  [IconName.Cube]: CubeIcon,
  [IconName.Deposit]: DepositIcon,
  [IconName.DepthChart]: DepthChartIcon,
  [IconName.Discord]: DiscordIcon,
@@ -205,12 +204,10 @@ 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,
@@ -1,11 +1,11 @@
 import styled, { type AnyStyledComponent } from 'styled-components';

 import { RiskLevels } from '@/constants/abacus';
+import { UsageColorFromRiskLevel } from '@/styles/colors';

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

 import { abacusHelper } from '@/lib/abacus';
-import { UsageColorFromRiskLevel } from '@/lib/styles';

 type ElementProps = {
  value: number;
@@ -4,7 +4,6 @@ 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;
@@ -68,12 +67,6 @@ 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);
@@ -47,7 +47,7 @@ Styled.Root = styled(Root)`
  --switch-thumb-backgroundColor: var(--color-layer-6);

  --switch-active-backgroundColor: var(--color-accent);
-  --switch-active-thumb-backgroundColor: ${({ theme }) => theme.switchThumbActiveBackground};
+  --switch-active-thumb-backgroundColor: var(--color-white);

  position: relative;
  width: var(--switch-width);
@@ -43,7 +43,6 @@ 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';
@@ -162,7 +161,10 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
        ? // String
          collator.compare(first as string, second as string)
        : // Number
-          MustBigNumber(first).comparedTo(MustBigNumber(second))) *
+          Math.sign(
+            (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)
    );
@@ -27,8 +27,9 @@ 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;
@@ -2,9 +2,9 @@ import styled, { type AnyStyledComponent } from 'styled-components';

 import { type RiskLevels } from '@/constants/abacus';

-import { abacusHelper } from '@/lib/abacus';
-import { UsageColorFromRiskLevel } from '@/lib/styles';
+import { UsageColorFromRiskLevel } from '@/styles/colors';

+import { abacusHelper } from '@/lib/abacus';
 type ElementProps = {
  value: number;
 };
@@ -110,7 +110,12 @@ Styled.Abbr = styled.abbr`

 Styled.Content = styled(Content)`
  --tooltip-backgroundColor: var(--color-layer-4);
-  --tooltip-backgroundColor: ${({ theme }) => theme.tooltipBackground};
+  --tooltip-backgroundColor: hsl(
+    var(--layer-base-hue),
+    var(--layer-base-saturation),
+    calc(var(--layer-base-lightness) + 4%),
+    0.66
+  );

  ${popoverMixins.popover}
  --popover-backgroundColor: var(--tooltip-backgroundColor);
@@ -27,7 +27,12 @@ Styled.TooltipContent = styled.aside<{ accentColor?: string }>`

  ${popoverMixins.popover}
  --popover-radius: 0.5rem;
-  --popover-background-color: ${({ theme }) => theme.popoverBackground};
+  --popover-background-color: hsl(
+    var(--layer-base-hue),
+    var(--layer-base-saturation),
+    calc(var(--layer-base-lightness)),
+    0.9
+  );
  --popover-backdrop-filter: saturate(120%) blur(12px);

  display: grid;
@@ -1,33 +1,26 @@
-import React, { PropsWithChildren, useContext, useState } from 'react';
+import React, { useContext, useState } from 'react';

 import { Point } from '@visx/point';
 import { localPoint } from '@visx/event';
-import { XYChart, DataContext, type EventHandlerParams } from '@visx/xychart';
+import { XYChart, DataContext } from '@visx/xychart';
 import { getScaleBandwidth } from '@/components/visx/getScaleBandwidth';

 export const XYChartWithPointerEvents = ({
-  onPointerMove,
-  onPointerUp,
-  onPointerPressedChange,
-  ...props
+  onPointerMove, onPointerUp, onPointerPressedChange, ...props
 }: {
-  onPointerMove?: (point: Point | EventHandlerParams<object>) => void;
-  onPointerUp?: (point: Point | EventHandlerParams<object>) => void;
+  onPointerMove?: (point: Point) => void;
+  onPointerUp?: (point: Point) => void;
  onPointerPressedChange?: (isPointerPressed: boolean) => void;
-} & PropsWithChildren<Parameters<typeof XYChart>[0]>) => {
+} & React.PropsWithChildren<Parameters<typeof XYChart>>) => {
  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),
    });

@@ -36,13 +29,15 @@ export const XYChartWithPointerEvents = ({
      {...props}
      onPointerMove={({ event }) => {
        setLastPointerMoveEvent(event as React.PointerEvent);
-        if (pointerChartPosition) onPointerMove?.(pointerChartPosition);
+        if (pointerChartPosition)
+          onPointerMove?.(pointerChartPosition);
      }}
      onPointerOut={() => setLastPointerMoveEvent(undefined)}
      onPointerDown={() => onPointerPressedChange?.(true)}
      onPointerUp={() => {
        onPointerPressedChange?.(false);
-        if (pointerChartPosition) onPointerUp?.(pointerChartPosition);
+        if (pointerChartPosition)
+          onPointerUp?.(pointerChartPosition);
      }}
    >
      {props.children}
@@ -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.model.TransferInputField;
+export const TransferInputField = Abacus.exchange.dydx.abacus.state.modal.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.model.TradeInputField;
+export const TradeInputField = Abacus.exchange.dydx.abacus.state.modal.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.model.ClosePositionInputField;
+  Abacus.exchange.dydx.abacus.state.modal.ClosePositionInputField;

 const closePositionInputFields = [...ClosePositionInputField.values()] as const;
 export type ClosePositionInputFields = (typeof closePositionInputFields)[number];
@@ -96,7 +96,6 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
        elapsedTime?: number;
        blockHeight?: number;
        indexerBlockHeight?: number;
-        trailingBlocks?: number;
      }
    : // Navigation
    T extends AnalyticsEvent.NavigatePage
@@ -1,40 +0,0 @@
-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,5 +25,40 @@ 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,8 +87,6 @@ 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,
@@ -10,7 +10,6 @@ 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;

@@ -19,7 +18,3 @@ 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,70 +0,0 @@
-export enum ColorToken {
-  Black = '#000000',
-  White = '#FFFFFF',
-
-  LightGray0 = '#FAFAFA',
-  LightGray1 = '#F7F8FA',
-  LightGray2 = '#FAFAFD',
-  LightGray3 = '#F5F5F5',
-  LightGray4 = '#EDF0F2',
-  LightGray5 = '#EDEDED',
-  LightGray6 = '#E9ECEE',
-  LightGray7 = '#E6E6E6',
-  LightGray8 = '#DBDBDB',
-  LightGray9 = '#D5DADF',
-  LightGray10 = '#D1D9E0',
-
-  MediumGray0 = '#CACACE',
-  MediumGray1 = '#C2CBD3',
-
-  DarkGray0 = '#888891',
-  DarkGray1 = '#737373',
-  DarkGray2 = '#56565C',
-  DarkGray3 = '#4B4B4B',
-  DarkGray4 = '#494950',
-  DarkGray5 = '#3B3B3F',
-  DarkGray6 = '#303033',
-  DarkGray7 = '#313135',
-  DarkGray8 = '#292929',
-  DarkGray9 = '#23232F',
-  DarkGray10 = '#212124',
-  DarkGray11 = '#18181B',
-  DarkGray12 = '#181818',
-  DarkGray13 = '#0C0C0D',
-
-  GrayBlue0 = '#464659',
-  GrayBlue1 = '#38384D',
-  GrayBlue2 = '#303045',
-  GrayBlue3 = '#29293D',
-  GrayBlue4 = '#212131',
-  GrayBlue5 = '#181825',
-  GrayBlue6 = '#101018',
-  GrayBlue7 = '#08080C',
-
-  GrayPurple0 = '#DFDADF',
-  GrayPurple1 = '#C8C7D8',
-  GrayPurple2 = '#807E98',
-
-  Purple0 = '#7774FF',
-  Purple1 = '#6966FF',
-
-  Green0 = '#1AFFB9',
-  Green1 = '#3ED9A4',
-  Green2 = '#2CCC98',
-  Green3 = '#3EB68A',
-
-  Yellow0 = '#FFCC48',
-  Yellow1 = '#FFB647',
-
-  Red0 = '#FF5C5C',
-  Red1 = '#E76565',
-  Red2 = '#E45555',
-}
-
-/** Maps opacity to corresponding hex value */
-export enum OpacityToken {
-  Opacity16 = '29',
-  Opacity20 = '33',
-  Opacity66 = 'A8',
-  Opacity90 = 'E6',
-}
@@ -1,77 +0,0 @@
-export type ThemeColors = LayerColors &
-  BorderColors &
-  TextColors &
-  GradientColors &
-  AccentColors &
-  StatusColors &
-  DirectionalColors &
-  RiskColors &
-  IconColors &
-  ComponentColors;
-
-type LayerColors = {
-  layer0: string;
-  layer1: string;
-  layer2: string;
-  layer3: string;
-  layer4: string;
-  layer5: string;
-  layer6: string;
-  layer7: string;
-};
-
-type BorderColors = {
-  borderDefault: string;
-  borderDestructive: string;
-  borderButton: string;
-};
-
-type TextColors = {
-  textPrimary: string;
-  textSecondary: string;
-  textTertiary: string;
-};
-
-type GradientColors = {
-  gradientBase0: string;
-  gradientBase1: string;
-};
-
-type AccentColors = {
-  accent: string;
-  accentFaded: string;
-  favorite: string;
-};
-
-type StatusColors = {
-  success: string;
-  warning: string;
-  error: string;
-};
-
-type DirectionalColors = {
-  positive: string;
-  negative: string;
-  positiveFaded: string;
-  negativeFaded: string;
-};
-
-type RiskColors = {
-  riskLow: string;
-  riskMedium: string;
-  riskHigh: string;
-};
-
-type IconColors = {
-  logoFill: string;
-  profileYellow: string;
-  profileRed: string;
-};
-
-type ComponentColors = {
-  inputBackground: string;
-  popoverBackground: string;
-  switchThumbActiveBackground: string;
-  toggleBackground: string;
-  tooltipBackground: string;
-};
@@ -1,10 +1,6 @@
 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,10 +5,6 @@ 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 }),
@@ -4,6 +4,7 @@ import { useSelector } from 'react-redux';
 import type { IChartingLibraryWidget, ThemeName } from 'public/tradingview/charting_library';

 import { AppTheme } from '@/state/configs';
+
 import { getAppTheme } from '@/state/configsSelectors';

 import { getWidgetOverrides } from '@/lib/tradingView/utils';
@@ -28,7 +29,7 @@ export const useTradingViewTheme = ({
  tvWidget: (IChartingLibraryWidget & { _id?: string; _ready?: boolean }) | null;
  isWidgetReady?: boolean;
 }) => {
-  const appTheme: AppTheme = useSelector(getAppTheme);
+  const appTheme = useSelector(getAppTheme);

  useEffect(() => {
    if (tvWidget && isWidgetReady) {
@@ -97,7 +97,7 @@ export const useAnalytics = () => {
  }, []);

  // AnalyticsEvent.NetworkStatus
-  const { height, indexerHeight, status, trailingBlocks} = useApiState();
+  const { height, indexerHeight, status } = useApiState();

  useEffect(() => {
    if (status) {
@@ -114,7 +114,6 @@ 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);

@@ -1,16 +0,0 @@
-import { useSelector } from 'react-redux';
-import { ThemeProvider } from 'styled-components';
-
-import { AppTheme } from '@/state/configs';
-import { getAppTheme } from '@/state/configsSelectors';
-
-import { Themes } from '@/styles/themes';
-
-export const AppThemeProvider = ({ ...props }) => {
-    return <ThemeProvider theme={useAppThemeContext()} {...props} />
-};
-
-export const useAppThemeContext = () => {
-    const theme: AppTheme = useSelector(getAppTheme);
-    return Themes[theme];
-}
@@ -1,7 +1,14 @@
 import { useMemo } from 'react';
 import { useSelector, shallowEqual } from 'react-redux';

-import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constants/markets';
+import {
+  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';
@@ -42,7 +49,9 @@ export const useMarketsData = (
  }, [allPerpetualMarkets, allAssets]);

  const filteredMarkets = useMemo(() => {
-    const filtered = markets.filter(filterFunctions[filter]);
+    const filtered = markets
+      .filter(filterFunctions[filter])
+      .filter(({ id }) => (testFlags.displayAllMarkets ? true : MARKETS_TO_DISPLAY.includes(id)));

    if (searchFilter) {
      return filtered.filter(
@@ -28,7 +28,6 @@ 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';

@@ -81,7 +80,6 @@ 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}
@@ -95,29 +93,6 @@ 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,
@@ -127,7 +102,6 @@ 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]
              );
@@ -183,8 +157,8 @@ export const notificationTypes: NotificationTypeConfig[] = [
          const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
          const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />;

-          const transferType =
-            type ?? fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
+          const transferType = type ??
+            fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
              ? TransferNotificationTypes.Withdrawal
              : TransferNotificationTypes.Deposit;

@@ -223,7 +197,6 @@ export const notificationTypes: NotificationTypeConfig[] = [
                />
              ),
              toastSensitivity: 'foreground',
-              groupKey: NotificationType.SquidTransfer,
            },
            [isFinished]
          );
@@ -269,7 +242,6 @@ export const notificationTypes: NotificationTypeConfig[] = [
              },
            }),
            toastSensitivity: 'foreground',
-            groupKey: NotificationType.ReleaseUpdates,
          },
          []
        );
@@ -1,44 +0,0 @@
-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]);
-};
@@ -1 +1,3 @@
-<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>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M14 6L7.83335 10.5L2 6" stroke="currentColor" stroke-width="2.25" stroke-linecap="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<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,6 +19,7 @@ export { default as CoinMarketCapIcon } from './logos/coinmarketcap.svg';
 export { default as CoinsIcon } from './coins.svg';
 export { default as CommentIcon } from './comment.svg';
 export { default as CopyIcon } from './copy.svg';
+export { default as CubeIcon } from './cube.svg';
 export { default as DepositIcon } from './deposit.svg';
 export { default as DepthChartIcon } from './depth-chart.svg';
 export { default as DiscordIcon } from './discord.svg';
@@ -43,14 +44,12 @@ 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';
@@ -1,52 +1,45 @@
-import { useAppThemeContext } from '@/hooks/useAppTheme';
-
-const LogoShortIcon: React.FC<{ id?: string }> = ({ id }: { id?: string }) => {
-  const theme = useAppThemeContext();
-  const fill = theme.logoFill;
-
-  return (
-    <svg
-      width="135"
-      height="145"
-      viewBox="0 0 135 145"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path d="M100.986 0L0 144.988H31.0048L132.514 0H100.986Z" fill={fill} />
-      <path
-        d="M34.2346 0L63.9475 42.7232L48.4451 66.0268L2.58386 0H34.2346Z"
-        fill={`url(#${id ? `${id}_logo_gradient_0` : 'paint0_linear'})`}
-      />
-      <path
-        d="M103.995 145L71.0526 97.7455L86.555 75.0893L135 145H103.995Z"
-        fill={`url(#${id ? `${id}_logo_gradient_1` : 'paint1_linear'})`}
-      />
-      <defs>
-        <linearGradient
-          id={id ? `${id}_logo_gradient_0` : 'paint0_linear'}
-          x1="27.1293"
-          y1="9.0625"
-          x2="69.773"
-          y2="60.4324"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor={fill} />
-          <stop offset="1" stopColor={fill} stopOpacity="0.55" />
-        </linearGradient>
-        <linearGradient
-          id={id ? `${id}_logo_gradient_1` : 'paint1_linear'}
-          x1="111.1"
-          y1="133.996"
-          x2="58.6959"
-          y2="63.4999"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="#6966FF" />
-          <stop offset="1" stopColor="#6966FF" stopOpacity="0.36" />
-        </linearGradient>
-      </defs>
-    </svg>
-  );
-};
+const LogoShortIcon: React.FC<{ id?: string }> = ({ id }: { id?: string }) => (
+  <svg
+    width="135"
+    height="145"
+    viewBox="0 0 135 145"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M100.986 0L0 144.988H31.0048L132.514 0H100.986Z" fill="white" />
+    <path
+      d="M34.2346 0L63.9475 42.7232L48.4451 66.0268L2.58386 0H34.2346Z"
+      fill={`url(#${id ? `${id}_logo_gradient_0` : 'paint0_linear'})`}
+    />
+    <path
+      d="M103.995 145L71.0526 97.7455L86.555 75.0893L135 145H103.995Z"
+      fill={`url(#${id ? `${id}_logo_gradient_1` : 'paint1_linear'})`}
+    />
+    <defs>
+      <linearGradient
+        id={id ? `${id}_logo_gradient_0` : 'paint0_linear'}
+        x1="27.1293"
+        y1="9.0625"
+        x2="69.773"
+        y2="60.4324"
+        gradientUnits="userSpaceOnUse"
+      >
+        <stop stopColor="white" />
+        <stop offset="1" stopColor="white" stopOpacity="0.55" />
+      </linearGradient>
+      <linearGradient
+        id={id ? `${id}_logo_gradient_1` : 'paint1_linear'}
+        x1="111.1"
+        y1="133.996"
+        x2="58.6959"
+        y2="63.4999"
+        gradientUnits="userSpaceOnUse"
+      >
+        <stop stopColor="#6966FF" />
+        <stop offset="1" stopColor="#6966FF" stopOpacity="0.36" />
+      </linearGradient>
+    </defs>
+  </svg>
+);

 export default LogoShortIcon;
@@ -1 +0,0 @@
-<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,5 +1,6 @@
@import 'styles/fonts.css';
@import 'styles/text.css';
+@import 'styles/colors.css';
@import 'styles/animations.css';

 :root {
@@ -1,11 +1,7 @@
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import styled, { css } from 'styled-components';

-import {
-  type Notification,
-  type NotificationDisplayData,
-  NotificationStatus,
-} from '@/constants/notifications';
+import { NotificationStatus } from '@/constants/notifications';
 import { ButtonShape, ButtonSize } from '@/constants/buttons';
 import { useNotifications } from '@/hooks/useNotifications';
 import { useBreakpoints } from '@/hooks/useBreakpoints';
@@ -17,31 +13,54 @@ 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;
 };

-export const NotificationStack = ({ notifications, className }: ElementProps & StyleProps) => {
+const MAX_TOASTS = 10;
+
+export const NotificationsToastArea = ({ className }: StyleProps) => {
  const [shouldStackNotifications, setshouldStackNotifications] = useState(true);

-  const { markUnseen, markSeen, onNotificationAction } = useNotifications();
+  const {
+    notifications,
+    getKey,
+    getDisplayData,
+    markUnseen,
+    markSeen,
+    isMenuOpen,
+    onNotificationAction,
+  } = useNotifications();
+
  const { isMobile } = useBreakpoints();
-  const hasMultipleToasts = notifications.length > 1;
+  const notificationMap = useMemo(() => {
+    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}
-      size={notifications.length}
-    >
+    <StyledToastArea swipeDirection={isMobile ? 'up' : 'right'} className={className}>
      {hasMultipleToasts && (
        <StyledToggleButton
          shape={ButtonShape.Pill}
@@ -53,12 +72,12 @@ export const NotificationStack = ({ notifications, className }: ElementProps & S
        </StyledToggleButton>
      )}

-      {notifications.map(({ notification, key, displayData }, idx) => (
+      {notificationMap.map(({ notification, key, displayData }, idx) => (
        <StyledToast
          key={key}
-          isStacked={idx > 0 && shouldStackNotifications}
+          isStacked={shouldStackNotifications}
          isOpen={notification.status < NotificationStatus.Unseen}
-          layer={idx}
+          layer={notificationMap.length - 1 - idx}
          notification={notification}
          slotIcon={displayData.icon}
          slotTitle={displayData.title}
@@ -91,13 +110,19 @@ export const NotificationStack = ({ notifications, className }: ElementProps & S
  );
 };

-const StyledToastArea = styled(ToastArea)<{ size: number }>`
-  position: relative;
-  ${({ size }) =>
-    size &&
-    css`
-      padding-bottom: calc(${size - 1} * 2px);
-    `}
+const StyledToastArea = styled(ToastArea)`
+  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);
+
+  @media ${breakpoints.mobile} {
+    width: 100%;
+    position: fixed;
+  }
 `;

 const StyledToast = styled(Toast)<{ isStacked?: boolean; layer: number }>`
@@ -108,7 +133,7 @@ const StyledToast = styled(Toast)<{ isStacked?: boolean; layer: number }>`
          position: absolute;
          left: 0;
          top: calc(${layer} * 2px);
-          right: 0;
+          right: calc(${layer} * -2px);
        `
      : css`
          margin-bottom: 0.75rem;
@@ -120,7 +145,7 @@ const StyledToggleButton = styled(ToggleButton)<{ isPressed: boolean }>`
  pointer-events: auto;
  display: none;
  position: absolute;
-  top: -0.5rem;
+  top: 4px;
  left: calc(50% - 0.75rem);
  --button-width: 2rem;
  --button-height: 1rem;
@@ -1,71 +0,0 @@
-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;
-  }
-`;
@@ -56,10 +56,6 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    this.store = undefined;
  }

-  get isNobleClientConnected(): boolean {
-    return this.nobleClient?.isConnected ?? false;
-  }
-
  setStore(store: RootStore): void {
    this.store = store;
  }
@@ -216,8 +212,8 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
        timeInForce as OrderTimeInForce,
        goodTilTimeInSeconds ?? 0,
        execution as OrderExecution,
-        postOnly ?? undefined,
-        reduceOnly ?? undefined,
+        postOnly,
+        reduceOnly,
        triggerPrice ?? undefined
      );

@@ -355,7 +351,12 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    }
  }

-  async sendNobleIBC(params: { msgTypeUrl: string; msg: any }): Promise<string> {
+  async sendNobleIBC(
+    params: {
+      msgTypeUrl: string,
+      msg: any,
+    }
+  ): Promise<string> {
    if (!this.nobleClient?.isConnected) {
      throw new Error('Missing nobleClient or localWallet');
    }
@@ -366,16 +367,15 @@ 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]);

@@ -391,21 +391,23 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    }
  }

-  async withdrawToNobleIBC(params: {
-    subaccountNumber: number;
-    amount: string;
-    ibcPayload: string;
-  }): Promise<string> {
+  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;
-
+      msgTypeUrl: string,
+      msg: any,
+    } = ibcPayload ? JSON.parse(ibcPayload) : undefined;
+  
    try {
      const msg = this.compositeClient.withdrawFromSubaccountMessage(
        new SubaccountClient(this.localWallet, subaccountNumber),
@@ -423,7 +425,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
      );

      return JSON.stringify({
-        txHash: hashFromTx(tx?.hash),
+        txHash: hashFromTx(tx?.hash)
      });
    } catch (error) {
      log('DydxChainTransactions/withdrawToNobleIBC', error);
@@ -434,7 +436,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
    }
  }

-  async cctpWithdraw(params: { typeUrl: string; value: any }): Promise<string> {
+  async cctpWithdraw(params: {
+    typeUrl: string,
+    value: any,
+  }): Promise<string> {
    if (!this.nobleClient?.isConnected) {
      throw new Error('Missing nobleClient or localWallet');
    }
@@ -445,18 +450,17 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
        value: params.value,
      };
      const fee = await this.nobleClient.simulateTransaction([ibcMsg]);
-
+  
      // take out fee from amount before sweeping
-      const amount =
-        parseInt(ibcMsg.value.amount, 10) -
+      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);
@@ -84,7 +84,8 @@ class AbacusStateManager {
    );

    const appConfigs = AbacusAppConfig.Companion.forWeb;
-    appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2;
+    if (!isMainnet || testFlags.withCCTP)
+      appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2;

    this.stateManager = new AsyncAbacusStateManager(
      '',
@@ -1,20 +0,0 @@
-import { css } from 'styled-components';
-
-import { type RiskLevels } from '@/constants/abacus';
-
-export const UsageColorFromRiskLevel = (riskLevel: RiskLevels) =>
-  ({
-    low: css`
-      color: var(--color-risk-low);
-    `,
-    medium: css`
-      color: var(--color-risk-medium);
-    `,
-    high: css`
-      color: var(--color-risk-high);
-    `,
-  }[riskLevel.name]);
-
-export const generateFadedColorVariant = (colorHex: string, opacityHex: string) => {
-  return `${colorHex}${opacityHex}`;
-};
@@ -5,22 +5,26 @@ 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.toLowerCase()] = value;
+        this.queryParams[key] = value;
    }
  }

  get displayInitializingMarkets() {
-    return !!this.queryParams.displayinitializingmarkets;
+    return !!this.queryParams.displayInitializingMarkets;
  }

-  get showMobileSignInOption() {
-    return !!this.queryParams.mobilesignin;
+  get displayAllMarkets() {
+    return !!this.queryParams.displayAllMarkets;
+  }
+
+  get withCCTP() {
+    return !!this.queryParams.withCCTP;
  }
 }

@@ -1,9 +1,11 @@
+import Color from 'color';
+import isEmpty from 'lodash/isEmpty';
+
 import { Candle, TradingViewBar, TradingViewSymbol } from '@/constants/candles';
+import { Colors } from '@/styles/colors';

 import { AppTheme } from '@/state/configs';

-import { Themes } from '@/styles/themes';
-
 export const mapCandle = ({
  startedAt,
  open,
@@ -47,42 +49,42 @@ export const getHistorySlice = ({
  return bars.filter(({ time }) => time >= fromMs);
 };

-export const getWidgetOverrides = (appTheme: AppTheme) => {
-  const theme = Themes[appTheme];
+export const getWidgetOverrides = (theme: AppTheme) => {
+  const colors = Colors[theme];

  return {
    overrides: {
-      'paneProperties.background': theme.layer2,
-      'paneProperties.horzGridProperties.color': theme.layer3,
-      'paneProperties.vertGridProperties.color': theme.layer3,
+      'paneProperties.background': Color(colors.layer2).hex(),
+      'paneProperties.horzGridProperties.color': Color(colors.layer3).hex(),
+      'paneProperties.vertGridProperties.color': Color(colors.layer3).hex(),
      'paneProperties.crossHairProperties.style': 1,
      'paneProperties.legendProperties.showBarChange': false,
      'paneProperties.backgroundType': 'solid',

      'mainSeriesProperties.style': 1,
-      'mainSeriesProperties.candleStyle.upColor': theme.positive,
-      'mainSeriesProperties.candleStyle.borderUpColor': theme.positive,
-      'mainSeriesProperties.candleStyle.wickUpColor': theme.positive,
-      'mainSeriesProperties.candleStyle.downColor': theme.negative,
-      'mainSeriesProperties.candleStyle.borderDownColor': theme.negative,
-      'mainSeriesProperties.candleStyle.wickDownColor': theme.negative,
+      'mainSeriesProperties.candleStyle.upColor': Color(colors.positive).hex(),
+      'mainSeriesProperties.candleStyle.borderUpColor': Color(colors.positive).hex(),
+      'mainSeriesProperties.candleStyle.wickUpColor': Color(colors.positive).hex(),
+      'mainSeriesProperties.candleStyle.downColor': Color(colors.negative).hex(),
+      'mainSeriesProperties.candleStyle.borderDownColor': Color(colors.negative).hex(),
+      'mainSeriesProperties.candleStyle.wickDownColor': Color(colors.negative).hex(),
      'mainSeriesProperties.statusViewStyle.symbolTextSource': 'ticker',

-      'scalesProperties.textColor': theme.textPrimary,
-      'scalesProperties.backgroundColor': theme.layer2,
-      'scalesProperties.lineColor': theme.layer3,
+      'scalesProperties.textColor': Color(colors.text1).hex(),
+      'scalesProperties.backgroundColor': Color(colors.layer2).hex(),
+      'scalesProperties.lineColor': Color(colors.layer3).hex(),
    },
    studies_overrides: {
-      'volume.volume.color.0': theme.negative,
-      'volume.volume.color.1': theme.positive,
+      'volume.volume.color.0': Color(colors.negative).hex(),
+      'volume.volume.color.1': Color(colors.positive).hex(),
      'volume.volume ma.visible': false,
-      'relative strength index.plot.color': theme.accent,
+      'relative strength index.plot.color': Color(colors.accent).hex(),
      'relative strength index.plot.linewidth': 1.5,
      'relative strength index.hlines background.color': '#134A9F',
    },
    loading_screen: {
-      backgroundColor: theme.layer2,
-      foregroundColor: theme.layer2,
+      backgroundColor: Color(colors.layer2).hex(),
+      foregroundColor: Color(colors.layer2).hex(),
    },
  };
 };
@@ -1,4 +1,4 @@
-import { createConfig, configureChains, mainnet, Chain } from 'wagmi';
+import { createConfig, configureChains, mainnet, Chain, Connector, usePublicClient } from 'wagmi';
 import { goerli } from 'wagmi/chains';

 import {
@@ -26,9 +26,6 @@ import {
  fantomTestnet,
  celo,
  celoAlfajores,
-  scroll,
-  kava,
-  sepolia,
 } from 'viem/chains';

 import { alchemyProvider } from 'wagmi/providers/alchemy';
@@ -56,7 +53,7 @@ import { isTruthy } from './isTruthy';
 export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
  mainnet,
  goerli,
-  sepolia,
+
  arbitrum,
  arbitrumGoerli,
  avalanche,
@@ -81,8 +78,6 @@ export const WAGMI_SUPPORTED_CHAINS: Chain[] = [
  fantomTestnet,
  celo,
  celoAlfajores,
-  scroll,
-  kava,
 ];

 const { chains, publicClient, webSocketPublicClient } = configureChains(
@@ -151,7 +146,7 @@ const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
  new CoinbaseWalletConnector({
    chains,
    options: {
-      appName: 'dYdX',
+      appName: 'wagmi',
      reloadOnDisconnect: false,
    },
  }),
@@ -30,9 +30,6 @@ 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 = () => {
@@ -178,27 +175,8 @@ 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}`}
@@ -213,6 +191,19 @@ 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
@@ -259,8 +250,8 @@ Styled.ProfileIcon = styled.div`
  border-radius: 50%;
  background: linear-gradient(
    135deg,
-    ${({ theme }) => theme.profileYellow} 0%,
-    ${({ theme }) => theme.profileRed} 100%
+    var(--theme-classic-color-yellow) 0%,
+    var(--theme-classic-color-red) 100%
  );
 `;

@@ -336,13 +327,6 @@ Styled.Details = styled(Details)`
 `;

 Styled.RewardsPanel = styled(Panel)`
-  align-self: flex-start;
-  
-  &,
-  > * {
-    height: 100%;
-  }
-
  dl {
    --details-grid-numColumns: 1;
  }
@@ -17,14 +17,11 @@ 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, getTradeInfoNumbers } from '@/state/accountSelectors';
+import { getOnboardingState, getSubaccount } from '@/state/accountSelectors';
 import { openDialog } from '@/state/dialogs';

-import { shortenNumberForDisplay } from '@/lib/numbers';
-
 import { PortfolioNavMobile } from './PortfolioNavMobile';
 import { LoadingSpace } from '@/components/Loading/LoadingSpinner';

@@ -45,10 +42,6 @@ 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 }));
@@ -125,28 +118,14 @@ export default () => {
                    },
                    {
                      value: PortfolioRoute.Positions,
-                      slotBefore: <Styled.Icon iconName={IconName.Positions} />,
-                      label: (
-                        <>
-                          {stringGetter({ key: STRING_KEYS.POSITIONS })}
-                          {numPositions > 0 && (
-                            <Tag type={TagType.Number}> {numPositions} </Tag>
-                          )}
-                        </>
-                      ),
+                      slotBefore: <Styled.Icon iconName={IconName.Cube} />,
+                      label: stringGetter({ key: STRING_KEYS.POSITIONS }),
                      href: PortfolioRoute.Positions,
                    },
                    {
                      value: PortfolioRoute.Orders,
                      slotBefore: <Styled.Icon iconName={IconName.OrderPending} />,
-                      label: (
-                        <>
-                          {stringGetter({ key: STRING_KEYS.ORDERS })}
-                          {numOrders > 0 && (
-                            <Tag type={TagType.Number}> {numOrders} </Tag>
-                          )}
-                        </>
-                      ),
+                      label: stringGetter({ key: STRING_KEYS.ORDERS }),
                      href: PortfolioRoute.Orders,
                    },
                    {
@@ -2,6 +2,7 @@ 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';

@@ -32,7 +33,7 @@ export const DYDXBalancePanel = () => {
  const { chainTokenLabel } = useTokenConfigs();

  return (
-    <Panel
+    <Styled.Panel
      slotHeader={
        <Styled.Header>
          <Styled.Title>
@@ -108,12 +109,21 @@ export const DYDXBalancePanel = () => {
          ]}
        />
      </Styled.Content>
-    </Panel>
+    </Styled.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,8 +24,6 @@ import { openDialog } from '@/state/dialogs';

 import { log } from '@/lib/telemetry';

-const SEASON_NUMBER = 2;
-
 export const LaunchIncentivesPanel = () => {
  const { isNotTablet } = useBreakpoints();
  const dispatch = useDispatch();
@@ -70,12 +68,10 @@ const EstimatedRewards = () => {

  const { data, isLoading } = useQuery({
    enabled: !!dydxAddress,
-    queryKey: `launch_incentives_rewards_${dydxAddress ?? ''}_${SEASON_NUMBER}`,
+    queryKey: `launch_incentives_rewards_${dydxAddress ?? ''}`,
    queryFn: async () => {
      if (!dydxAddress) return undefined;
-      const resp = await fetch(
-        `https://cloud.chaoslabs.co/query/api/dydx/points/${dydxAddress}?n=${SEASON_NUMBER}`
-      );
+      const resp = await fetch(`https://cloud.chaoslabs.co/query/api/dydx/points/${dydxAddress}`);
      return (await resp.json())?.incentivePoints;
    },
    onError: (error: Error) => log('LaunchIncentives/fetchPoints', error),
@@ -89,7 +85,9 @@ const EstimatedRewards = () => {
          <Styled.Season>
            {stringGetter({
              key: STRING_KEYS.LAUNCH_INCENTIVES_SEASON_NUM,
-              params: { SEASON_NUMBER },
+              params: {
+                SEASON_NUMBER: 1,
+              },
            })}
          </Styled.Season>
        </div>
@@ -153,8 +151,15 @@ 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`
@@ -218,7 +223,7 @@ Styled.Column = styled.div`
 Styled.EstimatedRewardsCard = styled.div`
  ${layoutMixins.spacedRow}
  padding: 1rem 1.25rem;
-  min-width: 19rem;
+  min-width: 21.25rem;
  height: calc(100% - calc(1.5rem * 2));
  margin: 1.5rem;

@@ -7,6 +7,8 @@ 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';
@@ -26,7 +28,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 = ({ className }: { className?: string }) => {
+export const MigratePanel = () => {
  const { isNotTablet } = useBreakpoints();
  const stringGetter = useStringGetter();

@@ -43,7 +45,6 @@ export const MigratePanel = ({ className }: { className?: string }) => {

  return isNotTablet ? (
    <Styled.MigratePanel
-      className={className}
      slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.MIGRATE })}</Styled.Title>}
      slotRight={
        <Styled.MigrateAction>
@@ -73,7 +74,6 @@ export const MigratePanel = ({ className }: { className?: string }) => {
    </Styled.MigratePanel>
  ) : (
    <Styled.MigratePanel
-      className={className}
      slotHeader={
        <Styled.MobileMigrateHeader>
          <h3>
@@ -134,11 +134,17 @@ export const MigratePanel = ({ className }: { className?: string }) => {
 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`
@@ -151,7 +157,7 @@ Styled.Title = styled.h3`
 Styled.MigrateAction = styled.div`
  ${layoutMixins.flexEqualColumns}
  align-items: center;
-  margin: 1rem;
+  margin-right: 1rem;
  gap: 1rem;
  padding: 1rem;
  width: 100%;
@@ -191,7 +197,7 @@ Styled.MobileMigrateHeader = styled.div`
  font: var(--font-small-book);
  color: var(--color-text-0);

-  padding: 1rem 1rem 0;
+  padding: 1rem 1.5rem 0;

  h3 {
    ${layoutMixins.inlineRow}
@@ -1,86 +0,0 @@
-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,18 +1,15 @@
 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';
@@ -23,14 +20,12 @@ import { openDialog } from '@/state/dialogs';
 import { DYDXBalancePanel } from './DYDXBalancePanel';
 import { MigratePanel } from './MigratePanel';
 import { LaunchIncentivesPanel } from './LaunchIncentivesPanel';
-import { RewardsHelpPanel } from './RewardsHelpPanel';

 const RewardsPage = () => {
  const dispatch = useDispatch();
  const stringGetter = useStringGetter();
  const { governanceLearnMore, stakingLearnMore } = useURLConfigs();
  const { isTablet, isNotTablet } = useBreakpoints();
-  const navigate = useNavigate();

  const panelArrow = (
    <Styled.Arrow>
@@ -44,16 +39,13 @@ const RewardsPage = () => {

  return (
    <Styled.Page>
-      {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 />}
+      {import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}

      {isTablet ? (
-        <LaunchIncentivesPanel />
+        <>
+          <LaunchIncentivesPanel />
+          <DYDXBalancePanel />
+        </>
      ) : (
        <Styled.PanelRowIncentivesAndBalance>
          <LaunchIncentivesPanel />
@@ -63,9 +55,7 @@ const RewardsPage = () => {

      <Styled.PanelRow>
        <Styled.Panel
-          slotHeaderContent={
-            <Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>
-          }
+          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
          slotRight={panelArrow}
          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
        >
@@ -78,9 +68,7 @@ const RewardsPage = () => {
        </Styled.Panel>

        <Styled.Panel
-          slotHeaderContent={
-            <Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>
-          }
+          slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.STAKING })}</Styled.Title>}
          slotRight={panelArrow}
          onClick={() => dispatch(openDialog({ type: DialogTypes.ExternalNavKeplr }))}
        >
@@ -92,8 +80,6 @@ const RewardsPage = () => {
          </Styled.Description>
        </Styled.Panel>
      </Styled.PanelRow>
-
-      <RewardsHelpPanel />
    </Styled.Page>
  );
 };
@@ -109,41 +95,33 @@ Styled.Page = styled.div`
  align-items: center;

  > * {
-    --content-max-width: 80rem;
+    --content-max-width: 70rem;
    max-width: min(calc(100vw - 4rem), var(--content-max-width));
  }

  @media ${breakpoints.tablet} {
-    --stickyArea-topHeight: var(--page-header-height-mobile);
-    padding: 0 1rem 1rem;
+    padding: 1.25rem;

    > * {
-      max-width: calc(100vw - 2rem);
+      max-width: calc(100vw - 2.5rem);
      width: 100%;
    }
  }
 `;

-Styled.MobileHeader = styled.header`
-  ${layoutMixins.contentSectionDetachedScrollable}
-  ${layoutMixins.stickyHeader}
-  z-index: 2;
-  padding: 1.25rem 0;
-  margin-bottom: -1.5rem;
-
-  font: var(--font-large-medium);
-  color: var(--color-text-2);
-  background-color: var(--color-layer-2);
-`;
-
 Styled.Panel = styled(Panel)`
-  height: fit-content;
+  --panel-paddingX: 1.5rem;
+
+  @media ${breakpoints.tablet} {
+    --panel-paddingY: 1.5rem;
+    --panel-content-paddingY: 1rem;
+  }
 `;

 Styled.Title = styled.h3`
  font: var(--font-medium-book);
  color: var(--color-text-2);
-  margin-bottom: -1rem;
+  padding: 1rem 1.5rem 0;
 `;

 Styled.Description = styled.div`
@@ -83,6 +83,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
  const tabItems = useMemo(
    () => [
      {
+        asChild: true,
        value: InfoSection.Position,
        label: stringGetter({
          key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,
@@ -1,8 +1,10 @@
 import { createSelector } from 'reselect';

+import { SubaccountPosition } from '@/constants/abacus';
 import { OnboardingState, OnboardingSteps } from '@/constants/account';

 import {
+  getExistingOpenPositions,
  getOnboardingGuards,
  getOnboardingState,
  getSubaccountId,
@@ -58,8 +60,13 @@ export const calculateIsAccountViewOnly = createSelector(
 );

 /**
- * @description calculate whether the subaccount has uncommitted positions
+ * @description calculate whether the subaccount has open positions
 */
+export const calculateHasOpenPositions = createSelector(
+  [getExistingOpenPositions],
+  (openPositions?: SubaccountPosition[]) => (openPositions?.length || 0) > 0
+);
+
 export const calculateHasUncommittedOrders = createSelector(
  [getUncommittedOrderClientIds],
  (uncommittedOrderClientIds: number[]) => uncommittedOrderClientIds.length > 0
@@ -2,7 +2,6 @@ import { OrderSide } from '@dydxprotocol/v4-client-js';
 import { createSelector } from 'reselect';

 import {
-  type AbacusOrderStatuses,
  type SubaccountOrder,
  type SubaccountFill,
  type SubaccountFundingPayment,
@@ -44,6 +43,7 @@ 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,14 +258,6 @@ 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
@@ -274,7 +266,8 @@ export const getTradeInfoNumbers = createSelector(
  [getExistingOpenPositions, getSubaccountOrders, getSubaccountFills, getSubaccountFundingPayments],
  (positions, orders, fills, fundingPayments) => ({
    numTotalPositions: positions?.length,
-    numTotalOpenOrders: orders?.filter((order) => isOpenOrderStatus(order.status)).length,
+    numTotalOpenOrders: orders?.filter((order) => order.status !== AbacusOrderStatus.cancelled)
+      .length,
    numTotalFills: fills?.length,
    numTotalFundingPayments: fundingPayments?.length,
  })
@@ -288,7 +281,8 @@ export const getCurrentMarketTradeInfoNumbers = createSelector(
  [getCurrentMarketOrders, getCurrentMarketFills, getCurrentMarketFundingPayments],
  (marketOrders, marketFills, marketFundingPayments) => {
    return {
-      numOpenOrders: marketOrders?.filter((order) => isOpenOrderStatus(order.status)).length,
+      numOpenOrders: marketOrders?.filter((order) => order.status !== AbacusOrderStatus.cancelled)
+        .length,
      numFills: marketFills?.length,
      numFundingPayments: marketFundingPayments?.length,
    };
@@ -26,12 +26,7 @@ export const calculateFundingRateHistory = createSelector(
    return data.map(({ effectiveAtMilliseconds, rate }) => ({
      time: effectiveAtMilliseconds,
      fundingRate: rate,
-      direction:
-        rate === 0
-          ? FundingDirection.None
-          : rate < 0
-          ? FundingDirection.ToLong
-          : FundingDirection.ToShort,
+      direction: rate < 0 ? FundingDirection.ToLong : FundingDirection.ToShort,
    }));
  }
 );
@@ -0,0 +1,180 @@
+:root {
+  /* Parameters */
+
+  /*
+    --layer-base-hue
+    --layer-base-saturation
+    --layer-base-lightness
+
+    --color-text-0
+    --color-text-1
+    --color-text-2
+
+    --color-accent
+    --color-positive
+    --color-negative
+    --color-success
+    --color-warning
+    --color-error
+    --color-favorite
+  */
+
+  /* Computed: Layers */
+
+  --color-layer-0: hsl(
+    var(--layer-base-hue),
+    var(--layer-base-saturation),
+    calc(var(--layer-base-lightness) - 12%)
+  );
+
+  --color-layer-1: hsl(
+    var(--layer-base-hue),
+    var(--layer-base-saturation),
+    calc(var(--layer-base-lightness) - 8%)
+  );
+
+  --color-layer-2: hsl(
+    var(--layer-base-hue),
+    var(--layer-base-saturation),
+    calc(var(--layer-base-lightness) - 4%)
+  );
+
+  --color-layer-3: hsl(
+    var(--layer-base-hue),
+    var(--layer-base-saturation),
+    var(--layer-base-lightness)
+  );
+
+  --color-layer-4: hsl(
+    var(--layer-base-hue),
+    var(--layer-base-saturation),
+    calc(var(--layer-base-lightness) + 4%)
+  );
+
+  --color-layer-5: hsl(
+    var(--layer-base-hue),
+    calc(var(--layer-base-saturation) - 2%),
+    calc(var(--layer-base-lightness) + 7%)
+  );
+
+  --color-layer-6: hsl(
+    var(--layer-base-hue),
+    calc(var(--layer-base-saturation) - 4%),
+    calc(var(--layer-base-lightness) + 10%)
+  );
+
+  --color-layer-7: hsla(var(--layer-base-hue), 0%, 100%, 0.07);
+
+  --color-gradient-base-0: hsl(
+    var(--layer-base-hue),
+    calc(var(--layer-base-saturation) - 5%),
+    var(--layer-base-lightness)
+  );
+
+  --color-gradient-base-1: hsl(
+    var(--layer-base-hue),
+    calc(var(--layer-base-saturation) - 1%),
+    calc(var(--layer-base-lightness) + 7%)
+  );
+
+  /* Computed: Borders */
+
+  --color-border: var(--color-layer-5);
+  --color-border-white: hsla(0, 0%, 100%, 0.2);
+  --color-border-red: hsla(360, 73%, 61%, 0.2);
+}
+
+/* Theme: Classic (default) */
+:root {
+  /* Constants */
+
+  --theme-classic-hue-purple: 240;
+  --theme-classic-color-green: hsl(159, 67%, 39%);
+  --theme-classic-color-yellow: hsl(36, 100%, 64%);
+  --theme-classic-color-red: hsl(360, 73%, 61%);
+
+  /* Parameters */
+
+  --layer-base-hue: var(--theme-classic-hue-purple);
+  --layer-base-saturation: 20%;
+  --layer-base-lightness: 16%;
+
+  --color-text-0: hsl(245, 11%, 55%);
+  --color-text-1: hsl(244, 18%, 81%);
+  --color-text-2: hsl(240, 43%, 99%);
+
+  --color-accent: hsl(var(--theme-classic-hue-purple), 100%, 70%);
+  --color-positive: var(--theme-classic-color-green);
+  --color-negative: var(--theme-classic-color-red);
+  --color-success: var(--theme-classic-color-green);
+  --color-warning: var(--theme-classic-color-yellow);
+  --color-error: var(--theme-classic-color-red);
+  --color-favorite: var(--theme-classic-color-yellow);
+
+  --color-white: #fff;
+  --color-black: #000;
+
+  --color-gradient-positive: hsla(158, 49%, 48%, 0.16);
+  --color-gradient-negative: hsla(0, 100%, 66%, 0.16);
+  --color-accent-faded: hsla(var(--theme-classic-hue-purple), 100%, 70%, 0.16);
+
+  --color-risk-low: var(--theme-classic-color-green);
+  --color-risk-medium: var(--theme-classic-color-yellow);
+  --color-risk-high: var(--theme-classic-color-red);
+}
+
+/* Theme: Light */
+:root.theme-light {
+  /* Constants */
+
+  --theme-light-hue-purple: 234;
+  --theme-light-color-green: hsl(159, 67%, 39%);
+  --theme-light-color-yellow: hsl(36, 100%, 64%);
+  --theme-light-color-red: hsl(360, 73%, 61%);
+
+  /* Parameters */
+
+  --layer-base-hue: var(--theme-light-hue-purple);
+  --layer-base-saturation: 0%;
+  --layer-base-lightness: 86%;
+
+  --color-text-0: hsl(0, 0%, 55%);
+  --color-text-1: hsl(0, 0%, 40%);
+  --color-text-2: hsl(0, 0%, 5%);
+
+  --color-accent: hsl(var(--theme-light-hue-purple), 100%, 70%);
+  --color-positive: var(--theme-light-color-green);
+  --color-negative: var(--theme-light-color-red);
+  --color-success: var(--theme-light-color-green);
+  --color-warning: var(--theme-light-color-yellow);
+  --color-error: var(--theme-light-color-red);
+  --color-favorite: var(--theme-light-color-yellow);
+}
+
+/* Theme: Dark */
+:root.theme-dark {
+  /* Constants */
+
+  --theme-dark-hue-purple: 240;
+  --theme-dark-color-green: hsl(159, 67%, 39%);
+  --theme-dark-color-yellow: hsl(36, 100%, 64%);
+  --theme-dark-color-red: hsl(360, 73%, 61%);
+
+  /* Parameters */
+
+  --layer-base-hue: 0;
+  --layer-base-saturation: 0%;
+  --layer-base-lightness: 16%;
+
+  --color-text-0: hsl(0, 0%, 47%);
+  --color-text-1: hsl(0, 0%, 67%);
+  --color-text-2: hsl(0, 0%, 100%);
+
+  --color-accent: hsl(var(--theme-dark-hue-purple), 100%, 70%);
+  --color-positive: var(--theme-dark-color-green);
+  --color-negative: var(--theme-dark-color-red);
+  --color-success: var(--theme-dark-color-green);
+  --color-warning: var(--theme-dark-color-yellow);
+  --color-error: var(--theme-dark-color-red);
+  --color-favorite: var(--theme-dark-color-yellow);
+}
@@ -0,0 +1,125 @@
+import { css } from 'styled-components';
+
+import { type RiskLevels } from '@/constants/abacus';
+
+import { AppTheme } from '@/state/configs';
+
+const BaseElements = {
+  [AppTheme.Classic]: {
+    hue: 240,
+    saturation: 20,
+    lightness: 16,
+  },
+  [AppTheme.Dark]: {
+    hue: 0,
+    saturation: 0,
+    lightness: 16,
+  },
+  [AppTheme.Light]: {
+    hue: 234,
+    saturation: 0,
+    lightness: 86,
+  },
+};
+
+const LayerColors = ({ theme }: { theme: AppTheme }) => {
+  const { hue, saturation, lightness } = BaseElements[theme];
+
+  return {
+    layer0: `hsl(${hue}, ${saturation}%, ${lightness - 12}%)`,
+    layer1: `hsl(${hue}, ${saturation}%, ${lightness - 8}%)`,
+    layer2: `hsl(${hue}, ${saturation}%, ${lightness - 4}%)`,
+    layer3: `hsl(${hue}, ${saturation}%, ${lightness}%)`,
+    layer4: `hsl(${hue}, ${saturation}%, ${lightness + 4}%)`,
+    layer5: `hsl(${hue}, ${saturation - 2}%, ${lightness + 7}%)`,
+    layer6: `hsl(${hue}, ${saturation - 4}%, ${lightness + 10}%)`,
+  };
+};
+
+const AccentColor = ({ theme }: { theme: AppTheme }) => {
+  const purpleHue = {
+    Classic: 240,
+    Dark: 240,
+    Light: 234,
+  }[theme];
+
+  return {
+    accent: `hsl(${purpleHue}, 100%, 70%)`,
+  };
+};
+
+export const Colors = {
+  [AppTheme.Classic]: {
+    ...LayerColors({ theme: AppTheme.Classic }),
+    text0: 'hsl(245, 11%, 55%)',
+    text1: 'hsl(244, 18%, 81%)',
+    text2: 'hsl(240, 43%, 99%)',
+
+    ...AccentColor({ theme: AppTheme.Classic }),
+    green: 'hsl(159, 67%, 39%)',
+    yellow: 'hsl(36, 100%, 64%)',
+    red: 'hsl(360, 73%, 61%)',
+
+    positive: 'hsl(159, 67%, 39%)',
+    negative: 'hsl(360, 73%, 61%)',
+
+    success: 'hsl(159, 67%, 39%)',
+    warning: 'hsl(36, 100%, 64%)',
+    error: 'hsl(360, 73%, 61%)',
+
+    favorite: 'hsl(36, 100%, 64%)',
+  },
+  [AppTheme.Dark]: {
+    ...LayerColors({ theme: AppTheme.Dark }),
+    text0: 'hsl(0, 0%, 47%)',
+    text1: 'hsl(0, 0%, 67%)',
+    text2: 'hsl(0, 0%, 100%)',
+
+    ...AccentColor({ theme: AppTheme.Dark }),
+    green: 'hsl(159, 67%, 39%)',
+    yellow: 'hsl(36, 100%, 64%)',
+    red: 'hsl(360, 73%, 61%)',
+
+    positive: 'hsl(159, 67%, 39%)',
+    negative: 'hsl(360, 73%, 61%)',
+
+    success: 'hsl(159, 67%, 39%)',
+    warning: 'hsl(36, 100%, 64%)',
+    error: 'hsl(360, 73%, 61%)',
+
+    favorite: 'hsl(36, 100%, 64%)',
+  },
+  [AppTheme.Light]: {
+    ...LayerColors({ theme: AppTheme.Light }),
+    text0: 'hsl(0, 0%, 55%)',
+    text1: 'hsl(0, 0%, 40%)',
+    text2: 'hsl(0, 0%, 5%)',
+
+    ...AccentColor({ theme: AppTheme.Light }),
+    green: 'hsl(159, 67%, 39%)',
+    yellow: 'hsl(36, 100%, 64%)',
+    red: 'hsl(360, 73%, 61%)',
+
+    positive: 'hsl(159, 67%, 39%)',
+    negative: 'hsl(360, 73%, 61%)',
+
+    success: 'hsl(159, 67%, 39%)',
+    warning: 'hsl(36, 100%, 64%)',
+    error: 'hsl(360, 73%, 61%)',
+
+    favorite: 'hsl(36, 100%, 64%)',
+  },
+};
+
+export const UsageColorFromRiskLevel = (riskLevel: RiskLevels) =>
+  ({
+    low: css`
+      color: var(--color-risk-low);
+    `,
+    medium: css`
+      color: var(--color-risk-medium);
+    `,
+    high: css`
+      color: var(--color-risk-high);
+    `,
+  }[riskLevel.name]);
@@ -21,7 +21,7 @@ export const formMixins: Record<
    --input-radius: 0.5em;
    --input-height: var(--form-input-height);
    --input-width: 100%;
-    --input-backgroundColor: ${({ theme }) => theme.inputBackground};
+    --input-backgroundColor: var(--color-layer-4);
    --input-borderColor: var(--color-layer-6);

    ${layoutMixins.row}
@@ -1,42 +0,0 @@
-import { createGlobalStyle } from 'styled-components';
-
-export const GlobalStyle = createGlobalStyle`
-  :root {
-    --color-layer-0: ${({ theme }) => theme.layer0};
-    --color-layer-1: ${({ theme }) => theme.layer1};
-    --color-layer-2: ${({ theme }) => theme.layer2};
-    --color-layer-3: ${({ theme }) => theme.layer3};
-    --color-layer-4: ${({ theme }) => theme.layer4};
-    --color-layer-5: ${({ theme }) => theme.layer5};
-    --color-layer-6: ${({ theme }) => theme.layer6};
-    --color-layer-7: ${({ theme }) => theme.layer7};
-
-    --color-border: ${({ theme }) => theme.borderDefault};
-    --color-border-white: ${({ theme }) => theme.borderButton};
-    --color-border-red: ${({ theme }) => theme.borderDestructive};
-
-    --color-text-0: ${({ theme }) => theme.textTertiary};
-    --color-text-1: ${({ theme }) => theme.textSecondary};
-    --color-text-2: ${({ theme }) => theme.textPrimary};
-
-    --color-gradient-base-0: ${({ theme }) => theme.gradientBase0};
-    --color-gradient-base-1: ${({ theme }) => theme.gradientBase1};
-
-    --color-accent: ${({ theme }) => theme.accent};
-    --color-accent-faded: ${({ theme }) => theme.accentFaded};
-    --color-favorite: ${({ theme }) => theme.favorite};
-
-    --color-success: ${({ theme }) => theme.success};
-    --color-warning: ${({ theme }) => theme.warning};
-    --color-error: ${({ theme }) => theme.error};
-
-    --color-positive: ${({ theme }) => theme.positive};
-    --color-negative: ${({ theme }) => theme.negative};
-    --color-gradient-positive: ${({ theme }) => theme.positiveFaded};
-    --color-gradient-negative: ${({ theme }) => theme.negativeFaded};
-
-    --color-risk-low: ${({ theme }) => theme.riskLow};
-    --color-risk-medium: ${({ theme }) => theme.riskMedium};
-    --color-risk-high: ${({ theme }) => theme.riskHigh};
-  }
-`;
@@ -1,157 +0,0 @@
-import { AppTheme } from '@/state/configs';
-import { ThemeColors } from '@/constants/styles/colors';
-import { ColorToken, OpacityToken } from '@/constants/styles/base';
-import { generateFadedColorVariant } from '@/lib/styles';
-
-const ClassicTheme: ThemeColors = {
-  layer0: ColorToken.GrayBlue7,
-  layer1: ColorToken.GrayBlue6,
-  layer2: ColorToken.GrayBlue5,
-  layer3: ColorToken.GrayBlue4,
-  layer4: ColorToken.GrayBlue3,
-  layer5: ColorToken.GrayBlue2,
-  layer6: ColorToken.GrayBlue1,
-  layer7: ColorToken.GrayBlue0,
-
-  borderDefault: ColorToken.GrayBlue2,
-  borderDestructive: generateFadedColorVariant(ColorToken.Red2, OpacityToken.Opacity20),
-  borderButton: generateFadedColorVariant(ColorToken.White, OpacityToken.Opacity20),
-
-  textPrimary: ColorToken.LightGray2,
-  textSecondary: ColorToken.GrayPurple1,
-  textTertiary: ColorToken.GrayPurple2,
-
-  gradientBase0: ColorToken.DarkGray9,
-  gradientBase1: ColorToken.GrayBlue2,
-
-  accent: ColorToken.Purple1,
-  accentFaded: generateFadedColorVariant(ColorToken.Purple1, OpacityToken.Opacity16),
-  favorite: ColorToken.Yellow0,
-
-  success: ColorToken.Green1,
-  warning: ColorToken.Yellow0,
-  error: ColorToken.Red2,
-
-  positive: ColorToken.Green1,
-  negative: ColorToken.Red2,
-  positiveFaded: generateFadedColorVariant(ColorToken.Green1, OpacityToken.Opacity16),
-  negativeFaded: generateFadedColorVariant(ColorToken.Red2, OpacityToken.Opacity16),
-
-  riskLow: ColorToken.Green1,
-  riskMedium: ColorToken.Yellow0,
-  riskHigh: ColorToken.Red2,
-
-  logoFill: ColorToken.White,
-  profileYellow: ColorToken.Yellow1,
-  profileRed: ColorToken.Red2,
-
-  inputBackground: ColorToken.GrayBlue3,
-  popoverBackground: generateFadedColorVariant(ColorToken.GrayBlue4, OpacityToken.Opacity90),
-  switchThumbActiveBackground: ColorToken.White,
-  toggleBackground: ColorToken.GrayBlue3,
-  tooltipBackground: generateFadedColorVariant(ColorToken.GrayBlue3, OpacityToken.Opacity66),
-};
-
-const DarkTheme: ThemeColors = {
-  layer0: ColorToken.Black,
-  layer1: ColorToken.DarkGray11,
-  layer2: ColorToken.DarkGray13,
-  layer3: ColorToken.DarkGray10,
-  layer4: ColorToken.DarkGray6,
-  layer5: ColorToken.DarkGray5,
-  layer6: ColorToken.DarkGray4,
-  layer7: ColorToken.DarkGray2,
-
-  borderDefault: ColorToken.DarkGray4,
-  borderDestructive: generateFadedColorVariant(ColorToken.Red0, OpacityToken.Opacity20),
-  borderButton: generateFadedColorVariant(ColorToken.White, OpacityToken.Opacity20),
-
-  textPrimary: ColorToken.LightGray0,
-  textSecondary: ColorToken.MediumGray0,
-  textTertiary: ColorToken.DarkGray0,
-
-  gradientBase0: ColorToken.DarkGray8,
-  gradientBase1: ColorToken.DarkGray5,
-
-  accent: ColorToken.Purple0,
-  accentFaded: generateFadedColorVariant(ColorToken.Purple0, OpacityToken.Opacity16),
-  favorite: ColorToken.Yellow0,
-
-  success: ColorToken.Green0,
-  warning: ColorToken.Yellow0,
-  error: ColorToken.Red0,
-
-  positive: ColorToken.Green0,
-  negative: ColorToken.Red0,
-  positiveFaded: generateFadedColorVariant(ColorToken.Green0, OpacityToken.Opacity16),
-  negativeFaded: generateFadedColorVariant(ColorToken.Red0, OpacityToken.Opacity16),
-
-  riskLow: ColorToken.Green0,
-  riskMedium: ColorToken.Yellow0,
-  riskHigh: ColorToken.Red0,
-
-  logoFill: ColorToken.White,
-  profileYellow: ColorToken.Yellow1,
-  profileRed: ColorToken.Red2,
-
-  inputBackground: ColorToken.DarkGray6,
-  popoverBackground: generateFadedColorVariant(ColorToken.DarkGray8, OpacityToken.Opacity90),
-  switchThumbActiveBackground: ColorToken.White,
-  toggleBackground: ColorToken.DarkGray6,
-  tooltipBackground: generateFadedColorVariant(ColorToken.DarkGray6, OpacityToken.Opacity66),
-};
-
-const LightTheme: ThemeColors = {
-  layer0: ColorToken.White,
-  layer1: ColorToken.LightGray6,
-  layer2: ColorToken.White,
-  layer3: ColorToken.LightGray1,
-  layer4: ColorToken.White,
-  layer5: ColorToken.LightGray4,
-  layer6: ColorToken.LightGray9,
-  layer7: ColorToken.MediumGray1,
-
-  borderDefault: ColorToken.LightGray10,
-  borderDestructive: generateFadedColorVariant(ColorToken.Red1, OpacityToken.Opacity20),
-  borderButton: generateFadedColorVariant(ColorToken.Black, OpacityToken.Opacity20),
-
-  textPrimary: ColorToken.DarkGray12,
-  textSecondary: ColorToken.DarkGray3,
-  textTertiary: ColorToken.DarkGray1,
-
-  gradientBase0: ColorToken.LightGray8,
-  gradientBase1: ColorToken.LightGray5,
-
-  accent: ColorToken.Purple0,
-  accentFaded: generateFadedColorVariant(ColorToken.Purple0, OpacityToken.Opacity16),
-  favorite: ColorToken.Yellow0,
-
-  success: ColorToken.Green2,
-  warning: ColorToken.Yellow0,
-  error: ColorToken.Red1,
-
-  positive: ColorToken.Green2,
-  negative: ColorToken.Red1,
-  positiveFaded: generateFadedColorVariant(ColorToken.Green2, OpacityToken.Opacity16),
-  negativeFaded: generateFadedColorVariant(ColorToken.Red1, OpacityToken.Opacity16),
-
-  riskLow: ColorToken.Green2,
-  riskMedium: ColorToken.Yellow0,
-  riskHigh: ColorToken.Red1,
-
-  logoFill: ColorToken.Black,
-  profileYellow: ColorToken.Yellow1,
-  profileRed: ColorToken.Red2,
-
-  inputBackground: ColorToken.White,
-  popoverBackground: generateFadedColorVariant(ColorToken.LightGray8, OpacityToken.Opacity90),
-  switchThumbActiveBackground: ColorToken.White,
-  toggleBackground: ColorToken.LightGray4,
-  tooltipBackground: generateFadedColorVariant(ColorToken.LightGray7, OpacityToken.Opacity66),
-};
-
-export const Themes = {
-  [AppTheme.Classic]: ClassicTheme,
-  [AppTheme.Dark]: DarkTheme,
-  [AppTheme.Light]: LightTheme,
-};
@@ -2,7 +2,9 @@ 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';

@@ -32,6 +34,7 @@ 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,6 +29,7 @@ export const MarketDetails: React.FC = () => {
  if (!configs) return null;

  const {
+    basePositionNotional,
    tickSize,
    stepSize,
    initialMarginFraction,
@@ -113,11 +114,17 @@ export const MarketDetails: React.FC = () => {
      ),
    },
    {
-      key: 'initial-margin-fraction',
-      label: stringGetter({ key: STRING_KEYS.INITIAL_MARGIN_FRACTION }),
+      key: 'base-initial-margin-fraction',
+      label: stringGetter({ key: STRING_KEYS.BASE_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 (
@@ -1,20 +1,14 @@
 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 {
-  DepthChartDatum,
-  DepthChartPoint,
-  DepthChartSeries,
-  SERIES_KEY_FOR_ORDER_SIDE,
-} from '@/constants/charts';
-import { StringGetterFunction } from '@/constants/localization';
+import { StringGetterFunction, STRING_KEYS } from '@/constants/localization';

 import { useBreakpoints } from '@/hooks';
-import { useOrderbookValuesForDepthChart } from '@/hooks/useOrderbookValues';

-import { getCurrentMarketConfig } from '@/state/perpetualsSelectors';
+import { MustBigNumber } from '@/lib/numbers';
+
+import { getCurrentMarketConfig, getCurrentMarketOrderbook } from '@/state/perpetualsSelectors';
 import { getCurrentMarketAssetData } from '@/state/assetsSelectors';

 import { XYChartWithPointerEvents } from '@/components/visx/XYChartWithPointerEvents';
@@ -27,25 +21,24 @@ import {
  darkTheme,
  DataProvider,
  EventEmitterProvider,
-  type EventHandlerParams,
 } from '@visx/xychart';
 import { LinearGradient } from '@visx/gradient';
 import { curveStepAfter } from '@visx/curve';
-import { Point } from '@visx/point';
+import type { 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 { OutputType } from '@/components/Output';
+import { Output, OutputType } from '@/components/Output';

-import { MustBigNumber } from '@/lib/numbers';
-
-import { DepthChartTooltipContent } from './Tooltip';
+import { OrderSide } from '@dydxprotocol/v4-client-js';

 // @ts-ignore
 const theme = buildChartTheme({
  ...darkTheme,
-  colors: ['var(--color-positive)', 'var(--color-negative)', 'var(--color-layer-6)'], // categorical colors, mapped to series via `dataKey`s
+  colors: ['var(--color-positive)', 'var(--color-negative)', 'white'], // categorical colors, mapped to series via `dataKey`s
 });

 const clamp = (n: number, min: number, max: number) => Math.max(min, Math.min(max, n));
@@ -65,6 +58,30 @@ 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,
@@ -79,6 +96,8 @@ export const DepthChart = ({
  const { isMobile } = useBreakpoints();

  // Chart data
+
+  const orderbook = useSelector(getCurrentMarketOrderbook, shallowEqual);
  const { id = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
  const { stepSizeDecimals, tickSizeDecimals } =
    useSelector(getCurrentMarketConfig, shallowEqual) ?? {};
@@ -93,15 +112,43 @@ export const DepthChart = ({
    midMarketPrice,
    spread,
    spreadPercent,
-    orderbook,
-  } = useOrderbookValuesForDepthChart();
+  } = 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]);

  // Chart state

  const [isPointerPressed, setIsPointerPressed] = useState(false);
  const [chartPointAtPointer, setChartPointAtPointer] = useState<DepthChartPoint>();

-  const isEditingOrder = Boolean(isPointerPressed && chartPointAtPointer);
+  const isEditingOrder = isPointerPressed && chartPointAtPointer;

  const [zoomDomain, setZoomDomain] = useState<undefined | number>();

@@ -146,24 +193,12 @@ export const DepthChart = ({
  }, [orderbook, zoomDomain]);

  const getChartPoint = useCallback(
-    (point: Point | EventHandlerParams<object>) => {
-      let price, size;
-      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,
+    ({ x: price, y: size }: Point) =>
+      ({
+        side: price < midMarketPrice! ? OrderSide.BUY : OrderSide.SELL,
        price,
        size,
-      } as DepthChartPoint;
-    },
+      } as DepthChartPoint),
    [midMarketPrice]
  );

@@ -221,7 +256,7 @@ export const DepthChart = ({
            }}
            onPointerUp={(point) => point && onChartClick?.(getChartPoint(point))}
            onPointerMove={(point) => point && setChartPointAtPointer(getChartPoint(point))}
-            onPointerPressedChange={(isPointerPressed) => setIsPointerPressed(isPointerPressed)}
+            onPointerPressedChange={setIsPointerPressed}
          >
            <Axis
              orientation="bottom"
@@ -328,7 +363,7 @@ export const DepthChart = ({
                <Styled.XAxisLabelOutput
                  type={OutputType.Fiat}
                  value={
-                    isEditingOrder && chartPointAtPointer
+                    isEditingOrder
                      ? chartPointAtPointer.price
                      : tooltipData!.nearestDatum?.datum.price
                  }
@@ -339,8 +374,8 @@ export const DepthChart = ({
                      [DepthChartSeries.Bids]: 'var(--color-positive)',
                      [DepthChartSeries.MidMarket]: 'var(--color-layer-6)',
                    }[
-                      isEditingOrder && chartPointAtPointer
-                        ? SERIES_KEY_FOR_ORDER_SIDE[chartPointAtPointer.side]
+                      isEditingOrder
+                        ? seriesKeyForOrderSide[chartPointAtPointer.side]
                        : (tooltipData!.nearestDatum?.key as DepthChartSeries)
                    ]
                  }
@@ -354,7 +389,7 @@ export const DepthChart = ({
                  <Styled.YAxisLabelOutput
                    type={OutputType.Asset}
                    value={
-                      isEditingOrder && chartPointAtPointer
+                      isEditingOrder
                        ? chartPointAtPointer.size
                        : tooltipData!.nearestDatum?.datum.depth
                    }
@@ -365,8 +400,8 @@ export const DepthChart = ({
                        [DepthChartSeries.Bids]: 'var(--color-positive)',
                        [DepthChartSeries.MidMarket]: 'var(--color-layer-6)',
                      }[
-                        isEditingOrder && chartPointAtPointer
-                          ? SERIES_KEY_FOR_ORDER_SIDE[chartPointAtPointer.side]
+                        isEditingOrder
+                          ? seriesKeyForOrderSide[chartPointAtPointer.side]
                          : (tooltipData!.nearestDatum?.key as DepthChartSeries)
                      ]
                    }
@@ -375,22 +410,181 @@ export const DepthChart = ({
              }
              snapTooltipToDatumX={!isEditingOrder}
              snapTooltipToDatumY={isEditingOrder ? false : isMobile}
-              renderTooltip={({ tooltipData, colorScale }) =>
-                chartPointAtPointer && (
-                  <DepthChartTooltipContent
-                    {...{
-                      tooltipData,
-                      colorScale,
-                      isEditingOrder,
-                      chartPointAtPointer,
-                      stringGetter,
-                      selectedLocale,
-                      stepSizeDecimals,
-                      tickSizeDecimals,
-                    }}
-                  />
-                )
-              }
+              renderTooltip={({ tooltipData, colorScale }) => {
+                const { nearestDatum } = tooltipData || {};
+
+                if (!isEditingOrder && !nearestDatum?.datum) return null;
+
+                return (
+                  <TooltipContent
+                    accentColor={colorScale?.(
+                      isEditingOrder
+                        ? seriesKeyForOrderSide[chartPointAtPointer.side]
+                        : nearestDatum.key
+                    )}
+                  >
+                    <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>
@@ -1,220 +0,0 @@
-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>
-  );
-};
@@ -3,27 +3,39 @@ import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent, css } from 'styled-components';
 import { curveMonotoneX, curveStepAfter } from '@visx/curve';

-import { ButtonSize } from '@/constants/buttons';
-import { FundingRateResolution, type FundingChartDatum } from '@/constants/charts';
-import { STRING_KEYS } from '@/constants/localization';
-import { FundingDirection } from '@/constants/markets';
-import { SMALL_PERCENT_DECIMALS, TINY_PERCENT_DECIMALS } from '@/constants/numbers';
 import { useBreakpoints, useStringGetter } from '@/hooks';
+import { ButtonSize } from '@/constants/buttons';
+import { STRING_KEYS } from '@/constants/localization';
+import { SMALL_PERCENT_DECIMALS, TINY_PERCENT_DECIMALS } from '@/constants/numbers';
+import { FundingDirection } from '@/constants/markets';

 import { breakpoints } from '@/styles';

-import { Output, OutputType } from '@/components/Output';
+import { Details, DetailsItem } from '@/components/Details';
+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

@@ -104,20 +116,114 @@ 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 }) => (
-        <FundingChartTooltipContent
-          fundingRateView={fundingRateView}
-          tooltipData={tooltipData}
-          latestDatum={latestDatum}
-        />
-      )}
-      onTooltipContext={(tooltipContext) => setTooltipContext(tooltipContext)}
+      renderTooltip={({ tooltipData }) => {
+        const { nearestDatum } = tooltipData || {};
+
+        const tooltipDatum = nearestDatum?.datum ?? latestDatum;
+        const isShowingCurrentFundingRate = tooltipDatum === latestDatum;
+
+        return (
+          <TooltipContent
+            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" />}
@@ -184,7 +290,6 @@ 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);

@@ -1,107 +0,0 @@
-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>
-  );
-};
@@ -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,7 +8,6 @@ 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;
@@ -73,11 +72,8 @@ 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);
-  }
 `;
@@ -18,7 +18,11 @@ type ElementProps = {
  onSelectChain: (chain: string) => void;
 };

-export const ChainSelectMenu = ({ label, selectedChain, onSelectChain }: ElementProps) => {
+export const ChainSelectMenu = ({
+  label,
+  selectedChain,
+  onSelectChain,
+}: ElementProps) => {
  const stringGetter = useStringGetter();
  const { type, depositOptions, withdrawalOptions, resources } =
    useSelector(getTransferInputs, shallowEqual) || {};
@@ -34,7 +38,7 @@ export const ChainSelectMenu = ({ label, selectedChain, onSelectChain }: Element
    slotBefore: <Styled.Img src={chain.iconUrl} alt="" />,
  }));

-  const selectedOption = chains.find((item) => item.type === selectedChain);
+  const selectedOption = chains.find((item) => item.type === selectedChain); 

  return (
    <SearchSelectMenu
@@ -77,4 +81,4 @@ Styled.ChainRow = styled.div`
  gap: 0.5rem;
  color: var(--color-text-2);
  font: var(--font-base-book);
-`;
+`;
@@ -10,8 +10,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, isMainnet } from '@/constants/networks';
-import { MAX_CCTP_TRANSFER_AMOUNT, MAX_PRICE_IMPACT, NumberSign } from '@/constants/numbers';
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { NotificationStatus } from '@/constants/notifications';
+import { NumberSign } from '@/constants/numbers';
 import type { EvmAddress } from '@/constants/wallets';

 import { useAccounts, useDebounce, useStringGetter, useSelectedNetwork } from '@/hooks';
@@ -235,10 +236,6 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
          throw new Error('Missing request payload');
        }

-        if (isCctp && !abacusStateManager.chainTransactions.isNobleClientConnected) {
-          throw new Error('Noble RPC endpoint unaccessible');
-        }
-
        setIsLoading(true);

        await validateTokenApproval();
@@ -256,9 +253,7 @@ 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(),
@@ -329,21 +324,6 @@ 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,
@@ -354,7 +334,6 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
    fromAmount,
    sourceToken,
    stringGetter,
-    summary,
  ]);

  const isDisabled =
@@ -1,16 +1,21 @@
-import { type Dispatch, type ReactNode, type SetStateAction, useState, useMemo } from 'react';
+import { type Dispatch, type SetStateAction, useState, type ReactNode } 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 { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons';
+import {
+  ButtonAction,
+  ButtonShape,
+  ButtonSize,
+  ButtonState,
+  ButtonType,
+} from '@/constants/buttons';

 import { TransferInputTokenResource } from '@/constants/abacus';
 import { STRING_KEYS } from '@/constants/localization';
-import { NumberSign, TOKEN_DECIMALS } from '@/constants/numbers';
+import { NumberSign } from '@/constants/numbers';

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

 import { layoutMixins } from '@/styles/layoutMixins';
@@ -29,7 +34,6 @@ 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';
@@ -79,8 +83,7 @@ export const DepositButtonAndReceipt = ({
  const { current: buyingPower, postOrder: newBuyingPower } =
    useSelector(getSubaccountBuyingPower, shallowEqual) || {};

-  const { isCctp, summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
-  const { usdcDecimals, usdcLabel } = useTokenConfigs();
+  const { summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};

  const feeSubitems: DetailsItem[] = [];

@@ -95,7 +98,7 @@ export const DepositButtonAndReceipt = ({
  if (typeof summary?.bridgeFee === 'number') {
    feeSubitems.push({
      key: 'bridge-fees',
-      label: <span>{stringGetter({ key: STRING_KEYS.BRIDGE_FEE })}</span>,
+      label: <span>Bridge Fee</span>,
      value: <Output type={OutputType.Fiat} value={summary?.bridgeFee} />,
    });
  }
@@ -109,53 +112,11 @@ 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>{usdcLabel}</Tag>
+          {stringGetter({ key: STRING_KEYS.EQUITY })} <Tag>USDC</Tag>
        </span>
      ),
      value: (
@@ -172,7 +133,7 @@ export const DepositButtonAndReceipt = ({
      key: 'buying-power',
      label: (
        <span>
-          {stringGetter({ key: STRING_KEYS.BUYING_POWER })} <Tag>{usdcLabel}</Tag>
+          {stringGetter({ key: STRING_KEYS.BUYING_POWER })} <Tag>USDC</Tag>
        </span>
      ),
      value: (
@@ -185,7 +146,18 @@ 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} />,
@@ -206,26 +178,22 @@ export const DepositButtonAndReceipt = ({
    {
      key: 'estimatedRouteDuration',
      label: <span>{stringGetter({ key: STRING_KEYS.ESTIMATED_TIME })}</span>,
-      value: (
+      value: typeof summary?.estimatedRouteDuration === 'number' && (
        <Output
          type={OutputType.Text}
-          value={
-            typeof summary?.estimatedRouteDuration === 'number'
-              ? stringGetter({
-                  key: STRING_KEYS.X_MINUTES_LOWERCASED,
-                  params: {
-                    X:
-                      summary?.estimatedRouteDuration < 60
-                        ? '< 1'
-                        : Math.round(summary?.estimatedRouteDuration / 60),
-                  },
-                })
-              : null
-          }
+          value={stringGetter({
+            key: STRING_KEYS.X_MINUTES_LOWERCASED,
+            params: {
+              X:
+                summary?.estimatedRouteDuration < 60
+                  ? '< 1'
+                  : Math.round(summary?.estimatedRouteDuration / 60),
+            },
+          })}
        />
      ),
    },
-  ].filter(isTruthy);
+  ];

  const isFormValid = !isDisabled && !isEditingSlippage;

@@ -34,7 +34,6 @@ export const TokenSelectMenu = ({ selectedToken, onSelectToken }: ElementProps)
      selectedToken && onSelectToken(selectedToken);
    },
    slotBefore: <Styled.Img src={token.iconUrl} alt="" />,
-    tag: resources?.tokenResources?.get(token.type)?.symbol,
  }));

  return (
@@ -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, isMainnet } from '@/constants/networks';
-import { TransferNotificationTypes } from '@/constants/notifications';
-import { MAX_CCTP_TRANSFER_AMOUNT, MAX_PRICE_IMPACT, NumberSign } from '@/constants/numbers';
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { NotificationStatus, TransferNotificationTypes } from '@/constants/notifications';
+import { NumberSign } from '@/constants/numbers';

 import {
  useAccounts,
@@ -67,8 +67,7 @@ export const WithdrawForm = () => {
    resources,
    errors: routeErrors,
    errorMessage: routeErrorMessage,
-    isCctp,
-    summary,
+    isCctp
  } = useSelector(getTransferInputs, shallowEqual) || {};

  // User input
@@ -76,6 +75,7 @@ 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(
@@ -148,10 +148,6 @@ export const WithdrawForm = () => {
          throw new Error('Invalid request payload');
        }

-        if (isCctp && !abacusStateManager.chainTransactions.isNobleClientConnected) {
-          throw new Error('Noble RPC endpoint unaccessible');
-        }
-
        setIsLoading(true);
        setError(undefined);

@@ -172,18 +168,12 @@ export const WithdrawForm = () => {
            })
          );
        } else {
-          const txHash = await sendSquidWithdraw(
-            debouncedAmountBN.toNumber(),
-            requestPayload.data,
-            isCctp
-          );
+          const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data, isCctp);
          if (txHash) {
            addTransferNotification({
              txHash: txHash,
              type: TransferNotificationTypes.Withdrawal,
-              fromChainId: !isCctp
-                ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
-                : getNobleChainId(),
+              fromChainId: !isCctp ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId : getNobleChainId(),
              toChainId: chainIdStr || undefined,
              toAmount: debouncedAmountBN.toNumber(),
              triggeredAt: Date.now(),
@@ -293,7 +283,10 @@ export const WithdrawForm = () => {

  const errorMessage = useMemo(() => {
    if (error) {
-      return error;
+      return stringGetter({
+        key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
+        params: { ERROR_MESSAGE: error },
+      });
    }

    if (routeErrors) {
@@ -324,21 +317,6 @@ 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,
@@ -351,7 +329,6 @@ export const WithdrawForm = () => {
    toAddress,
    sanctionedAddresses,
    stringGetter,
-    summary,
  ]);

  const isDisabled =
@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { useState } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { formatUnits } from 'viem';
@@ -6,11 +6,14 @@ 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, TOKEN_DECIMALS } from '@/constants/numbers';
+import { NumberSign } from '@/constants/numbers';
+
+import { formatSeconds } from '@/lib/timeUtils';

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

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

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

@@ -57,7 +60,11 @@ 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[] = [];

@@ -92,12 +99,24 @@ export const WithdrawButtonAndReceipt = ({
      value: <Output type={OutputType.Fiat} value={totalFees} />,
      subitems: feeSubitems,
    },
+    {
+      key: 'slippage',
+      label: <span>{stringGetter({ key: STRING_KEYS.MAX_SLIPPAGE })}</span>,
+      value: (
+        <SlippageEditor
+          disabled
+          slippage={slippage}
+          setIsEditing={setIsEditingSlipapge}
+          setSlippage={setSlippage}
+        />
+      ),
+    },
    {
      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={usdcLabel} />
+          <Output type={OutputType.Asset} value={1} fractionDigits={0} tag="USDC" />
          =
          <Output
            type={OutputType.Asset}
@@ -108,7 +127,7 @@ export const WithdrawButtonAndReceipt = ({
      ),
    },
    {
-      key: 'estimated-route-duration',
+      key: 'estimatedRouteDuration',
      label: <span>{stringGetter({ key: STRING_KEYS.ESTIMATED_TIME })}</span>,
      value: typeof summary?.estimatedRouteDuration === 'number' && (
        <Output
@@ -126,39 +145,20 @@ export const WithdrawButtonAndReceipt = ({
      ),
    },
    {
-      key: 'expected-amount-received',
+      key: 'wallet',
      label: (
        <span>
-          {stringGetter({ key: STRING_KEYS.EXPECTED_AMOUNT_RECEIVED })}{' '}
+          {stringGetter({ key: STRING_KEYS.MINIMUM_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}
+        <Styled.DiffOutput
+          type={OutputType.Asset}
+          value={'0'}
+          newValue={toAmount}
+          sign={NumberSign.Positive}
+          withDiff={Boolean(toAmount)}
        />
      ),
    },
@@ -44,7 +44,6 @@ export const TradeSideToggle = memo(() => {
 const ToggleContainer = styled(ToggleGroup)<{ value: OrderSide }>`
  --toggle-radius: 0.5em;
  --toggle-color: var(--color-negative);
-  --toggle-background: ${({ theme }) => theme.toggleBackground};

  ${({ value }) =>
    value === OrderSide.BUY &&
@@ -53,7 +52,7 @@ const ToggleContainer = styled(ToggleGroup)<{ value: OrderSide }>`
    `}

  border-radius: var(--toggle-radius);
-  background-color: var(--toggle-background);
+  background-color: var(--color-layer-4);
  position: relative;

  > button {
@@ -10,9 +10,6 @@ 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,
@@ -38,8 +35,10 @@ 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();
@@ -179,7 +178,7 @@ export const AccountMenu = () => {
        },
        ...(onboardingState === OnboardingState.AccountConnected && hdKey
          ? [
-              (!isMainnet || testFlags.showMobileSignInOption) && {
+              !isMainnet && {
                value: 'MobileQrSignIn',
                icon: <Icon iconName={IconName.Qr} />,
                label: stringGetter({ key: STRING_KEYS.TITLE_SIGN_INTO_MOBILE }),
@@ -1,78 +0,0 @@
-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;
-  }
-`;
@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';

 import { STRING_KEYS } from '@/constants/localization';
 import { MarketFilters, type MarketData } from '@/constants/markets';
-import { FUNDING_DECIMALS, LARGE_TOKEN_DECIMALS } from '@/constants/numbers';
+import { LARGE_TOKEN_DECIMALS } from '@/constants/numbers';
 import { AppRoute } from '@/constants/routes';

 import { useBreakpoints, useStringGetter } from '@/hooks';
@@ -128,8 +128,7 @@ export const MarketsTable = ({ className }: { className?: string }) => {
              label: stringGetter({ key: STRING_KEYS.FUNDING_RATE_1H_SHORT }),
              renderCell: (row) => (
                <Styled.Output
-                  type={OutputType.Percent}
-                  fractionDigits={FUNDING_DECIMALS}
+                  type={OutputType.SmallPercent}
                  value={row.nextFundingRate}
                  isPositive={MustBigNumber(row.nextFundingRate).gt(0)}
                  isNegative={MustBigNumber(row.nextFundingRate).isNegative()}
@@ -366,7 +366,6 @@ Styled.InlineRow = styled.div`

 Styled.AssetIcon = styled(AssetIcon)`
  ${layoutMixins.inlineRow}
-  min-width: unset;
  font-size: 2.25rem;
 `;
Author	SHA1	Message	Date
jaredvu	d2749e6e59	Fix import order	2023-12-19 16:24:49 -08:00
jaredvu	582dade27e	Lazy import pages	2023-12-19 16:23:50 -08:00
				`@@ -1 +0,0 @@`
				<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>