make sure view more is hidden when not num rows not specified

Change iOS app scheme to dydx-t-v4 (#248 )
✨ Canvas Orderbook (#227 )
2024-01-25 13:28:08 -05:00 · 2024-01-25 09:19:49 -08:00 · 2024-01-24 23:16:33 -08:00 · 2024-01-24 15:29:43 -08:00 · 2024-01-24 15:28:11 -08:00 · 2024-01-24 17:03:44 -05:00
256 changed files with 12151 additions and 4918 deletions
@@ -4,6 +4,11 @@ VITE_ALCHEMY_API_KEY=

 VITE_PK_ENCRYPTION_KEY=

-VITE_WALLETCONNECT2_PROJECT_ID=
+VITE_V3_TOKEN_ADDRESS=
+VITE_TOKEN_MIGRATION_URI=

-VITE_V3_TOKEN_ADDRESS=
+AMPLITUDE_API_KEY=
+BUGSNAG_API_KEY=
+IOS_APP_ID=
+INTERCOM_APP_ID=
+STATUS_PAGE_SCRIPT_URI=
@@ -5,29 +5,35 @@ 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('Default theme');
+  const [theme, setTheme] = useState(AppTheme.Classic);

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

@@ -1,6 +1,9 @@
 Copyright (C) 2023 dYdX Trading Inc.

-Subject to your compliance with applicable law, you are granted the right to use the Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Licensed Work will automatically and immediately terminate.
+Subject to your compliance with applicable law and the v4 Terms of Use, available at dydx.exchange/legal, you are granted the right to use the Program or Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Program or Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Program or Licensed Work will automatically and immediately terminate.
+
+
+The “Program” or “Licensed Work” shall mean any of the following: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-clients, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. repository reflecting a copy of, or link to, this license.


 The GNU Affero General Public License
@@ -26,7 +26,7 @@ Alternatively, follow the [IPFS Kubo installation guide](https://docs.ipfs.tech

 ## Part 1: Setting up your local environment

-### Step 1: Clone the repo
+### 1. Clone the repo

 Clone the repository and navigate to its directory:

@@ -35,7 +35,7 @@ git clone https://github.com/dydxprotocol/v4-web.git
 cd v4-web
 ```

-### Step 2: Install pnpm and dependencies
+### 2. Install pnpm and dependencies

 Install pnpm and the project dependencies:

@@ -69,7 +69,24 @@ You'll need to provide a Wallet Connect project id to enable onboarding and wall
 - Create a project on https://cloud.walletconnect.com/app
 - Copy over the project ID into this [field](https://github.com/dydxprotocol/v4-web/blob/67ecbd75b43e0c264b7b4d2d9b3d969830b0621c/public/configs/env.json#L822C33-L822C46)

-## Part 4: Deploying with Vercel
+## Part 4: Set Enviornment variables
+Set environment variables via `.env`.
+
+- `VITE_BASE_URL` (required): The base URL of the deployment (e.g., `https://www.example.com`).
+- `VITE_ALCHEMY_API_KEY` (optional): Add an Alchemy API key for EVM interactions; the app will fall back to public RPCs if not provided.
+- `VITE_PK_ENCRYPTION_KEY` (optional): AES encryption key used for signature obfuscation; necessary for enabling the "Remember Me" feature.
+- `VITE_V3_TOKEN_ADDRESS` (optional): Address of the V3 $DYDX token.
+- `VITE_TOKEN_MIGRATION_URI` (optional): The URL of the token migration website.
+- `AMPLITUDE_API_KEY` (optional): Amplitude API key for enabling Amplitude; used with `pnpm run build:inject-amplitude`.
+- `BUGSNAG_API_KEY` (optional): API key for enabling Bugsnag; used with `pnpm run build:inject-bugsnag`.
+- `IOS_APP_ID` (optional): iOS app ID used for enabling deep linking to the iOS app; used with `pnpm run build:inject-app-deeplinks`.
+- `INTERCOM_APP_ID` (optional): Used for enabling Intercom; utilized with `pnpm run build:inject-intercom`.
+- `STATUS_PAGE_SCRIPT_URI` (optional): Used for enabling the status page; used with `pnpm run build:inject-statuspage`.
+
+
+# Deployments
+
+## Deploying with Vercel

 ### Step 1: Connect your repository to Vercel

@@ -81,12 +98,17 @@ For the "Build & Development Settings", we recommend the following:
 - Framework Preset: `Vite`
 - Build Command (override): `pnpm run build`

+By default, the dev server runs in development mode and the build command runs in production mode. To override the default mode, you can pass in the `--mode` option flag. For example, if you want to build your app for testnet:
+```
+pnpm run build --mode testnet
+```
+
 If you wish to incorporate analytics via Amplitude and Bugsnag, you can use our scripts:
 `pnpm run build:inject-amplitude` and `pnpm run build:inject-bugsnag`. You will need to provide your own API keys for these services. In the Environment Variables section, name the variables as `AMPLITUDE_API_KEY` and `BUGSNAG_API_KEY` and provide the respective keys as their values.

 For more details, check out Vercel's [official documentation](https://vercel.com/docs).

-## Part 5: Deploying to IPFS
+## Deploying to IPFS

 ### web3.storage: deploy to IPFS via web3.storage using the provided script

@@ -118,3 +140,18 @@ To access your content on IPFS:
 2. **Public IPFS gateway:** Access your content via a public IPFS gateway, such as [https://dweb.link](https://dweb.link/) or [https://w3s.link/](https://w3s.link/). Use the gateway URL with your CID appended, like `https://dweb.link/ipfs/your_cid`.

 Replace `your_cid` with the actual CID.
+
+## Cloudflare Settings
+
+We recommend that you add your website to Cloudflare for additional security settings.
+
+To block OFAC Sanctioned countries:
+1. Navigate Websites > Domain > Security > WAF
+
+2. Create Rule with the following settings:
+  * If incoming requests match
+`(ip.geoip.country eq "CU") or (ip.geoip.country eq "IR") or (ip.geoip.country eq "KP") or (ip.geoip.country eq "SY") or (ip.geoip.country eq "MM") or (ip.geoip.subdivision_1_iso_code eq "UA-09") or (ip.geoip.subdivision_1_iso_code eq "UA-14") or (ip.geoip.subdivision_1_iso_code eq "UA-43")`
+  * This rule will bring up a Cloudflare page when a restricted geography tries to access your site. You will have the option to display:
+    1. Custom Text
+      - (e.g. `Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use, or have engaged in activity that violates our terms of use, you have been blocked. You may withdraw your funds from the protocol at any time.`)
+    2. Default Cloudflare WAF block page
@@ -33,20 +33,23 @@
  "packageManager": "pnpm@8.6.6",
  "dependencies": {
    "@0xsquid/sdk": "^1.10.0",
-    "@cosmjs/amino": "^0.31.0",
-    "@cosmjs/crypto": "^0.31.0",
-    "@cosmjs/encoding": "^0.31.0",
-    "@cosmjs/proto-signing": "^0.31.0",
-    "@cosmjs/stargate": "^0.31.0",
-    "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^0.7.6",
-    "@dydxprotocol/v4-client-js": "^0.40.3",
-    "@dydxprotocol/v4-localization": "^0.1.32",
+    "@cosmjs/amino": "^0.32.1",
+    "@cosmjs/crypto": "^0.32.1",
+    "@cosmjs/encoding": "^0.32.1",
+    "@cosmjs/proto-signing": "^0.32.1",
+    "@cosmjs/stargate": "^0.32.1",
+    "@cosmjs/tendermint-rpc": "^0.32.1",
+    "@dydxprotocol/v4-abacus": "^1.2.5",
+    "@dydxprotocol/v4-client-js": "^1.0.14",
+    "@dydxprotocol/v4-localization": "^1.1.11",
    "@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",
    "@radix-ui/react-dropdown-menu": "^2.0.5",
+    "@radix-ui/react-icons": "^1.3.0",
    "@radix-ui/react-navigation-menu": "^1.1.3",
    "@radix-ui/react-popover": "^1.0.6",
    "@radix-ui/react-radio-group": "^1.1.3",
@@ -96,6 +99,7 @@
    "long": "^5.2.3",
    "luxon": "^3.3.0",
    "qr-code-styling": "1.6.0-rc.1",
+    "query-string": "^8.1.0",
    "react": "^18.2.0",
    "react-aria": "^3.25.0",
    "react-dom": "^18.2.0",
@@ -107,8 +111,8 @@
    "reselect": "^4.1.8",
    "styled-components": "^5.3.11",
    "use-latest": "^1.2.1",
-    "viem": "^1.12.2",
-    "wagmi": "^1.3.7"
+    "viem": "^1.20.0",
+    "wagmi": "^1.4.12"
  },
  "devDependencies": {
    "@babel/core": "^7.22.5",
@@ -8,67 +8,43 @@
                ],
                "components": [
                    {
-                        "/": "/trade/*"
+                        "/": "/"
                    },
                    {
-                        "/": "/r/*"
+                        "/": "/#/"
                    },
                    {
-                        "/": "/portfolio/overview"
+                        "/": "*/markets"
                    },
                    {
-                        "/": "/portfolio/positions"
+                        "/": "*/trade"
                    },
                    {
-                        "/": "/portfolio/orders"
+                        "/": "*/trade/*"
                    },
                    {
-                        "/": "/portfolio/fees"
+                        "/": "*/portfolio"
                    },
                    {
-                        "/": "/portfolio/history"
+                        "/": "*/portfolio/overview"
                    },
                    {
-                        "/": "/portfolio/history/trades"
+                        "/": "*/portfolio/positions"
                    },
                    {
-                        "/": "/portfolio/history/transfers"
+                        "/": "*/portfolio/orders"
                    },
                    {
-                        "/": "/portfolio/history/funding"
+                        "/": "*/portfolio/fees"
                    },
                    {
-                        "/": "/rewards"
+                        "/": "*/portfolio/history/trades"
                    },
                    {
-                        "/": "/my-profile"
+                        "/": "*/portfolio/history/transfers"
                    },
                    {
-                        "/": "/rankings/hedgies"
-                    },
-                    {
-                        "/": "/rankings/competition"
-                    },
-                    {
-                        "/": "/rankings/diamond"
-                    },
-                    {
-                        "/": "/rankings/platinum"
-                    },
-                    {
-                        "/": "/rankings/gold"
-                    },
-                    {
-                        "/": "/rankings/silver"
-                    },
-                    {
-                        "/": "/rankings/bronze"
-                    },
-                    {
-                        "/": "/rankings/pnl-absolute"
-                    },
-                    {
-                        "/": "/rankings/pnl-percent"
+                        "/": "*/portfolio/history/funding"
                    },
                    {
                        "/": "/walletsegue",
@@ -0,0 +1,12 @@
+[
+    {
+        "chainId": "1",
+        "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+        "name": "Ethereum"
+    },
+    {
+        "chainId": "5",
+        "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
+        "name": "Ethereum Goerli"
+    }
+]
@@ -0,0 +1,16 @@
+{
+    "tradingRewardsFAQs": [
+        {
+            "questionLocalizationKey": "APP.TRADING_REWARDS.FAQ_WHO_IS_ELIGIBLE_QUESTION",
+            "answerLocalizationKey": "APP.TRADING_REWARDS.FAQ_WHO_IS_ELIGIBLE_ANSWER"
+        },
+        {
+            "questionLocalizationKey": "APP.TRADING_REWARDS.FAQ_HOW_DO_TRADING_REWARDS_WORK_QUESTION",
+            "answerLocalizationKey": "APP.TRADING_REWARDS.FAQ_HOW_DO_TRADING_REWARDS_WORK_ANSWER"
+        },
+        {
+            "questionLocalizationKey": "APP.TRADING_REWARDS.FAQ_HOW_DO_I_CLAIM_MY_REWARDS_QUESTION",
+            "answerLocalizationKey": "APP.TRADING_REWARDS.FAQ_HOW_DO_I_CLAIM_MY_REWARDS_ANSWER"
+        }
+    ]
+}
@@ -1,4 +1,9 @@
 {
+   "apps": {
+      "ios": {
+         "scheme": "dydx-t-v4"
+      }
+   },
   "deployments": {
      "MAINNET": {
         "environments": [
@@ -22,10 +27,11 @@
            "dydxprotocol-staging-west",
            "dydxprotocol-testnet",
            "dydxprotocol-testnet-dydx",
-            "dydxprotocol-testnet-dsrv",
            "dydxprotocol-testnet-nodefleet",
            "dydxprotocol-testnet-kingnodes",
-            "dydxprotocol-testnet-liquify"
+            "dydxprotocol-testnet-liquify",
+            "dydxprotocol-testnet-polkachu",
+            "dydxprotocol-testnet-bware"
         ],
         "default": "dydxprotocol-testnet"
      }
@@ -33,10 +39,11 @@
   "environments": {
      "dydxprotocol-dev": {
         "name": "v4 Dev",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -64,13 +71,26 @@
               "https://validator.v4dev.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.0xsquid.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4dev.dydx.exchange"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -93,10 +113,11 @@
      },
      "dydxprotocol-dev-2": {
         "name": "v4 Dev 2",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -123,13 +144,26 @@
            "validators": [
               "http://54.92.118.111"
            ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
+            "0xsquid": "https://testnet.api.0xsquid.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -152,10 +186,11 @@
      },
      "dydxprotocol-dev-4": {
         "name": "v4 Dev 4",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -175,20 +210,34 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "http://indexer.v4dev4.dydx.exchange",
-                  "socket": "ws://indexer.v4dev4.dydx.exchange"
+                  "api": "https://indexer.v4dev4.dydx.exchange",
+                  "socket": "wss://indexer.v4dev4.dydx.exchange"
               }
            ],
            "validators": [
-               "http://validator.v4dev4.dydx.exchange"
+               "https://validator.v4dev4.dydx.exchange"
            ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
+            "0xsquid": "https://testnet.api.0xsquid.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "faucet": "https://faucet.v4dev4.dydx.exchange"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -211,10 +260,11 @@
      },
      "dydxprotocol-dev-5": {
         "name": "v4 Dev 5",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -241,13 +291,26 @@
            "validators": [
               "http://18.223.78.50"
            ],
-            "0xsquid": "https://testnet.api.0xsquid.com"
+            "0xsquid": "https://testnet.api.0xsquid.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -270,10 +333,11 @@
      },
      "dydxprotocol-staging": {
         "name": "v4 Staging",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -301,12 +365,89 @@
            "validators": [
               "https://validator.v4staging.dydx.exchange"
            ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog",
+            "help": "https://help.dydx.exchange",
+            "foundation": "https://www.dydx.foundation",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX Chain"
+         }
+      },
+      "dydxprotocol-staging-forced-update": {
+         "name": "v4 Staging Forced Update",
+         "ethereumChainId": "11155111",
+         "dydxChainId": "dydxprotocol-testnet",
+         "chainName": "dYdX Chain",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://indexer.v4staging.dydx.exchange",
+                  "socket": "wss://indexer.v4staging.dydx.exchange"
+               }
+            ],
+            "faucet": "https://faucet.v4staging.dydx.exchange",
+            "validators": [
+               "https://validator.v4staging.dydx.exchange"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+         },
+         "links": {
+            "tos": "https://dydx.exchange/v4-terms",
+            "privacy": "https://dydx.exchange/privacy",
+            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
            "documentation": "https://v4-teacher.vercel.app/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
@@ -329,14 +470,22 @@
            "images": "/wallets/",
            "signTypedDataAction": "dYdX Chain Onboarding",
            "signTypedDataDomainName": "dYdX Chain"
+         },
+         "apps": {
+            "ios": {
+               "minimalVersion": "1.0",
+               "build": 40000,
+               "url": "https://apps.apple.com/app/dydx/id1564787350"
+            }
         }
      },
      "dydxprotocol-staging-west": {
         "name": "v4 Staging West",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydxprotocol-testnet",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -364,16 +513,27 @@
            "validators": [
               "https://validator-uswest1.v4staging.dydx.exchange"
            ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "help": "https://help.dydx.exchange",
+            "foundation": "https://www.dydx.foundation",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -396,10 +556,11 @@
      },
      "dydxprotocol-testnet": {
         "name": "v4 Public Testnet",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -419,26 +580,39 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
+               "https://dydx-testnet-full-rpc.public.blastapi.io/",
+               "https://dydx-testnet-rpc.polkachu.com/",
               "https://dydx-testnet.nodefleet.org",
               "https://test-dydx.kingnodes.com",
               "https://dydx-rpc.liquify.com/api=8878132/dydx"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
            "tos": "https://dydx.exchange/v4-terms",
            "privacy": "https://dydx.exchange/privacy",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -461,10 +635,11 @@
      },
      "dydxprotocol-testnet-dydx": {
         "name": "v4 Public Testnet/dYdX",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -492,6 +667,7 @@
               "https://validator.v4testnet.dydx.exchange"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -499,74 +675,20 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX V4"
-         }
-      },
-      "dydxprotocol-testnet-dsrv": {
-         "name": "v4 Public Testnet/DSRV",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydx-testnet-4",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
-               }
-            ],
-            "validators": [
-               "https://dydx-testnet-archive.allthatnode.com:26657/XZvMM41hESf8PJrEQiTzbCOMVyFca79R"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com",
-            "faucet": "https://faucet.v4testnet.dydx.exchange"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "statusPage": "https://status.v4testnet.dydx.exchange/",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -589,10 +711,11 @@
      },
      "dydxprotocol-testnet-nodefleet": {
         "name": "v4 Public Testnet/nodefleet",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -612,14 +735,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
               "https://dydx-testnet.nodefleet.org"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -627,10 +751,20 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -653,10 +787,11 @@
      },
      "dydxprotocol-testnet-kingnodes": {
         "name": "v4 Public Testnet/KingNodes",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -676,14 +811,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
               "https://test-dydx.kingnodes.com"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -691,7 +827,160 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX V4"
+         }
+      },
+      "dydxprotocol-testnet-liquify": {
+         "name": "v4 Public Testnet/Liquify",
+         "ethereumChainId": "11155111",
+         "dydxChainId": "dydx-testnet-4",
+         "chainName": "dYdX Chain",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+               }
+            ],
+            "validators": [
+               "https://dydx-rpc.liquify.com/api=8878132/dydx"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "faucet": "https://faucet.v4testnet.dydx.exchange"
+         },
+         "links": {
+            "tos": "https://dydx.exchange/v4-terms",
+            "privacy": "https://dydx.exchange/privacy",
+            "statusPage": "https://status.v4testnet.dydx.exchange/",
+            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "documentation": "https://docs.dydx.exchange/",
+            "community": "https://discord.com/invite/dydx",
+            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnMore": "https://help.dydx.exchange",
+            "stakingLearnMore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX V4"
+         }
+      },
+      "dydxprotocol-testnet-polkachu": {
+         "name": "v4 Public Testnet/Polkahcu",
+         "ethereumChainId": "11155111",
+         "dydxChainId": "dydx-testnet-4",
+         "chainName": "dYdX Chain",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
+               }
+            ],
+            "validators": [
+               "https://dydx-testnet-rpc.polkachu.com/"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
+            "faucet": "https://faucet.v4testnet.dydx.exchange"
+         },
+         "links": {
+            "tos": "https://dydx.exchange/v4-terms",
+            "privacy": "https://dydx.exchange/privacy",
+            "statusPage": "https://status.v4testnet.dydx.exchange/",
+            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
            "blogs": "https://www.dydx.foundation/blog"
@@ -715,12 +1004,13 @@
            "signTypedDataDomainName": "dYdX V4"
         }
      },
-      "dydxprotocol-testnet-liquify": {
-         "name": "v4 Public Testnet/Liquify",
-         "ethereumChainId": "5",
+      "dydxprotocol-testnet-bware": {
+         "name": "v4 Public Testnet/BWare",
+         "ethereumChainId": "11155111",
         "dydxChainId": "dydx-testnet-4",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
         "isMainNet": false,
         "tokens": {
            "chain": {
@@ -740,14 +1030,15 @@
         "endpoints": {
            "indexers": [
               {
-                  "api": "https://dydx-testnet.imperator.co",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "api": "https://indexer.v4testnet.dydx.exchange",
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
               }
            ],
            "validators": [
-               "https://dydx-rpc.liquify.com/api=8878132/dydx"
+               "https://dydx-testnet-full-rpc.public.blastapi.io/"
            ],
            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "links": {
@@ -755,10 +1046,20 @@
            "privacy": "https://dydx.exchange/privacy",
            "statusPage": "https://status.v4testnet.dydx.exchange/",
            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
+            "documentation": "https://docs.dydx.exchange/",
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
+            "blogs": "https://www.dydx.foundation/blog",
+            "foundation": "https://www.dydx.foundation",
+            "help": "https://help.dydx.exchange/",
+            "initialMarginFractionLearnmore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
+            "reduceOnlyLearnmore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "governanceLearnmore": "https://help.dydx.exchange",
+            "stakingLearnmore": "https://help.dydx.exchange",
+            "keplrDashboard": "https://testnet.keplr.app/",
+            "accountExportLearnmore": "https://help.dydx.exchange",
+            "walletLearnmore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -784,7 +1085,8 @@
         "ethereumChainId": "1",
         "dydxChainId": "[mainnet chain id]",
         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "[mainnet squid integrator id]",
         "isMainNet": true,
         "tokens": {
            "comment": "Change according to mainnet release",
@@ -813,16 +1115,27 @@
               "[Validator endpoint 1",
               "[Validator endpoint n]"
            ],
-            "0xsquid": "[0xSquid endpoint for mainnet]"
+            "0xsquid": "[0xSquid endpoint for mainnet]",
+            "nobleValidator": "[noble validator endpoint for mainnet]"
         },
         "links": {
            "tos": "[HTTP link to TOS]",
            "privacy": "[HTTP link to Privacy Policy]",
            "mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]",
+            "mintscanBase": "[HTTP link to TOS mintscan base url]",
+            "feedback": "[HTTP link to feedback form, can be null]",
+            "blogs": "[HTTP link to blogs, can be null]",
+            "foundation": "[HTTP link to foundation, can be null]",
+            "initialMarginFractionLearnMore": "[HTTP link to initial margin fraction learn more, can be null]",
+            "reduceOnlyLearnMore": "[HTTP link to reduce-only learn more, can be null]",
            "documentation": "[HTTP link to documentation, can be null]",
            "community": "[HTTP link to community, can be null]",
-            "feedback": "[HTTP link to feedback form, can be null]",
-            "blogs": "[HTTP link to blogs, can be null]"
+            "help": "[HTTP link to help page, can be null]",
+            "governanceLearnMore": "[HTTP link to governance learn more, can be null]",
+            "stakingLearnMore": "[HTTP link to staking learn more, can be null]",
+            "keplrDashboard": "[HTTP link to keplr dashboard, can be null]",
+            "accountExportLearnMore": "[HTTP link to account export learn more, can be null]",
+            "walletLearnMore": "[HTTP link to wallet learn more, can be null]"
         },
         "wallets": {
            "walletconnect": {
@@ -1,454 +1,360 @@
 {
-    "1INCH-USD":{
-       "name":"1inch",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://1inch.io/",
-       "whitepaperLink":"https://github.com/1inch",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/1inch/"
-    },
-    "AAVE-USD":{
-       "name":"Aave",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://aave.com/",
-       "whitepaperLink":"https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aave/"
-    },
-    "ADA-USD":{
-       "name":"Cardano",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://cardano.org/",
-       "whitepaperLink":"https://why.cardano.org/en/introduction/motivation/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cardano/"
-    },
-    "ALGO-USD":{
-       "name":"Algorand",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://algorand.com/",
-       "whitepaperLink":"https://algorand.com/technology/white-papers",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/algorand/"
-    },
-    "APE-USD":{
-       "name":"ApeCoin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://apecoin.com/",
-       "whitepaperLink":"https://apecoin.com/about",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/apecoin-ape/"
-    },
-    "APT-USD":{
-       "name":"Aptos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://aptoslabs.com/",
-       "whitepaperLink":"https://aptos.dev/aptos-white-paper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/aptos/"
-    },
-    "ARB-USD":{
-       "name":"Arbitrum",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://arbitrum.io/",
-       "whitepaperLink":"https://github.com/OffchainLabs/nitro",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/arbitrum/"
-    },
-    "ATOM-USD":{
-       "name":"Cosmos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://cosmos.network/",
-       "whitepaperLink":"https://v1.cosmos.network/resources/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/cosmos/"
-    },
-    "AVAX-USD":{
-       "name":"Avalanche",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.avalabs.org/",
-       "whitepaperLink":"https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/avalanche/"
-    },
-    "BCH-USD":{
-       "name":"Bitcoin Cash",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://bitcoincash.org/",
-       "whitepaperLink":"https://bitcoincash.org/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin-cash/"
-    },
-    "BLUR-USD":{
-       "name":"Blur",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://blur.io/",
-       "whitepaperLink":"https://docs.blur.foundation/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/blur-token/"
-    },
-    "CELO-USD":{
-       "name":"Celo",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://celo.org",
-       "whitepaperLink":"https://docs.celo.org",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/celo/"
-    },
-    "BTC-USD":{
-       "name":"Bitcoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://bitcoin.org/",
-       "whitepaperLink":"https://bitcoin.org/bitcoin.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/bitcoin/"
-    },
-    "COMP-USD":{
-       "name":"Compound",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://compound.finance/",
-       "whitepaperLink":"https://compound.finance/documents/Compound.Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/compound/"
-    },
-    "CRV-USD":{
-       "name":"Curve",
-       "tags":[
-          "Governance"
-       ],
-       "websiteLink":"https://curve.fi/",
-       "whitepaperLink":"https://curve.fi/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/curve-dao-token/"
-    },
-    "DOGE-USD":{
-       "name":"Dogecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://dogecoin.com/",
-       "whitepaperLink":"https://github.com/dogecoin/dogecoin",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/dogecoin/"
-    },
-    "DOT-USD":{
-       "name":"Polkadot",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://polkadot.network/",
-       "whitepaperLink":"https://polkadot.network/PolkaDotPaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polkadot-new/"
-    },
-    "ENJ-USD":{
-       "name":"Enjin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://enjin.io/",
-       "whitepaperLink":"https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/enjin-coin/"
-    },
-    "EOS-USD":{
-       "name":"EOS",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://eos.io/",
-       "whitepaperLink":"https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/eos/"
-    },
-    "ETC-USD":{
-       "name":"Ethereum Classic",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ethereumclassic.org/",
-       "whitepaperLink":"https://ethereumclassic.org/why-classic",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum-classic/"
-    },
-    "ETH-USD":{
-       "name":"Ethereum",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ethereum.org/",
-       "whitepaperLink":"https://ethereum.org/whitepaper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/ethereum/",
-       "displayStepSize":"0.001",
-       "displayTickSize":"0.1"
-    },
-    "FIL-USD":{
-       "name":"Filecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://filecoin.io/",
-       "whitepaperLink":"https://filecoin.io/filecoin.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/filecoin/"
-    },
-    "HNT-USD":{
-       "name":"Helium",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.helium.com",
-       "whitepaperLink":"http://whitepaper.helium.com",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/helium/"
-    },
-    "ICP-USD":{
-       "name":"Internet Computer",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://dfinity.org",
-       "whitepaperLink":"https://dfinity.org/whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/internet-computer/"
-    },
-    "LDO-USD":{
-       "name":"Lido DAO",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://lido.fi/",
-       "whitepaperLink":"https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/lido-dao/"
-    },
-    "LINK-USD":{
-       "name":"Chainlink",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://chain.link/",
-       "whitepaperLink":"https://link.smartcontract.com/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/chainlink/"
-    },
-    "LTC-USD":{
-       "name":"Litecoin",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://litecoin.org/",
-       "whitepaperLink":"https://litecoin.info/index.php/Main_Page",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/litecoin/"
-    },
-    "MATIC-USD":{
-       "name":"Polygon",
-       "tags":[
-          "Layer 2"
-       ],
-       "websiteLink":"https://polygon.technology/",
-       "whitepaperLink":"https://polygon.technology/lightpaper-polygon.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/polygon/"
-    },
-    "MKR-USD":{
-       "name":"Maker",
-       "tags":[
-          "Governance"
-       ],
-       "websiteLink":"https://makerdao.com",
-       "whitepaperLink":"https://makerdao.com/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/maker/"
-    },
-    "NEAR-USD":{
-       "name":"NEAR Protocol",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://near.org",
-       "whitepaperLink":"https://near.org/papers/the-official-near-white-paper/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/near-protocol/"
-    },
-    "OP-USD":{
-       "name":"Optimism",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://www.optimism.io/",
-       "whitepaperLink":"https://github.com/ethereum-optimism",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/optimism-ethereum/"
-    },
-    "PEPE-USD":{
-       "name":"Pepe",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://www.pepe.vip/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/pepe/"
-    },
-    "RUNE-USD":{
-       "name":"THORChain",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://thorchain.org",
-       "whitepaperLink":"https://whitepaper.io/document/709/thorchain-whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/thorchain/"
-    },
-    "SEI-USD":{
-       "name":"Sei",
-       "tags":[
-          "Layer 1",
-          "Defi"
-       ],
-       "websiteLink":"https://www.sei.io/",
-       "whitepaperLink":"https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sei/"
-    },
-    "SHIB-USD":{
-       "name":"Shiba Inu",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://shibatoken.com/",
-       "whitepaperLink":"https://docs.shibatoken.com/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/shiba-inu/"
-    },
-    "SNX-USD":{
-       "name":"Synthetix",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://synthetix.io/",
-       "whitepaperLink":"https://docs.synthetix.io/litepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/synthetix-network-token/"
-    },
-    "SOL-USD":{
-       "name":"Solana",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://solana.com/",
-       "whitepaperLink":"https://solana.com/solana-whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/solana/"
-    },
-    "SUI-USD":{
-       "name":"Sui",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://sui.io/",
-       "whitepaperLink":"https://github.com/MystenLabs",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sui/"
-    },
-    "SUSHI-USD":{
-       "name":"Sushi",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://sushi.com/",
-       "whitepaperLink":"https://docs.sushi.com/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/sushiswap/"
-    },
-    "TRX-USD":{
-       "name":"TRON",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://tron.network/",
-       "whitepaperLink":"https://tron.network/static/doc/white_paper_v_2_0.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/tron/"
-    },
-    "UMA-USD":{
-       "name":"UMA",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://umaproject.org/",
-       "whitepaperLink":"https://github.com/UMAprotocol/whitepaper",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/uma/"
-    },
-    "UNI-USD":{
-       "name":"Uniswap",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://uniswap.org/",
-       "whitepaperLink":"https://uniswap.org/whitepaper-v3.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/uniswap/"
-    },
-    "WLD-USD":{
-       "name":"Worldcoin",
-       "tags":[
-          
-       ],
-       "websiteLink":"https://worldcoin.org/",
-       "whitepaperLink":"https://whitepaper.worldcoin.org/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/worldcoin-org/"
-    },
-    "XLM-USD":{
-       "name":"Stellar",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.stellar.org/",
-       "whitepaperLink":"https://www.stellar.org/papers/stellar-consensus-protocol",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/stellar/"
-    },
-    "XMR-USD":{
-       "name":"Monero",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://www.getmonero.org/",
-       "whitepaperLink":"https://www.getmonero.org/resources/research-lab/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/monero/"
-    },
-    "XRP-USD":{
-       "name":"Ripple",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://ripple.com/currency/",
-       "whitepaperLink":"https://github.com/ripple",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/xrp/"
-    },
-    "XTZ-USD":{
-       "name":"Tezos",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://tezos.com",
-       "whitepaperLink":"https://tezos.com/whitepaper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/tezos/"
-    },
-    "YFI-USD":{
-       "name":"Yearn",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://yearn.finance/",
-       "whitepaperLink":"https://docs.yearn.finance/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/yearn-finance/"
-    },
-    "ZEC-USD":{
-       "name":"Zcash",
-       "tags":[
-          "Layer 1"
-       ],
-       "websiteLink":"https://z.cash/",
-       "whitepaperLink":"https://z.cash/technology/",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/zcash/"
-    },
-    "ZRX-USD":{
-       "name":"0x",
-       "tags":[
-          "Defi"
-       ],
-       "websiteLink":"https://0x.org/",
-       "whitepaperLink":"https://0x.org/pdfs/0x_white_paper.pdf",
-       "coinMarketCapsLink":"https://coinmarketcap.com/currencies/0x/"
-    }
- }
+  "1INCH-USD": {
+    "name": "1inch",
+    "tags": ["Defi"],
+    "websiteLink": "https://1inch.io/",
+    "whitepaperLink": "https://github.com/1inch",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/1inch/"
+  },
+  "AAVE-USD": {
+    "name": "Aave",
+    "tags": ["Defi"],
+    "websiteLink": "https://aave.com/",
+    "whitepaperLink": "https://github.com/aave/protocol-v2/blob/master/aave-v2-whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/aave/"
+  },
+  "ADA-USD": {
+    "name": "Cardano",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://cardano.org/",
+    "whitepaperLink": "https://why.cardano.org/en/introduction/motivation/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cardano/"
+  },
+  "ALGO-USD": {
+    "name": "Algorand",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://algorand.com/",
+    "whitepaperLink": "https://algorand.com/technology/white-papers",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/algorand/"
+  },
+  "APE-USD": {
+    "name": "ApeCoin",
+    "tags": [],
+    "websiteLink": "https://apecoin.com/",
+    "whitepaperLink": "https://apecoin.com/about",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/apecoin-ape/"
+  },
+  "APT-USD": {
+    "name": "Aptos",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://aptoslabs.com/",
+    "whitepaperLink": "https://aptos.dev/aptos-white-paper/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/aptos/"
+  },
+  "ARB-USD": {
+    "name": "Arbitrum",
+    "tags": [],
+    "websiteLink": "https://arbitrum.io/",
+    "whitepaperLink": "https://github.com/OffchainLabs/nitro",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/arbitrum/"
+  },
+  "ATOM-USD": {
+    "name": "Cosmos",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://cosmos.network/",
+    "whitepaperLink": "https://v1.cosmos.network/resources/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cosmos/"
+  },
+  "AVAX-USD": {
+    "name": "Avalanche",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://www.avalabs.org/",
+    "whitepaperLink": "https://assets.website-files.com/5d80307810123f5ffbb34d6e/6008d7bbf8b10d1eb01e7e16_Avalanche%20Platform%20Whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/avalanche/"
+  },
+  "BCH-USD": {
+    "name": "Bitcoin Cash",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://bitcoincash.org/",
+    "whitepaperLink": "https://bitcoincash.org/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin-cash/"
+  },
+  "BLUR-USD": {
+    "name": "Blur",
+    "tags": [],
+    "websiteLink": "https://blur.io/",
+    "whitepaperLink": "https://docs.blur.foundation/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/blur-token/"
+  },
+  "CELO-USD": {
+    "name": "Celo",
+    "tags": [],
+    "websiteLink": "https://celo.org",
+    "whitepaperLink": "https://docs.celo.org",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/celo/"
+  },
+  "BTC-USD": {
+    "name": "Bitcoin",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://bitcoin.org/",
+    "whitepaperLink": "https://bitcoin.org/bitcoin.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bitcoin/"
+  },
+  "COMP-USD": {
+    "name": "Compound",
+    "tags": ["Defi"],
+    "websiteLink": "https://compound.finance/",
+    "whitepaperLink": "https://compound.finance/documents/Compound.Whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/compound/"
+  },
+  "CRV-USD": {
+    "name": "Curve",
+    "tags": ["Governance"],
+    "websiteLink": "https://curve.fi/",
+    "whitepaperLink": "https://curve.fi/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/curve-dao-token/"
+  },
+  "DOGE-USD": {
+    "name": "Dogecoin",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://dogecoin.com/",
+    "whitepaperLink": "https://github.com/dogecoin/dogecoin",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/dogecoin/"
+  },
+  "DOT-USD": {
+    "name": "Polkadot",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://polkadot.network/",
+    "whitepaperLink": "https://polkadot.network/PolkaDotPaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polkadot-new/"
+  },
+  "ENJ-USD": {
+    "name": "Enjin",
+    "tags": [],
+    "websiteLink": "https://enjin.io/",
+    "whitepaperLink": "https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/enjin-coin/"
+  },
+  "EOS-USD": {
+    "name": "EOS",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://eos.io/",
+    "whitepaperLink": "https://github.com/EOSIO/Documentation/blob/master/TechnicalWhitePaper.md",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/eos/"
+  },
+  "ETC-USD": {
+    "name": "Ethereum Classic",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://ethereumclassic.org/",
+    "whitepaperLink": "https://ethereumclassic.org/why-classic",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum-classic/"
+  },
+  "ETH-USD": {
+    "name": "Ethereum",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://ethereum.org/",
+    "whitepaperLink": "https://ethereum.org/whitepaper/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum/",
+    "displayStepSize": "0.001",
+    "displayTickSize": "0.1"
+  },
+  "FIL-USD": {
+    "name": "Filecoin",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://filecoin.io/",
+    "whitepaperLink": "https://filecoin.io/filecoin.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/filecoin/"
+  },
+  "HNT-USD": {
+    "name": "Helium",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://www.helium.com",
+    "whitepaperLink": "http://whitepaper.helium.com",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/helium/"
+  },
+  "ICP-USD": {
+    "name": "Internet Computer",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://dfinity.org",
+    "whitepaperLink": "https://dfinity.org/whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/internet-computer/"
+  },
+  "LDO-USD": {
+    "name": "Lido DAO",
+    "tags": ["Defi"],
+    "websiteLink": "https://lido.fi/",
+    "whitepaperLink": "https://lido.fi/static/Lido:Ethereum-Liquid-Staking.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/lido-dao/"
+  },
+  "LINK-USD": {
+    "name": "Chainlink",
+    "tags": ["Defi"],
+    "websiteLink": "https://chain.link/",
+    "whitepaperLink": "https://link.smartcontract.com/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/chainlink/"
+  },
+  "LTC-USD": {
+    "name": "Litecoin",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://litecoin.org/",
+    "whitepaperLink": "https://litecoin.info/index.php/Main_Page",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/litecoin/"
+  },
+  "MATIC-USD": {
+    "name": "Polygon",
+    "tags": ["Layer 2"],
+    "websiteLink": "https://polygon.technology/",
+    "whitepaperLink": "https://polygon.technology/lightpaper-polygon.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polygon/"
+  },
+  "MKR-USD": {
+    "name": "Maker",
+    "tags": ["Governance"],
+    "websiteLink": "https://makerdao.com",
+    "whitepaperLink": "https://makerdao.com/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/maker/"
+  },
+  "NEAR-USD": {
+    "name": "NEAR Protocol",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://near.org",
+    "whitepaperLink": "https://near.org/papers/the-official-near-white-paper/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/near-protocol/"
+  },
+  "OP-USD": {
+    "name": "Optimism",
+    "tags": [],
+    "websiteLink": "https://www.optimism.io/",
+    "whitepaperLink": "https://github.com/ethereum-optimism",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/optimism-ethereum/"
+  },
+  "PEPE-USD": {
+    "name": "Pepe",
+    "tags": [],
+    "websiteLink": "https://www.pepe.vip/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/pepe/"
+  },
+  "RUNE-USD": {
+    "name": "THORChain",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://thorchain.org",
+    "whitepaperLink": "https://whitepaper.io/document/709/thorchain-whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/thorchain/"
+  },
+  "SEI-USD": {
+    "name": "Sei",
+    "tags": ["Layer 1", "Defi"],
+    "websiteLink": "https://www.sei.io/",
+    "whitepaperLink": "https://github.com/sei-protocol/sei-chain/blob/3c9576fee3494ce039df684624f918dd8066ba3f/whitepaper/Sei_Whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sei/"
+  },
+  "SHIB-USD": {
+    "name": "Shiba Inu",
+    "tags": [],
+    "websiteLink": "https://shibatoken.com/",
+    "whitepaperLink": "https://docs.shibatoken.com/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/shiba-inu/"
+  },
+  "SNX-USD": {
+    "name": "Synthetix",
+    "tags": ["Defi"],
+    "websiteLink": "https://synthetix.io/",
+    "whitepaperLink": "https://docs.synthetix.io/litepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/synthetix-network-token/"
+  },
+  "SOL-USD": {
+    "name": "Solana",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://solana.com/",
+    "whitepaperLink": "https://solana.com/solana-whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/"
+  },
+  "SUI-USD": {
+    "name": "Sui",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://sui.io/",
+    "whitepaperLink": "https://github.com/MystenLabs",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sui/"
+  },
+  "SUSHI-USD": {
+    "name": "Sushi",
+    "tags": ["Defi"],
+    "websiteLink": "https://sushi.com/",
+    "whitepaperLink": "https://docs.sushi.com/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/sushiswap/"
+  },
+  "TIA-USD": {
+    "name": "Celestia",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://celestia.org/",
+    "whitepaperLink": "https://arxiv.org/pdf/1905.09274.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/celestia/"
+  },
+  "TRX-USD": {
+    "name": "TRON",
+    "tags": ["Defi"],
+    "websiteLink": "https://tron.network/",
+    "whitepaperLink": "https://tron.network/static/doc/white_paper_v_2_0.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/tron/"
+  },
+  "UMA-USD": {
+    "name": "UMA",
+    "tags": ["Defi"],
+    "websiteLink": "https://umaproject.org/",
+    "whitepaperLink": "https://github.com/UMAprotocol/whitepaper",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/uma/"
+  },
+  "UNI-USD": {
+    "name": "Uniswap",
+    "tags": ["Defi"],
+    "websiteLink": "https://uniswap.org/",
+    "whitepaperLink": "https://uniswap.org/whitepaper-v3.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/uniswap/"
+  },
+  "WLD-USD": {
+    "name": "Worldcoin",
+    "tags": [],
+    "websiteLink": "https://worldcoin.org/",
+    "whitepaperLink": "https://whitepaper.worldcoin.org/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/worldcoin-org/"
+  },
+  "XLM-USD": {
+    "name": "Stellar",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://www.stellar.org/",
+    "whitepaperLink": "https://www.stellar.org/papers/stellar-consensus-protocol",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/stellar/"
+  },
+  "XMR-USD": {
+    "name": "Monero",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://www.getmonero.org/",
+    "whitepaperLink": "https://www.getmonero.org/resources/research-lab/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/monero/"
+  },
+  "XRP-USD": {
+    "name": "Ripple",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://ripple.com/currency/",
+    "whitepaperLink": "https://github.com/ripple",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/xrp/"
+  },
+  "XTZ-USD": {
+    "name": "Tezos",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://tezos.com",
+    "whitepaperLink": "https://tezos.com/whitepaper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/tezos/"
+  },
+  "YFI-USD": {
+    "name": "Yearn",
+    "tags": ["Defi"],
+    "websiteLink": "https://yearn.finance/",
+    "whitepaperLink": "https://docs.yearn.finance/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/yearn-finance/"
+  },
+  "ZEC-USD": {
+    "name": "Zcash",
+    "tags": ["Layer 1"],
+    "websiteLink": "https://z.cash/",
+    "whitepaperLink": "https://z.cash/technology/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/zcash/"
+  },
+  "ZRX-USD": {
+    "name": "0x",
+    "tags": ["Defi"],
+    "websiteLink": "https://0x.org/",
+    "whitepaperLink": "https://0x.org/pdfs/0x_white_paper.pdf",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/0x/"
+  }
+}
@@ -40,6 +40,7 @@
      "iosMinVersion": "0",
      "imageUrl": "",
      "encoding": "=\"#%/<>?@\\^`{|}:&",
+      "androidPackage": "io.metamask",
      "connections": [
        {
          "type": "walletConnectV2",
@@ -98,6 +99,7 @@
      "iosMinVersion": "1.8.0",
      "imageUrl": "",
      "encoding": "=\"#%/<>?@\\^`{|}:&",
+      "androidPackage": "org.toshi",
      "connections": [
        {
          "type": "walletSegue",
@@ -155,6 +157,7 @@
      "comment": "imToken",
      "iosMinVersion": "0",
      "imageUrl": "",
+      "androidPackage": "im.token.app",
      "connections": [
        {
          "type": "walletConnectV2",
@@ -196,7 +199,7 @@
    },
    "mobile": {
      "native": "trust:",
-      "universal": "https://link.trustwallet.com"
+      "universal": ""
    },
    "desktop": {
      "native": "",
@@ -214,6 +217,7 @@
      "iosMinVersion": "0",
      "encoding": "=\"#%/<>?@\\^`{|}:&",
      "imageUrl": "",
+      "androidPackage": "com.wallet.crypto.trustapp",
      "connections": [
        {
          "type": "walletConnectV2",
@@ -271,6 +275,7 @@
      "iosMinVersion": "0",
      "encoding": "=\"#%/<>?@\\^`{|}:&",
      "imageUrl": "",
+      "androidPackage": "io.zerion.android",
      "connections": [
        {
          "type": "walletConnectV2",
@@ -327,6 +332,7 @@
      "comment": "TokenPocket",
      "iosMinVersion": "0",
      "imageUrl": "",
+      "androidPackage": "vip.mytokenpocket",
      "connections": [
        {
          "type": "walletConnectV2",
@@ -383,6 +389,7 @@
      "comment": "Rainbow",
      "iosMinVersion": "0",
      "encoding": "=\"#%/<>?@\\^`{|}:&",
+      "androidPackage": "me.rainbow",
      "backlinked": true,
      "imageUrl": "",
      "connections": [
@@ -442,6 +449,7 @@
      "comment": "1inch",
      "iosMinVersion": "0",
      "encoding": "=\"#%/<>?@\\^`{|}:&",
+      "androidPackage": "io.oneinch.android",
      "imageUrl": "",
      "connections": [
        {
@@ -0,0 +1,230 @@
+<svg width="254" height="77" viewBox="0 0 254 77" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1258">
+<g id="Ellipse 9" opacity="0.4" filter="url(#filter0_f_20300_14972)">
+<ellipse cx="86.5425" cy="-3.91219" rx="116.542" ry="20.0878" fill="#7774FF"/>
+</g>
+<g id="Ellipse 10" opacity="0.3" filter="url(#filter1_f_20300_14972)">
+<circle cx="74.5734" cy="4.63007" r="1.00507" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 12" opacity="0.3" filter="url(#filter2_f_20300_14972)">
+<circle cx="82.1105" cy="7.64179" r="1.00507" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 22" opacity="0.3" filter="url(#filter3_f_20300_14972)">
+<circle cx="116.785" cy="4.63007" r="1.00507" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 11" opacity="0.3" filter="url(#filter4_f_20300_14972)">
+<circle cx="64.774" cy="8.90488" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 18" opacity="0.3" filter="url(#filter5_f_20300_14972)">
+<circle cx="96.4322" cy="3.87363" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 20" opacity="0.3" filter="url(#filter6_f_20300_14972)">
+<circle cx="76.0807" cy="14.9361" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 21" opacity="0.3" filter="url(#filter7_f_20300_14972)">
+<circle cx="104.725" cy="4.87754" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 23" opacity="0.3" filter="url(#filter8_f_20300_14972)">
+<circle cx="114.021" cy="7.13925" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 24" opacity="0.3" filter="url(#filter9_f_20300_14972)">
+<circle cx="109.75" cy="15.4361" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 25" opacity="0.3" filter="url(#filter10_f_20300_14972)">
+<circle cx="119.801" cy="12.6705" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 27" opacity="0.3" filter="url(#filter11_f_20300_14972)">
+<circle cx="94.0885" cy="11.0182" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 30" opacity="0.3" filter="url(#filter12_f_20300_14972)">
+<circle cx="154.475" cy="11.6666" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 29" opacity="0.3" filter="url(#filter13_f_20300_14972)">
+<circle cx="146.435" cy="8.90488" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 15" opacity="0.3" filter="url(#filter14_f_20300_14972)">
+<circle cx="24.0103" cy="4.44785" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 33" opacity="0.3" filter="url(#filter15_f_20300_14972)">
+<circle cx="-1.05899" cy="13.6783" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 16" opacity="0.3" filter="url(#filter16_f_20300_14972)">
+<circle cx="17.441" cy="16.4908" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 35" opacity="0.3" filter="url(#filter17_f_20300_14972)">
+<circle cx="36.0553" cy="6.63535" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 32" opacity="0.3" filter="url(#filter18_f_20300_14972)">
+<circle cx="10.8707" cy="14.2994" r="0.502536" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 13" opacity="0.3" filter="url(#filter19_f_20300_14972)">
+<circle cx="55.7274" cy="9.65615" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 19" opacity="0.3" filter="url(#filter20_f_20300_14972)">
+<circle cx="87.3886" cy="20.7108" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 26" opacity="0.3" filter="url(#filter21_f_20300_14972)">
+<circle cx="123.82" cy="15.1874" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 36" opacity="0.3" filter="url(#filter22_f_20300_14972)">
+<circle cx="134.876" cy="14.4335" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 28" opacity="0.3" filter="url(#filter23_f_20300_14972)">
+<circle cx="129.6" cy="6.38662" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 14" opacity="0.3" filter="url(#filter24_f_20300_14972)">
+<circle cx="41.6571" cy="14.9335" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 31" opacity="0.3" filter="url(#filter25_f_20300_14972)">
+<circle cx="4.21767" cy="17.9491" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 34" opacity="0.3" filter="url(#filter26_f_20300_14972)">
+<circle cx="12.2177" cy="6.88662" r="0.753803" fill="#9A9AFF"/>
+</g>
+<g id="Ellipse 17" opacity="0.3" filter="url(#filter27_f_20300_14972)">
+<circle cx="50.2001" cy="3.6249" r="0.753803" fill="#9A9AFF"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_20300_14972" x="-94" y="-88" width="361.085" height="168.176" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="32" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter1_f_20300_14972" x="72.5633" y="2.61993" width="4.01991" height="4.02186" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter2_f_20300_14972" x="80.6029" y="6.13418" width="3.01484" height="3.01679" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter3_f_20300_14972" x="115.278" y="3.12246" width="3.01484" height="3.01679" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter4_f_20300_14972" x="63.2664" y="7.39727" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter5_f_20300_14972" x="94.9246" y="2.36602" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter6_f_20300_14972" x="74.5731" y="13.4285" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter7_f_20300_14972" x="103.218" y="3.36993" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter8_f_20300_14972" x="112.513" y="5.63165" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter9_f_20300_14972" x="108.242" y="13.9285" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter10_f_20300_14972" x="118.294" y="11.1629" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter11_f_20300_14972" x="92.5809" y="9.51055" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter12_f_20300_14972" x="153.47" y="10.6615" width="2.00995" height="2.00898" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter13_f_20300_14972" x="144.928" y="7.39727" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter14_f_20300_14972" x="22.5027" y="2.94024" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter15_f_20300_14972" x="-2.56659" y="12.1707" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter16_f_20300_14972" x="15.9334" y="14.9832" width="3.01502" height="3.01405" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter17_f_20300_14972" x="35.0502" y="5.63028" width="2.00995" height="2.00898" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter18_f_20300_14972" x="9.86563" y="13.2943" width="2.00995" height="2.00898" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.251268" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter19_f_20300_14972" x="53.9686" y="7.89727" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter20_f_20300_14972" x="85.6297" y="18.952" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter21_f_20300_14972" x="122.061" y="13.4285" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter22_f_20300_14972" x="133.117" y="12.6746" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter23_f_20300_14972" x="127.842" y="4.62774" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter24_f_20300_14972" x="39.8982" y="13.1746" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter25_f_20300_14972" x="2.4588" y="16.1902" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter26_f_20300_14972" x="10.4588" y="5.12774" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+<filter id="filter27_f_20300_14972" x="48.4412" y="1.86602" width="3.51795" height="3.51795" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="0.502536" result="effect1_foregroundBlur_20300_14972"/>
+</filter>
+</defs>
+</svg>
@@ -0,0 +1,38 @@
+## App Integrations
+### Amplitude
+Analytics service used to collect data to help the dYdX Product team make informed product decisions.
+
+<b>To use with dydxprotocol/v4-web:</b>
+1. Amplitude account with API key.
+2. Add API key in Github > Secrets and Variables > Actions as `AMPLITUDE_API_KEY`
+3. In your deploy scripts add `pnpm run build:inject-amplitude` after your pnpm build / vite build command.
+
+### Bugsnag
+Error handling service used to collect handled/unhandled errors within the app. The information collected is used to help debug and alert the engineering team of crashes/unhandled errors within the app to improve stability.
+
+<b>To use with dydxprotocol/v4-web:</b>
+1. Bugsnag account with API key.
+2. Add API key in Github > Secrets and Variables > Actions as `BUGSNAG_API_KEY`
+3. In your deploy scripts add `pnpm run build:inject-bugsnag` after your pnpm build / vite build command.
+4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-bugsnag`
+
+### StatusPage
+Service used to inform users of any status updates to our platform. These status updates are manually set and updated by the On Call engineers.
+
+<b>To use with dydxprotocol/v4-web:</b>
+1. StatusPage account and script URI
+2. Add API key in Github > Secrets and Variables > Actions as `STATUS_PAGE_SCRIPT_URI`
+3. In your deploy scripts add `pnpm run build:inject-statuspage` after your pnpm build / vite build command.
+4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-statuspage`
+
+### Intercom
+Service used for live customer support (chat/inbox) as well as home for Help Articles.
+
+<b>To use with dydxprotocol/v4-web:</b>
+1. Create Intercom account
+2. In Intercom UI
+Getting started > Set up Messenger > will give you your API Key on Step 2
+Customize Intercom Messenger by adding logo and brand colors
+3. Add API key in Github > Secrets and Variables > Actions as `INTERCOM_APP_ID`
+4. In your deploy scripts add `pnpm run build:inject-intercom` after your pnpm build / vite build command.
+5. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-intercom`
@@ -1,4 +1,4 @@
-import { Suspense } from 'react';
+import { lazy, Suspense } from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
 import styled, { AnyStyledComponent, css } from 'styled-components';
 import { WagmiConfig } from 'wagmi';
@@ -16,26 +16,16 @@ 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';
 import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
 import { RestrictionProvider } from '@/hooks/useRestrictions';
 import { SubaccountProvider } from '@/hooks/useSubaccount';
-import { SquidProvider } from '@/hooks/useSquid';

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

-import MarketsPage from '@/pages/markets/Markets';
-import PortfolioPage from '@/pages/portfolio/Portfolio';
-import { AlertsPage } from '@/pages/AlertsPage';
-import ProfilePage from '@/pages/Profile';
-import { SettingsPage } from '@/pages/settings/Settings';
-import TradePage from '@/pages/trade/Trade';
-import { RewardsPage } from '@/pages/rewards/RewardsPage';
-import { TermsOfUsePage } from '@/pages/TermsOfUsePage';
-import { PrivacyPolicyPage } from '@/pages/PrivacyPolicyPage';
-
 import { HeaderDesktop } from '@/layout/Header/HeaderDesktop';
 import { FooterDesktop } from '@/layout/Footer/FooterDesktop';
 import { FooterMobile } from '@/layout/Footer/FooterMobile';
@@ -46,12 +36,24 @@ 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';

 import '@/styles/constants.css';
 import '@/styles/fonts.css';
 import '@/styles/web3modal.css';

+const MarketsPage = lazy(() => import('@/pages/markets/Markets'));
+const PortfolioPage = lazy(() => import('@/pages/portfolio/Portfolio'));
+const AlertsPage = lazy(() => import('@/pages/AlertsPage'));
+const ProfilePage = lazy(() => import('@/pages/Profile'));
+const SettingsPage = lazy(() => import('@/pages/settings/Settings'));
+const TradePage = lazy(() => import('@/pages/trade/Trade'));
+const RewardsPage = lazy(() => import('@/pages/rewards/RewardsPage'));
+const TermsOfUsePage = lazy(() => import('@/pages/TermsOfUsePage'));
+const PrivacyPolicyPage = lazy(() => import('@/pages/PrivacyPolicyPage'));
+
 const queryClient = new QueryClient();

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

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

-      <Styled.Main>
-        <Suspense fallback={null}>
-          <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>
+    </>
  );
 };

@@ -128,10 +133,10 @@ const providers = [
  wrapProvider(DydxProvider),
  wrapProvider(AccountsProvider),
  wrapProvider(SubaccountProvider),
-  wrapProvider(SquidProvider),
  wrapProvider(LocalNotificationsProvider),
  wrapProvider(NotificationsProvider),
  wrapProvider(DialogAreaProvider),
+  wrapProvider(AppThemeProvider),
 ];

 const App = () => {
@@ -0,0 +1,390 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [{ "name": "", "type": "string" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "_upgradedAddress", "type": "address" }],
+    "name": "deprecate",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_spender", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "approve",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "deprecated",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "_evilUser", "type": "address" }],
+    "name": "addBlackList",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_from", "type": "address" },
+      { "name": "_to", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "transferFrom",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "upgradedAddress",
+    "outputs": [{ "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "", "type": "address" }],
+    "name": "balances",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "maximumFee",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "_totalSupply",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "unpause",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "_maker", "type": "address" }],
+    "name": "getBlackListStatus",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      { "name": "", "type": "address" },
+      { "name": "", "type": "address" }
+    ],
+    "name": "allowed",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "paused",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "who", "type": "address" }],
+    "name": "balanceOf",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "pause",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "getOwner",
+    "outputs": [{ "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "owner",
+    "outputs": [{ "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [{ "name": "", "type": "string" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_to", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "transfer",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "newBasisPoints", "type": "uint256" },
+      { "name": "newMaxFee", "type": "uint256" }
+    ],
+    "name": "setParams",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "amount", "type": "uint256" }],
+    "name": "issue",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "amount", "type": "uint256" }],
+    "name": "redeem",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      { "name": "_owner", "type": "address" },
+      { "name": "_spender", "type": "address" }
+    ],
+    "name": "allowance",
+    "outputs": [{ "name": "remaining", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "basisPointsRate",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "", "type": "address" }],
+    "name": "isBlackListed",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "_clearedUser", "type": "address" }],
+    "name": "removeBlackList",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "MAX_UINT",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "newOwner", "type": "address" }],
+    "name": "transferOwnership",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "name": "_blackListedUser", "type": "address" }],
+    "name": "destroyBlackFunds",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "name": "_initialSupply", "type": "uint256" },
+      { "name": "_name", "type": "string" },
+      { "name": "_symbol", "type": "string" },
+      { "name": "_decimals", "type": "uint256" }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "amount", "type": "uint256" }],
+    "name": "Issue",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "amount", "type": "uint256" }],
+    "name": "Redeem",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "newAddress", "type": "address" }],
+    "name": "Deprecate",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "name": "feeBasisPoints", "type": "uint256" },
+      { "indexed": false, "name": "maxFee", "type": "uint256" }
+    ],
+    "name": "Params",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "name": "_blackListedUser", "type": "address" },
+      { "indexed": false, "name": "_balance", "type": "uint256" }
+    ],
+    "name": "DestroyedBlackFunds",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "_user", "type": "address" }],
+    "name": "AddedBlackList",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "name": "_user", "type": "address" }],
+    "name": "RemovedBlackList",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "owner", "type": "address" },
+      { "indexed": true, "name": "spender", "type": "address" },
+      { "indexed": false, "name": "value", "type": "uint256" }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "from", "type": "address" },
+      { "indexed": true, "name": "to", "type": "address" },
+      { "indexed": false, "name": "value", "type": "uint256" }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  { "anonymous": false, "inputs": [], "name": "Pause", "type": "event" },
+  { "anonymous": false, "inputs": [], "name": "Unpause", "type": "event" }
+]
@@ -0,0 +1,26 @@
+import type { Story } from '@ladle/react';
+
+import { Accordion as AccordionComponent, AccordionProps } from '@/components/Accordion';
+
+import { StoryWrapper } from '.ladle/components';
+
+export const Accordion: Story<AccordionProps> = (args) => {
+  return (
+    <StoryWrapper>
+      <AccordionComponent {...args} />
+    </StoryWrapper>
+  );
+};
+
+Accordion.args = {
+  items: [
+    {
+      header: 'Question 1?',
+      content: 'Answer 1.',
+    },
+    {
+      header: 'Question 2?',
+      content: 'Answer 2.',
+    },
+  ],
+};
@@ -0,0 +1,129 @@
+import styled, { keyframes, type AnyStyledComponent } from 'styled-components';
+
+import { Root, Item, Header, Trigger, Content } from '@radix-ui/react-accordion';
+
+import { layoutMixins } from '@/styles/layoutMixins';
+import { breakpoints } from '@/styles';
+
+import { PlusIcon } from '@/icons';
+
+export type AccordionItem = {
+  header: React.ReactNode;
+  content: React.ReactNode;
+};
+
+export type AccordionProps = {
+  items: AccordionItem[];
+  className?: string;
+};
+
+export const Accordion = ({ items, className }: AccordionProps) => (
+  <Styled.Root className={className} type="single" collapsible>
+    {items.map(({ header, content }, idx) => (
+      <Styled.Item key={idx} value={idx.toString()}>
+        <Header>
+          <Styled.Trigger>
+            {header}
+            <Styled.Icon>
+              <PlusIcon />
+            </Styled.Icon>
+          </Styled.Trigger>
+        </Header>
+        <Styled.Content>{content}</Styled.Content>
+      </Styled.Item>
+    ))}
+  </Styled.Root>
+);
+
+const Styled: Record<string, AnyStyledComponent> = {};
+
+Styled.Root = styled(Root)`
+  --accordion-paddingY: 1rem;
+  --accordion-paddingX: 1rem;
+
+  @media ${breakpoints.notTablet} {
+    --accordion-paddingX: 1.5rem;
+  }
+
+  > *:not(:last-child) {
+    border-bottom: var(--border-width) solid var(--border-color);
+  }
+`;
+
+Styled.Item = styled(Item)``;
+
+Styled.Icon = styled.div`
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+
+  width: 2.25rem;
+  height: 2.25rem;
+
+  --color-border: var(--color-layer-6);
+  color: var(--color-text-1);
+  background-color: var(--color-layer-5);
+  border: solid var(--border-width) var(--color-border);
+  border-radius: 50%;
+  font: var(--font-small-book);
+
+  svg {
+    height: 1.125em;
+    width: 1.125em;
+  }
+`;
+
+Styled.Trigger = styled(Trigger)`
+  ${layoutMixins.spacedRow}
+  width: 100%;
+  padding: var(--accordion-paddingY) var(--accordion-paddingX);
+  gap: 0.5rem;
+
+  color: var(--color-text-1);
+  text-align: start;
+
+  &:hover {
+    ${Styled.Icon} {
+      color: var(--color-text-2);
+      filter: brightness(1.1);
+    }
+  }
+
+  svg {
+    color: var(--color-text-0);
+    transition: transform 0.3s var(--ease-out-expo);
+  }
+
+  &[data-state='open'] svg {
+    transform: rotate(45deg);
+  }
+`;
+
+Styled.Content = styled(Content)`
+  overflow: hidden;
+  margin: 0 var(--accordion-paddingX) var(--accordion-paddingY);
+
+  color: var(--color-text-0);
+
+  &[data-state='open'] {
+    animation: ${keyframes`
+      from {
+        height: 0;
+      }
+      to {
+        height: var(--radix-accordion-content-height);
+      }
+    `} 0.3s var(--ease-out-expo);
+  }
+
+  &[data-state='closed'] {
+    animation: ${keyframes`
+      from {
+        height: var(--radix-accordion-content-height);
+      }
+      to {
+        height: 0;
+      }
+    `} 0.1s var(--ease-in-expo);
+  }
+`;
@@ -45,6 +45,7 @@ const assetIcons = {
  SOL: '/currencies/sol.png',
  SUI: '/currencies/sui.png',
  SUSHI: '/currencies/sushi.png',
+  TIA: '/currencies/tia.png',
  TRX: '/currencies/trx.png',
  UMA: '/currencies/uma.png',
  UNI: '/currencies/uni.png',
@@ -71,8 +72,13 @@ export const AssetIcon = ({
 }: {
  symbol?: Nullable<string>;
  className?: string;
-}) =>
-  isAssetSymbol(symbol) ? <Styled.Img src={assetIcons[symbol]} className={className} /> : null;
+}) => (
+  <Styled.Img
+    src={isAssetSymbol(symbol) ? assetIcons[symbol] : '/currencies/unavailable.png'}
+    className={className}
+    alt={symbol}
+  />
+);

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

@@ -61,7 +61,7 @@ export const Button = forwardRef<HTMLButtonElement | HTMLAnchorElement, ButtonPr

    return (
      <StyledBaseButton
-        disabled={state[ButtonState.Disabled]}
+        disabled={state[ButtonState.Disabled] || state[ButtonState.Loading]}
        {...{ ref, action, size, shape, state, ...otherProps }}
      >
        {
@@ -0,0 +1,13 @@
+import { forwardRef } from 'react';
+
+type CanvasProps = {
+  className?: string;
+  width: number | string;
+  height: number | string;
+};
+
+export const Canvas = forwardRef<HTMLCanvasElement, CanvasProps>(
+  ({ className, width, height }, canvasRef) => (
+    <canvas ref={canvasRef} className={className} width={width} height={height} />
+  )
+);
@@ -13,7 +13,9 @@ export const Checkboxes: Story<CheckboxProps> = (args) => {
      <Checkbox
        {...args}
        checked={isChecked}
-        onClick={(e: React.ChangeEvent) => setIsChecked((e.target as HTMLInputElement).checked)}
+        onCheckedChange={setIsChecked}
+        id="story-checkbox"
+        label="example label"
      />
    </StoryWrapper>
  );
@@ -1,10 +1,14 @@
 import styled, { type AnyStyledComponent } from 'styled-components';
+import { Root, Indicator } from '@radix-ui/react-checkbox';
+import { CheckIcon } from '@radix-ui/react-icons';

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

 type ElementProps = {
  checked: boolean;
-  onClick: (e: React.ChangeEvent) => void;
+  onCheckedChange: (checked: boolean) => void;
+  id?: string;
+  label?: React.ReactNode;
 };

 type StyleProps = {
@@ -13,85 +17,54 @@ type StyleProps = {

 export type CheckboxProps = ElementProps & StyleProps;

-export const Checkbox: React.FC<CheckboxProps> = ({ checked, className, onClick }) => {
-  return (
-    <Styled.CheckboxWrapper className={className}>
-      <Styled.Checkbox
-        type="checkbox"
-        checked={checked}
-        onChange={onClick}
-      />
-      <Styled.CustomCheckbox />
-    </Styled.CheckboxWrapper>
-  );
-};
+export const Checkbox: React.FC<CheckboxProps> = ({
+  checked,
+  className,
+  onCheckedChange,
+  id,
+  label,
+}) => (
+  <Styled.Container>
+    <Styled.Root className={className} checked={checked} onCheckedChange={onCheckedChange} id={id}>
+      <Styled.Indicator>
+        <CheckIcon />
+      </Styled.Indicator>
+    </Styled.Root>
+    {label && <label htmlFor={id}>{label}</label>}
+  </Styled.Container>
+);

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

-Styled.CustomCheckbox = styled.span`
-  width: 1.25em;
-  height: 1.25em;
+Styled.Container = styled.div`
+  ${layoutMixins.row}
+  gap: 1ch;
+  font: var(--font-small-book);

-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
+  label {
+    cursor: pointer;
+  }
+`;
+
+Styled.Root = styled(Root)`
+  --checkbox-backgroundColor: var(--color-layer-0);
+
+  min-width: 1.25rem;
+  height: 1.25rem;
+
+  border-radius: 0.375rem;
+  border: var(--border-width) solid var(--color-border);
  background-color: var(--checkbox-backgroundColor);

-  &::after {
-    position: absolute;
-    content: '';
-    top: 0.25em;
-    left: 0.4375em;
-    width: 0.3125em;
-    height: 0.5em;
-    border: solid var(--checkbox-checkColor);
-    border-width: 0 0.125em 0.125em 0;
-    border-radius: 0.0625em;
-    opacity: 0;
-    transform: rotate(0deg) scale(0);
-    transition: opacity 0.2s ease-in-out, transform 0.2s ease-in-out;
-  }
-
-  @media ${breakpoints.tablet} {
-    width: 1.5em;
-    height: 1.5em;
-
-    &::after {
-      top: 0.25em;
-      left: 0.4375em;
-      width: 0.4375em;
-      height: 0.625em;
-    }
+  &[data-state='checked'] {
+    --checkbox-backgroundColor: var(--color-accent);
  }
 `;

-Styled.CheckboxWrapper = styled.div`
-  --checkbox-backgroundColor: var(--color-layer-1);
-  --checkbox-checkColor: var(--color-text-1);
-
+Styled.Indicator = styled(Indicator)`
  display: flex;
-  border-radius: 0.25em;
-  overflow: hidden;
-  position: relative;
-  cursor: pointer;
+  align-items: center;
+  justify-content: center;

-  > input:checked ~ ${Styled.CustomCheckbox}::after {
-    opacity: 1;
-    transform: rotate(40deg) scale(1);
-  }
-`;
-
-Styled.Checkbox = styled.input`
-  width: 1.25em;
-  height: 1.25em;
-  z-index: 1;
-  cursor: pointer;
-  opacity: 0;
-
-  @media ${breakpoints.tablet} {
-    width: 1.5em;
-    height: 1.5em;
-  }
+  color: var(--color-text-2);
 `;
@@ -1,16 +1,13 @@
 import type { Story } from '@ladle/react';

-import { Collapsible } from '@/components/Collapsible';
+import { Collapsible, type CollapsibleProps } from '@/components/Collapsible';

 import { StoryWrapper } from '.ladle/components';
 import { IconName } from './Icon';

-export const CollapsibleStory: Story<Parameters<typeof Collapsible>> = (args) => (
+export const CollapsibleStory: Story<CollapsibleProps> = (args) => (
  <StoryWrapper>
-    <Collapsible
-      label="Collapsible List of Items"
-      {...args}
-    >
+    <Collapsible {...args}>
      <ul>
        <li>Collapsible Item 1</li>
        <li>Collapsible Item 2</li>
@@ -23,6 +20,8 @@ export const CollapsibleStory: Story<Parameters<typeof Collapsible>> = (args) =>

 CollapsibleStory.args = {
  disabled: false,
+  withTrigger: true,
+  label: 'Collapsible List of Items',
 };

 CollapsibleStory.argTypes = {
@@ -14,6 +14,7 @@ type ElementProps = {
  label: React.ReactNode;
  triggerIcon?: IconName;
  children: React.ReactNode;
+  withTrigger?: boolean;
 };

 type StyleProps = {
@@ -23,6 +24,8 @@ type StyleProps = {
  fullWidth?: boolean;
 };

+export type CollapsibleProps = ElementProps & StyleProps;
+
 export const Collapsible = ({
  defaultOpen = false,
  disabled,
@@ -35,26 +38,29 @@ export const Collapsible = ({
  triggerIconSide = 'left',
  fullWidth,
  className,
-}: ElementProps & StyleProps) => (
+  withTrigger = true,
+}: CollapsibleProps) => (
  <Styled.Root defaultOpen={defaultOpen} open={open} onOpenChange={onOpenChange}>
-    <Styled.Trigger className={className} disabled={disabled}>
-      {triggerIconSide === 'right' && (
-        <>
-          {label}
-          {fullWidth && <HorizontalSeparatorFiller />}
-        </>
-      )}
+    {withTrigger && (
+      <Styled.Trigger className={className} disabled={disabled}>
+        {triggerIconSide === 'right' && (
+          <>
+            {label}
+            {fullWidth && <HorizontalSeparatorFiller />}
+          </>
+        )}

-      <Styled.TriggerIcon>
-        <Icon iconName={triggerIcon} />
-      </Styled.TriggerIcon>
-      {triggerIconSide === 'left' && (
-        <>
-          {fullWidth && <HorizontalSeparatorFiller />}
-          {label}
-        </>
-      )}
-    </Styled.Trigger>
+        <Styled.TriggerIcon>
+          <Icon iconName={triggerIcon} />
+        </Styled.TriggerIcon>
+        {triggerIconSide === 'left' && (
+          <>
+            {fullWidth && <HorizontalSeparatorFiller />}
+            {label}
+          </>
+        )}
+      </Styled.Trigger>
+    )}
    <Styled.Content $transitionDuration={transitionDuration}>{children}</Styled.Content>
  </Styled.Root>
 );
@@ -80,7 +86,7 @@ Styled.TriggerIcon = styled.span`
  width: var(--trigger-icon-width);

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

  ${Styled.Trigger}[data-state='open'] & {
@@ -31,10 +31,12 @@ type ElementProps<TabItemsValue> = {
 };

 type StyleProps = {
-  fullWidthTabs?: boolean;
  className?: string;
+  fullWidthTabs?: boolean;
 };

+export type CollapsibleTabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
+
 export const CollapsibleTabs = <TabItemsValue extends string>({
  defaultValue,
  items,
@@ -43,8 +45,9 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
  onOpenChange,

  fullWidthTabs,
+
  className,
-}: ElementProps<TabItemsValue> & StyleProps) => {
+}: CollapsibleTabsProps<TabItemsValue>) => {
  const [value, setValue] = useState(defaultValue);

  const currentItem = items.find((item) => item.value === value);
@@ -86,8 +89,8 @@ export const CollapsibleTabs = <TabItemsValue extends string>({
        </Styled.Header>

        <Styled.CollapsibleContent>
-          {items.map(({ value, content }) => (
-            <Styled.TabsContent key={value} value={value}>
+          {items.map(({ asChild, value, content }) => (
+            <Styled.TabsContent key={value} asChild={asChild} value={value}>
              {content}
            </Styled.TabsContent>
          ))}
@@ -219,12 +222,12 @@ Styled.Header = styled.header`

 Styled.CollapsibleContent = styled(CollapsibleContent)`
  ${layoutMixins.stack}
-  ${layoutMixins.perspectiveArea}

  box-shadow: none;
 `;

 Styled.IconButton = styled(IconButton)`
+  --button-icon-size: 1em;
  ${Styled.CollapsibleRoot}[data-state='closed'] & {
    rotate: -0.5turn;
  }
@@ -22,7 +22,12 @@ type PickComboxMenuProps<
  MenuGroupValue extends string | number
 > = Pick<
  ComboboxMenuProps<MenuItemValue, MenuGroupValue>,
-  'inputPlaceholder' | 'onItemSelected' | 'slotEmpty' | 'withSearch' | 'withStickyLayout'
+  | 'inputPlaceholder'
+  | 'onItemSelected'
+  | 'slotEmpty'
+  | 'withItemBorders'
+  | 'withSearch'
+  | 'withStickyLayout'
 >;

 type PickDialogProps = Pick<
@@ -34,6 +39,7 @@ type PickDialogProps = Pick<
  | 'slotHeaderInner'
  | 'slotTrigger'
  | 'slotFooter'
+  | 'preventClose'
 >;

 export const ComboboxDialogMenu = <
@@ -52,11 +58,13 @@ export const ComboboxDialogMenu = <
  onItemSelected,
  inputPlaceholder,
  slotEmpty,
+  withItemBorders,
  withSearch,
  withStickyLayout = true,
  children,

  placement = DialogPlacement.Default,
+  preventClose,
  className,
 }: ElementProps<MenuItemValue, MenuGroupValue> &
  PickComboxMenuProps<MenuItemValue, MenuGroupValue> &
@@ -72,6 +80,7 @@ export const ComboboxDialogMenu = <
    slotTrigger={slotTrigger}
    slotFooter={slotFooter}
    placement={placement}
+    preventClose={preventClose}
    className={className}
  >
    <Styled.ComboboxMenu
@@ -80,6 +89,7 @@ export const ComboboxDialogMenu = <
      title={title}
      inputPlaceholder={inputPlaceholder}
      slotEmpty={slotEmpty}
+      withItemBorders={withItemBorders}
      withSearch={withSearch}
      withStickyLayout={withStickyLayout}
    />
@@ -92,6 +102,8 @@ const Styled: Record<string, AnyStyledComponent> = {};
 Styled.Dialog = styled(Dialog)`
  /* Params */
  --comboboxDialogMenu-backgroundColor: var(--color-layer-2);
+  --comboboxDialogMenu-item-gap: 0.5rem;
+  --comboboxDialogMenu-item-padding: 0.5rem 1rem;

  /* Overrides */
  & {
@@ -110,10 +122,12 @@ Styled.Dialog = styled(Dialog)`

    /* Net 0 sticky top inset (let stickyArea1 header stick to top) */
    --stickyArea0-topGap: calc(-1 * var(--stickyArea0-topHeight));
+    overflow-x: clip;
  }
 `;

 Styled.ComboboxMenu = styled(ComboboxMenu)`
  --comboboxMenu-backgroundColor: var(--comboboxDialogMenu-backgroundColor);
-  --comboboxMenu-item-gap: var(--comboxDialogMenu-item-gap, 0.5rem);
+  --comboboxMenu-item-gap: var(--comboboxDialogMenu-item-gap);
+  --comboboxMenu-item-padding: var(--comboboxDialogMenu-item-padding);
 `;
@@ -2,7 +2,7 @@ import { Fragment, type ReactNode, useState } from 'react';
 import styled, { type AnyStyledComponent, css } from 'styled-components';
 import { Command } from 'cmdk';

-import { type MenuConfig } from '@/constants/menus';
+import { MenuItem, type MenuConfig } from '@/constants/menus';
 import { popoverMixins } from '@/styles/popoverMixins';
 import { layoutMixins } from '@/styles/layoutMixins';

@@ -20,6 +20,7 @@ type ElementProps<MenuItemValue extends string | number, MenuGroupValue extends

 type StyleProps = {
  className?: string;
+  withItemBorders?: boolean;
  withStickyLayout?: boolean;
 };

@@ -38,17 +39,11 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
  withSearch = true,

  className,
+  withItemBorders,
  withStickyLayout,
 }: ComboboxMenuProps<MenuItemValue, MenuGroupValue>) => {
  const [highlightedCommand, setHighlightedCommand] = useState<MenuItemValue>();
  const [searchValue, setSearchValue] = useState('');
-  // const inputRef = useRef<HTMLInputElement | null>(null);
-
-  // console.log({ commandValue: highlightedCommand });
-
-  // useEffect(() => {
-  //   inputRef?.current?.focus();
-  // }, []);

  return (
    <Styled.Command
@@ -65,11 +60,14 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
      {withSearch && (
        <Styled.Header $withStickyLayout={withStickyLayout}>
          <Styled.Input
-            // ref={inputRef}
+            /**
+             * Mobile Issue: Search Input will always trigger mobile keyboard drawer. There is no fix.
+             * https://github.com/pacocoursey/cmdk/issues/127
+             */
+            autoFocus
            type="search"
            value={searchValue}
            onValueChange={setSearchValue}
-            autoFocus
            placeholder={inputPlaceholder}
          />
        </Styled.Header>
@@ -80,6 +78,7 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
          <Styled.Group
            key={group.group}
            heading={group.groupLabel}
+            $withItemBorders={withItemBorders}
            $withStickyLayout={withStickyLayout}
          >
            {group.items.map((item) => (
@@ -99,22 +98,31 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
                    }
                  }}
                  disabled={item.disabled}
+                  $withItemBorders={withItemBorders}
                >
-                  {item.slotBefore}
-                  <Styled.ItemLabel>
-                    <span>
-                      {`${item.label}${item.subitems?.length ? '…' : ''}`}
-                      {item.tag && (
-                        <>
-                          {' '}
-                          <Tag>{item.tag}</Tag>
-                        </>
+                  {
+                    <>
+                      {item.slotBefore}
+                      {item.slotCustomContent ?? (
+                        <Styled.ItemLabel>
+                          <span>
+                            {typeof item.label === 'string'
+                              ? `${item.label}${item.subitems?.length ? '…' : ''}`
+                              : item.label}
+                            {item.tag && (
+                              <>
+                                {' '}
+                                <Tag>{item.tag}</Tag>
+                              </>
+                            )}
+                          </span>
+                          {item.description && <span>{item.description}</span>}
+                        </Styled.ItemLabel>
                      )}
-                    </span>
-                    {item.description && <span>{item.description}</span>}
-                  </Styled.ItemLabel>
-                  {item.slotAfter}
-                  {item.subitems && '→'}
+                      {item.slotAfter}
+                      {item.subitems && '→'}
+                    </>
+                  }
                </Styled.Item>

                {searchValue &&
@@ -137,6 +145,7 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
                          onItemSelected?.();
                        }}
                        disabled={subitem.disabled}
+                        $withItemBorders={withItemBorders}
                      >
                        {subitem.slotBefore}
                        <Styled.ItemLabel>
@@ -169,14 +178,17 @@ const Styled: Record<string, AnyStyledComponent> = {};

 Styled.Command = styled(Command)<{ $withStickyLayout?: boolean }>`
  --comboboxMenu-backgroundColor: var(--color-layer-2);
+
  --comboboxMenu-input-backgroundColor: var(--color-layer-3);
  --comboboxMenu-input-height: 2.5rem;
+
  --comboboxMenu-item-checked-backgroundColor: ;
  --comboboxMenu-item-checked-textColor: ;
  --comboboxMenu-item-highlighted-backgroundColor: var(--color-layer-3);
  --comboboxMenu-item-highlighted-textColor: var(--color-text-1);
  --comboboxMenu-item-backgroundColor: ;
  --comboboxMenu-item-gap: 0.5rem;
+  --comboboxMenu-item-padding: 0.5em 1em;

  display: grid;
  align-content: start;
@@ -225,7 +237,7 @@ Styled.Input = styled(Command.Input)`
  gap: 0.5rem;
 `;

-Styled.Group = styled(Command.Group)<{ $withStickyLayout?: boolean }>`
+Styled.Group = styled(Command.Group)<{ $withItemBorders?: boolean; $withStickyLayout?: boolean }>`
  color: var(--color-text-0);

  > [cmdk-group-heading] {
@@ -242,12 +254,21 @@ Styled.Group = styled(Command.Group)<{ $withStickyLayout?: boolean }>`

      > [cmdk-group-heading] {
        ${layoutMixins.stickyHeader}
+        z-index: 2;
      }

      > [cmdk-group-items] {
        ${layoutMixins.stickyArea3}
      }
    `}
+
+  ${({ $withItemBorders }) =>
+    $withItemBorders &&
+    css`
+      > [cmdk-group-items] {
+        padding: var(--border-width) 0;
+      }
+    `}
 `;

 Styled.List = styled(Command.List)<{ $withStickyLayout?: boolean }>`
@@ -274,13 +295,14 @@ Styled.List = styled(Command.List)<{ $withStickyLayout?: boolean }>`
    `}
 `;

-Styled.Item = styled(Command.Item)`
+Styled.Item = styled(Command.Item)<{ $withItemBorders?: boolean }>`
  ${layoutMixins.scrollSnapItem}
  ${popoverMixins.item}
  --item-checked-backgroundColor: var(--comboboxMenu-item-checked-backgroundColor);
  --item-checked-textColor: var(--comboboxMenu-item-checked-textColor);
  --item-highlighted-textColor: var(--comboboxMenu-item-highlighted-textColor);
  --item-gap: var(--comboboxMenu-item-gap);
+  --item-padding: var(--comboboxMenu-item-padding);

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

@@ -291,6 +313,12 @@ Styled.Item = styled(Command.Item)`
    opacity: 0.75;
    cursor: not-allowed;
  }
+
+  ${({ $withItemBorders }) =>
+    $withItemBorders &&
+    css`
+      ${layoutMixins.withOuterBorder}
+    `}
 `;

 Styled.ItemLabel = styled.div`
@@ -309,6 +337,8 @@ Styled.ItemLabel = styled.div`
      opacity: 0.8;
    }
  }
+
+  min-width: 0;
 `;

 Styled.Empty = styled(Command.Empty)`
@@ -11,6 +11,5 @@ export const DetachedScrollableSection = styled.section`

 export const AttachedExpandingSection = styled.section`
  ${layoutMixins.contentSectionAttached}
-  ${layoutMixins.expandingColumnWithHeader}
  gap: var(--border-width);
 `;
@@ -15,10 +15,10 @@ CopyButtonStory.args = {
 };

 CopyButtonStory.argTypes = {
-  shownAsText: {
-    options: [true, false],
+  buttonType: {
+    options: ["text", "icon", "default"],
    control: { type: 'select' },
-    defaultValue: false,
+    defaultValue: "default",
  },
  children: {
    options: ['some text to copy'],
@@ -9,14 +9,21 @@ import { layoutMixins } from '@/styles/layoutMixins';

 import { Button, ButtonProps } from './Button';
 import { Icon, IconName } from './Icon';
+import { IconButton } from './IconButton';
+import { WithTooltip } from './WithTooltip';

 export type CopyButtonProps = {
  value?: string;
-  shownAsText?: boolean;
+  buttonType?: 'text' | 'icon' | 'default';
  children?: React.ReactNode;
 } & ButtonProps;

-export const CopyButton = ({ value, shownAsText, children, ...buttonProps }: CopyButtonProps) => {
+export const CopyButton = ({
+  value,
+  buttonType = 'default',
+  children,
+  ...buttonProps
+}: CopyButtonProps) => {
  const stringGetter = useStringGetter();
  const [copied, setCopied] = useState(false);

@@ -28,11 +35,23 @@ export const CopyButton = ({ value, shownAsText, children, ...buttonProps }: Cop
    setTimeout(() => setCopied(false), 500);
  };

-  return shownAsText ? (
+  return buttonType === 'text' ? (
    <Styled.InlineRow onClick={onCopy} copied={copied}>
      {children}
-      <Icon iconName={IconName.Copy} />
+      <Styled.Icon copied={copied} iconName={copied ? IconName.Check : IconName.Copy} />
    </Styled.InlineRow>
+  ) : buttonType === 'icon' ? (
+    <WithTooltip
+      tooltipString={stringGetter({ key: copied ? STRING_KEYS.COPIED : STRING_KEYS.COPY })}
+    >
+      <Styled.IconButton
+        {...buttonProps}
+        copied={copied}
+        action={ButtonAction.Base}
+        iconName={copied ? IconName.Check : IconName.Copy}
+        onClick={onCopy}
+      />
+    </WithTooltip>
  ) : (
    <Button
      {...buttonProps}
@@ -63,3 +82,21 @@ Styled.InlineRow = styled.div<{ copied: boolean }>`
          }
        `}
 `;
+
+Styled.Icon = styled(Icon)<{ copied: boolean }>`
+  ${({ copied }) =>
+    copied &&
+    css`
+      color: var(--color-positive);
+    `}
+`;
+
+Styled.IconButton = styled(IconButton)<{ copied: boolean }>`
+  ${({ copied }) =>
+    copied &&
+    css`
+      svg {
+        color: var(--color-positive);
+      }
+    `}
+`;
@@ -38,6 +38,7 @@ type ElementProps = {
  slotTrigger?: React.ReactNode;
  slotHeaderInner?: React.ReactNode;
  slotFooter?: React.ReactNode;
+  withClose?: boolean;
 };

 type StyleProps = {
@@ -46,6 +47,7 @@ type StyleProps = {
  hasHeaderBorder?: boolean;
  children?: React.ReactNode;
  className?: string;
+  withAnimation?: boolean;
 };

 export type DialogProps = ElementProps & StyleProps;
@@ -79,9 +81,11 @@ export const Dialog = ({
  slotTrigger,
  slotHeaderInner,
  slotFooter,
+  withClose = true,
  placement = DialogPlacement.Default,
  portalContainer,
  hasHeaderBorder = false,
+  withAnimation = false,
  children,
  className,
 }: DialogProps) => {
@@ -105,6 +109,7 @@ export const Dialog = ({
              e.preventDefault();
            }
          }}
+          $withAnimation={withAnimation}
        >
          <Styled.Header $withBorder={hasHeaderBorder}>
            <Styled.HeaderTopRow>
@@ -114,7 +119,7 @@ export const Dialog = ({

              {title && <Styled.Title>{title}</Styled.Title>}

-              {!preventClose && (
+              {!preventClose && withClose && (
                <Styled.Close ref={closeButtonRef}>
                  <Icon iconName={IconName.Close} />
                </Styled.Close>
@@ -168,7 +173,7 @@ Styled.Overlay = styled(Overlay)`
  }
 `;

-Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
+Styled.Container = styled(Content)<{ placement: DialogPlacement; $withAnimation?: boolean }>`
  /* Params */
  --dialog-inset: 1rem;
  --dialog-width: 30rem;
@@ -224,7 +229,7 @@ Styled.Container = styled(Content)<{ placement: DialogPlacement }>`

  outline: none;

-  ${({ placement }) =>
+  ${({ placement, $withAnimation }) =>
    ({
      [DialogPlacement.Default]: css`
        inset: var(--dialog-inset);
@@ -260,9 +265,11 @@ Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
          padding-bottom: var(--dialog-radius); */
        }

-        @media (prefers-reduced-motion: no-preference) {
-          &[data-state='open'] {
-            animation: ${keyframes`
+        ${$withAnimation &&
+        css`
+          @media (prefers-reduced-motion: no-preference) {
+            &[data-state='open'] {
+              animation: ${keyframes`
              from {
                opacity: 0;
              }
@@ -270,18 +277,19 @@ Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
                max-height: 0;
              }
            `} 0.15s var(--ease-out-expo);
-          }
+            }

-          &[data-state='closed'] {
-            animation: ${keyframes`
+            &[data-state='closed'] {
+              animation: ${keyframes`
              to {
                opacity: 0;
                scale: 0.9;
                max-height: 0;
              }
            `} 0.15s;
+            }
          }
-        }
+        `}
      `,
      [DialogPlacement.Sidebar]: css`
        --dialog-width: var(--sidebar-width);
@@ -291,50 +299,52 @@ Styled.Container = styled(Content)<{ placement: DialogPlacement }>`
          margin-left: auto;
        }

-        @media (prefers-reduced-motion: no-preference) {
-          &[data-state='open'] {
-            animation: ${keyframes`
+        ${$withAnimation &&
+        css`
+          @media (prefers-reduced-motion: no-preference) {
+            &[data-state='open'] {
+              animation: ${keyframes`
              from {
                translate: 100% 0;
                opacity: 0;
              }
            `} 0.15s var(--ease-out-expo);
-          }
+            }

-          &[data-state='closed'] {
-            animation: ${keyframes`
+            &[data-state='closed'] {
+              animation: ${keyframes`
              to {
                translate: 100% 0;
                opacity: 0;
              }
            `} 0.15s var(--ease-out-expo);
+            }
          }
-        }
+        `}
      `,
      [DialogPlacement.Inline]: css`
-        @media (prefers-reduced-motion: no-preference) {
-          &[data-state='open'] {
-            animation: ${keyframes`
+        ${$withAnimation &&
+        css`
+          @media (prefers-reduced-motion: no-preference) {
+            &[data-state='open'] {
+              animation: ${keyframes`
              from {
                scale: 0.99;
                opacity: 0;
-                /* filter: blur(2px); */
-                /* backdrop-filter: none; */
              }
            `} 0.15s var(--ease-out-expo);
-          }
+            }

-          &[data-state='closed'] {
-            animation: ${keyframes`
+            &[data-state='closed'] {
+              animation: ${keyframes`
              to {
                scale: 0.99;
                opacity: 0;
-                /* filter: blur(2px); */
-                /* backdrop-filter: none; */
              }
            `} 0.15s var(--ease-out-expo);
+            }
          }
-        }
+        `}
      `,
      [DialogPlacement.FullScreen]: css`
        --dialog-width: 100vw;
@@ -14,7 +14,7 @@ export const DiffArrowStory: Story<DiffArrowProps> = (args) => (

 DiffArrowStory.argTypes = {
  direction: {
-    options: ['left', 'right'],
+    options: ['left', 'right', 'up', 'down'],
    control: { type: 'select' },
    defaultValue: 'right',
  },
@@ -10,7 +10,7 @@ type ElementProps = {

 type StyleProps = {
  className?: string;
-  direction?: 'right' | 'left';
+  direction?: 'right' | 'left' | 'up' | 'down';
 };

 export type DiffArrowProps = ElementProps & StyleProps;
@@ -57,5 +57,11 @@ Styled.DiffArrowContainer = styled.span<DiffArrowProps>`
      left: css`
        transform: scaleX(-1);
      `,
+      up: css`
+        transform: rotate(-90deg);
+      `,
+      down: css`
+        transform: rotate(90deg);
+      `
    }[direction || 'right'])}
 `;
@@ -33,9 +33,11 @@ export const DropdownHeaderMenu = <MenuItemValue extends string>({

  return (
    <Root>
-      <Styled.Trigger className={className}>
+      <Styled.Trigger className={className} asChild>
+        <div>
        {children}
        <Styled.DropdownIconButton iconName={IconName.Caret} isToggle />
+        </div>
      </Styled.Trigger>
      <Portal>
        <Styled.Content
@@ -9,6 +9,7 @@ import {
  RadioItem,
  Portal,
 } from '@radix-ui/react-dropdown-menu';
+import { CheckIcon } from '@radix-ui/react-icons';

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

@@ -90,7 +91,9 @@ export const DropdownSelectMenu = <MenuItemValue extends string>({

                {slotAfter}

-                <Styled.ItemIndicator>✔{/* <CheckIcon /> */}</Styled.ItemIndicator>
+                <Styled.ItemIndicator>
+                  <CheckIcon />
+                </Styled.ItemIndicator>
              </Styled.RadioItem>
            ))}
          </RadioGroup>
@@ -1,43 +1,16 @@
 import styled, { AnyStyledComponent } from 'styled-components';

-import { layoutMixins } from '@/styles/layoutMixins';
-
 import { Icon, IconName } from '@/components/Icon';

 export const GreenCheckCircle = ({ className }: { className?: string }) => (
-  <Styled.GreenCheckCircle className={className}>
-    <Icon iconName={IconName.Check} />
-  </Styled.GreenCheckCircle>
+  <Styled.Icon className={className} iconName={IconName.CheckCircle} />
 );

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

-Styled.GreenCheckCircle = styled.div`
-  ${layoutMixins.stack}
-
+Styled.Icon = styled(Icon)`
  --icon-size: 1.25rem;
-  --icon-border-width: 3px;

  width: var(--icon-size);
  height: var(--icon-size);
-  border-radius: 50%;
-
-  align-items: center;
-
-  &:before {
-    content: '';
-    width: calc(var(--icon-size) - var(--icon-border-width) * 2);
-    height: calc(var(--icon-size) - var(--icon-border-width) * 2);
-    border: solid var(--icon-border-width) var(--color-positive);
-    border-radius: 50%;
-    opacity: 0.6;
-  }
-
-  svg {
-    width: calc(var(--icon-size) / 3);
-    height: calc(var(--icon-size) / 3);
-
-    color: var(--color-positive);
-    justify-self: center;
-  }
 `;
@@ -15,6 +15,7 @@ import {
  CautionCircleIcon,
  ChatIcon,
  CheckIcon,
+  CheckCircleIcon,
  ChevronLeftIcon,
  ChevronRightIcon,
  ClockIcon,
@@ -23,10 +24,10 @@ import {
  CoinsIcon,
  CommentIcon,
  CopyIcon,
-  CubeIcon,
+  DepositIcon,
+  DepthChartIcon,
  DiscordIcon,
  EtherscanIcon,
-  DepthChartIcon,
  ExportKeysIcon,
  FeedbackIcon,
  FileIcon,
@@ -36,11 +37,14 @@ import {
  HelpCircleIcon,
  HideIcon,
  HistoryIcon,
+  LeaderboardIcon,
  LinkOutIcon,
  LockIcon,
  LogoShortIcon,
  MenuIcon,
+  MigrateIcon,
  MintscanIcon,
+  MoonIcon,
  OrderbookIcon,
  OrderCanceledIcon,
  OrderFilledIcon,
@@ -50,16 +54,20 @@ import {
  OrderUntriggeredIcon,
  OverviewIcon,
  PencilIcon,
+  PlayIcon,
+  PlusIcon,
  PositionsIcon,
  PriceChartIcon,
  PrivacyIcon,
  QrIcon,
+  RewardStarIcon,
  SearchIcon,
  SendIcon,
  ShareIcon,
  ShowIcon,
  TogglesMenuIcon,
  StarIcon,
+  SunIcon,
  TerminalIcon,
  TradeIcon,
  TransferIcon,
@@ -68,6 +76,7 @@ import {
  WarningIcon,
  WebsiteIcon,
  WhitepaperIcon,
+  WithdrawIcon,
 } from '@/icons';

 export enum IconName {
@@ -83,6 +92,7 @@ export enum IconName {
  CautionCircleStroked = 'CautionCircleStroked',
  Chat = 'Chat',
  Check = 'Check',
+  CheckCircle = 'CheckCircle',
  ChevronLeft = 'ChevronLeft',
  ChevronRight = 'ChevronRight',
  Clock = 'Clock',
@@ -91,7 +101,7 @@ export enum IconName {
  Coins = 'Coins',
  Comment = 'Comment',
  Copy = 'Copy',
-  Cube = 'Cube',
+  Deposit = 'Deposit',
  DepthChart = 'DepthChart',
  Discord = 'Discord',
  Etherscan = 'Etherscan',
@@ -104,11 +114,14 @@ export enum IconName {
  HelpCircle = 'HelpCircle',
  Hide = 'Hide',
  History = 'History',
+  Leaderboard = 'Leaderboard',
  LinkOut = 'LinkOut',
  Lock = 'Lock',
  LogoShort = 'LogoShort',
  Menu = 'Menu',
+  Migrate = 'Migrate',
  Mintscan = 'Mintscan',
+  Moon = 'Moon',
  Onboarding = 'Onboarding',
  Orderbook = 'OrderbookIcon',
  OrderCanceled = 'OrderCanceled',
@@ -119,15 +132,19 @@ export enum IconName {
  OrderUntriggered = 'OrderUntriggered',
  Overview = 'Overview',
  Pencil = 'Pencil',
+  Play = 'Play',
+  Plus = 'Plus',
  Positions = 'Positions',
  PriceChart = 'PriceChart',
  Privacy = 'Privacy',
  Qr = 'Qr',
+  RewardStar = 'RewardStar',
  Search = 'Search',
  Send = 'Send',
  Share = 'Share',
  Show = 'Show',
  Star = 'Star',
+  Sun = 'Sun',
  Terminal = 'Terminal',
  TogglesMenu = 'TogglesMenu',
  Trade = 'Trade',
@@ -137,6 +154,7 @@ export enum IconName {
  Warning = 'Warning',
  Website = 'Website',
  Whitepaper = 'Whitepaper',
+  Withdraw = 'Withdraw',
 }

 const icons = {
@@ -152,6 +170,7 @@ const icons = {
  [IconName.CautionCircleStroked]: CautionCircleStrokeIcon,
  [IconName.Chat]: ChatIcon,
  [IconName.Check]: CheckIcon,
+  [IconName.CheckCircle]: CheckCircleIcon,
  [IconName.ChevronLeft]: ChevronLeftIcon,
  [IconName.ChevronRight]: ChevronRightIcon,
  [IconName.Clock]: ClockIcon,
@@ -160,7 +179,7 @@ const icons = {
  [IconName.Coins]: CoinsIcon,
  [IconName.Comment]: CommentIcon,
  [IconName.Copy]: CopyIcon,
-  [IconName.Cube]: CubeIcon,
+  [IconName.Deposit]: DepositIcon,
  [IconName.DepthChart]: DepthChartIcon,
  [IconName.Discord]: DiscordIcon,
  [IconName.Etherscan]: EtherscanIcon,
@@ -173,11 +192,14 @@ const icons = {
  [IconName.HelpCircle]: HelpCircleIcon,
  [IconName.Hide]: HideIcon,
  [IconName.History]: HistoryIcon,
+  [IconName.Leaderboard]: LeaderboardIcon,
  [IconName.LinkOut]: LinkOutIcon,
  [IconName.Lock]: LockIcon,
  [IconName.LogoShort]: LogoShortIcon,
  [IconName.Menu]: MenuIcon,
+  [IconName.Migrate]: MigrateIcon,
  [IconName.Mintscan]: MintscanIcon,
+  [IconName.Moon]: MoonIcon,
  [IconName.Orderbook]: OrderbookIcon,
  [IconName.OrderCanceled]: OrderCanceledIcon,
  [IconName.OrderFilled]: OrderFilledIcon,
@@ -187,15 +209,19 @@ const icons = {
  [IconName.OrderUntriggered]: OrderUntriggeredIcon,
  [IconName.Overview]: OverviewIcon,
  [IconName.Pencil]: PencilIcon,
+  [IconName.Play]: PlayIcon,
+  [IconName.Plus]: PlusIcon,
  [IconName.Positions]: PositionsIcon,
  [IconName.PriceChart]: PriceChartIcon,
  [IconName.Privacy]: PrivacyIcon,
  [IconName.Qr]: QrIcon,
+  [IconName.RewardStar]: RewardStarIcon,
  [IconName.Search]: SearchIcon,
  [IconName.Send]: SendIcon,
  [IconName.Share]: ShareIcon,
  [IconName.Show]: ShowIcon,
  [IconName.Star]: StarIcon,
+  [IconName.Sun]: SunIcon,
  [IconName.Terminal]: TerminalIcon,
  [IconName.TogglesMenu]: TogglesMenuIcon,
  [IconName.Trade]: TradeIcon,
@@ -205,6 +231,7 @@ const icons = {
  [IconName.Warning]: WarningIcon,
  [IconName.Website]: WebsiteIcon,
  [IconName.Whitepaper]: WhitepaperIcon,
+  [IconName.Withdraw]: WithdrawIcon,
 } as Record<IconName, ElementType>;

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

  // Rules
  > * {
@@ -10,7 +10,7 @@ import {
  USD_DECIMALS,
 } from '@/constants/numbers';

-import { BIG_NUMBERS, MustBigNumber } from '@/lib/numbers';
+import { BIG_NUMBERS } from '@/lib/numbers';
 import { useLocaleSeparators } from '@/hooks';

 export enum InputType {
@@ -29,31 +29,38 @@ type StyleProps = {
 type ElementProps = {
  type?: InputType;
  value?: string | number | null;
-
-  allowNegative?: boolean;
-  decimals?: number;
  disabled?: boolean;
  id?: string;
-  max?: number;
  onBlur?: () => void;
-  onChange?:
-    | Dispatch<SetStateAction<string>>
-    | React.ReactEventHandler<HTMLInputElement>
-    | ((values: NumberFormatValues, e: SourceInfo) => void);
  onFocus?: () => void;
-  onInput?: ({
-    value,
-    floatValue,
-    formattedValue,
-  }: {
-    value: string;
-    floatValue?: number;
-    formattedValue: string;
-  }) => void;
  placeholder?: string;
 };

-export type InputProps = ElementProps & StyleProps;
+type ConditionalProps =
+  | {
+      allowNegative?: boolean;
+      decimals?: number;
+      max?: number;
+      onChange?: (values: NumberFormatValues, e: SourceInfo) => void;
+      onInput?: ({
+        value,
+        floatValue,
+        formattedValue,
+      }: {
+        value: string;
+        floatValue?: number;
+        formattedValue: string;
+      }) => void;
+    }
+  | {
+      allowNegative?: never;
+      decimals?: never;
+      max?: never;
+      onChange?: Dispatch<SetStateAction<string>> | React.ReactEventHandler<HTMLInputElement>;
+      onInput?: (e: SyntheticInputEvent) => void;
+    };
+
+export type InputProps = ElementProps & StyleProps & ConditionalProps;

 export const Input = forwardRef<HTMLInputElement, InputProps>(
  (
@@ -129,6 +136,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
            placeholder={placeholder}
            value={value}
            // Other
+            data-1p-ignore // prevent 1Password fill
            {...otherProps}
          />
        ) : (
@@ -137,6 +145,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
            ref={ref as React.Ref<typeof NumericFormat<unknown>>}
            id={id}
            // NumericFormat
+            valueIsNumericString
            allowNegative={allowNegative}
            decimalScale={decimals}
            decimalSeparator={LOCALE_DECIMAL_SEPARATOR}
@@ -160,7 +169,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
                ? undefined
                : Number(formattedValue.replace(',', '.'));

-              onInput?.({ value, floatValue, formattedValue });
+              onInput?.({ value, floatValue, formattedValue, ...e });
            }}
            // Native
            disabled={disabled}
@@ -168,6 +177,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
            value={formattedValue}
            autoComplete="off"
            autoCorrect="off"
+            data-1p-ignore // prevent 1Password fill
            {...otherProps}
          />
        )}
@@ -188,7 +198,6 @@ Styled.InputContainer = styled.div`
  border-radius: inherit;

  input {
-    user-select: all;
    flex: 1;
    width: 100%;
  }
@@ -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;
@@ -1,4 +1,4 @@
-import { forwardRef, Ref, useEffect, useRef, useState } from 'react';
+import { forwardRef, Ref } from 'react';
 import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components';
 import { NavLink, matchPath, useLocation } from 'react-router-dom';

@@ -21,8 +21,6 @@ import {

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

-import { isTruthy } from '@/lib/isTruthy';
-
 import { Tag } from './Tag';
 import { Icon, IconName } from './Icon';

@@ -61,7 +59,6 @@ const NavItem = forwardRef(
      <>
        {slotBefore}
        <span>
-          {/* {`${label}${subitems?.length ? ' ' : ''}`} */}
          {label}
          {tag && (
            <>
@@ -71,7 +68,7 @@ const NavItem = forwardRef(
          )}
        </span>
        {slotAfter}
-        {subitems?.length && <Styled.Icon iconName={IconName.Caret} />}
+        {subitems?.length && <Styled.Icon iconName={IconName.Triangle} />}
      </>
    );

@@ -100,8 +97,6 @@ const NavItem = forwardRef(
  }
 );

-type TriggerRef = HTMLAnchorElement | HTMLDivElement | HTMLButtonElement | null;
-
 export const NavigationMenu = <MenuItemValue extends string, MenuGroupValue extends string>({
  onSelectItem,
  onSelectGroup,
@@ -112,33 +107,6 @@ export const NavigationMenu = <MenuItemValue extends string, MenuGroupValue exte
  dir = 'ltr',
  className,
 }: ElementProps<MenuItemValue, MenuGroupValue> & StyleProps) => {
-  // Disable click (close) in the first 500ms after hover (open)
-  // https://github.com/radix-ui/primitives/issues/1630#issuecomment-1545995075
-  const [clickIsDisabled, setClickIsDisabled] = useState(false);
-  const triggerRefs = useRef({} as { [value: string]: TriggerRef });
-
-  useEffect(() => {
-    const observer = new MutationObserver((mutationsList) => {
-      for (const mutation of mutationsList) {
-        if (
-          mutation.type === 'attributes' &&
-          mutation.attributeName === 'data-state' &&
-          (mutation.target as unknown as HTMLOrSVGElement).dataset.state === 'open' &&
-          mutation.target !== document.activeElement
-        ) {
-          setClickIsDisabled(true);
-          setTimeout(() => setClickIsDisabled(false), 500);
-        }
-      }
-    });
-
-    for (const element of Object.values(triggerRefs.current).filter(isTruthy)) {
-      observer.observe(element, { attributes: true });
-    }
-
-    return () => observer.disconnect();
-  }, []);
-
  const renderSubitems = ({
    item,
    depth = 0,
@@ -148,18 +116,18 @@ export const NavigationMenu = <MenuItemValue extends string, MenuGroupValue exte
  }) => (
    <>
      <Styled.SubMenuTrigger
-        asChild={depth > 0}
-        ref={(ref: TriggerRef) => (triggerRefs.current[item.value] = ref)}
-        onClick={(e: MouseEvent) => {
-          if (clickIsDisabled) {
-            e.preventDefault();
-          }
-        }}
+        asChild
+        onPointerMove={(e: MouseEvent) => e.preventDefault()}
+        onPointerLeave={(e: MouseEvent) => e.preventDefault()}
      >
        <Styled.NavItem onSelect={onSelectGroup} orientation={itemOrientation} {...item} />
      </Styled.SubMenuTrigger>

-      <Styled.Content data-placement={submenuPlacement}>
+      <Styled.Content
+        onPointerEnter={(e: MouseEvent) => e.preventDefault()}
+        onPointerLeave={(e: MouseEvent) => e.preventDefault()}
+        data-placement={submenuPlacement}
+      >
        <Styled.Sub data-placement={submenuPlacement}>
          <Styled.List
            data-orientation={depth > 0 ? 'menu' : orientation === 'vertical' ? 'vertical' : 'menu'}
@@ -410,25 +378,12 @@ Styled.List = styled(List)`
 `;

 Styled.ListItem = styled(Item)`
-  /* display: contents; */
  display: grid;
  position: relative;

  ${Styled.List}[data-orientation="horizontal"] > & {
    gap: var(--submenu-side-offset);
  }
-
-  /* ${Styled.List}[data-orientation="menu"] > & {
-    grid-template-columns: 1fr 0;
-    align-items: start;
-    gap: 2rem;
-  } */
-
-  /* &:has([data-state="open"]) {
-    position: sticky;
-    left: 0;
-    right: 0;
-  } */
 `;

 Styled.SubMenuTrigger = styled(Trigger)`
@@ -436,11 +391,6 @@ Styled.SubMenuTrigger = styled(Trigger)`
  outline-offset: -2px;

  &[data-state='open'] {
-    div {
-      background-color: var(--navigationMenu-item-checked-backgroundColor);
-      color: var(--navigationMenu-item-checked-textColor);
-    }
-
    svg {
      rotate: 0.5turn;
    }
@@ -452,11 +402,10 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
    subitems?.length
      ? css`
          ${popoverMixins.trigger}
-          --trigger-backgroundColor: transparent;
-          --trigger-open-backgroundColor: var(--color-layer-3);
+          --trigger-open-backgroundColor: var(--navigationMenu-item-checked-backgroundColor);
        `
      : css`
-          &:hover:not(.active) {
+          &:hover:not(:active) {
            background-color: var(--navigationMenu-item-highlighted-backgroundColor);
            color: var(--navigationMenu-item-highlighted-textColor);
          }
@@ -470,8 +419,6 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
  --item-radius: var(--navigationMenu-item-radius);
  --item-padding: var(--navigationMenu-item-padding);

-  /* ${popoverMixins.backdropOverlay} */
-
  ${layoutMixins.scrollSnapItem}

  min-height: var(--navigationMenu-item-height);
@@ -525,6 +472,9 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
 `;

 Styled.Icon = styled(Icon)`
+  font-size: 0.375em;
+  transition: rotate 0.3s var(--ease-out-expo);
+
  ${Styled.List}[data-orientation="menu"] & {
    rotate: -0.25turn;
  }
@@ -0,0 +1,201 @@
+import React, { type MouseEvent } from 'react';
+import styled, { css } from 'styled-components';
+
+import { ButtonShape, ButtonSize } from '@/constants/buttons';
+
+import {
+  NotificationStatus,
+  type Notification as NotificationDataType,
+} from '@/constants/notifications';
+
+import { useNotifications } from '@/hooks/useNotifications';
+
+import { popoverMixins } from '@/styles/popoverMixins';
+import { layoutMixins } from '@/styles/layoutMixins';
+
+import { IconButton } from '@/components/IconButton';
+import { IconName } from '@/components/Icon';
+import { Output, OutputType } from '@/components/Output';
+
+type ElementProps = {
+  notification: NotificationDataType;
+  onClick?: () => void;
+  slotIcon?: React.ReactNode;
+  slotTitle?: React.ReactNode;
+  slotTitleLeft?: React.ReactNode;
+  slotTitleRight?: React.ReactNode;
+  slotDescription?: React.ReactNode;
+  slotCustomContent?: React.ReactNode;
+  slotAction?: React.ReactNode;
+  withClose?: boolean;
+};
+
+type StyleProps = {
+  className?: string;
+  isToast?: boolean;
+};
+
+export type NotificationProps = ElementProps & StyleProps;
+
+export const Notification = ({
+  className,
+  isToast,
+  notification,
+  onClick,
+  slotIcon,
+  slotTitle,
+  slotTitleLeft,
+  slotTitleRight,
+  slotDescription,
+  slotCustomContent,
+  slotAction,
+  withClose = !isToast,
+}: NotificationProps) => {
+  const { markCleared, markSeen } = useNotifications();
+
+  return (
+    <$Container className={className} isToast={isToast} onClick={onClick}>
+      <$Header>
+        {slotTitleLeft ?? (slotIcon && <$Icon>{slotIcon}</$Icon>)}
+        <$Title>{slotTitle}</$Title>
+        {slotTitleRight}
+        {withClose && !isToast && (
+          <$ActionItems>
+            <$Output
+              type={OutputType.RelativeTime}
+              value={notification.timestamps[NotificationStatus.Triggered]}
+            />
+
+            {notification.status < NotificationStatus.Seen ? <$UnreadIndicator /> : null}
+
+            {notification.status < NotificationStatus.Cleared ? (
+              <$IconButton
+                iconName={IconName.Close}
+                shape={ButtonShape.Square}
+                size={ButtonSize.XSmall}
+                onClick={(e: MouseEvent) => {
+                  e.stopPropagation();
+
+                  if (notification.status < NotificationStatus.Seen) {
+                    markSeen(notification);
+                  } else if (notification.status < NotificationStatus.Cleared) {
+                    markCleared(notification);
+                  }
+                }}
+              />
+            ) : null}
+          </$ActionItems>
+        )}
+      </$Header>
+      <$Description>{slotCustomContent ?? slotDescription}</$Description>
+      {slotAction && <$Action>{slotAction}</$Action>}
+    </$Container>
+  );
+};
+
+const $Container = styled.div<{ isToast?: boolean }>`
+  // Params
+  --toast-icon-size: 1.75em;
+
+  // Rules
+  ${popoverMixins.popover}
+  overflow: visible;
+  padding: 1rem 1.25rem;
+
+  ${({ isToast }) =>
+    isToast
+      ? css`
+          padding: 1rem;
+          box-shadow: 0 0 0 var(--border-width) var(--color-border),
+            // border
+            0 0 0.5rem 0.1rem var(--color-layer-2); // shadow
+        `
+      : css`
+          flex: 1;
+          background-color: transparent;
+          border-radius: 0;
+          backdrop-filter: none;
+        `}
+`;
+
+const $Header = styled.header`
+  ${layoutMixins.row}
+  position: relative;
+`;
+
+const $Icon = styled.div`
+  ${layoutMixins.row}
+  float: left;
+
+  margin-right: 0.5rem;
+
+  line-height: 1;
+
+  > svg,
+  img {
+    width: 1.5rem;
+    height: 1.5rem;
+  }
+`;
+
+const $Title = styled.div`
+  flex: 1;
+
+  font: var(--font-base-medium);
+  color: var(--color-text-2);
+
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const $Description = styled.div`
+  margin-top: 0.5rem;
+  color: var(--color-text-0);
+  font: var(--font-small-book);
+`;
+
+const $Action = styled.div`
+  margin-top: 0.5rem;
+  font: var(--font-small-book);
+`;
+
+const $ActionItems = styled.div`
+  min-width: fit-content;
+  padding-left: 0.5rem;
+  height: 100%;
+  ${layoutMixins.row};
+  justify-content: end;
+  gap: 0.5rem;
+
+  position: absolute;
+  right: 0;
+  top: 0;
+
+  background-color: var(--color-layer-2);
+  font: var(--font-mini-book);
+
+  display: none;
+  z-index: 1;
+
+  ${$Container}:hover & {
+    display: flex;
+  }
+`;
+
+const $UnreadIndicator = styled.div`
+  width: 0.5rem;
+  height: 0.5rem;
+  border-radius: 50%;
+  background-color: var(--color-accent);
+  border: 1px solid var(--color-layer-2);
+`;
+
+const $Output = styled(Output)`
+  color: var(--color-text-0);
+`;
+
+const $IconButton = styled(IconButton)`
+  --button-border: none;
+  --button-textColor: var(--color-text-0);
+  --button-hover-textColor: var(--color-text-1);
+`;
@@ -4,10 +4,12 @@ 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;
+  slotHeaderContent?: React.ReactNode;
  slotHeader?: React.ReactNode;
+  slotRight?: React.ReactNode;
  children?: React.ReactNode;
  href?: string;
  onHeaderClick?: () => void;
@@ -22,6 +24,7 @@ type PanelStyleProps = {
 export const Panel = ({
  slotHeaderContent,
  slotHeader,
+  slotRight,
  children,
  href,
  onHeaderClick,
@@ -29,56 +32,86 @@ export const Panel = ({
  hasSeparator,
  className,
 }: PanelProps & PanelStyleProps) => (
-  <Styled.Panel onClick={onClick}>
-    {href ? (
-      <Link to={href}>
-        {slotHeader ? (
-          slotHeader
-        ) : (
+  <Styled.Panel onClick={onClick} className={className}>
+    <Styled.Left>
+      {href ? (
+        <Link to={href}>
+          {slotHeader ? (
+            slotHeader
+          ) : (
+            <Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
+              {slotHeaderContent}
+              <Styled.Icon iconName={IconName.ChevronRight} />
+            </Styled.Header>
+          )}
+        </Link>
+      ) : slotHeader ? (
+        slotHeader
+      ) : (
+        slotHeaderContent && (
          <Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
            {slotHeaderContent}
-            <Styled.Icon iconName={IconName.ChevronRight} />
          </Styled.Header>
-        )}
-      </Link>
-    ) : slotHeader ? (
-      slotHeader
-    ) : (
-      slotHeaderContent && (
-        <Styled.Header role="button" onClick={onHeaderClick} hasSeparator={hasSeparator}>
-          {slotHeaderContent}
-        </Styled.Header>
-      )
-    )}
-    <Styled.Content className={className}>{children}</Styled.Content>
+        )
+      )}
+      <Styled.Content>{children}</Styled.Content>
+    </Styled.Left>
+    {slotRight}
  </Styled.Panel>
 );

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

-Styled.Panel = styled.section`
-  ${layoutMixins.flexColumn}
+Styled.Panel = styled.section<{ onClick?: () => void }>`
+  --panel-paddingY: 1rem;
+  --panel-paddingX: 1rem;
+  --panel-content-paddingY: var(--panel-paddingY);
+  --panel-content-paddingX: var(--panel-paddingX);
+
+  @media ${breakpoints.notTablet} {
+    --panel-paddingX: 1.5rem;
+    --panel-paddingY: 1.25rem;
+    --panel-content-paddingY: 1rem;
+  }
+
+  ${layoutMixins.row}

  background-color: var(--color-layer-3);
  border-radius: 0.875rem;
+
+  ${({ onClick }) =>
+    onClick &&
+    css`
+      cursor: pointer;
+
+      &:hover {
+        button:not(:disabled) {
+          color: var(--button-hover-textColor);
+          filter: var(--button-hover-filter);
+        }
+      }
+    `}
+`;
+
+Styled.Left = styled.div`
+  ${layoutMixins.flexColumn}
+  width: 100%;
 `;

 Styled.Header = styled.header<{ hasSeparator?: boolean }>`
  ${layoutMixins.spacedRow}
-
-  padding: 0.875rem 1rem 0.625rem;
-  font-size: 0.875rem;
+  padding: var(--panel-paddingY) var(--panel-paddingX);

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

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

@@ -86,6 +119,5 @@ Styled.Content = styled.div`
  ${layoutMixins.scrollArea}
  ${layoutMixins.stickyArea0}
  --stickyArea0-background: transparent;
-
-  padding: 0.5rem 1rem;
+  padding: var(--panel-content-paddingY) var(--panel-content-paddingX);
 `;
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import styled, { type AnyStyledComponent, css } from 'styled-components';

 import { layoutMixins } from '@/styles/layoutMixins';
@@ -22,6 +22,11 @@ export const SearchInput = ({
 }: SearchInputProps) => {
  const [isOpen, setIsOpen] = useState(false);
  const [value, setValue] = useState('');
+  const inputRef = useRef<HTMLInputElement | null>(null);
+
+  useEffect(() => {
+    if (isOpen) inputRef?.current?.focus();
+  }, [inputRef, isOpen]);

  return (
    <Styled.Search>
@@ -41,6 +46,7 @@ export const SearchInput = ({
      />
      <Styled.Input
        autoFocus
+        ref={inputRef}
        value={value}
        isOpen={isOpen}
        type={type}
@@ -12,6 +12,8 @@ import { WithDetailsReceipt } from '@/components/WithDetailsReceipt';
 import { WithLabel } from '@/components/WithLabel';

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

 type ElementProps = {
  asChild?: boolean;
@@ -84,27 +86,30 @@ export const SearchSelectMenu = ({

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

+Styled.SearchSelectMenu = styled.div`
+  ${layoutMixins.column}
+`;
+
 Styled.MenuTrigger = styled.div`
  height: var(--form-input-height);

  ${layoutMixins.spacedRow}
  align-items: center;
-  padding: 0 1rem;
+  padding: var(--form-input-paddingY) var(--form-input-paddingX);
+
+  @media ${breakpoints.tablet} {
+    height: var(--form-input-height-mobile);
+  }
 `;

 Styled.WithLabel = styled(WithLabel)`
-  --label-textColor: var(--color-text-0);
-  gap: 0.25rem;
+  ${formMixins.inputLabel}

  label {
    font: var(--font-mini-book);
  }
 `;

-Styled.SearchSelectMenu = styled.div`
-  ${layoutMixins.column}
-`;
-
 Styled.WithDetailsReceipt = styled(WithDetailsReceipt)`
  --withReceipt-backgroundColor: var(--color-layer-2);

@@ -1,5 +1,5 @@
 import React from 'react';
-import styled, { type AnyStyledComponent } from 'styled-components';
+import styled, { css, type AnyStyledComponent } from 'styled-components';

 import {
  Root,
@@ -13,11 +13,13 @@ import {
  Portal,
  Icon as SelectIcon,
 } from '@radix-ui/react-select';
+import { CheckIcon } from '@radix-ui/react-icons';

 import { popoverMixins } from '@/styles/popoverMixins';
 import { formMixins } from '@/styles/formMixins';

 import { WithLabel } from '@/components/WithLabel';
+import { Icon, IconName } from './Icon';

 export const SelectMenu = <T extends string>({
  children,
@@ -44,7 +46,9 @@ export const SelectMenu = <T extends string>({
        ) : (
          <Value />
        )}
-        {React.Children.toArray(children).length > 1 && <Styled.DropdownIcon />}
+        {React.Children.toArray(children).length > 1 && (
+          <Styled.TriggerIcon iconName={IconName.Triangle} />
+        )}
      </Styled.Trigger>
      <Portal>
        <Styled.Content className={className}>
@@ -68,7 +72,9 @@ export const SelectItem = <T extends string>({
 }) => (
  <Styled.Item className={className} value={value}>
    <ItemText>{label}</ItemText>
-    <Styled.ItemIndicator>✔{/* <CheckIcon /> */}</Styled.ItemIndicator>
+    <Styled.ItemIndicator>
+      <CheckIcon />
+    </Styled.ItemIndicator>
  </Styled.Item>
 );

@@ -88,12 +94,6 @@ Styled.Trigger = styled(Trigger)<{ $withBlur?: boolean }>`
  }
 `;

-Styled.DropdownIcon = styled(SelectIcon)`
-  font-size: 0.675em;
-  color: var(--color-text-1);
-  margin-left: auto;
-`;
-
 Styled.Content = styled(Content)`
  --select-menu-content-maxWidth: ;
  max-width: var(--select-menu-content-maxWidth);
@@ -116,3 +116,9 @@ Styled.WithLabel = styled(WithLabel)`
  ${formMixins.inputLabel}
  border-radius: 0;
 `;
+
+Styled.TriggerIcon = styled(Icon)`
+  width: 0.625rem;
+  height: 0.375rem;
+  color: var(--color-text-0);
+`;
@@ -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: var(--color-white);
+  --switch-active-thumb-backgroundColor: ${({ theme }) => theme.switchThumbActiveBackground};

  position: relative;
  width: var(--switch-width);
@@ -33,16 +33,20 @@ import {

 import { useAsyncList } from 'react-stately';

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

-import { Checkbox } from '@/components/Checkbox';
-
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
+import { CaretIcon } from '@/icons';
+
+import { STRING_KEYS } from '@/constants/localization';
+
+import { MustBigNumber } from '@/lib/numbers';

 import { Icon, IconName } from './Icon';
 import { Tag } from './Tag';
+import { Button } from './Button';

 export { TableCell } from './Table/TableCell';
 export { TableColumnHeader } from './Table/TableColumnHeader';
@@ -64,7 +68,7 @@ export type TableItem<TableRowData> = {
  onSelect?: (key: TableRowData) => void;
 };

-export type ColumnDef<TableRowData extends object> = {
+type ColumnDef<TableRowData extends object> = {
  columnKey: string;
  label: React.ReactNode;
  tag?: React.ReactNode;
@@ -79,7 +83,7 @@ export type ColumnDef<TableRowData extends object> = {
  width?: ColumnSize;
 };

-type ElementProps<TableRowData extends object | CustomRowConfig, TableRowKey extends Key> = {
+export type ElementProps<TableRowData extends object | CustomRowConfig, TableRowKey extends Key> = {
  label?: string;
  columns: ColumnDef<TableRowData>[];
  data: TableRowData[];
@@ -91,6 +95,7 @@ type ElementProps<TableRowData extends object | CustomRowConfig, TableRowKey ext
  selectionBehavior?: 'replace' | 'toggle';
  onRowAction?: (key: TableRowKey, row: TableRowData) => void;
  slotEmpty?: React.ReactNode;
+  initialNumRowsToShow?: number;
  // collection: TableCollection<string>;
  // children: React.ReactNode;
 };
@@ -120,6 +125,7 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
  selectionMode = 'single',
  selectionBehavior = 'toggle',
  slotEmpty,
+  initialNumRowsToShow,
  // shouldRowRender,

  // collection,
@@ -135,6 +141,8 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
  style,
 }: ElementProps<TableRowData, TableRowKey> & StyleProps) => {
  const [selectedKeys, setSelectedKeys] = useState(new Set<TableRowKey>());
+  const [numRowsToShow, setNumRowsToShow] = useState(initialNumRowsToShow);
+  const enableViewMore = numRowsToShow !== undefined;

  const currentBreakpoints = useBreakpoints();
  const shownColumns = columns.filter(
@@ -161,10 +169,7 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
        ? // String
          collator.compare(first as string, second as string)
        : // Number
-          Math.sign(
-            (parseInt(first as string) || (first as number)) -
-              (parseInt(second as string) || (second as number))
-          )) *
+          MustBigNumber(first).comparedTo(MustBigNumber(second))) *
      // Flip the direction if descending order is specified.
      (sortDirection === 'descending' ? -1 : 1)
    );
@@ -211,6 +216,12 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
            onRowAction &&
            ((key: TableRowKey) => onRowAction(key, data.find((row) => getRowKey(row) === key)!))
          }
+          numColumns={shownColumns.length}
+          onViewMoreClick={
+            enableViewMore && numRowsToShow < data.length
+              ? () => setNumRowsToShow(data.length)
+              : undefined
+          }
          // shouldRowRender={shouldRowRender}
          hideHeader={hideHeader}
          withGradientCardRows={withGradientCardRows}
@@ -235,7 +246,7 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
            )}
          </TableHeader>

-          <TableBody items={list.items}>
+          <TableBody items={enableViewMore ? list.items.slice(0, numRowsToShow) : list.items}>
            {(item) => (
              <Row key={getRowKey(item)}>
                {(columnKey) => (
@@ -269,6 +280,8 @@ const TableRoot = <TableRowData extends object | CustomRowConfig, TableRowKey ex
  onRowAction?: (key: TableRowKey) => void;
  // shouldRowRender?: (prevRowData: object, currentRowData: object) => boolean;
  children: CollectionChildren<TableRowData>;
+  numColumns: number;
+  onViewMoreClick?: () => void;

  hideHeader?: boolean;
  withGradientCardRows?: boolean;
@@ -278,7 +291,7 @@ const TableRoot = <TableRowData extends object | CustomRowConfig, TableRowKey ex
  withScrollSnapColumns?: boolean;
  withScrollSnapRows?: boolean;
 }) => {
-  const { selectionMode, selectionBehavior } = props;
+  const { selectionMode, selectionBehavior, numColumns, onViewMoreClick } = props;

  const state = useTableState<TableRowData>({
    ...props,
@@ -339,6 +352,7 @@ const TableRoot = <TableRowData extends object | CustomRowConfig, TableRowKey ex
      <TableBodyRowGroup
        withGradientCardRows={props.withGradientCardRows}
        withInnerBorders={props.withInnerBorders}
+        withOuterBorder={props.withOuterBorder}
      >
        {/* {Array.from(collection.getChildren!(collection.body.key), (row) => */}
        {[...collection.body.childNodes].map((row) =>
@@ -384,6 +398,9 @@ const TableRoot = <TableRowData extends object | CustomRowConfig, TableRowKey ex
            </TableRow>
          )
        )}
+        {onViewMoreClick ? (
+          <ViewMoreRow colSpan={numColumns} onClick={onViewMoreClick} />
+        ) : undefined}
      </TableBodyRowGroup>
    </Styled.Table>
  );
@@ -417,6 +434,7 @@ const TableBodyRowGroup = ({
  children,
  withGradientCardRows,
  withInnerBorders,
+  withOuterBorder,
 }: { children: React.ReactNode } & StyleProps) => {
  const { rowGroupProps } = useTableRowGroup();

@@ -425,6 +443,7 @@ const TableBodyRowGroup = ({
      {...rowGroupProps}
      withGradientCardRows={withGradientCardRows}
      withInnerBorders={withInnerBorders}
+      withOuterBorder={withOuterBorder}
    >
      {children}
    </Styled.Tbody>
@@ -491,6 +510,23 @@ const TableColumnHeader = <TableRowData extends object>({
  );
 };

+export const ViewMoreRow = ({ colSpan, onClick }: { colSpan: number; onClick: () => void }) => {
+  const stringGetter = useStringGetter();
+  return (
+    <Styled.Tr key="viewmore">
+      <Styled.Td
+        colSpan={colSpan}
+        onMouseDown={(e: MouseEvent) => e.preventDefault()}
+        onPointerDown={(e: MouseEvent) => e.preventDefault()}
+      >
+        <Styled.ViewMoreButton slotRight={<CaretIcon />} onClick={onClick}>
+          {stringGetter({ key: STRING_KEYS.VIEW_MORE })}
+        </Styled.ViewMoreButton>
+      </Styled.Td>
+    </Styled.Tr>
+  );
+};
+
 export const TableRow = <TableRowData extends object>({
  item,
  children,
@@ -662,7 +698,7 @@ Styled.Empty = styled.div<{ withOuterBorder: boolean }>`

  justify-items: center;
  align-content: center;
-  padding: 2rem;
+  padding: 4rem;
  gap: 0.75em;

  color: var(--color-text-0);
@@ -831,6 +867,7 @@ Styled.SortArrow = styled.span<{ sortDirection: 'ascending' | 'descending' }>`
 Styled.Thead = styled.thead<StyleProps>`
  ${layoutMixins.stickyHeader}
  scroll-snap-align: none;
+  font: var(--font-mini-book);

  > * {
    height: var(--stickyArea-topHeight);
@@ -839,18 +876,17 @@ Styled.Thead = styled.thead<StyleProps>`
  color: var(--tableHeader-textColor);
  background-color: var(--tableHeader-backgroundColor);

-  @media ${breakpoints.notTablet} {
-    ${({ withInnerBorders, withGradientCardRows }) =>
-      withInnerBorders &&
-      !withGradientCardRows &&
-      css`
-        ${layoutMixins.withInnerHorizontalBorders}
-      `}
-  }
+  ${({ withInnerBorders, withGradientCardRows }) =>
+    withInnerBorders &&
+    !withGradientCardRows &&
+    css`
+      ${layoutMixins.withInnerHorizontalBorders}
+    `}
 `;

 Styled.Tbody = styled.tbody<StyleProps>`
  ${layoutMixins.stickyArea2}
+  font: var(--font-small-book);

  // If <table> height is fixed with not enough rows to overflow, vertically center the rows
  &:before,
@@ -869,6 +905,22 @@ Styled.Tbody = styled.tbody<StyleProps>`
      --stickyArea2-paddingBottom: var(--border-width);
      --stickyArea2-paddingLeft: var(--border-width);
      --stickyArea2-paddingRight: var(--border-width);
+
+      tr:first-of-type {
+        box-shadow: 0 calc(var(--border-width)) 0 0 var(--border-color);
+      }
+    `}
+
+  ${({ withOuterBorder }) =>
+    withOuterBorder &&
+    css`
+      tr:last-of-type:not(:only-of-type) {
+        box-shadow: 0 calc(-1 * var(--border-width)) 0 0 var(--border-color);
+      }
+
+      tr:first-of-type {
+        box-shadow: none;
+      }
    `}

  ${({ withGradientCardRows }) =>
@@ -920,3 +972,15 @@ Styled.Row = styled.div`
  ${layoutMixins.inlineRow}
  padding: var(--tableCell-padding);
 `;
+
+Styled.ViewMoreButton = styled(Button)`
+  --button-backgroundColor: var(--color-layer-2);
+  --button-textColor: var(--color-text-1);
+
+  width: 100%;
+
+  svg {
+    width: 0.675rem;
+    margin-left: 0.5ch;
+  }
+`;
@@ -21,6 +21,7 @@ export type TabItem<TabItemsValue> = {
  content?: React.ReactNode;
  subitems?: TabItem<TabItemsValue>[];
  customTrigger?: ReactNode;
+  asChild?: boolean;
 };

 type ElementProps<TabItemsValue> = {
@@ -41,6 +42,8 @@ type StyleProps = {
  className?: string;
 };

+export type TabsProps<TabItemsValue> = ElementProps<TabItemsValue> & StyleProps;
+
 export const Tabs = <TabItemsValue extends string>({
  defaultValue,
  value,
@@ -107,9 +110,10 @@ export const Tabs = <TabItemsValue extends string>({
        sharedContent
      ) : (
        <Styled.Stack>
-          {items.map(({ value, content, forceMount }) => (
+          {items.map(({ asChild, value, content, forceMount }) => (
            <Styled.Content
              key={value}
+              asChild={asChild}
              value={value}
              forceMount={forceMount}
              $hide={forceMount && currentItem?.value !== value}
@@ -242,7 +246,6 @@ Styled.Trigger = styled(Trigger)<{ $withBorders?: boolean }>`

 Styled.Stack = styled.div`
  ${layoutMixins.stack}
-  ${layoutMixins.perspectiveArea}

  box-shadow: none;
 `;
@@ -1,24 +1,19 @@
-import React, { useEffect, useRef, useState } from 'react';
-
-import { Root, Title, Description, Action, Close } from '@radix-ui/react-toast';
+import { type MouseEvent, useEffect, useRef, useState } from 'react';
+import styled, { keyframes } from 'styled-components';
+import { Root, Action, Close } from '@radix-ui/react-toast';

 import { ButtonShape, ButtonSize } from '@/constants/buttons';
+import { popoverMixins } from '@/styles/popoverMixins';
+import { breakpoints } from '@/styles';
+
+import { Notification, type NotificationProps } from '@/components/Notification';

 import { IconButton } from './IconButton';
-import { CloseIcon } from '@/icons';
-
-import styled, { keyframes } from 'styled-components';
-import { popoverMixins } from '@/styles/popoverMixins';
-import { layoutMixins } from '@/styles/layoutMixins';
+import { IconName } from './Icon';

 type ElementProps = {
  isOpen?: boolean;
  setIsOpen?: (isOpen: boolean, isClosedFromTimeout?: boolean) => void;
-  slotIcon?: React.ReactNode;
-  slotTitle?: React.ReactNode;
-  slotDescription?: React.ReactNode;
-  slotCustomContent?: React.ReactNode;
-  slotAction?: React.ReactNode;
  actionDescription?: string;
  actionAltText?: string;
  sensitivity?: 'foreground' | 'background';
@@ -26,13 +21,22 @@ type ElementProps = {
  lastUpdated?: number;
 };

-type StyleProps = {};
+type StyleProps = {
+  className?: string;
+};
+
+type ToastProps = NotificationProps & ElementProps & StyleProps;

 export const Toast = ({
+  className,
  isOpen = true,
+  notification,
+  onClick,
  setIsOpen,
  slotIcon,
  slotTitle,
+  slotTitleLeft,
+  slotTitleRight,
  slotDescription,
  slotCustomContent,
  slotAction,
@@ -41,7 +45,7 @@ export const Toast = ({
  sensitivity = 'background',
  duration = Infinity,
  lastUpdated,
-}: ElementProps & StyleProps) => {
+}: ToastProps) => {
  // Timeout
  const timeout = useRef<number>();
  const [isPaused, setIsPaused] = useState(false);
@@ -58,37 +62,45 @@ export const Toast = ({

  return (
    <$Root
+      className={className}
      type={sensitivity}
      duration={Infinity}
      open={isOpen}
      onOpenChange={setIsOpen}
      onPause={() => setIsPaused(true)}
      onResume={() => setIsPaused(false)}
+      onClick={() => {
+        setIsOpen?.(false, false);
+        onClick?.();
+      }}
    >
-      <div>
-        <$Container>
-          <$Header>
-            {slotIcon && <$Icon>{slotIcon}</$Icon>}
+      <Close asChild>
+        <$CloseButton
+          iconName={IconName.Close}
+          shape={ButtonShape.Circle}
+          size={ButtonSize.XSmall}
+          onClick={(e: MouseEvent) => e.stopPropagation()}
+        />
+      </Close>

-            <Close asChild>
-              <$CloseButton
-                iconComponent={CloseIcon}
-                shape={ButtonShape.Square}
-                size={ButtonSize.XSmall}
-              />
-            </Close>
-
-            <$Title>{slotTitle}</$Title>
-          </$Header>
-          {!slotCustomContent && <$Description>{slotDescription}</$Description>}
-          {slotCustomContent}
-          {actionDescription && (
-            <$Action asChild altText={actionAltText}>
-              {slotAction}
-            </$Action>
-          )}
-        </$Container>
-      </div>
+      {slotCustomContent ?? (
+        <$Notification
+          isToast
+          notification={notification}
+          slotIcon={slotIcon}
+          slotTitle={slotTitle}
+          slotTitleLeft={slotTitleLeft}
+          slotTitleRight={slotTitleRight}
+          slotDescription={slotDescription}
+          slotAction={
+            actionDescription && (
+              <$Action asChild altText={actionAltText}>
+                {slotAction}
+              </$Action>
+            )
+          }
+        />
+      )}
    </$Root>
  );
 };
@@ -114,7 +126,7 @@ const $Root = styled(Root)`
  translate: var(--x) var(--y);
  will-change: translate, margin-top;

-  margin-bottom: var(--toasts-gap);
+  /* margin-bottom: var(--toasts-gap); */

  &[data-swipe-direction='right'] {
    &[data-state='open'] {
@@ -163,6 +175,10 @@ const $Root = styled(Root)`
    cursor: n-resize;
  }

+  &:focus:not([data-swipe='end']) & {
+    outline: var(--color-accent) 1px solid;
+  }
+
  &[data-swipe='move'] {
    transition-property: opacity;
    opacity: 0.98;
@@ -171,6 +187,10 @@ const $Root = styled(Root)`
    * {
      cursor: inherit;
    }
+
+    & > * {
+      opacity: 0.5;
+    }
  }

  &[data-state='closed'],
@@ -198,69 +218,48 @@ const $Root = styled(Root)`
  }
 `;

-const $Container = styled.div`
+const $Notification = styled(Notification)`
  // Params
  --toast-icon-size: 1.75em;

  // Rules
  ${popoverMixins.popover}
+  overflow: visible;
  padding: 1rem;
  box-shadow: 0 0 0 var(--border-width) var(--color-border),
    // border
    0 0 0.5rem 0.1rem var(--color-layer-2); // shadow

-  ${$Root}:focus:not([data-swipe='end']) & {
-    outline: var(--color-accent) 1px solid;
-  }
-
  > * {
    transition: opacity 0.2s;
  }
-  ${$Root}[data-swipe='move'] & > * {
-    opacity: 0.5;
-  }
-`;
-
-const $Header = styled.header`
-  display: block;
-`;
-
-const $Icon = styled.div`
-  ${layoutMixins.row}
-
-  float: left;
-
-  width: 1em;
-  height: 1em;
-
-  margin-right: 0.4em;
-
-  line-height: 1;
 `;

 const $CloseButton = styled(IconButton)`
  --button-textColor: var(--color-text-0);
  --button-border: none;
  --button-icon-size: 0.85em;
+  display: none;

-  float: right;
+  /* float: right; */
  margin: -0.42rem -0.42rem -0.42rem 0.42rem;
-`;

-const $Title = styled(Title)`
-  flex: 1;
+  // Absolute
+  position: absolute;
+  top: 0;
+  right: 0;

-  font: var(--font-base-medium);
-  color: var(--color-text-2);
+  border: solid var(--border-width) var(--color-border);

-  overflow: hidden;
-  text-overflow: ellipsis;
-`;
+  ${$Root}:hover & {
+    display: block;
+    z-index: 2;
+  }

-const $Description = styled(Description)`
-  margin-top: 0.5rem;
-  color: var(--color-text-0);
-  font: var(--font-small-book);
+  @media ${breakpoints.mobile} {
+    display: block;
+    z-index: 2;
+  }
 `;

 const $Action = styled(Action)`
@@ -1,6 +1,7 @@
+import styled from 'styled-components';
+
 import { Provider, Viewport } from '@radix-ui/react-toast';

-import styled from 'styled-components';
 import { layoutMixins } from '@/styles/layoutMixins';

 type ElementProps = {
@@ -12,7 +13,9 @@ type StyleProps = {
  className?: string;
 };

-export const ToastArea = ({ swipeDirection, children, className }: ElementProps & StyleProps) => (
+type ToastAreaProps = ElementProps & StyleProps;
+
+export const ToastArea = ({ swipeDirection, children, className }: ToastAreaProps) => (
  <$ToastArea className={className}>
    <Provider swipeDirection={swipeDirection}>
      {children}
@@ -24,9 +27,8 @@ export const ToastArea = ({ swipeDirection, children, className }: ElementProps
 const $ToastArea = styled.aside`
  // Params
  --toasts-gap: 0.5rem;
-
+  
  // Rules
-  ${layoutMixins.scrollArea}
  z-index: 1;

  pointer-events: none;
@@ -34,6 +36,7 @@ const $ToastArea = styled.aside`
  > * {
    display: contents;
    pointer-events: none;
+    position: relative;

    > ol {
      /* display: block; */
@@ -43,6 +46,7 @@ const $ToastArea = styled.aside`
      // Desired display order: latest to earliest (¯\_(ツ)_/¯)
      display: flex;
      flex-direction: column-reverse;
+      position: relative;

      pointer-events: none;

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

  --button-backgroundColor: var(--button-toggle-off-backgroundColor);
  --button-textColor: var(--button-toggle-off-textColor);
+  --button-border: var(--button-toggle-off-border);

  &[data-state='on'],
  &[data-state='active'] {
    --button-backgroundColor: var(--button-toggle-on-backgroundColor);
    --button-textColor: var(--button-toggle-on-textColor);
+    --button-border: var(--button-toggle-on-border);
  }
 `;
@@ -7,13 +7,15 @@ import { ButtonShape, ButtonSize } from '@/constants/buttons';
 import { useBreakpoints } from '@/hooks';
 import { layoutMixins } from '@/styles/layoutMixins';

-import {  type BaseButtonProps } from '@/components/BaseButton';
+import { type BaseButtonProps } from '@/components/BaseButton';
 import { ToggleButton } from '@/components/ToggleButton';

 type ElementProps<MenuItemValue extends string> = {
  items: MenuItem<MenuItemValue>[];
  value: MenuItemValue;
-  onValueChange: (value: MenuItemValue) => void;
+  onValueChange: (value: any) => void;
+  onInteraction?: () => void;
+  ensureSelected?: boolean;
 };

 type StyleProps = {
@@ -25,10 +27,14 @@ export const ToggleGroup = forwardRef(
    {
      items,
      value,
+      ensureSelected = true,
      onValueChange,
+      onInteraction,
+
      className,
      size,
      shape = ButtonShape.Pill,
+
      ...buttonProps
    }: ElementProps<MenuItemValue> & StyleProps & BaseButtonProps,
    ref: Ref<HTMLDivElement>
@@ -40,12 +46,17 @@ export const ToggleGroup = forwardRef(
        ref={ref}
        type="single"
        value={value}
-        onValueChange={onValueChange}
+        onValueChange={(newValue: MenuItemValue) => {
+          if ((ensureSelected && newValue) || !ensureSelected) {
+            onValueChange(newValue);
+          }
+          onInteraction?.();
+        }}
        className={className}
        loop
      >
        {items.map((item) => (
-          <Item key={item.value} value={item.value} aria-label={item.label} asChild>
+          <Item key={item.value} value={item.value} asChild>
            <ToggleButton
              size={size ? size : isTablet ? ButtonSize.Small : ButtonSize.XSmall}
              shape={shape}
@@ -2,9 +2,9 @@ import styled, { type AnyStyledComponent } from 'styled-components';

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

-import { UsageColorFromRiskLevel } from '@/styles/colors';
-
 import { abacusHelper } from '@/lib/abacus';
+import { UsageColorFromRiskLevel } from '@/lib/styles';
+
 type ElementProps = {
  value: number;
 };
@@ -2,11 +2,13 @@ import type { ReactNode } from 'react';
 import styled, { AnyStyledComponent } from 'styled-components';
 import { Content, Portal, Provider, Root, Trigger, Arrow } from '@radix-ui/react-tooltip';

+import { STRING_KEYS } from '@/constants/localization';
 import { tooltipStrings } from '@/constants/tooltips';

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

 import { Icon, IconName } from '@/components/Icon';
+import { Link } from '@/components/Link';

 import { layoutMixins } from '@/styles/layoutMixins';
 import { popoverMixins } from '@/styles/popoverMixins';
@@ -38,20 +40,24 @@ export const WithTooltip = ({
  slotTooltip,
 }: ElementProps & StyleProps) => {
  const stringGetter = useStringGetter();
+  const urlConfigs = useURLConfigs();

  const getTooltipStrings = tooltip && tooltipStrings[tooltip];
  if (!getTooltipStrings && !tooltipString && !slotTooltip) return <>{children}</>;

  let tooltipTitle;
  let tooltipBody;
+  let tooltipLearnMore;

  if (getTooltipStrings) {
-    const { title, body } = getTooltipStrings({
+    const { title, body, learnMoreLink } = getTooltipStrings({
      stringGetter,
      stringParams,
+      urlConfigs,
    });
    tooltipTitle = title;
    tooltipBody = body;
+    tooltipLearnMore = learnMoreLink;
  } else {
    tooltipBody = tooltipString;
  }
@@ -72,6 +78,13 @@ export const WithTooltip = ({
              <dl>
                {tooltipTitle && <dt>{tooltipTitle}</dt>}
                {tooltipBody && <dd>{tooltipBody}</dd>}
+                {tooltipLearnMore && (
+                  <dd>
+                    <Styled.LearnMore href={tooltipLearnMore}>
+                      {stringGetter({ key: STRING_KEYS.LEARN_MORE })} →
+                    </Styled.LearnMore>
+                  </dd>
+                )}
                <Styled.Arrow />
              </dl>
            )}
@@ -97,12 +110,7 @@ Styled.Abbr = styled.abbr`

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

  ${popoverMixins.popover}
  --popover-backgroundColor: var(--tooltip-backgroundColor);
@@ -142,3 +150,7 @@ Styled.Arrow = styled(Arrow)`
 Styled.Icon = styled(Icon)`
  color: var(--color-text-0);
 `;
+
+Styled.LearnMore = styled(Link)`
+  --link-color: var(--color-accent);
+`;
@@ -27,12 +27,7 @@ Styled.TooltipContent = styled.aside<{ accentColor?: string }>`

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

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

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

 export const XYChartWithPointerEvents = ({
-  onPointerMove, onPointerUp, onPointerPressedChange, ...props
+  onPointerMove,
+  onPointerUp,
+  onPointerPressedChange,
+  ...props
 }: {
-  onPointerMove?: (point: Point) => void;
-  onPointerUp?: (point: Point) => void;
+  onPointerMove?: (point: Point | EventHandlerParams<object>) => void;
+  onPointerUp?: (point: Point | EventHandlerParams<object>) => void;
  onPointerPressedChange?: (isPointerPressed: boolean) => void;
-} & React.PropsWithChildren<Parameters<typeof XYChart>>) => {
+} & PropsWithChildren<Parameters<typeof XYChart>[0]>) => {
  const { xScale, yScale } = useContext(DataContext);
-
  const [lastPointerMoveEvent, setLastPointerMoveEvent] = useState<React.PointerEvent>();

  const pointerContainerPosition = lastPointerMoveEvent ? localPoint(lastPointerMoveEvent) : null;

-  const pointerChartPosition = xScale && yScale && pointerContainerPosition &&
+  const pointerChartPosition =
+    xScale &&
+    yScale &&
+    pointerContainerPosition &&
    new Point({
+      // @ts-expect-error invert supposedly doesn't exist on AxisScale
      x: xScale.invert(pointerContainerPosition?.x - getScaleBandwidth(xScale) / 2),
+      // @ts-expect-error invert supposedly doesn't exist on AxisScale
      y: yScale.invert(pointerContainerPosition?.y - getScaleBandwidth(yScale) / 2),
    });

@@ -29,15 +36,13 @@ export const XYChartWithPointerEvents = ({
      {...props}
      onPointerMove={({ event }) => {
        setLastPointerMoveEvent(event as React.PointerEvent);
-        if (pointerChartPosition)
-          onPointerMove?.(pointerChartPosition);
+        if (pointerChartPosition) onPointerMove?.(pointerChartPosition);
      }}
      onPointerOut={() => setLastPointerMoveEvent(undefined)}
      onPointerDown={() => onPointerPressedChange?.(true)}
      onPointerUp={() => {
        onPointerPressedChange?.(false);
-        if (pointerChartPosition)
-          onPointerUp?.(pointerChartPosition);
+        if (pointerChartPosition) onPointerUp?.(pointerChartPosition);
      }}
    >
      {props.children}
@@ -124,6 +124,8 @@ export type SubaccountPosition = Abacus.exchange.dydx.abacus.output.SubaccountPo
 export type SubaccountOrder = Abacus.exchange.dydx.abacus.output.SubaccountOrder;
 export type OrderStatus = Abacus.exchange.dydx.abacus.output.input.OrderStatus;
 export const AbacusOrderStatus = Abacus.exchange.dydx.abacus.output.input.OrderStatus;
+const abacusOrderStatuses = [...AbacusOrderStatus.values()] as const;
+export type AbacusOrderStatuses = (typeof abacusOrderStatuses)[number];
 export type SubaccountFills = Abacus.exchange.dydx.abacus.output.SubaccountFill[];
 export type SubaccountFill = Abacus.exchange.dydx.abacus.output.SubaccountFill;
 export type SubaccountFundingPayment = Abacus.exchange.dydx.abacus.output.SubaccountFundingPayment;
@@ -140,7 +142,7 @@ const historicalPnlPeriod = [...HistoricalPnlPeriod.values()] as const;
 export type HistoricalPnlPeriods = (typeof historicalPnlPeriod)[number];

 // ------ Transfer Items ------ //
-export const TransferInputField = Abacus.exchange.dydx.abacus.state.modal.TransferInputField;
+export const TransferInputField = Abacus.exchange.dydx.abacus.state.model.TransferInputField;
 const transferInputFields = [...TransferInputField.values()] as const;
 export type TransferInputFields = (typeof transferInputFields)[number];

@@ -149,7 +151,7 @@ const transferTypes = [...TransferType.values()] as const;
 export type TransferTypes = (typeof transferTypes)[number];

 // ------ Trade Items ------ //
-export const TradeInputField = Abacus.exchange.dydx.abacus.state.modal.TradeInputField;
+export const TradeInputField = Abacus.exchange.dydx.abacus.state.model.TradeInputField;
 const tradeInputFields = [...TradeInputField.values()] as const;
 export type TradeInputFields = (typeof tradeInputFields)[number];

@@ -160,7 +162,7 @@ export type TradeState<T> = {
 };

 export const ClosePositionInputField =
-  Abacus.exchange.dydx.abacus.state.modal.ClosePositionInputField;
+  Abacus.exchange.dydx.abacus.state.model.ClosePositionInputField;

 const closePositionInputFields = [...ClosePositionInputField.values()] as const;
 export type ClosePositionInputFields = (typeof closePositionInputFields)[number];
@@ -209,11 +211,13 @@ type ReadonlyKeysOf<T> = {
  [K in keyof T]: IfEquals<{ [_ in K]: T[K] }, { readonly [_ in K]: T[K] }, K, never>;
 }[keyof T];

-type KotlinIrEnumValues<T> = Exclude<ReadonlyKeysOf<T>, 'Companion' | '$serializer'>;
+export type KotlinIrEnumValues<T> = Exclude<ReadonlyKeysOf<T>, 'Companion' | '$serializer'>;

 export const ORDER_SIDES: Record<KotlinIrEnumValues<typeof AbacusOrderSide>, OrderSide> = {
  [AbacusOrderSide.buy.name]: OrderSide.BUY,
  [AbacusOrderSide.sell.name]: OrderSide.SELL,
+  [AbacusOrderSide.buy.rawValue]: OrderSide.BUY,
+  [AbacusOrderSide.sell.rawValue]: OrderSide.SELL,
 };

 export const POSITION_SIDES: Record<KotlinIrEnumValues<typeof AbacusPositionSide>, PositionSide> = {
@@ -234,12 +238,25 @@ export const HISTORICAL_PNL_PERIODS: Record<

 export const ORDER_STATUS_STRINGS: Record<KotlinIrEnumValues<typeof AbacusOrderStatus>, string> = {
  [AbacusOrderStatus.open.name]: STRING_KEYS.OPEN_STATUS,
+  [AbacusOrderStatus.open.rawValue]: STRING_KEYS.OPEN_STATUS,
+
  [AbacusOrderStatus.partiallyFilled.name]: STRING_KEYS.PARTIALLY_FILLED,
+  [AbacusOrderStatus.partiallyFilled.rawValue]: STRING_KEYS.PARTIALLY_FILLED,
+
  [AbacusOrderStatus.filled.name]: STRING_KEYS.ORDER_FILLED,
+  [AbacusOrderStatus.filled.rawValue]: STRING_KEYS.ORDER_FILLED,
+
  [AbacusOrderStatus.cancelled.name]: STRING_KEYS.CANCELED,
+  [AbacusOrderStatus.cancelled.rawValue]: STRING_KEYS.CANCELED,
+
  [AbacusOrderStatus.canceling.name]: STRING_KEYS.CANCELING,
+  [AbacusOrderStatus.canceling.rawValue]: STRING_KEYS.CANCELING,
+
  [AbacusOrderStatus.pending.name]: STRING_KEYS.PENDING,
+  [AbacusOrderStatus.pending.rawValue]: STRING_KEYS.PENDING,
+
  [AbacusOrderStatus.untriggered.name]: STRING_KEYS.UNTRIGGERED,
+  [AbacusOrderStatus.untriggered.rawValue]: STRING_KEYS.UNTRIGGERED,
 };

 export const TRADE_TYPES: Record<
@@ -247,15 +264,40 @@ export const TRADE_TYPES: Record<
  Nullable<TradeTypes>
 > = {
  [AbacusOrderType.limit.name]: TradeTypes.LIMIT,
+  [AbacusOrderType.limit.rawValue]: TradeTypes.LIMIT,
+
  [AbacusOrderType.market.name]: TradeTypes.MARKET,
+  [AbacusOrderType.market.rawValue]: TradeTypes.MARKET,
+
  [AbacusOrderType.stopLimit.name]: TradeTypes.STOP_LIMIT,
+  [AbacusOrderType.stopLimit.rawValue]: TradeTypes.STOP_LIMIT,
+
  [AbacusOrderType.stopMarket.name]: TradeTypes.STOP_MARKET,
+  [AbacusOrderType.stopMarket.rawValue]: TradeTypes.STOP_MARKET,
+
  [AbacusOrderType.takeProfitLimit.name]: TradeTypes.TAKE_PROFIT,
+  [AbacusOrderType.takeProfitLimit.rawValue]: TradeTypes.TAKE_PROFIT,
+
  [AbacusOrderType.takeProfitMarket.name]: TradeTypes.TAKE_PROFIT_MARKET,
+  [AbacusOrderType.takeProfitMarket.rawValue]: TradeTypes.TAKE_PROFIT_MARKET,

  [AbacusOrderType.liquidated.name]: null,
+  [AbacusOrderType.liquidated.rawValue]: null,
+
  [AbacusOrderType.liquidation.name]: null,
+  [AbacusOrderType.liquidation.rawValue]: null,
+
  [AbacusOrderType.trailingStop.name]: null,
+  [AbacusOrderType.trailingStop.rawValue]: null,
+
+  [AbacusOrderType.offsetting.name]: null,
+  [AbacusOrderType.offsetting.rawValue]: null,
+
+  [AbacusOrderType.deleveraged.name]: null,
+  [AbacusOrderType.deleveraged.rawValue]: null,
+
+  [AbacusOrderType.finalSettlement.name]: null,
+  [AbacusOrderType.finalSettlement.rawValue]: null,
 };

 // Custom types involving Abacus
@@ -274,3 +316,9 @@ export type NetworkConfig = Partial<{
 }>;

 export type ConnectNetworkEvent = CustomEvent<Partial<NetworkConfig>>;
+
+export type PerpetualMarketOrderbookLevel = OrderbookLine & {
+  side?: 'ask' | 'bid';
+  mine: number;
+  key: string;
+};
@@ -96,6 +96,7 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
        elapsedTime?: number;
        blockHeight?: number;
        indexerBlockHeight?: number;
+        trailingBlocks?: number;
      }
    : // Navigation
    T extends AnalyticsEvent.NavigatePage
@@ -0,0 +1,40 @@
+import { OrderSide } from '@dydxprotocol/v4-client-js';
+import { FundingDirection } from './markets';
+
+// ------ Depth Chart ------ //
+export enum DepthChartSeries {
+  Asks = 'Asks',
+  Bids = 'Bids',
+  MidMarket = 'MidMarket',
+}
+
+export type DepthChartDatum = {
+  size: number;
+  price: number;
+  depth: number;
+  seriesKey: DepthChartSeries;
+};
+
+export type DepthChartPoint = {
+  side: OrderSide;
+  price: number;
+  size: number;
+};
+
+export const SERIES_KEY_FOR_ORDER_SIDE = {
+  [OrderSide.BUY]: DepthChartSeries.Bids,
+  [OrderSide.SELL]: DepthChartSeries.Asks,
+};
+
+// ------ Funding Chart ------ //
+export enum FundingRateResolution {
+  OneHour = 'OneHour',
+  EightHour = 'EightHour',
+  Annualized = 'Annualized',
+}
+
+export type FundingChartDatum = {
+  time: number;
+  fundingRate: number;
+  direction: FundingDirection;
+};
@@ -3,6 +3,7 @@ export enum DialogTypes {
  Deposit = 'Deposit',
  DisconnectWallet = 'DisconnectWallet',
  ExchangeOffline = 'ExchangeOffline',
+  ExternalLink = 'ExternalLink',
  FillDetails = 'FillDetails',
  Help = 'Help',
  ExternalNavKeplr = 'ExternalNavKeplr',
@@ -10,13 +11,14 @@ export enum DialogTypes {
  MobileSignIn = 'MobileSignIn',
  Onboarding = 'Onboarding',
  OrderDetails = 'OrderDetails',
+  Preferences = 'Preferences',
  RateLimit = 'RateLimit',
-  Receive = 'Receive',
  RestrictedGeo = 'RestrictedGeo',
  RestrictedWallet = 'RestrictedWallet',
  Trade = 'Trade',
  Transfer = 'Transfer',
  Withdraw = 'Withdraw',
+  ManageFunds = 'ManageFunds',
 }

 export enum TradeBoxDialogTypes {
@@ -13,6 +13,7 @@ export enum LocalStorageKey {
  PushNotificationsEnabled = 'dydx.PushNotificationsEnabled',
  PushNotificationsLastUpdated = 'dydx.PushNotificationsLastUpdated',
  TransferNotifications = 'dydx.TransferNotifications',
+  NotificationPreferences = 'dydx.NotificationPreferences',

  // UI State
  LastViewedMarket = 'dydx.LastViewedMarket',
@@ -21,9 +22,13 @@ export enum LocalStorageKey {
  SelectedTheme = 'dydx.SelectedTheme',
  SelectedTradeLayout = 'dydx.SelectedTradeLayout',
  TradingViewChartConfig = 'dydx.TradingViewChartConfig',
+  HasSeenLaunchIncentives = 'dydx.HasSeenLaunchIncentives',
 }

 export const LOCAL_STORAGE_VERSIONS = {
  [LocalStorageKey.EvmDerivedAddresses]: 'v2',
+  [LocalStorageKey.NotificationPreferences]: 'v1',
+  [LocalStorageKey.TransferNotifications]: 'v1',
+  [LocalStorageKey.Notifications]: 'v1',
  // TODO: version all localStorage keys
 };
@@ -6,8 +6,12 @@ import {
  LOCALE_DATA,
  TOOLTIPS,
  WARNINGS_STRING_KEYS,
+  NOTIFICATIONS_STRING_KEYS,
+  NOTIFICATIONS,
 } from '@dydxprotocol/v4-localization';

+import { type LinksConfigs } from '@/hooks/useURLConfigs';
+
 export { TOOLTIP_STRING_KEYS } from '@dydxprotocol/v4-localization';

 export enum SupportedLocales {
@@ -25,6 +29,7 @@ export enum SupportedLocales {

 export const EN_LOCALE_DATA = {
  ...LOCALE_DATA[SupportedLocales.EN],
+  ...NOTIFICATIONS[SupportedLocales.EN],
  TOOLTIPS: TOOLTIPS[SupportedLocales.EN],
 };

@@ -32,8 +37,13 @@ export const STRING_KEYS = {
  ...APP_STRING_KEYS,
  ...ERRORS_STRING_KEYS,
  ...WARNINGS_STRING_KEYS,
+  ...NOTIFICATIONS_STRING_KEYS,
 };

+export const STRING_KEY_VALUES = Object.fromEntries(
+  Object.values(STRING_KEYS).map((key) => [key, key])
+);
+
 export type StringKey = keyof typeof STRING_KEYS;

 export type LocaleData = typeof EN_LOCALE_DATA;
@@ -79,9 +89,11 @@ export type TooltipStrings = {
  [key: string]: ({
    stringGetter,
    stringParams,
+    urlConfigs,
  }: {
    stringGetter: StringGetterFunction;
    stringParams?: any;
+    urlConfigs?: LinksConfigs;
  }) => {
    title: string;
    body: string;
@@ -25,4 +25,5 @@ export const DEFAULT_MARKETID = 'ETH-USD';
 export enum FundingDirection {
  ToShort = 'ToShort',
  ToLong = 'ToLong',
+  None = 'None',
 }
@@ -26,6 +26,7 @@ export type MenuItem<MenuItemValue, MenuItemTypes = string> = {
  tag?: React.ReactNode;
  slotAfter?: React.ReactNode;
  description?: string;
+  slotCustomContent?: React.ReactNode;

  href?: string;
  onSelect?: (key: MenuItemValue) => void;
@@ -1,12 +1,18 @@
 import environments from '../../public/configs/env.json';

-// TODO: Update for Mainnet deployment
-export const AVAILABLE_ENVIRONMENTS =
-  import.meta.env.MODE === 'production'
-    ? environments.deployments.TESTNET
-    : environments.deployments.DEV;
+const CURRENT_MODE = ({
+  production: 'MAINNET',
+  testnet: 'TESTNET',
+  staging: 'DEV',
+  development: 'DEV',
+}[import.meta.env.MODE] ?? 'MAINNET') as 'MAINNET' | 'TESTNET' | 'DEV';

-export const CURRENT_ABACUS_DEPLOYMENT = import.meta.env.MODE === 'production' ? 'TESTNET' : 'DEV';
+export const isMainnet = CURRENT_MODE === 'MAINNET';
+export const isTestnet = CURRENT_MODE === 'TESTNET';
+export const isDev = CURRENT_MODE === 'DEV';
+
+export const AVAILABLE_ENVIRONMENTS = environments.deployments[CURRENT_MODE];
+export const CURRENT_ABACUS_DEPLOYMENT = CURRENT_MODE;
 export const ENVIRONMENT_CONFIG_MAP = environments.environments;
 export type DydxNetwork = keyof typeof ENVIRONMENT_CONFIG_MAP;
 export const DEFAULT_APP_ENVIRONMENT = AVAILABLE_ENVIRONMENTS.default as DydxNetwork;
@@ -2,8 +2,9 @@ import { StatusResponse } from '@0xsquid/sdk';

 /** implemented in useNotificationTypes */
 export enum NotificationType {
-  OrderStatusChanged = 'OrderStatusChanged',
+  AbacusGenerated = 'AbacusGenerated',
  SquidTransfer = 'SquidTransfer',
+  ReleaseUpdates = 'ReleaseUpdates',
 }

 export enum NotificationComponentType {}
@@ -59,7 +60,7 @@ export enum NotificationStatus {
  /** Toast or NotificationsMenu item interacted with or dismissed. "Seen" in NotificationsMenu. */
  Seen,

-  /** Notification marked for deletion. "Archived" in NotificationsMenu. */
+  /** Notification marked for deletion. Hidden in NotificationsMenu. */
  Cleared,
 }

@@ -80,14 +81,22 @@ export type Notifications = Record<NotificationId, Notification<any>>;
 /** Notification display data derived from app state at runtime. */
 export type NotificationDisplayData = {
  icon?: React.ReactNode;
+  title: string; // Title for Toast, Notification, and Push Notification
+  body?: string; // Description body for Toast, Notification, and Push Notification

-  title?: string;
+  slotTitleLeft?: React.ReactNode;
+  slotTitleRight?: React.ReactNode;

-  description?: React.ReactNode;
+  groupKey: string; // Grouping key toast notification stacking

-  customContent?: React.ReactNode;
-
-  customMenuContent?: React.ReactNode;
+  // Overrides title/body for Notification in NotificationMenu
+  renderCustomBody?: ({
+    isToast,
+    notification,
+  }: {
+    isToast?: boolean;
+    notification: Notification;
+  }) => React.ReactNode; // Custom Notification

  actionDescription?: string;

@@ -115,12 +124,29 @@ export type NotificationDisplayData = {
  toastDuration?: number;
 };

+export enum TransferNotificationTypes {
+  Withdrawal = 'withdrawal',
+  Deposit = 'deposit',
+}
+
 // Notification types
 export type TransferNotifcation = {
  txHash: string;
+  type?: TransferNotificationTypes;
  toChainId?: string;
  fromChainId?: string;
  toAmount?: number;
  triggeredAt?: number;
+  isCctp?: boolean;
+  errorCount?: number;
  status?: StatusResponse;
 };
+
+/**
+ * @description Struct to store whether a NotificationType should be triggered
+ */
+export type NotificationPreferences = {
+  [key in NotificationType]: boolean;
+} & { version: string };
+
+export const DEFAULT_TOAST_AUTO_CLOSE_MS = 5000;
@@ -10,6 +10,7 @@ export const LEVERAGE_DECIMALS = 2;
 export const TOKEN_DECIMALS = 4;
 export const LARGE_TOKEN_DECIMALS = 2;
 export const FEE_DECIMALS = 3;
+export const FUNDING_DECIMALS = 6;

 export const QUANTUM_MULTIPLIER = 1_000_000;

@@ -18,3 +19,7 @@ export enum NumberSign {
  Negative = 'Negative',
  Neutral = 'Neutral',
 }
+
+// Deposit/Withdraw
+export const MAX_CCTP_TRANSFER_AMOUNT = 1_000_000;
+export const MAX_PRICE_IMPACT = 0.02; // 2%
@@ -0,0 +1,15 @@
+/**
+ * @description Orderbook display constants
+ */
+export const ORDERBOOK_MAX_ROWS_PER_SIDE = 30;
+export const ORDERBOOK_ANIMATION_DURATION = 400;
+
+/**
+ * @description Orderbook pixel constants
+ * @note ORDERBOOK_ROW_HEIGHT should be a divisor of ORDERBOOK_HEIGHT so that we do not have a partial row at the bottom
+ * @note To change the Orderbook width, --orderbook-trades-width and ORDERBOOK_WIDTH must be changed to the same value
+ */
+export const ORDERBOOK_HEIGHT = 800;
+export const ORDERBOOK_WIDTH = 300;
+export const ORDERBOOK_ROW_HEIGHT = 24;
+export const ORDERBOOK_ROW_PADDING_RIGHT = 8;
@@ -37,7 +37,3 @@ export const HISTORY_ROUTE = `${AppRoute.Portfolio}/${PortfolioRoute.History}/:s
 export const DEFAULT_TRADE_ROUTE = `${AppRoute.Trade}/${DEFAULT_MARKETID}`;
 export const SETTINGS_ROUTE = `${AppRoute.Settings}/*`;
 export const DEFAULT_DOCUMENT_TITLE = 'dYdX';
-
-export enum ExternalLink {
-  Foundation = 'https://dydx.foundation',
-}
@@ -0,0 +1,70 @@
+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',
+}
@@ -0,0 +1,77 @@
+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,6 +1,10 @@
 import { type TooltipStrings, TOOLTIP_STRING_KEYS } from '@/constants/localization';

 export const depositTooltips: TooltipStrings = {
+  'minimum-deposit-amount': ({ stringGetter }) => ({
+    title: stringGetter({ key: TOOLTIP_STRING_KEYS.MINIMUM_DEPOSIT_AMOUNT_TITLE }),
+    body: stringGetter({ key: TOOLTIP_STRING_KEYS.MINIMUM_DEPOSIT_AMOUNT_BODY }),
+  }),
  swap: ({ stringGetter }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.SWAP_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.SWAP_BODY }),
@@ -57,10 +57,10 @@ export const tradeTooltips: TooltipStrings = {
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_BODY }),
  }),
-  'initial-margin-fraction': ({ stringGetter }) => ({
+  'initial-margin-fraction': ({ stringGetter, urlConfigs }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_BODY }),
-    learnMoreLink: 'https://help.dydx.exchange/articles/5232637-maximum-position-sizes',
+    learnMoreLink: urlConfigs?.initialMarginFractionLearnMore,
  }),
  'initial-stop': ({ stringGetter }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_STOP_TITLE }),
@@ -146,10 +146,10 @@ export const tradeTooltips: TooltipStrings = {
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_BODY }),
  }),
-  'reduce-only': ({ stringGetter }) => ({
+  'reduce-only': ({ stringGetter, urlConfigs }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_BODY }),
-    learnMoreLink: 'https://help.dydx.exchange/articles/6345793-reduce-only-orders',
+    learnMoreLink: urlConfigs?.reduceOnlyLearnMore,
  }),
  spread: () => ({
    title: 'Spread',
@@ -5,6 +5,10 @@ export const withdrawTooltips: TooltipStrings = {
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.FAST_WITHDRAW_FEE_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.FAST_WITHDRAW_FEE_BODY }),
  }),
+  'minimum-amount-received': ({ stringGetter }) => ({
+    title: stringGetter({ key: TOOLTIP_STRING_KEYS.MINIMUM_AMOUNT_RECEIVED_TITLE }),
+    body: stringGetter({ key: TOOLTIP_STRING_KEYS.MINIMUM_AMOUNT_RECEIVED_BODY }),
+  }),
  'withdraw-types': ({ stringGetter }) => ({
    title: stringGetter({ key: TOOLTIP_STRING_KEYS.WITHDRAW_TYPES_TITLE }),
    body: stringGetter({ key: TOOLTIP_STRING_KEYS.WITHDRAW_TYPES_BODY }),
@@ -116,3 +116,15 @@ export enum MobilePlaceOrderSteps {
  PlacingOrder = 'PlacingOrder',
  Confirmation = 'Confirmation',
 }
+
+export const CLEARED_TRADE_INPUTS = {
+  limitPriceInput: '',
+  triggerPriceInput: '',
+  trailingPercentInput: '',
+};
+
+export const CLEARED_SIZE_INPUTS = {
+  amountInput: '',
+  usdAmountInput: '',
+  leverageInput: '',
+};
@@ -0,0 +1,4 @@
+export * from './useCenterOrderbook';
+export * from './useSpreadRowScrollListener';
+export * from './useDrawOrderbook';
+export * from './useOrderbookValues';
@@ -0,0 +1,22 @@
+import { useEffect, type RefObject } from 'react';
+
+type Props = {
+  marketId: string;
+  orderbookRef: RefObject<HTMLDivElement>;
+};
+
+/**
+ * @description Center Orderbook on load and market change
+ * Assumed that the two sides are the same height
+ */
+export const useCenterOrderbook = ({ marketId, orderbookRef }: Props) => {
+  const orderbookEl = orderbookRef.current;
+  const { clientHeight, scrollHeight } = orderbookEl ?? {};
+  const shouldScroll = scrollHeight && clientHeight && scrollHeight > clientHeight;
+
+  useEffect(() => {
+    if (orderbookEl && shouldScroll) {
+      orderbookEl.scrollTo({ top: (scrollHeight - clientHeight) / 2 });
+    }
+  }, [shouldScroll, marketId]);
+};
@@ -0,0 +1,373 @@
+import { useEffect, useMemo, useRef } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+
+import type { PerpetualMarketOrderbookLevel } from '@/constants/abacus';
+import { SMALL_USD_DECIMALS, TOKEN_DECIMALS } from '@/constants/numbers';
+
+import {
+  ORDERBOOK_ANIMATION_DURATION,
+  ORDERBOOK_HEIGHT,
+  ORDERBOOK_ROW_HEIGHT,
+  ORDERBOOK_ROW_PADDING_RIGHT,
+  ORDERBOOK_WIDTH,
+} from '@/constants/orderbook';
+
+import { getCurrentMarketConfig, getCurrentMarketOrderbookMap } from '@/state/perpetualsSelectors';
+import { getAppTheme } from '@/state/configsSelectors';
+
+import { MustBigNumber } from '@/lib/numbers';
+
+import {
+  getHistogramXValues,
+  getRektFromIdx,
+  getXByColumn,
+  getYForElements,
+} from '@/lib/orderbookHelpers';
+import { useAppThemeContext } from '../useAppTheme';
+
+type ElementProps = {
+  data: Array<PerpetualMarketOrderbookLevel | undefined>;
+  histogramRange: number;
+  side: PerpetualMarketOrderbookLevel['side'];
+};
+
+type StyleProps = {
+  histogramSide: 'left' | 'right';
+};
+
+enum OrderbookRowAnimationType {
+  REMOVE,
+  NEW,
+  NONE,
+}
+
+export const useDrawOrderbook = ({
+  data,
+  histogramRange,
+  histogramSide,
+  side,
+}: ElementProps & StyleProps) => {
+  const canvasRef = useRef<HTMLCanvasElement>(null);
+  const canvas = canvasRef.current;
+  const currentOrderbookMap = useSelector(getCurrentMarketOrderbookMap, shallowEqual);
+  const { stepSizeDecimals = TOKEN_DECIMALS, tickSizeDecimals = SMALL_USD_DECIMALS } =
+    useSelector(getCurrentMarketConfig, shallowEqual) || {};
+  const prevData = useRef<typeof data>(data);
+  const theme = useAppThemeContext();
+
+  /**
+   * Scale canvas using device pixel ratio to unblur drawn text
+   * @url https://stackoverflow.com/questions/15661339/how-do-i-fix-blurry-text-in-my-html5-canvas/65124939#65124939
+   * @returns adjusted canvas width/height/rowHeight used in coordinates for drawing
+   **/
+  const { canvasWidth, canvasHeight, rowHeight } = useMemo(() => {
+    const ratio = window.devicePixelRatio || 1;
+
+    if (!canvas) {
+      return {
+        canvasWidth: ORDERBOOK_WIDTH / devicePixelRatio,
+        canvasHeight: ORDERBOOK_HEIGHT / devicePixelRatio,
+        rowHeight: ORDERBOOK_ROW_HEIGHT / devicePixelRatio,
+      };
+    }
+
+    const ctx = canvas.getContext('2d');
+    canvas.width = canvas.offsetWidth * ratio;
+    canvas.height = canvas.offsetHeight * ratio;
+
+    if (ctx) {
+      ctx.scale(ratio, ratio);
+      ctx.font = '12px Satoshi';
+      ctx.textAlign = 'right';
+      ctx.textBaseline = 'middle';
+      ctx.imageSmoothingQuality = 'high';
+    }
+
+    return {
+      canvasWidth: canvas.width / ratio,
+      canvasHeight: canvas.height / ratio,
+      rowHeight: ORDERBOOK_ROW_HEIGHT,
+    };
+  }, [canvas]);
+
+  const drawBars = ({
+    barType,
+    ctx,
+    depthOrSizeValue,
+    gradientMultiplier,
+    histogramAccentColor,
+    histogramSide,
+    idx,
+  }: {
+    barType: 'depth' | 'size';
+    ctx: CanvasRenderingContext2D;
+    depthOrSizeValue: number;
+    gradientMultiplier: number;
+    histogramAccentColor: string;
+    histogramSide: 'left' | 'right';
+    idx: number;
+  }) => {
+    const { x1, x2, y1, y2 } = getRektFromIdx({
+      idx,
+      rowHeight,
+      canvasWidth,
+      canvasHeight,
+      side,
+    });
+
+    // X values
+    const maxHistogramBarWidth = x2 - x1 - (barType === 'size' ? 8 : 2);
+    const barWidth = depthOrSizeValue
+      ? Math.min((depthOrSizeValue / histogramRange) * maxHistogramBarWidth, maxHistogramBarWidth)
+      : 0;
+
+    const { gradient, bar } = getHistogramXValues({
+      barWidth,
+      canvasWidth,
+      gradientMultiplier,
+      histogramSide,
+    });
+
+    // Gradient
+    let linearGradient;
+
+    try {
+      linearGradient = ctx.createLinearGradient(gradient.x1, y1, gradient.x2, y2);
+      linearGradient.addColorStop(0, histogramAccentColor);
+      linearGradient.addColorStop(1, 'rgba(0, 0, 0, 0)');
+      ctx.fillStyle = linearGradient;
+    } catch (err) {
+      ctx.fillStyle = 'rgba(0, 0, 0, 0)';
+    }
+
+    ctx.beginPath();
+
+    // Bar
+    const { bar: y } = getYForElements({ y: y1, rowHeight });
+
+    if (ctx.roundRect) {
+      ctx.roundRect(
+        bar.x1,
+        y,
+        bar.x2,
+        rowHeight - 2,
+        histogramSide === 'right' ? [2, 0, 0, 2] : [0, 2, 2, 0]
+      );
+    } else {
+      ctx.rect(bar.x1, y, bar.x2, rowHeight - 2);
+    }
+
+    ctx.fill();
+  };
+
+  const drawText = ({
+    animationType = OrderbookRowAnimationType.NONE,
+    ctx,
+    idx,
+    mine,
+    price,
+    size,
+  }: {
+    animationType?: OrderbookRowAnimationType;
+    ctx: CanvasRenderingContext2D;
+    idx: number;
+    mine?: number;
+    price?: number;
+    size?: number;
+  }) => {
+    const { y1 } = getRektFromIdx({
+      idx,
+      rowHeight,
+      canvasWidth,
+      canvasHeight,
+      side,
+    });
+
+    const { text: y } = getYForElements({ y: y1, rowHeight });
+
+    let textColor: string;
+    let updatedTextColor: string | undefined;
+
+    switch (animationType) {
+      case OrderbookRowAnimationType.REMOVE: {
+        textColor = theme.textSecondary;
+        break;
+      }
+
+      case OrderbookRowAnimationType.NEW: {
+        updatedTextColor = side === 'bid' ? theme.positive : theme.negative;
+        textColor = theme.textPrimary;
+        break;
+      }
+
+      default: {
+        textColor = theme.textPrimary;
+        break;
+      }
+    }
+
+    // Size text
+    if (size) {
+      ctx.fillStyle = updatedTextColor ?? textColor;
+      ctx.fillText(
+        MustBigNumber(size).toFixed(stepSizeDecimals ?? TOKEN_DECIMALS),
+        getXByColumn({ canvasWidth, colIdx: 0 }) - ORDERBOOK_ROW_PADDING_RIGHT,
+        y
+      );
+    }
+
+    // Price text
+    if (price) {
+      ctx.fillStyle = textColor;
+      ctx.fillText(
+        MustBigNumber(price).toFixed(tickSizeDecimals ?? SMALL_USD_DECIMALS),
+        getXByColumn({ canvasWidth, colIdx: 1 }) - ORDERBOOK_ROW_PADDING_RIGHT,
+        y
+      );
+    }
+
+    // Mine text
+    if (mine) {
+      ctx.fillStyle = textColor;
+      ctx.fillText(
+        MustBigNumber(mine).toFixed(stepSizeDecimals ?? TOKEN_DECIMALS),
+        getXByColumn({ canvasWidth, colIdx: 2 }) - ORDERBOOK_ROW_PADDING_RIGHT,
+        y
+      );
+    }
+  };
+
+  const drawOrderbookRow = ({
+    ctx,
+    idx,
+    rowToRender,
+    animationType = OrderbookRowAnimationType.NONE,
+  }: {
+    ctx: CanvasRenderingContext2D;
+    idx: number;
+    rowToRender?: PerpetualMarketOrderbookLevel;
+    animationType?: OrderbookRowAnimationType;
+  }) => {
+    if (!rowToRender) return;
+    const { depth, mine, price, size } = rowToRender;
+    const histogramAccentColor = side === 'bid' ? theme.positiveFaded : theme.negativeFaded;
+
+    // Depth Bar
+    if (depth) {
+      drawBars({
+        barType: 'depth',
+        ctx,
+        depthOrSizeValue: depth,
+        gradientMultiplier: 1.3,
+        histogramAccentColor,
+        histogramSide,
+        idx,
+      });
+    }
+
+    // Size Bar
+    drawBars({
+      barType: 'size',
+      ctx,
+      depthOrSizeValue: size,
+      gradientMultiplier: 5,
+      histogramAccentColor,
+      histogramSide,
+      idx,
+    });
+
+    // Size, Price, Mine
+    drawText({
+      animationType,
+      ctx,
+      idx,
+      mine,
+      price,
+      size,
+    });
+  };
+
+  // Update histograms and row contents on data change
+  useEffect(() => {
+    const ctx = canvas?.getContext('2d');
+
+    if (!canvas || !ctx) return;
+
+    // Clear canvas before redraw
+    ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
+
+    // Animate row removal and update
+    const mapOfOrderbookPriceLevels =
+      side && currentOrderbookMap?.[side === 'ask' ? 'asks' : 'bids'];
+    const empty: number[] = [];
+    const removed: number[] = [];
+    const updated: number[] = [];
+
+    prevData.current.forEach((row, idx) => {
+      if (!row) {
+        empty.push(idx);
+        return;
+      }
+
+      if (mapOfOrderbookPriceLevels?.[row.price] === 0) {
+        removed.push(idx);
+        drawOrderbookRow({
+          ctx,
+          idx,
+          rowToRender: row,
+          animationType: OrderbookRowAnimationType.REMOVE,
+        });
+      } else if (mapOfOrderbookPriceLevels?.[row.price] === row?.size) {
+        drawOrderbookRow({
+          ctx,
+          idx,
+          rowToRender: data[idx],
+          animationType: OrderbookRowAnimationType.NONE,
+        });
+      } else {
+        updated.push(idx);
+        drawOrderbookRow({
+          ctx,
+          idx,
+          rowToRender: row,
+          animationType: OrderbookRowAnimationType.NEW,
+        });
+      }
+    });
+
+    setTimeout(() => {
+      [...empty, ...removed, ...updated].forEach((idx) => {
+        const { x1, y1, x2, y2 } = getRektFromIdx({
+          idx,
+          rowHeight,
+          canvasWidth,
+          canvasHeight,
+          side,
+        });
+
+        ctx.clearRect(x1, y1, x2 - x1, y2 - y1);
+        drawOrderbookRow({
+          ctx,
+          idx,
+          rowToRender: data[idx],
+        });
+      });
+    }, ORDERBOOK_ANIMATION_DURATION);
+
+    prevData.current = data;
+  }, [
+    canvasHeight,
+    canvasWidth,
+    rowHeight,
+    data,
+    histogramRange,
+    stepSizeDecimals,
+    tickSizeDecimals,
+    histogramSide,
+    side,
+    theme,
+    currentOrderbookMap,
+  ]);
+
+  return { canvasRef };
+};
@@ -0,0 +1,126 @@
+import { useMemo } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+import { OrderSide } from '@dydxprotocol/v4-client-js';
+
+import { type PerpetualMarketOrderbookLevel } from '@/constants/abacus';
+import { DepthChartSeries, DepthChartDatum } from '@/constants/charts';
+
+import { getCurrentMarketOrderbook } from '@/state/perpetualsSelectors';
+import { getSubaccountOpenOrdersBySideAndPrice } from '@/state/accountSelectors';
+
+import { MustBigNumber } from '@/lib/numbers';
+
+export const useCalculateOrderbookData = ({ maxRowsPerSide }: { maxRowsPerSide: number }) => {
+  const orderbook = useSelector(getCurrentMarketOrderbook, shallowEqual);
+
+  const openOrdersBySideAndPrice =
+    useSelector(getSubaccountOpenOrdersBySideAndPrice, shallowEqual) || {};
+
+  return useMemo(() => {
+    const asks: Array<PerpetualMarketOrderbookLevel | undefined> = (
+      orderbook?.asks?.toArray() ?? []
+    )
+      .map(
+        (row, idx: number) =>
+          ({
+            key: `ask-${idx}`,
+            side: 'ask',
+            mine: openOrdersBySideAndPrice[OrderSide.SELL]?.[row.price]?.size,
+            ...row,
+          } as PerpetualMarketOrderbookLevel)
+      )
+      .slice(0, maxRowsPerSide);
+
+    const bids: Array<PerpetualMarketOrderbookLevel | undefined> = (
+      orderbook?.bids?.toArray() ?? []
+    )
+      .map(
+        (row, idx: number) =>
+          ({
+            key: `bid-${idx}`,
+            side: 'bid',
+            mine: openOrdersBySideAndPrice[OrderSide.BUY]?.[row.price]?.size,
+            ...row,
+          } as PerpetualMarketOrderbookLevel)
+      )
+      .slice(0, maxRowsPerSide);
+
+    // Prevent the bid/ask sides from crossing by using the offsets.
+    // While the books are crossing...
+    while (asks[0] && bids[0] && bids[0]!.price >= asks[0].price) {
+      // Drop the order on the side with the lower offset.
+      // The offset of the other side is higher and so supercedes.
+      if (bids[0]!.offset === asks[0].offset) {
+        // If offsets are the same, give precedence to the larger size. In this case,
+        // one of the sizes *should* be zero, but we simply check for the larger size.
+        if (bids[0]!.size > asks[0].size) {
+          asks.shift();
+        } else {
+          bids.pop();
+        }
+      } else {
+        // Offsets are not equal. Give precedence to the larger offset.
+        if (bids[0]!.offset > asks[0].offset) {
+          asks.shift();
+        } else {
+          bids.pop();
+        }
+      }
+    }
+
+    const spread =
+      asks[0]?.price && bids[0]?.price ? MustBigNumber(asks[0].price).minus(bids[0].price) : null;
+
+    const spreadPercent = orderbook?.spreadPercent;
+
+    const histogramRange = Math.max(
+      isNaN(Number(bids[bids.length - 1]?.depth)) ? 0 : Number(bids[bids.length - 1]?.depth),
+      isNaN(Number(asks[asks.length - 1]?.depth)) ? 0 : Number(asks[asks.length - 1]?.depth)
+    );
+
+    return {
+      asks,
+      bids,
+      spread,
+      spreadPercent,
+      histogramRange,
+      hasOrderbook: !!orderbook,
+    };
+  }, [orderbook, openOrdersBySideAndPrice]);
+};
+
+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]);
+};
@@ -0,0 +1,39 @@
+import { type RefObject, useEffect, useState } from 'react';
+
+export const useSpreadRowScrollListener = ({
+  orderbookRef,
+  spreadRowRef,
+}: {
+  orderbookRef: RefObject<HTMLDivElement>;
+  spreadRowRef: RefObject<HTMLDivElement>;
+}) => {
+  const [displaySide, setDisplaySide] = useState<string>();
+
+  useEffect(() => {
+    const onScroll = () => {
+      if (spreadRowRef.current && orderbookRef.current) {
+        const { clientHeight } = orderbookRef.current;
+        const parent = orderbookRef.current.getBoundingClientRect();
+        const spread = spreadRowRef.current.getBoundingClientRect();
+        const spreadTop = spread.top - parent.top;
+        const spreadBottom = spread.bottom - parent.top;
+
+        if (spreadBottom > clientHeight) {
+          setDisplaySide('bottom');
+        } else if (spreadTop < 0) {
+          setDisplaySide('top');
+        } else {
+          setDisplaySide(undefined);
+        }
+      }
+    };
+
+    orderbookRef.current?.addEventListener('scroll', onScroll, false);
+
+    return () => {
+      orderbookRef.current?.removeEventListener('scroll', onScroll, false);
+    };
+  }, [orderbookRef.current, spreadRowRef.current]);
+
+  return displaySide;
+};
@@ -22,6 +22,8 @@ import { useShouldShowFooter } from './useShouldShowFooter';
 import { useSelectedNetwork } from './useSelectedNetwork';
 import { useStringGetter } from './useStringGetter';
 import { useSubaccount } from './useSubaccount';
+import { useTradeFormInputs } from './useTradeFormInputs';
+import { useURLConfigs } from './useURLConfigs';

 export {
  useApiState,
@@ -48,4 +50,6 @@ export {
  useSelectedNetwork,
  useStringGetter,
  useSubaccount,
+  useTradeFormInputs,
+  useURLConfigs,
 };
@@ -44,7 +44,7 @@ export const useTradingView = ({
  const hasMarkets = marketIds.length > 0;

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

  return { savedResolution };
 };
@@ -4,7 +4,6 @@ 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';
@@ -29,7 +28,7 @@ export const useTradingViewTheme = ({
  tvWidget: (IChartingLibraryWidget & { _id?: string; _ready?: boolean }) | null;
  isWidgetReady?: boolean;
 }) => {
-  const appTheme = useSelector(getAppTheme);
+  const appTheme: AppTheme = useSelector(getAppTheme);

  useEffect(() => {
    if (tvWidget && isWidgetReady) {
@@ -2,7 +2,7 @@ import { useCallback, useContext, createContext, useEffect, useState, useMemo }

 import { useDispatch } from 'react-redux';
 import { AES, enc } from 'crypto-js';
-import { LocalWallet, type Subaccount } from '@dydxprotocol/v4-client-js';
+import { NOBLE_BECH32_PREFIX, LocalWallet, type Subaccount } from '@dydxprotocol/v4-client-js';

 import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/constants/account';
 import { DialogTypes } from '@/constants/dialogs';
@@ -42,6 +42,7 @@ const useAccountsContext = () => {
    selectedWalletError,
    evmAddress,
    signerWagmi,
+    publicClientWagmi,
    dydxAddress: connectedDydxAddress,
    signerGraz,
  } = useWalletConnection();
@@ -135,8 +136,8 @@ const useAccountsContext = () => {
      getSubaccounts: async ({ dydxAddress }: { dydxAddress: DydxAddress }) => {
        try {
          const response = await compositeClient?.indexerClient.account.getSubaccounts(dydxAddress);
-          setDydxSubaccounts(response.subaccounts);
-          return response.subaccounts;
+          setDydxSubaccounts(response?.subaccounts);
+          return response?.subaccounts ?? [];
        } catch (error) {
          // 404 is expected if the user has no subaccounts
          if (error.status === 404) {
@@ -218,6 +219,16 @@ const useAccountsContext = () => {
    else abacusStateManager.attemptDisconnectAccount();
  }, [localDydxWallet]);

+  useEffect(() => {
+    const setNobleWallet = async () => {
+      if (hdKey?.mnemonic) {
+        const nobleWallet = await LocalWallet.fromMnemonic(hdKey.mnemonic, NOBLE_BECH32_PREFIX);
+        abacusStateManager.setNobleWallet(nobleWallet);
+      }
+    };
+    setNobleWallet();
+  }, [hdKey?.mnemonic]);
+
  // clear subaccounts when no dydxAddress is set
  useEffect(() => {
    (async () => {
@@ -296,6 +307,7 @@ const useAccountsContext = () => {
    // Wallet connection (EVM)
    evmAddress,
    signerWagmi,
+    publicClientWagmi,

    // Wallet connection (Cosmos)
    signerGraz,
@@ -97,7 +97,7 @@ export const useAnalytics = () => {
  }, []);

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

  useEffect(() => {
    if (status) {
@@ -114,6 +114,7 @@ export const useAnalytics = () => {
        elapsedTime: lastSuccessfulIndexerRpcQuery && Date.now() - lastSuccessfulIndexerRpcQuery,
        blockHeight: height ?? undefined,
        indexerBlockHeight: indexerHeight ?? undefined,
+        trailingBlocks: trailingBlocks ?? undefined
      });
    }
  }, [status]);
@@ -71,7 +71,7 @@ export const getIndexerHeight = (apiState: Nullable<AbacusApiState>) => {
 export const useApiState = () => {
  const stringGetter = useStringGetter();
  const apiState = useSelector(getApiState, shallowEqual);
-  const { haltedBlock, height, status, trailingBlocks } = apiState ?? {};
+  const { haltedBlock, height, status, trailingBlocks} = apiState ?? {};
  const statusErrorMessage = getStatusErrorMessage({ apiState, stringGetter });
  const indexerHeight = getIndexerHeight(apiState);

@@ -0,0 +1,16 @@
+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];
+}
@@ -5,16 +5,15 @@ import { useMatch, useNavigate } from 'react-router-dom';
 import { LocalStorageKey } from '@/constants/localStorage';
 import { DEFAULT_MARKETID } from '@/constants/markets';
 import { AppRoute } from '@/constants/routes';
+import { useLocalStorage } from '@/hooks/useLocalStorage';

 import { getSelectedNetwork } from '@/state/appSelectors';
 import { closeDialogInTradeBox } from '@/state/dialogs';
 import { setCurrentMarketId } from '@/state/perpetuals';
+import { getMarketIds } from '@/state/perpetualsSelectors';

 import abacusStateManager from '@/lib/abacus';

-import { useLocalStorage } from './useLocalStorage';
-import { getMarketIds } from '@/state/perpetualsSelectors';
-
 export const useCurrentMarketId = () => {
  const navigate = useNavigate();
  const match = useMatch(`/${AppRoute.Trade}/:marketId`);
@@ -22,6 +21,8 @@ export const useCurrentMarketId = () => {
  const dispatch = useDispatch();
  const selectedNetwork = useSelector(getSelectedNetwork);
  const marketIds = useSelector(getMarketIds, shallowEqual);
+  const hasMarketIds = marketIds.length > 0;
+
  const [lastViewedMarket, setLastViewedMarket] = useLocalStorage({
    key: LocalStorageKey.LastViewedMarket,
    defaultValue: DEFAULT_MARKETID,
@@ -31,22 +32,40 @@ export const useCurrentMarketId = () => {
    if (marketIds.length === 0) return marketId ?? lastViewedMarket;
    if (!marketIds.includes(marketId ?? lastViewedMarket)) return DEFAULT_MARKETID;
    return marketId ?? lastViewedMarket;
-  }, [marketIds, marketId]);
+  }, [hasMarketIds, marketId]);

  useEffect(() => {
-    setLastViewedMarket(validId);
-    dispatch(setCurrentMarketId(validId));
-    dispatch(closeDialogInTradeBox());
+    // If v4_markets has not been subscribed to yet or marketId is not specified, default to validId
+    if (!hasMarketIds || !marketId) {
+      setLastViewedMarket(validId);
+      dispatch(setCurrentMarketId(validId));
+      dispatch(closeDialogInTradeBox());

-    navigate(`${AppRoute.Trade}/${validId}`, {
-      replace: true,
-    });
-  }, [validId]);
+      if (validId !== marketId) {
+        navigate(`${AppRoute.Trade}/${validId}`, {
+          replace: true,
+        });
+      }
+    } else {
+      // If v4_markets has been subscribed to, check if marketId is valid
+      if (!marketIds.includes(marketId)) {
+        // If marketId is not valid (i.e. final settlement), navigate to markets page
+        navigate(AppRoute.Markets, {
+          replace: true,
+        });
+      } else {
+        // If marketId is valid, set currentMarketId
+        setLastViewedMarket(marketId);
+        dispatch(setCurrentMarketId(marketId));
+        dispatch(closeDialogInTradeBox());
+      }
+    }
+  }, [hasMarketIds, marketId]);

  useEffect(() => {
    // Check for marketIds otherwise Abacus will silently fail its isMarketValid check
    if (marketIds) {
      abacusStateManager.setMarket(marketId ?? DEFAULT_MARKETID);
    }
-  }, [selectedNetwork, marketIds, marketId]);
+  }, [selectedNetwork, hasMarketIds, marketId]);
 };
@@ -1,3 +1,4 @@
+import { isDev } from '@/constants/networks';
 import { WalletType } from '@/constants/wallets';

 import { isTruthy } from '@/lib/isTruthy';
@@ -6,7 +7,7 @@ export const useDisplayedWallets = () => {
  return [
    WalletType.MetaMask,

-    import.meta.env.MODE !== 'production' && WalletType.Keplr,
+    isDev && WalletType.Keplr,

    WalletType.WalletConnect2,
    
@@ -1,12 +1,12 @@
 import { createContext, useContext, useCallback, useEffect, useMemo } from 'react';
 import { useQuery } from 'react-query';
-import type { StatusResponse } from '@0xsquid/sdk';

-import { LocalStorageKey } from '@/constants/localStorage';
+import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage';
 import { type TransferNotifcation } from '@/constants/notifications';
-
 import { useAccounts } from '@/hooks/useAccounts';
-import { STATUS_ERROR_GRACE_PERIOD, useSquid } from '@/hooks/useSquid';
+
+import { fetchSquidStatus, STATUS_ERROR_GRACE_PERIOD } from '@/lib/squid';
+
 import { useLocalStorage } from './useLocalStorage';

 const LocalNotificationsContext = createContext<
@@ -22,16 +22,32 @@ export const LocalNotificationsProvider = ({ ...props }) => (
 export const useLocalNotifications = () => useContext(LocalNotificationsContext)!;

 const TRANSFER_STATUS_FETCH_INTERVAL = 10_000;
+const ERROR_COUNT_THRESHOLD = 3;

 const useLocalNotificationsContext = () => {
  // transfer notifications
  const [allTransferNotifications, setAllTransferNotifications] = useLocalStorage<{
    [key: `dydx${string}`]: TransferNotifcation[];
+    version: string;
  }>({
    key: LocalStorageKey.TransferNotifications,
-    defaultValue: {},
+    defaultValue: {
+      version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.TransferNotifications],
+    },
  });

+  // Ensure version matches, otherwise wipe
+  useEffect(() => {
+    if (
+      allTransferNotifications?.version !==
+      LOCAL_STORAGE_VERSIONS[LocalStorageKey.TransferNotifications]
+    ) {
+      setAllTransferNotifications({
+        version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.TransferNotifications],
+      });
+    }
+  }, [allTransferNotifications]);
+
  const { dydxAddress } = useAccounts();

  const transferNotifications = dydxAddress ? allTransferNotifications[dydxAddress] || [] : [];
@@ -52,49 +68,65 @@ const useLocalNotificationsContext = () => {
    [transferNotifications]
  );

-  const squid = useSquid();
-
-  const { data: transferStatuses } = useQuery({
-    queryKey: ['getTransactionStatus', transferNotifications],
+  useQuery({
+    queryKey: 'getTransactionStatus',
    queryFn: async () => {
-      const statuses: { [key: string]: StatusResponse } = {};
-      for (const {
-        txHash,
-        toChainId,
-        fromChainId,
-        triggeredAt,
-        status: currentStatus,
-      } of transferNotifications) {
-        try {
-          if (currentStatus && currentStatus?.squidTransactionStatus !== 'ongoing') continue;
+      const processTransferNotifications = async (transferNotifications: TransferNotifcation[]) => {
+        const newTransferNotifications = await Promise.all(
+          transferNotifications.map(async (transferNotification) => {
+            const {
+              txHash,
+              toChainId,
+              fromChainId,
+              triggeredAt,
+              isCctp,
+              errorCount,
+              status: currentStatus,
+            } = transferNotification;

-          const status = await squid?.getStatus({ transactionId: txHash, toChainId, fromChainId });
-          if (status) statuses[txHash] = status;
-        } catch (error) {
-          // ignore errors for the first 120s since the status might not be available yet
-          if (!triggeredAt || Date.now() - triggeredAt > STATUS_ERROR_GRACE_PERIOD) {
-            statuses[txHash] = error;
-          }
-        }
-      }
-      return statuses;
+            // @ts-ignore status.errors is not in the type definition but can be returned
+            // also error can some time come back as an empty object so we need to ignore for that
+            const hasErrors = !!currentStatus?.errors || 
+                 (currentStatus?.error && Object.keys(currentStatus.error).length !== 0);
+
+            if (
+              !hasErrors &&
+              (!currentStatus?.squidTransactionStatus ||
+                currentStatus?.squidTransactionStatus === 'ongoing')
+            ) {
+              try {
+                const status = await fetchSquidStatus({
+                  transactionId: txHash,
+                  toChainId,
+                  fromChainId,
+                }, isCctp);
+
+                if (status) {
+                  transferNotification.status = status;
+                }
+              } catch (error) {
+                if (!triggeredAt || Date.now() - triggeredAt > STATUS_ERROR_GRACE_PERIOD) {
+                  if (errorCount && errorCount > ERROR_COUNT_THRESHOLD) {
+                    transferNotification.status = error;
+                  } else {
+                    transferNotification.errorCount = errorCount ? errorCount + 1 : 1;
+                  }
+                }
+              }
+            }
+
+            return transferNotification;
+          })
+        );
+
+        return newTransferNotifications;
+      };
+      const newTransferNotifications = await processTransferNotifications(transferNotifications);
+      setTransferNotifications(newTransferNotifications);
    },
    refetchInterval: TRANSFER_STATUS_FETCH_INTERVAL,
  });

-  useEffect(() => {
-    if (!transferStatuses) return;
-    const newTransferNotifications = transferNotifications.map((notification) => {
-      const status = transferStatuses[notification.txHash];
-      if (!status) return notification;
-      return {
-        ...notification,
-        status,
-      };
-    });
-    setTransferNotifications(newTransferNotifications);
-  }, [transferStatuses]);
-
  return {
    transferNotifications,
    addTransferNotification,
@@ -6,8 +6,10 @@ import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constant
 import { getAssets } from '@/state/assetsSelectors';
 import { getPerpetualMarkets } from '@/state/perpetualsSelectors';

+import { isTruthy } from '@/lib/isTruthy';
+
 const filterFunctions = {
-  [MarketFilters.ALL]: (market: MarketData) => true,
+  [MarketFilters.ALL]: () => true,
  [MarketFilters.LAYER_1]: (market: MarketData) => {
    return market.asset.tags?.toArray().includes('Layer 1');
  },
@@ -28,13 +30,15 @@ export const useMarketsData = (
  const allAssets = useSelector(getAssets, shallowEqual) || {};

  const markets = useMemo(() => {
-    return Object.values(allPerpetualMarkets).map((marketData) => ({
-      asset: allAssets[marketData.assetId],
-      tickSizeDecimals: marketData.configs?.tickSizeDecimals,
-      ...marketData,
-      ...marketData.perpetual,
-      ...marketData.configs,
-    })) as MarketData[];
+    return Object.values(allPerpetualMarkets)
+      .filter(isTruthy)
+      .map((marketData) => ({
+        asset: allAssets[marketData.assetId],
+        tickSizeDecimals: marketData.configs?.tickSizeDecimals,
+        ...marketData,
+        ...marketData.perpetual,
+        ...marketData.configs,
+      })) as MarketData[];
  }, [allPerpetualMarkets, allAssets]);

  const filteredMarkets = useMemo(() => {
@@ -1,205 +1,291 @@
-import { useCallback, useEffect, useMemo } from 'react';
-import styled, { type AnyStyledComponent } from 'styled-components';
-import { useSelector, shallowEqual, useDispatch } from 'react-redux';
-import { groupBy } from 'lodash';
+import { type ReactNode, useEffect } from 'react';
+import styled from 'styled-components';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
+import { isEqual, groupBy } from 'lodash';
+import { useNavigate } from 'react-router-dom';

-import { AlertType } from '@/constants/alerts';
-import { AbacusOrderStatus, ORDER_SIDES } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
-import { STRING_KEYS, StringKey } from '@/constants/localization';
-import { type NotificationTypeConfig, NotificationType } from '@/constants/notifications';
-import { ORDER_SIDE_STRINGS } from '@/constants/trade';
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { AppRoute } from '@/constants/routes';
+import { DydxChainAsset } from '@/constants/wallets';

+import {
+  STRING_KEYS,
+  STRING_KEY_VALUES,
+  type StringGetterFunction,
+  type StringKey,
+} from '@/constants/localization';
+
+import {
+  type NotificationTypeConfig,
+  NotificationType,
+  DEFAULT_TOAST_AUTO_CLOSE_MS,
+  TransferNotificationTypes,
+} from '@/constants/notifications';
+
+import { useSelectedNetwork, useStringGetter } from '@/hooks';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';

+import { AssetIcon } from '@/components/AssetIcon';
 import { Icon, IconName } from '@/components/Icon';
-import { Output, OutputType } from '@/components/Output';
-import { TransferStatusToast } from '@/views/TransferStatus';
+import { BlockRewardNotification } from '@/views/notifications/BlockRewardNotification';
+import { TradeNotification } from '@/views/notifications/TradeNotification';
+import { TransferStatusNotification } from '@/views/notifications/TransferStatusNotification';

 import { getSubaccountFills, getSubaccountOrders } from '@/state/accountSelectors';
 import { openDialog } from '@/state/dialogs';
+import { getAbacusNotifications } from '@/state/notificationsSelectors';
+import { getMarketIds } from '@/state/perpetualsSelectors';

-import { OrderStatusIcon } from '@/views/OrderStatusIcon';
+import { formatSeconds } from '@/lib/timeUtils';

-import { useStringGetter } from './useStringGetter';
-import { TransferStatusSteps } from '@/views/TransferStatusSteps';
-import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
+const parseStringParamsForNotification = ({
+  stringGetter,
+  value,
+}: {
+  stringGetter: StringGetterFunction;
+  value: unknown;
+}): ReactNode => {
+  if (STRING_KEY_VALUES[value as StringKey]) {
+    return stringGetter({ key: value as StringKey });
+  }

-export const notificationTypes = [
+  return value as ReactNode;
+};
+
+export const notificationTypes: NotificationTypeConfig[] = [
  {
-    type: NotificationType.OrderStatusChanged,
-
-    useTrigger: ({ trigger, lastUpdated }) => {
+    type: NotificationType.AbacusGenerated,
+    useTrigger: ({ trigger }) => {
      const stringGetter = useStringGetter();
-
-      const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
-      const ordersByOrderId = Object.fromEntries(orders.map((order) => [order.id, order]));
-
-      const fills = useSelector(getSubaccountFills, shallowEqual) || [];
-      const fillsByOrderId = groupBy(fills, (fill) => fill.orderId);
-
-      const orderIds = useMemo(
-        () => [...Object.keys(ordersByOrderId), ...Object.keys(fillsByOrderId)],
-        [orders, fills]
-      );
+      const abacusNotifications = useSelector(getAbacusNotifications, isEqual);

      useEffect(() => {
-        for (const orderId of orderIds) {
-          const fills = fillsByOrderId[orderId];
+        for (const abacusNotif of abacusNotifications) {
+          const [abacusNotificationType = '', id = ''] = abacusNotif.id.split(':');
+          const parsedData = abacusNotif.data ? JSON.parse(abacusNotif.data) : {};

-          const order =
-            ordersByOrderId[orderId] ??
-            (fills?.length
-              ? {
-                  ...fills[fills.length - 1],
-                  id: orderId,
-                  createdAtMilliseconds: Math.max(
-                    ...fills.map((fill) => fill.createdAtMilliseconds)
+          const params = Object.fromEntries(
+            Object.entries(parsedData).map(([key, value]) => {
+              return [key, parseStringParamsForNotification({ stringGetter, value })];
+            })
+          );
+
+          switch (abacusNotificationType) {
+            case 'order': {
+              trigger(
+                abacusNotif.id,
+                {
+                  icon: abacusNotif.image && <$Icon src={abacusNotif.image} alt="" />,
+                  title: stringGetter({ key: abacusNotif.title }),
+                  body: abacusNotif.text ? stringGetter({ key: abacusNotif.text, params }) : '',
+                  toastDuration: DEFAULT_TOAST_AUTO_CLOSE_MS,
+                  toastSensitivity: 'foreground',
+                  groupKey: abacusNotificationType,
+                  renderCustomBody: ({ isToast, notification }) => (
+                    <TradeNotification
+                      isToast={isToast}
+                      data={parsedData}
+                      notification={notification}
+                    />
                  ),
-                  status: AbacusOrderStatus.filled,
-                }
-              : undefined);
-
-          if (order)
-            trigger(
-              order.id,
-              {
-                icon: (
-                  <OrderStatusIcon status={order.status} totalFilled={order.totalFilled ?? 0} />
-                ),
-                title: `${stringGetter({
-                  key: order.resources.typeStringKey as StringKey,
-                })} ${
-                  order.status === AbacusOrderStatus.open && (order?.totalFilled ?? 0) > 0
-                    ? stringGetter({ key: STRING_KEYS.PARTIALLY_FILLED })
-                    : stringGetter({ key: order.resources.statusStringKey as StringKey })
-                }`,
-                description: `${stringGetter({
-                  key: ORDER_SIDE_STRINGS[ORDER_SIDES[order.side.name]],
-                })} ${order.size} ${order.marketId} @ $${order.price}`,
-                actionDescription: 'View Order',
-                actionAltText: 'View this order in the Orders tab or the Notifications menu.',
-                toastSensitivity:
-                  order.status === AbacusOrderStatus.pending ? 'foreground' : 'background',
-                toastDuration: 5000,
-              },
-              [order.status.name, order.size],
-              !order.createdAtMilliseconds || order.createdAtMilliseconds > lastUpdated
-            );
+                },
+                [abacusNotif.updateTimeInMilliseconds, abacusNotif.data],
+                true
+              );
+              break;
+            }
+            case 'blockReward': {
+              trigger(
+                abacusNotif.id,
+                {
+                  icon: abacusNotif.image && <$Icon src={abacusNotif.image} alt="" />,
+                  title: stringGetter({ key: abacusNotif.title }),
+                  body: abacusNotif.text ? stringGetter({ key: abacusNotif.text, params }) : '',
+                  toastDuration: DEFAULT_TOAST_AUTO_CLOSE_MS,
+                  toastSensitivity: 'foreground',
+                  groupKey: abacusNotificationType,
+                  renderCustomBody: ({ isToast, notification }) => (
+                    <BlockRewardNotification
+                      isToast={isToast}
+                      data={parsedData}
+                      notification={notification}
+                    />
+                  ),
+                },
+                [abacusNotif.updateTimeInMilliseconds, abacusNotif.data],
+                true
+              );
+              break;
+            }
+            default:
+              trigger(
+                abacusNotif.id,
+                {
+                  icon: abacusNotif.image && <$Icon src={abacusNotif.image} alt="" />,
+                  title: stringGetter({ key: abacusNotif.title }),
+                  body: abacusNotif.text ? stringGetter({ key: abacusNotif.text, params }) : '',
+                  toastDuration: DEFAULT_TOAST_AUTO_CLOSE_MS,
+                  toastSensitivity: 'foreground',
+                  groupKey: abacusNotificationType,
+                },
+                [abacusNotif.updateTimeInMilliseconds, abacusNotif.data]
+              );
+              break;
+          }
        }
-      }, [orderIds]);
+      }, [abacusNotifications, stringGetter]);
    },
+    useNotificationAction: () => {
+      const dispatch = useDispatch();
+      const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
+      const ordersById = groupBy(orders, 'id');
+      const fills = useSelector(getSubaccountFills, shallowEqual) || [];
+      const fillsById = groupBy(fills, 'id');
+      const marketIds = useSelector(getMarketIds, shallowEqual);
+      const navigate = useNavigate();

-    // useNotificationAction: () => {
-    //   const dispatch = useDispatch();
-    //   const orders = useSelector(getSubaccountOrders, shallowEqual) || [];
-    //   const ordersByOrderId = Object.fromEntries(orders.map((order) => [order.id, order]));
+      return (notificationId: string) => {
+        const [abacusNotificationType = '', id = ''] = notificationId.split(':');

-    //   const fills = useSelector(getSubaccountFills, shallowEqual) || [];
-    //   const fillsByOrderId = groupBy(fills, (fill) => fill.orderId);
-
-    //   return (id) => {
-    //     if (ordersByOrderId[id]) {
-    //       dispatch(
-    //         openDialog({
-    //           type: DialogTypes.OrderDetails,
-    //           dialogProps: { orderId: id },
-    //         })
-    //       );
-    //     } else if (fillsByOrderId[id]) {
-    //       const fillId = fillsByOrderId[id][0].id;
-
-    //       dispatch(
-    //         openDialog({
-    //           type: DialogTypes.FillDetails,
-    //           dialogProps: { fillId },
-    //         })
-    //       );
-    //     }
-    //   };
-    // },
-  } as NotificationTypeConfig<string, [string, number]>,
+        if (ordersById[id]) {
+          dispatch(
+            openDialog({
+              type: DialogTypes.OrderDetails,
+              dialogProps: { orderId: id },
+            })
+          );
+        } else if (fillsById[id]) {
+          dispatch(
+            openDialog({
+              type: DialogTypes.FillDetails,
+              dialogProps: { fillId: id },
+            })
+          );
+        } else if (marketIds.includes(id)) {
+          navigate(`${AppRoute.Trade}/${id}`, {
+            replace: true,
+          });
+        }
+      };
+    },
+  },
  {
    type: NotificationType.SquidTransfer,
    useTrigger: ({ trigger }) => {
      const stringGetter = useStringGetter();
      const { transferNotifications } = useLocalNotifications();
-
-      const getTitleStringKey = useCallback((type: 'deposit' | 'withdrawal', finished: boolean) => {
-        if (type === 'deposit' && !finished) return STRING_KEYS.DEPOSIT_IN_PROGRESS;
-        if (type === 'deposit' && finished) return STRING_KEYS.DEPOSIT;
-        if (type === 'withdrawal' && !finished) return STRING_KEYS.WITHDRAW_IN_PROGRESS;
-        return STRING_KEYS.WITHDRAW;
-      }, []);
+      const { selectedNetwork } = useSelectedNetwork();

      useEffect(() => {
        for (const transfer of transferNotifications) {
-          const { fromChainId, status, txHash, toAmount } = transfer;
-          const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
-          const type = fromChainId === TESTNET_CHAIN_ID ? 'withdrawal' : 'deposit';
-          // @ts-ignore status.errors is not in the type definition but can be returned
-          const error = status?.errors?.length ? status?.errors[0] : status?.error;
+          const { fromChainId, status, txHash, toAmount, type } = transfer;
+          const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
+          const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />;

-          // TODO: confirm with design what the description should be
-          const description = (
-            <div>
-              <Styled.TransferText>
-                {type === 'deposit' ? 'Deposit of ' : 'Withdraw of '}
-                <Output type={OutputType.Fiat} value={toAmount} />
-              </Styled.TransferText>
+          const transferType =
+            type ?? fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
+              ? TransferNotificationTypes.Withdrawal
+              : TransferNotificationTypes.Deposit;

-              {error && (
-                <Styled.ErrorMessage type={AlertType.Error}>
-                  {stringGetter({
-                    key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-                    params: {
-                      ERROR_MESSAGE:
-                        error.message || stringGetter({ key: STRING_KEYS.UNKNOWN_ERROR }),
-                    },
-                  })}
-                </Styled.ErrorMessage>
-              )}
-            </div>
-          );
+          const title = stringGetter({
+            key: {
+              deposit: isFinished ? STRING_KEYS.DEPOSIT : STRING_KEYS.DEPOSIT_IN_PROGRESS,
+              withdrawal: isFinished ? STRING_KEYS.WITHDRAW : STRING_KEYS.WITHDRAW_IN_PROGRESS,
+            }[transferType],
+          });
+
+          const toChainEta = status?.toChain?.chainData?.estimatedRouteDuration || 0;
+          const estimatedDuration = formatSeconds(Math.max(toChainEta, 0));
+          const body = stringGetter({
+            key: STRING_KEYS.DEPOSIT_STATUS,
+            params: {
+              AMOUNT_USD: `${toAmount} ${DydxChainAsset.USDC.toUpperCase()}`,
+              ESTIMATED_DURATION: estimatedDuration,
+            },
+          });

          trigger(
            txHash,
            {
-              icon: <Icon iconName={finished ? IconName.Transfer : IconName.Clock} />,
-              title: stringGetter({ key: getTitleStringKey(type, finished) }),
-              description: description,
-              customContent: (
-                <TransferStatusToast
-                  type={type}
-                  toAmount={transfer.toAmount}
+              icon,
+              title,
+              body,
+              renderCustomBody: ({ isToast, notification }) => (
+                <TransferStatusNotification
+                  isToast={isToast}
+                  slotIcon={icon}
+                  slotTitle={title}
+                  transfer={transfer}
+                  type={transferType}
                  triggeredAt={transfer.triggeredAt}
-                  status={transfer.status}
+                  notification={notification}
                />
              ),
-              customMenuContent: !finished && (
-                <div>
-                  {description}
-                  <TransferStatusSteps status={transfer.status} type={type} />
-                </div>
-              ),
              toastSensitivity: 'foreground',
+              groupKey: NotificationType.SquidTransfer,
            },
-            []
+            [isFinished]
          );
        }
-      }, [transferNotifications]);
+      }, [transferNotifications, stringGetter]);
+    },
+    useNotificationAction: () => {
+      return () => {};
    },
  },
-] satisfies NotificationTypeConfig[];
+  {
+    type: NotificationType.ReleaseUpdates,
+    useTrigger: ({ trigger }) => {
+      const stringGetter = useStringGetter();

-const Styled: Record<string, AnyStyledComponent> = {};
+      useEffect(() => {
+        trigger(
+          'rewards-and-full-trading-live',
+          {
+            icon: <AssetIcon symbol="DYDX" />,
+            title: stringGetter({ key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.TITLE' }),
+            body: stringGetter({
+              key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.BODY',
+              params: {
+                DOS_BLOGPOST: (
+                  <$Link
+                    href="https://www.dydxopsdao.com/blog/deep-dive-full-trading"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    {stringGetter({ key: STRING_KEYS.HERE })}
+                  </$Link>
+                ),
+                TRADING_BLOGPOST: (
+                  <$Link
+                    href="https://dydx.exchange/blog/v4-full-trading"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    {stringGetter({ key: STRING_KEYS.HERE })}
+                  </$Link>
+                ),
+              },
+            }),
+            toastSensitivity: 'foreground',
+            groupKey: NotificationType.ReleaseUpdates,
+          },
+          []
+        );
+      }, [stringGetter]);
+    },
+    useNotificationAction: () => {
+      return () => {};
+    },
+  },
+];

-Styled.TransferText = styled.span`
-  display: inline-flex;
-  align-items: center;
-  gap: 0.5ch;
+const $Icon = styled.img`
+  height: 1.5rem;
+  width: 1.5rem;
 `;

-Styled.ErrorMessage = styled.div`
-  max-width: 13rem;
+const $Link = styled.a`
+  --link-color: var(--color-text-2);
 `;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aleka Cheung	4c6508f574	make sure view more is hidden when not num rows not specified	2024-01-25 13:28:08 -05:00
Rui	54e81cca80	Change iOS app scheme to dydx-t-v4 (#248 )	2024-01-25 09:19:49 -08:00
Jared Vu	0ed1f33808	✨ Canvas Orderbook (#227 ) * 🚧 Canvas Orderbook * 🚧 Add orderbookMap to aid in Canvas redraws * enable mine column * Merge main into canvas-orderbook-2 * 🧱 fix: Add orderbook constants file, remove console log, nits * 💄 style: orderbook canvas text 13.5px -> 12px * Updated constants and typings * loadingSpace logic was slowing down ref mount	2024-01-24 23:16:33 -08:00
Bill	48e67f5681	Upgrade v4 clients and @cosmjs packages (#243 ) * Upgrade v4-client and @cosmjs packages * add comments	2024-01-24 15:29:43 -08:00
mike-dydx	da1ac0d087	Update ios app scheme in env.json (#247 )	2024-01-24 15:28:11 -08:00
moo-onthelawn	17fce5417a	TRCL-3476 Create colorTokens file + new theme color types (#239 ) * introduce tokens file + theme type * fix lint error * TRCL-3497 Use color tokens in app + tradingView widget (#240) * update to use tokens, small fixes * fix eol lint * move usage style helper to lib/styles * move files, fix text colors * fix logo in light mode * remove colors.css file * small lint things * add transparency to button + destructive borders	2024-01-24 17:03:44 -05:00
aleka	b86a346be3	move governance staking panels out of trading rewards to profile on mobile (#242 ) * add collapsible table * update to add a TR inside table instead * move governance staking panels to mobile profile	2024-01-24 15:33:01 -05:00
aleka	5cecc40a1c	fix http->https in validator v4dev4 url (#245 ) * fix http->https in validator v4dev4 url * add faucet url	2024-01-24 15:32:40 -05:00
moo-onthelawn	7134fa541d	add icons and update stories (#244 )	2024-01-24 15:07:32 -05:00
aleka	cd30c9c7d9	add collapsible table (#231 ) * add collapsible table * update to add a TR inside table instead	2024-01-24 12:26:32 -05:00
aleka	414e38afec	Delay wagmi connection if remember me is enabled (#210 ) * connect wagmi on deposit if remember me * use alert message instead of button message * clear input state when closing transfers forms to renable trade place order button	2024-01-23 13:45:14 -05:00
Bill	e93850484b	CCTP deposit/withdraw to throw error if nobleClient is not initialized (#215 ) * CCTP deposit/withdraw to throw error if nobleClient is not initialized * update error str	2024-01-22 09:55:26 -08:00
aleka	521b6d6135	test flag for sign in option (#236 )	2024-01-17 16:22:17 -08:00
aleka	94772bf4dc	bump abacus to remove base position notional (#235 )	2024-01-17 15:52:02 -08:00
Adam Fraser	149f21e7e0	Add trailing blocks to NetworkStatus analytics event (#230 )	2024-01-17 10:34:04 -05:00
aleka	0a3ef3a7ab	bump abacus (#233 )	2024-01-17 10:33:29 -05:00
Bill	fef9935883	Support notification for trading rewards (#224 ) * Support notification for trading rewards * bump abacus * Stack notifications based on notification type * address comments	2024-01-16 10:19:48 -08:00
Bill	c7a5b706e1	Fix toAmount/toAmountMin on withdraw (#232 )	2024-01-15 10:31:23 -08:00
moo-onthelawn	f304bb069a	TRCL-1979 Show open positions / orders in portfolio sidebar (#228 ) * add tags for open orders + positions * clean up, use new num selector function * update logic for open orders	2024-01-12 14:44:09 -05:00
Bill	ad6aa1af49	Bump abacus, fix onboarding toAmount (#229 )	2024-01-11 11:52:02 -08:00
Jared Vu	55b2c3fb4a	Update Funding Chart Tooltip (#225 ) * 🚧 depth chart * ✨ Fixed types and shortened FundingRateTooltip * 💄 update depth chart color scale to use css var * 💄 use layer-6 instead of text-1 * 🌐 Add localization, fix nits	2024-01-11 10:31:53 -08:00
moo-onthelawn	83bcde00eb	TRCL-1623 Update Positions icon in nav sidebar (#226 ) * update icon * remove unused cube icon	2024-01-11 11:02:23 -05:00
Jared Vu	e8024b9337	Add Sepolia (#222 )	2024-01-09 16:35:19 -08:00
Jared Vu	8280e512bc	Remove BasePositionNotional DetailItem (#223 )	2024-01-09 14:01:38 -08:00
aleka	b2234cb969	reorganize rewards vs. profile, update panel and accordion styling (#221 ) * reorganize rewards vs. profile, update panel and accordion styling * feedback	2024-01-09 16:57:02 -05:00
Bill	4bcb1f64ac	Add Kava support for onboarding, and add token symbol to token select (#220 ) * Add Kava support for onboarding, and add token symbol to token select * bump abacus	2024-01-09 11:51:31 -08:00
BillandAleka Cheung	4a64d59546	Update launch incentives to season 2 (#218 ) * Update launch incentives to season 2 * update api url --------- Co-authored-by: Aleka Cheung <aforaleka@gmail.com>	2024-01-04 19:14:23 -08:00
Jared Vu	3fc43e8a12	Remove base from baseInitialMarginFraction (#209 )	2024-01-04 15:35:05 -08:00
Jared Vu	c24a9229a6	Imperator testnet indexer to be scaled down (#219 )	2024-01-04 15:34:18 -08:00
aleka	90329d44d0	update lock file (#217 )	2024-01-03 13:57:21 -08:00
Bill	9a02bd3f1c	remove testnet cctp chains (#216 )	2024-01-03 12:55:58 -08:00
aleka	adba11b462	add accordion component and rewards help panel (#214 )	2024-01-03 14:20:30 -05:00
Jared Vu	29526b927f	Update deposit and withdrawal receipts (#212 ) * Update receipts * Remove duplicate const * Restore env * format * Try using raw * Use 3 spaces T.T * copy from main * Update abacus, display proper toAmount and toAmountMin * nits	2024-01-03 09:56:01 -08:00
Jared Vu	503e089efa	temp hide fees for cctp route (#213 )	2023-12-23 01:17:41 -08:00
Jared Vu	c3495f462c	Additional Withdraw/Deposit validation (#211 ) * Add cctp amount check and price impact check * 2.5% -> 2%	2023-12-22 17:31:32 -08:00
Billandjaredvu	6da6eeb2a4	Enable CCTP (#194 ) * Enable CCTP * Handle base64 encode * Update localization package --------- Co-authored-by: jaredvu <jaredvu@gmail.com>	2023-12-22 11:12:41 -08:00
mike-dydx	0cf3e81bd7	Create documentation.json (#205 )	2023-12-21 15:08:08 -05:00
aleka	f8cf1d364b	update coinbase connect app name (#208 )	2023-12-21 10:58:57 -08:00
Jared Vu	6f344c6b5d	Update comparison function in Table (#207 )	2023-12-21 10:53:56 -08:00
Jared Vu	133856afca	Export secret phrase help article (#206 ) * Update config with correct article link * Remove auto-format of json	2023-12-21 10:49:52 -08:00
Jared Vu	33c543daaf	Update bridgeFee in Withdraw/Deposit forms (#202 ) * Update Withdraw form receipt * Bump abacus 1.1.27 * pnpm-lock * bump v4-localization	2023-12-19 23:36:13 -08:00
Jared Vu	c77e727d2b	TRCL-3406: firefox mobile position table row has stretched icon (#204 ) * Fix PositionsTable assetIcon * Mobile width of HelpDialog	2023-12-19 23:33:36 -08:00
Jared Vu	b94538711d	Lazy load Pages (#203 ) * Lazy import pages * Fix import order	2023-12-19 23:30:51 -08:00
Jared Vu	b83479f45c	Handle New Markets added by Gov (#201 ) * Add celestia assets * Handle symbol not yet added	2023-12-19 23:25:14 -08:00
Jared Vu	001aad3abc	Navigate to the Markets page if the current marketId is not included in subscribed markets (#198 ) * Navigate to markets if current url is invalid * nits	2023-12-19 15:58:49 -08:00
Jared Vu	f8db5e1ba0	Update abacus to 1.1.25: Good til time fix (#199 )	2023-12-19 09:49:51 -08:00
Jared Vu	f8bec0fb3d	Update Withdraw form receipt (#200 )	2023-12-19 09:49:37 -08:00
Bill	8bf23b7e9c	bump abacus (#197 )	2023-12-15 15:12:35 -08:00
Jared Vu	3f10e045f4	bump abacus & wagmi (#196 )	2023-12-15 09:26:41 -08:00
Bill	71d1a0321b	Do not block website if NobleClient cannot init, and other onboarding fixes (#193 )	2023-12-13 08:11:19 -08:00
Bill	0f16396c8d	Implement CCTP withdraw (#188 ) * Implement CCTP withdraw * bump packages * address comments	2023-12-12 10:12:37 -08:00
Jared Vu	2709d79f59	Firefox issues (#190 ) * remove row flicker on hover * Fix border for AccountInfoConnectedState on mobile * Remove sticky position to allow button click * Fix: AccountInfo not displaying on mobile firefox * Fix css var name * Restore filter on Table row hover * Remove PerspectiveArea. broken on firefox * Symbol no longer exists on AbacusType * HorizontalPanel: memoize tabConfig * input: firefox cant click between chars	2023-12-12 08:37:50 -08:00
Bill	ab0eec5d4f	Update noble tesnet rpc (#192 )	2023-12-12 11:35:21 -05:00
Jared Vu	4a044da38f	Size inputs (#191 ) * use formattedValue to update redux state * Separate updateLeverage and onLeverageInput * Remove console.log	2023-12-12 07:11:51 -08:00
Jared Vu	fbbfbc6580	Bump v4-abacus and v4-localization (#189 )	2023-12-08 15:41:07 -08:00
Rui	2714c2b084	Fix path to chainLogo (#187 )	2023-12-07 13:03:44 -08:00
Jared Vu	9979bc8a16	Prevent Spread row from moving when orderbook updates (#186 ) * Add dummy rows to ensure even row count * Reverse bids for horizontal layout * disable pointer-events for dummy rows	2023-12-06 10:26:47 -08:00
aleka	a958a59ea2	Display more markets 12/06 (#178 ) * add more markets 12/06	2023-12-06 11:38:49 -05:00
Jared Vu	2bf9e66da5	Fix inputs for comma locales (#171 ) * Fix for comma decimal separator locales * Accept tickSizeDecimals 0 * Use FloatValue as value for Size Input * Use formattedValue to handle prefix/suffix * Use MustBigNumber.toString()	2023-12-05 16:22:41 -08:00
Bill	2980144e40	Enable CCTP via TestFlags (#185 ) * Enable CCTP via Env Var * Use test flags instead	2023-12-05 14:48:47 -08:00
aleka	5387fe8632	Display more markets 12/05 (#177 ) * add more markets 12/05	2023-12-05 09:52:12 -05:00
Bill	1132ea3bbd	Do not init nobleClient if nobleValidatorUrl does not exist (#184 )	2023-12-04 11:19:29 -08:00
aleka	9188e08a4f	prevent 1password fill (#183 )	2023-12-04 11:06:49 -05:00
aleka	941ef7f9dd	Display more markets 12/04 (#176 ) * add more markets 11/30 * add more markets 12/01 * add more markets 12/04	2023-12-04 10:53:25 -05:00
Bill	b1ffa2e219	Support CCTP and noble auto deposits on testnet (#180 ) * Support CCTP and noble auto deposits on testnet * slippage * fix fees * update isCctp, and comments * bump packages * cctp.json * Bump abacus * fix error * fix loading button	2023-12-01 15:18:50 -08:00
aleka	91ea68dc53	Add chaos labs launch incentives panel (#182 ) * add chaos lab incentives panel * add seen state * external link dialog * better disconnected state	2023-12-01 15:27:19 -05:00
aleka	cf79528d05	Display more markets 12/01 (#175 ) * add more markets 12/01	2023-12-01 09:59:04 -05:00
Bill	ef81f9da57	Add nobleValidator to config (#181 )	2023-11-30 16:11:55 -08:00
aleka	60d59cd211	add more markets 11/30 (#174 )	2023-11-30 10:06:25 -05:00
aleka	19d38378f3	display more markets (#173 )	2023-11-29 10:33:02 -05:00
Bill	15a64232c0	Fix USDT approval (#170 ) * Fix USDT approval * address comment	2023-11-28 11:44:21 -08:00
aleka	28d3be0370	Release notification (#169 ) * add release notif	2023-11-28 12:36:29 -05:00
Rui	90ff9ccc5a	Add token address to cctp.json (#167 ) * Add token address to cctp.json * Update field name to tokenAddress	2023-11-27 17:55:52 -08:00
Jared Vu	33516422e7	Filter markets and add test flag (#168 )	2023-11-27 17:05:19 -08:00
Rui	eb31610a38	Add CCTP supported chains to cctp.json (#166 )	2023-11-27 14:27:42 -08:00
Jared Vu	b0e1655018	Bump Abacus@1.0.30 (#165 )	2023-11-27 13:01:25 -08:00
Jared Vu	b4cc5f87ec	Add href prop to button component (#164 ) * Add href prop to button component * Use ButtonType.Link	2023-11-27 12:39:57 -08:00
Bill	549ae558e7	Default Locale to EN if not supported (#163 )	2023-11-27 08:57:57 -08:00
Jared Vu	5b06110e2d	Update Abacus@1.0.28 (#161 )	2023-11-22 14:08:03 -08:00
aleka	e3da2ee4b1	update copy and other polish (#157 ) * update copy and other polish * fix mobile nav menu nested buttons * feedback	2023-11-22 15:06:21 -05:00
Rui	6b38d68b09	Remove universal link for trust wallet since it's no longer valid. (#160 )	2023-11-21 19:25:03 -08:00
Jared Vu	1dedc93a56	Mobile friendly Toast: Collapse/Close (#159 )	2023-11-21 19:24:19 -08:00
Jared Vu	1427b55728	MarketsTable: Sort OpenInterest by notional, Display 24h volume as fiat value (#158 ) * Fix Sort by notional, Display fiat for volume * OpenInterest notional on top	2023-11-21 16:10:23 -08:00
Jared Vu	20521b5b3f	Add button to stack/unstack Toast notifications (#149 ) * Add button to stack/unstack * Button -> Toggle button, add offset for notifs	2023-11-20 15:12:38 -08:00
Jared Vu	532df49a06	Use new redux tradeFormInputs object for TradingForm input display values (#144 ) * Redux slice for TradeFormInputs * Move sideEffects from TradeForm to hook in Trade	2023-11-20 11:56:09 -08:00
aleka	fb65db633a	move buttons to footer in ack terms (#155 )	2023-11-20 13:21:06 -05:00
aleka	279ef6b4f9	bump abacus (#153 )	2023-11-13 10:57:40 -05:00
aleka	0def18db07	fix sorting 24h price change in markets table (#152 )	2023-11-13 09:36:32 -05:00
Jared Vu	50bd860ced	Bump Abacus 1.0.25 (#151 )	2023-11-13 09:36:16 -05:00
Jared Vu	818574cedb	Change dep in hook to fix input bug (#150 )	2023-11-13 09:11:54 -05:00
aleka	3be0429a60	add back border to toggle buttons (#148 )	2023-11-11 20:46:04 -08:00
aleka	b8e72246b9	add manage funds dialog and transfers form styling (#147 ) * add manage funds dialog and transfers form styling * add sticky footer backdrop * add testnet deposit toggle	2023-11-10 20:56:27 -08:00
Jared VuandBill He	99e708a984	Notifications Refresh (#135 ) * Remove X button from tablet/mobile Notification menu * Toast styling * missed in merge * .env.example * Update abacus@1.0.9 * Add notif strings, and abaucs notif state * Update Notification hooks, add Notification Preference controls * Consolidate Notification into single component * withLabel -> withTrigger prop * nits * OrderStatusChanged -> AbacusGenerated * Notification OnClick * Move Notification -> Components * withAnimation -> $withAnimation * Notification styling and click handle * load state, onClick, localStorage * add error count * Rez localStorage Notifications * Update TransferStatus UI * Use Notification component for other abacusNotifs * fix uselocalnotif query * Default to Notification from NotificationMenu --------- Co-authored-by: Bill He <bill@dydx.exchange>	2023-11-10 20:55:34 -08:00
aleka	876f620ada	Account menu and components improvements (#145 ) * better copy button * hide sign into mobile for production and use new copy icon button * new checkbox	2023-11-10 22:07:29 -05:00
Bill	b9550890da	Add additional onboarding entry points (#146 ) * Add additional onboarding entry points * flex-wrap	2023-11-10 19:05:46 -08:00
aleka	3732b955f5	add sample terms of use (#138 ) * add sample terms of use * add back article mixin	2023-11-10 14:58:26 -05:00
aleka	253bfc0eff	update nav menu dropdown behavior to click instead of hover to open (#142 )	2023-11-10 14:58:17 -05:00
Bill	d4bcfc0428	Fix status empty bug (#143 )	2023-11-10 09:55:54 -08:00
aleka	7dec32df5e	fix 24h sort in market dropdown, table styling (#141 )	2023-11-09 16:40:27 -05:00
aleka	e09d574d5b	show deposit form in mainnet onboarding (#140 )	2023-11-09 15:33:16 -05:00
Bill	944fc6dc95	Handle squid rout errors (#139 ) * Handle squid route errors * bump abacus * add dep * address comments * fix max * disable slippage editor * parse error message in abacus	2023-11-09 10:34:22 -08:00
aleka	91a97a1c68	add network select menu in restriction modals (dev) (#137 )	2023-11-09 09:10:12 -05:00
aleka	c5f736d805	fix deposit dialog logic (#136 )	2023-11-08 14:01:16 -05:00
aleka	3769f7078c	update readme re env mode (#133 )	2023-11-07 20:28:56 -08:00
Jared Vu	edc9fadfee	Add TestFlags provider and class (#132 ) * Add TestFlags provider and class * import order nit * markets is an object and not array * Use null coalescing op	2023-11-07 20:28:42 -08:00
aleka	5e2d426cd1	Send native tokens inclusive fee (#118 ) * send dv4tnt inclusive of fees	2023-11-07 22:42:41 -05:00
Bill	766209baf1	Onboarding fixes (#131 ) * Onboarding fixes * address comments * rebase	2023-11-07 17:18:16 -08:00
aleka	906faa554d	Surface close position input errors (#130 ) * show abacus close position validation errors * bump abacus version	2023-11-07 19:11:08 -05:00
John Huang	c339eeccde	TRCL-3077 Added an environment for testing. Expected behavior - when "v4 Staging Forced Update" is selected in iOS app, it should switch to the forced update screen (#99 )	2023-11-07 13:33:06 -08:00
aleka	bd03fb73ca	update mintscan tx link on transfer history table (#128 ) * update mintscan tx link on transfer history table * bump localization + fix icon button padding in header	2023-11-07 16:00:22 -05:00
Rui	31825a8a52	Change "iOS" to "ios" for consistency (#129 )	2023-11-07 11:01:41 -08:00
John Huang	8d5bf1a721	TRCL-3128 TradePlaceOrder and TradeCancelOrder are now tracked by Abacus (#115 )	2023-11-07 10:34:06 -08:00
aleka	7f3d57b46a	support multiple modes (#125 )	2023-11-07 12:13:59 -05:00
Bill	c292c84c2c	Fix decimal overflow bug (#127 ) * Fix decimal overflow bug * use decimals:	2023-11-06 17:48:19 -08:00
Bill	2d37ff676b	do not use TESTNET_CHAIN_ID (#126 )	2023-11-06 17:39:02 -08:00
Rui	68f3552569	Add app configuration to env.json (#121 )	2023-11-06 13:02:38 -08:00
aleka	18b12591ca	Update LICENSE (#123 )	2023-11-06 11:10:31 -08:00
Bill	3f963ffb07	Add Env var descriptions to readme (#124 ) * Add Env var descriptions to readme * update * remove examples * grammar	2023-11-06 10:50:45 -08:00
aleka	aac024fd5e	showing negative buying power as - (#119 )	2023-11-06 13:31:41 -05:00
Christopher-Li	4913c690ec	Update all dev4 endpoints to use https and wss (#117 ) * Update all dev endpoints to use https and wss * dev4	2023-11-06 09:33:22 -08:00
Bill	b0db577b28	Configurable squid integrator id (#120 ) * Configurable squid integrator id * bump abacus	2023-11-03 14:18:15 -07:00
Bill	9815437a80	Account dropdown onboarding entrypoints (#113 ) * Account dropdown onboarding entrypoints * Update based on latest designs	2023-10-31 14:29:36 -07:00
aleka	890a4b2c0e	Padding fixes, markets data null fix, update .env.example (#112 ) * update .env.example for token migration * bump icon size in icon button * add padding in rewards / fees page, panel changes * fix markets data crashing * fix market details overflow on tablet * fix market filters * prevent fees table overflow * remove notifications close button on mobile * fix nested button console warning * update ToggleGroup value change logic * panel hover impact button hover * update dropdown icon in header	2023-10-31 17:11:46 -04:00
Bill	8d3cc76d14	Configurable URLs (#107 ) * Configurable URLs * add learnmore to tooltip * Learnmore -> LearnMore	2023-10-31 11:02:45 -07:00
Adam Fraser	c7ad4b3028	Remove DSRV from Testnet node config options (#108 ) * Remove DSRV from Testnet node config options * Add Bware to testnet node config	2023-10-31 10:52:49 -07:00
Rui	c88d5dd411	Add Android config to wallets.json (#114 )	2023-10-31 09:35:59 -07:00
Jared Vu	d6ab547055	Update README.md (#111 ) * Add README in scripts directory * Add Cloudflare instructions to README	2023-10-30 15:17:12 -07:00
aleka	2fe6c2bb3b	reorder header, center align header, update collapse caret icons (#110 )	2023-10-27 23:32:51 -04:00
aleka	e6858ca917	show loading state instead of "Unavailable" for place order button (#104 ) * show loading instead of unavailable for place order button	2023-10-27 17:39:12 -04:00
aleka	d92b49f4fa	bump packages, fix missing asset symbol (#106 )	2023-10-27 16:47:34 -04:00
aleka	e7da21962a	add entry point to token migration (#98 ) * update migrate panel * address feedback	2023-10-27 16:14:34 -04:00
aleka	b479531e34	update v4 docs link (#102 )	2023-10-27 16:13:48 -04:00
Bill	0d4c5a547a	Abort key derivation if second signature fails (#109 )	2023-10-27 11:41:00 -07:00
Rui	5b235ee53f	Add link to help page (#103 )	2023-10-27 09:15:31 -07:00
Adam Fraser	18dee0586b	Add Polkachu as RPC Node for Testnet (#105 ) * Update env.json * Add Polkachu option to environments * Fix trailing comma error	2023-10-25 18:21:27 -04:00
mikemag-dev	9f1f5987ee	Update apple-app-site-association (#100 )	2023-10-24 18:33:41 -04:00
James Jia	7f531516ca	v1.0: Update LICENSE and README (#101 ) * Update LICENSE and README * Update README, package.json * Update package.json	2023-10-24 14:14:49 -07:00
aleka	3fd71558c0	fix trading view error (#96 ) * fix trading view error * only init trading view if market id is first defined, and nits re fills table with empty asset	2023-10-24 17:06:00 -04:00