Change iOS app scheme to dydx-t-v4

* 🚧 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

.ladle/components.tsx

@@ -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>
+      <AppThemeProvider>
-    </Provider>
+        <GlobalStyle />
+        <StoryContent>{children}</StoryContent>
+      </AppThemeProvider>
+      </Provider>
   );
 };
 

README.md

@@ -98,6 +98,11 @@ 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.
 

package.json

@@ -33,20 +33,23 @@
   "packageManager": "pnpm@8.6.6",
   "dependencies": {
     "@0xsquid/sdk": "^1.10.0",
-    "@cosmjs/amino": "^0.31.0",
+    "@cosmjs/amino": "^0.32.1",
-    "@cosmjs/crypto": "^0.31.0",
+    "@cosmjs/crypto": "^0.32.1",
-    "@cosmjs/encoding": "^0.31.0",
+    "@cosmjs/encoding": "^0.32.1",
-    "@cosmjs/proto-signing": "^0.31.0",
+    "@cosmjs/proto-signing": "^0.32.1",
-    "@cosmjs/stargate": "^0.31.0",
+    "@cosmjs/stargate": "^0.32.1",
-    "@cosmjs/tendermint-rpc": "^0.31.0",
+    "@cosmjs/tendermint-rpc": "^0.32.1",
-    "@dydxprotocol/v4-abacus": "^1.0.10",
+    "@dydxprotocol/v4-abacus": "^1.2.5",
-    "@dydxprotocol/v4-client-js": "^1.0.0",
+    "@dydxprotocol/v4-client-js": "^1.0.14",
-    "@dydxprotocol/v4-localization": "^1.0.0",
+    "@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",
+    "viem": "^1.20.0",
-    "wagmi": "^1.3.7"
+    "wagmi": "^1.4.12"
   },
   "devDependencies": {
     "@babel/core": "^7.22.5",

public/configs/cctp.json

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

public/configs/documentation.json

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

public/configs/env.json

@@ -1,7 +1,7 @@
 {
    "apps": {
-      "iOS": {
+      "ios": {
-         "scheme": "dydxv4"
+         "scheme": "dydx-t-v4"
       }
    },
    "deployments": {
@@ -39,10 +39,10 @@
    "environments": {
       "dydxprotocol-dev": {
          "name": "v4 Dev",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -71,6 +71,7 @@
                "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": {
@@ -88,7 +89,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -112,10 +113,10 @@
       },
       "dydxprotocol-dev-2": {
          "name": "v4 Dev 2",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -143,7 +144,8 @@
             "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",
@@ -160,7 +162,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -184,10 +186,10 @@
       },
       "dydxprotocol-dev-4": {
          "name": "v4 Dev 4",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -213,9 +215,11 @@
                }
             ],
             "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",
@@ -232,7 +236,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -256,10 +260,10 @@
       },
       "dydxprotocol-dev-5": {
          "name": "v4 Dev 5",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -287,7 +291,8 @@
             "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",
@@ -304,7 +309,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -328,10 +333,10 @@
       },
       "dydxprotocol-staging": {
          "name": "v4 Staging",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -360,7 +365,8 @@
             "validators": [
                "https://validator.v4staging.dydx.exchange"
             ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -378,7 +384,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -400,12 +406,85 @@
             "signTypedDataDomainName": "dYdX Chain"
          }
       },
-      "dydxprotocol-staging-west": {
+      "dydxprotocol-staging-forced-update": {
-         "name": "v4 Staging West",
+         "name": "v4 Staging Forced Update",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
+         "squidIntegratorId": "dYdX-api",
+         "isMainNet": false,
+         "tokens": {
+            "chain": {
+               "name": "Dv4TNT",
+               "denom": "adv4tnt",
+               "decimals": 18,
+               "image": "/currencies/dydx.png"
+            },
+            "usdc": {
+               "name": "USDC",
+               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
+               "gasDenom": "uusdc",
+               "decimals": 6,
+               "image": "/currencies/usdc.png"
+            }
+         },
+         "endpoints": {
+            "indexers": [
+               {
+                  "api": "https://indexer.v4staging.dydx.exchange",
+                  "socket": "wss://indexer.v4staging.dydx.exchange"
+               }
+            ],
+            "faucet": "https://faucet.v4staging.dydx.exchange",
+            "validators": [
+               "https://validator.v4staging.dydx.exchange"
+            ],
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
+         },
+         "links": {
+            "tos": "https://dydx.exchange/v4-terms",
+            "privacy": "https://dydx.exchange/privacy",
+            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
+            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
+            "documentation": "https://v4-teacher.vercel.app/",
+            "community": "https://discord.com/invite/dydx",
+            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
+            "blogs": "https://www.dydx.foundation/blog"
+         },
+         "wallets": {
+            "walletconnect": {
+               "client": {
+                  "name": "dYdX v4",
+                  "description": "dYdX v4 App",
+                  "iconUrl": "/logos/dydx-x.png"
+               },
+               "v2": {
+                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
+               }
+            },
+            "walletSegue": {
+               "callbackUrl": "/walletsegue"
+            },
+            "images": "/wallets/",
+            "signTypedDataAction": "dYdX Chain Onboarding",
+            "signTypedDataDomainName": "dYdX Chain"
+         },
+         "apps": {
+            "ios": {
+               "minimalVersion": "1.0",
+               "build": 40000,
+               "url": "https://apps.apple.com/app/dydx/id1564787350"
+            }
+         }
+      },
+      "dydxprotocol-staging-west": {
+         "name": "v4 Staging West",
+         "ethereumChainId": "11155111",
+         "dydxChainId": "dydxprotocol-testnet",
+         "chainName": "dYdX Chain",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -434,7 +513,8 @@
             "validators": [
                "https://validator-uswest1.v4staging.dydx.exchange"
             ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
+            "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "links": {
             "tos": "https://dydx.exchange/v4-terms",
@@ -452,7 +532,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -476,10 +556,10 @@
       },
       "dydxprotocol-testnet": {
          "name": "v4 Public Testnet",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -500,8 +580,8 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
@@ -512,6 +592,7 @@
                "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": {
@@ -530,7 +611,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -554,10 +635,10 @@
       },
       "dydxprotocol-testnet-dydx": {
          "name": "v4 Public Testnet/dYdX",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -586,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": {
@@ -605,7 +687,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -629,10 +711,10 @@
       },
       "dydxprotocol-testnet-nodefleet": {
          "name": "v4 Public Testnet/nodefleet",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -653,14 +735,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
                "https://dydx-testnet.nodefleet.org"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -680,7 +763,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -704,10 +787,10 @@
       },
       "dydxprotocol-testnet-kingnodes": {
          "name": "v4 Public Testnet/KingNodes",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -728,14 +811,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
                "https://test-dydx.kingnodes.com"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -755,7 +839,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -779,10 +863,10 @@
       },
       "dydxprotocol-testnet-liquify": {
          "name": "v4 Public Testnet/Liquify",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -803,14 +887,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
                "https://dydx-rpc.liquify.com/api=8878132/dydx"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -830,7 +915,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -854,10 +939,10 @@
       },
       "dydxprotocol-testnet-polkachu": {
          "name": "v4 Public Testnet/Polkahcu",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -878,14 +963,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
                "https://dydx-testnet-rpc.polkachu.com/"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -893,6 +979,7 @@
             "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",
@@ -919,10 +1006,10 @@
       },
       "dydxprotocol-testnet-bware": {
          "name": "v4 Public Testnet/BWare",
-         "ethereumChainId": "5",
+         "ethereumChainId": "11155111",
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
@@ -943,14 +1030,15 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://dydx-testnet.imperator.co",
+                  "api": "https://indexer.v4testnet.dydx.exchange",
-                  "socket": "wss://dydx-testnet.imperator.co"
+                  "socket": "wss://indexer.v4testnet.dydx.exchange"
                }
             ],
             "validators": [
                "https://dydx-testnet-full-rpc.public.blastapi.io/"
             ],
             "0xsquid": "https://testnet.api.squidrouter.com",
+            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/",
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "links": {
@@ -997,7 +1085,7 @@
          "ethereumChainId": "1",
          "dydxChainId": "[mainnet chain id]",
          "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
+         "chainLogo": "/dydx-chain.png",
          "squidIntegratorId": "[mainnet squid integrator id]",
          "isMainNet": true,
          "tokens": {
@@ -1027,18 +1115,19 @@
                "[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 mintsacn base url]",
+            "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": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "reduceOnlyLearnMore": "[HTTP link to reduce-only learn more, can be null]",
             "documentation": "[HTTP link to documentation, can be null]",
             "community": "[HTTP link to community, can be null]",
             "help": "[HTTP link to help page, can be null]",

public/configs/markets.json

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

public/configs/wallets.json

@@ -199,7 +199,7 @@
     },
     "mobile": {
       "native": "trust:",
-      "universal": "https://link.trustwallet.com"
+      "universal": ""
     },
     "desktop": {
       "native": "",

public/dots-background-2.svg

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

src/App.tsx

@@ -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>
+        <Styled.Main>
-        <Suspense fallback={null}>
+          <Suspense fallback={<LoadingSpace id="main" />}>
-          <Routes>
+            <Routes>
-            <Route path={AppRoute.Trade}>
+              <Route path={AppRoute.Trade}>
-              <Route path=":market" element={<TradePage />} />
+                <Route path=":market" element={<TradePage />} />
-              <Route path={AppRoute.Trade} element={<TradePage />} />
+                <Route path={AppRoute.Trade} element={<TradePage />} />
-            </Route>
+              </Route>
 
-            <Route path={AppRoute.Markets} element={<MarketsPage />} />
+              <Route path={AppRoute.Markets} element={<MarketsPage />} />
-            <Route path={`/${chainTokenLabel}`} element={<RewardsPage />} />
+              <Route path={`/${chainTokenLabel}`} element={<RewardsPage />} />
-            {isTablet && (
+              {isTablet && (
-              <>
+                <>
-                <Route path={AppRoute.Alerts} element={<AlertsPage />} />
+                  <Route path={AppRoute.Alerts} element={<AlertsPage />} />
-                <Route path={AppRoute.Profile} element={<ProfilePage />} />
+                  <Route path={AppRoute.Profile} element={<ProfilePage />} />
-                <Route path={`${AppRoute.Settings}/*`} element={<SettingsPage />} />
+                  <Route path={`${AppRoute.Settings}/*`} element={<SettingsPage />} />
-              </>
+                </>
-            )}
+              )}
 
-            <Route element={<GuardedMobileRoute />}>
+              <Route element={<GuardedMobileRoute />}>
-              <Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
+                <Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
-            </Route>
+              </Route>
 
-            <Route path={AppRoute.Terms} element={<TermsOfUsePage />} />
+              <Route path={AppRoute.Terms} element={<TermsOfUsePage />} />
-            <Route path={AppRoute.Privacy} element={<PrivacyPolicyPage />} />
+              <Route path={AppRoute.Privacy} element={<PrivacyPolicyPage />} />
 
-            <Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
+              <Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
-          </Routes>
+            </Routes>
-        </Suspense>
+          </Suspense>
-      </Styled.Main>
+        </Styled.Main>
 
-      {isTablet ? <FooterMobile /> : <FooterDesktop />}
+        {isTablet ? <FooterMobile /> : <FooterDesktop />}
 
-      <Styled.NotificationsToastArea />
+        <Styled.NotificationsToastArea />
 
-      <Styled.DialogArea ref={setDialogArea}>
+        <Styled.DialogArea ref={setDialogArea}>
-        <DialogManager />
+          <DialogManager />
-      </Styled.DialogArea>
+        </Styled.DialogArea>
 
-      <GlobalCommandDialog />
+        <GlobalCommandDialog />
-    </Styled.Content>
+      </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 = () => {

src/abi/erc20_usdt.json

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

src/components/Accordion.stories.tsx

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

src/components/Accordion.tsx

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

src/components/AssetIcon.tsx

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

src/components/Button.tsx

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

src/components/Canvas.tsx

@@ -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} />
+  )
+);

src/components/Checkbox.stories.tsx

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

src/components/Checkbox.tsx

@@ -1,10 +1,14 @@
 import styled, { type AnyStyledComponent } from 'styled-components';
+import { Root, Indicator } from '@radix-ui/react-checkbox';
+import { CheckIcon } from '@radix-ui/react-icons';
 
-import { breakpoints } from '@/styles';
+import { layoutMixins } from '@/styles/layoutMixins';
 
 type ElementProps = {
   checked: boolean;
-  onClick: (e: React.ChangeEvent) => void;
+  onCheckedChange: (checked: boolean) => void;
+  id?: string;
+  label?: React.ReactNode;
 };
 
 type StyleProps = {
@@ -13,85 +17,54 @@ type StyleProps = {
 
 export type CheckboxProps = ElementProps & StyleProps;
 
-export const Checkbox: React.FC<CheckboxProps> = ({ checked, className, onClick }) => {
+export const Checkbox: React.FC<CheckboxProps> = ({
-  return (
+  checked,
-    <Styled.CheckboxWrapper className={className}>
+  className,
-      <Styled.Checkbox
+  onCheckedChange,
-        type="checkbox"
+  id,
-        checked={checked}
+  label,
-        onChange={onClick}
+}) => (
-      />
+  <Styled.Container>
-      <Styled.CustomCheckbox />
+    <Styled.Root className={className} checked={checked} onCheckedChange={onCheckedChange} id={id}>
-    </Styled.CheckboxWrapper>
+      <Styled.Indicator>
-  );
+        <CheckIcon />
-};
+      </Styled.Indicator>
+    </Styled.Root>
+    {label && <label htmlFor={id}>{label}</label>}
+  </Styled.Container>
+);
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
-Styled.CustomCheckbox = styled.span`
+Styled.Container = styled.div`
-  width: 1.25em;
+  ${layoutMixins.row}
-  height: 1.25em;
+  gap: 1ch;
+  font: var(--font-small-book);
 
-  position: absolute;
+  label {
-  left: 0;
+    cursor: pointer;
-  right: 0;
+  }
-  top: 0;
+`;
-  bottom: 0;
+
+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 {
+  &[data-state='checked'] {
-    position: absolute;
+    --checkbox-backgroundColor: var(--color-accent);
-    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;
-    }
   }
 `;
 
-Styled.CheckboxWrapper = styled.div`
+Styled.Indicator = styled(Indicator)`
-  --checkbox-backgroundColor: var(--color-layer-1);
-  --checkbox-checkColor: var(--color-text-1);
-
   display: flex;
-  border-radius: 0.25em;
+  align-items: center;
-  overflow: hidden;
+  justify-content: center;
-  position: relative;
-  cursor: pointer;
 
-  > input:checked ~ ${Styled.CustomCheckbox}::after {
+  color: var(--color-text-2);
-    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;
-  }
 `;

src/components/Collapsible.stories.tsx

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

src/components/Collapsible.tsx

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

src/components/CollapsibleTabs.tsx

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

src/components/ComboboxDialogMenu.tsx

@@ -22,7 +22,12 @@ type PickComboxMenuProps<
   MenuGroupValue extends string | number
 > = Pick<
   ComboboxMenuProps<MenuItemValue, MenuGroupValue>,
-  'inputPlaceholder' | 'onItemSelected' | 'slotEmpty' | 'withSearch' | 'withStickyLayout'
+  | 'inputPlaceholder'
+  | 'onItemSelected'
+  | 'slotEmpty'
+  | 'withItemBorders'
+  | 'withSearch'
+  | 'withStickyLayout'
 >;
 
 type PickDialogProps = Pick<
@@ -53,6 +58,7 @@ export const ComboboxDialogMenu = <
   onItemSelected,
   inputPlaceholder,
   slotEmpty,
+  withItemBorders,
   withSearch,
   withStickyLayout = true,
   children,
@@ -83,6 +89,7 @@ export const ComboboxDialogMenu = <
       title={title}
       inputPlaceholder={inputPlaceholder}
       slotEmpty={slotEmpty}
+      withItemBorders={withItemBorders}
       withSearch={withSearch}
       withStickyLayout={withStickyLayout}
     />
@@ -95,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 */
   & {
@@ -113,10 +122,12 @@ Styled.Dialog = styled(Dialog)`
 
     /* Net 0 sticky top inset (let stickyArea1 header stick to top) */
     --stickyArea0-topGap: calc(-1 * var(--stickyArea0-topHeight));
+    overflow-x: clip;
   }
 `;
 
 Styled.ComboboxMenu = styled(ComboboxMenu)`
   --comboboxMenu-backgroundColor: var(--comboboxDialogMenu-backgroundColor);
-  --comboboxMenu-item-gap: var(--comboxDialogMenu-item-gap, 0.5rem);
+  --comboboxMenu-item-gap: var(--comboboxDialogMenu-item-gap);
+  --comboboxMenu-item-padding: var(--comboboxDialogMenu-item-padding);
 `;

src/components/ComboboxMenu.tsx

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

src/components/ContentSection.tsx

@@ -11,6 +11,5 @@ export const DetachedScrollableSection = styled.section`
 
 export const AttachedExpandingSection = styled.section`
   ${layoutMixins.contentSectionAttached}
-  ${layoutMixins.expandingColumnWithHeader}
   gap: var(--border-width);
 `;

src/components/CopyButton.stories.tsx

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

src/components/CopyButton.tsx

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

src/components/Dialog.tsx

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

src/components/DiffArrow.stories.tsx

@@ -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',
   },

src/components/DiffArrow.tsx

@@ -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'])}
 `;

src/components/DropdownSelectMenu.tsx

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

src/components/GreenCheckCircle.tsx

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

src/components/Icon.tsx

@@ -15,6 +15,7 @@ import {
   CautionCircleIcon,
   ChatIcon,
   CheckIcon,
+  CheckCircleIcon,
   ChevronLeftIcon,
   ChevronRightIcon,
   ClockIcon,
@@ -23,7 +24,6 @@ import {
   CoinsIcon,
   CommentIcon,
   CopyIcon,
-  CubeIcon,
   DepositIcon,
   DepthChartIcon,
   DiscordIcon,
@@ -37,12 +37,14 @@ import {
   HelpCircleIcon,
   HideIcon,
   HistoryIcon,
+  LeaderboardIcon,
   LinkOutIcon,
   LockIcon,
   LogoShortIcon,
   MenuIcon,
   MigrateIcon,
   MintscanIcon,
+  MoonIcon,
   OrderbookIcon,
   OrderCanceledIcon,
   OrderFilledIcon,
@@ -52,16 +54,20 @@ import {
   OrderUntriggeredIcon,
   OverviewIcon,
   PencilIcon,
+  PlayIcon,
+  PlusIcon,
   PositionsIcon,
   PriceChartIcon,
   PrivacyIcon,
   QrIcon,
+  RewardStarIcon,
   SearchIcon,
   SendIcon,
   ShareIcon,
   ShowIcon,
   TogglesMenuIcon,
   StarIcon,
+  SunIcon,
   TerminalIcon,
   TradeIcon,
   TransferIcon,
@@ -86,6 +92,7 @@ export enum IconName {
   CautionCircleStroked = 'CautionCircleStroked',
   Chat = 'Chat',
   Check = 'Check',
+  CheckCircle = 'CheckCircle',
   ChevronLeft = 'ChevronLeft',
   ChevronRight = 'ChevronRight',
   Clock = 'Clock',
@@ -94,7 +101,6 @@ export enum IconName {
   Coins = 'Coins',
   Comment = 'Comment',
   Copy = 'Copy',
-  Cube = 'Cube',
   Deposit = 'Deposit',
   DepthChart = 'DepthChart',
   Discord = 'Discord',
@@ -108,12 +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',
@@ -124,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',
@@ -158,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,
@@ -166,7 +179,6 @@ const icons = {
   [IconName.Coins]: CoinsIcon,
   [IconName.Comment]: CommentIcon,
   [IconName.Copy]: CopyIcon,
-  [IconName.Cube]: CubeIcon,
   [IconName.Deposit]: DepositIcon,
   [IconName.DepthChart]: DepthChartIcon,
   [IconName.Discord]: DiscordIcon,
@@ -180,12 +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,
@@ -195,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,

src/components/Input.tsx

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

src/components/MarginUsageRing.tsx

@@ -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;

src/components/NavigationMenu.tsx

@@ -1,4 +1,4 @@
-import { forwardRef, Ref, useEffect, useRef, useState } from 'react';
+import { forwardRef, Ref } from 'react';
 import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components';
 import { NavLink, matchPath, useLocation } from 'react-router-dom';
 
@@ -21,8 +21,6 @@ import {
 
 import { layoutMixins } from '@/styles/layoutMixins';
 
-import { isTruthy } from '@/lib/isTruthy';
-
 import { Tag } from './Tag';
 import { Icon, IconName } from './Icon';
 
@@ -61,7 +59,6 @@ const NavItem = forwardRef(
       <>
         {slotBefore}
         <span>
-          {/* {`${label}${subitems?.length ? ' ' : ''}`} */}
           {label}
           {tag && (
             <>
@@ -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}
+        asChild
-        ref={(ref: TriggerRef) => (triggerRefs.current[item.value] = ref)}
+        onPointerMove={(e: MouseEvent) => e.preventDefault()}
-        onClick={(e: MouseEvent) => {
+        onPointerLeave={(e: MouseEvent) => e.preventDefault()}
-          if (clickIsDisabled) {
-            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(--navigationMenu-item-checked-backgroundColor);
-          --trigger-open-backgroundColor: var(--color-layer-3);
         `
       : 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);

src/components/Notification.tsx

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

src/components/Panel.tsx

@@ -4,9 +4,10 @@ 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;
@@ -67,6 +68,12 @@ Styled.Panel = styled.section<{ onClick?: () => void }>`
   --panel-content-paddingY: var(--panel-paddingY);
   --panel-content-paddingX: var(--panel-paddingX);
 
+  @media ${breakpoints.notTablet} {
+    --panel-paddingX: 1.5rem;
+    --panel-paddingY: 1.25rem;
+    --panel-content-paddingY: 1rem;
+  }
+
   ${layoutMixins.row}
 
   background-color: var(--color-layer-3);

src/components/SearchInput.tsx

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

src/components/SearchSelectMenu.tsx

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

src/components/SelectMenu.tsx

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

src/components/Switch.tsx

@@ -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);

src/components/Table.tsx

@@ -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 = data.length,
   // shouldRowRender,
 
   // collection,
@@ -135,6 +141,7 @@ 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 currentBreakpoints = useBreakpoints();
   const shownColumns = columns.filter(
@@ -161,10 +168,7 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
         ? // String
           collator.compare(first as string, second as string)
         : // Number
-          Math.sign(
+          MustBigNumber(first).comparedTo(MustBigNumber(second))) *
-            (parseInt(first as string) || (first as number)) -
-              (parseInt(second as string) || (second as number))
-          )) *
       // Flip the direction if descending order is specified.
       (sortDirection === 'descending' ? -1 : 1)
     );
@@ -211,6 +215,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={
+            numRowsToShow !== undefined && numRowsToShow < data.length
+              ? () => setNumRowsToShow(data.length)
+              : undefined
+          }
           // shouldRowRender={shouldRowRender}
           hideHeader={hideHeader}
           withGradientCardRows={withGradientCardRows}
@@ -235,7 +245,7 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
             )}
           </TableHeader>
 
-          <TableBody items={list.items}>
+          <TableBody items={list.items.slice(0, numRowsToShow)}>
             {(item) => (
               <Row key={getRowKey(item)}>
                 {(columnKey) => (
@@ -269,6 +279,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 +290,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 +351,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 +397,9 @@ const TableRoot = <TableRowData extends object | CustomRowConfig, TableRowKey ex
             </TableRow>
           )
         )}
+        {onViewMoreClick ? (
+          <ViewMoreRow colSpan={numColumns} onClick={onViewMoreClick} />
+        ) : undefined}
       </TableBodyRowGroup>
     </Styled.Table>
   );
@@ -417,6 +433,7 @@ const TableBodyRowGroup = ({
   children,
   withGradientCardRows,
   withInnerBorders,
+  withOuterBorder,
 }: { children: React.ReactNode } & StyleProps) => {
   const { rowGroupProps } = useTableRowGroup();
 
@@ -425,6 +442,7 @@ const TableBodyRowGroup = ({
       {...rowGroupProps}
       withGradientCardRows={withGradientCardRows}
       withInnerBorders={withInnerBorders}
+      withOuterBorder={withOuterBorder}
     >
       {children}
     </Styled.Tbody>
@@ -491,6 +509,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 +697,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 +866,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 +875,17 @@ Styled.Thead = styled.thead<StyleProps>`
   color: var(--tableHeader-textColor);
   background-color: var(--tableHeader-backgroundColor);
 
-  @media ${breakpoints.notTablet} {
+  ${({ withInnerBorders, withGradientCardRows }) =>
-    ${({ withInnerBorders, withGradientCardRows }) =>
+    withInnerBorders &&
-      withInnerBorders &&
+    !withGradientCardRows &&
-      !withGradientCardRows &&
+    css`
-      css`
+      ${layoutMixins.withInnerHorizontalBorders}
-        ${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 +904,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 +971,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;
+  }
+`;

src/components/Tabs.tsx

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

src/components/Toast.tsx

@@ -1,24 +1,19 @@
-import React, { useEffect, useRef, useState } from 'react';
+import { type MouseEvent, useEffect, useRef, useState } from 'react';
-
+import styled, { keyframes } from 'styled-components';
-import { Root, Title, Description, Action, Close } from '@radix-ui/react-toast';
+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 { IconName } from './Icon';
-
-import styled, { keyframes } from 'styled-components';
-import { popoverMixins } from '@/styles/popoverMixins';
-import { layoutMixins } from '@/styles/layoutMixins';
 
 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>
+      <Close asChild>
-        <$Container>
+        <$CloseButton
-          <$Header>
+          iconName={IconName.Close}
-            {slotIcon && <$Icon>{slotIcon}</$Icon>}
+          shape={ButtonShape.Circle}
+          size={ButtonSize.XSmall}
+          onClick={(e: MouseEvent) => e.stopPropagation()}
+        />
+      </Close>
 
-            <Close asChild>
+      {slotCustomContent ?? (
-              <$CloseButton
+        <$Notification
-                iconComponent={CloseIcon}
+          isToast
-                shape={ButtonShape.Square}
+          notification={notification}
-                size={ButtonSize.XSmall}
+          slotIcon={slotIcon}
-              />
+          slotTitle={slotTitle}
-            </Close>
+          slotTitleLeft={slotTitleLeft}
-
+          slotTitleRight={slotTitleRight}
-            <$Title>{slotTitle}</$Title>
+          slotDescription={slotDescription}
-          </$Header>
+          slotAction={
-          {!slotCustomContent && <$Description>{slotDescription}</$Description>}
+            actionDescription && (
-          {slotCustomContent}
+              <$Action asChild altText={actionAltText}>
-          {actionDescription && (
+                {slotAction}
-            <$Action asChild altText={actionAltText}>
+              </$Action>
-              {slotAction}
+            )
-            </$Action>
+          }
-          )}
+        />
-        </$Container>
+      )}
-      </div>
     </$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)`
+  // Absolute
-  flex: 1;
+  position: absolute;
+  top: 0;
+  right: 0;
 
-  font: var(--font-base-medium);
+  border: solid var(--border-width) var(--color-border);
-  color: var(--color-text-2);
 
-  overflow: hidden;
+  ${$Root}:hover & {
-  text-overflow: ellipsis;
+    display: block;
-`;
+    z-index: 2;
+  }
 
-const $Description = styled(Description)`
+  @media ${breakpoints.mobile} {
-  margin-top: 0.5rem;
+    display: block;
-  color: var(--color-text-0);
+    z-index: 2;
-  font: var(--font-small-book);
+  }
 `;
 
 const $Action = styled(Action)`

src/components/ToastArea.tsx

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

src/components/ToggleButton.tsx

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

src/components/UsageBars.tsx

@@ -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;
 };

src/components/WithTooltip.tsx

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

src/components/visx/TooltipContent.tsx

@@ -27,12 +27,7 @@ Styled.TooltipContent = styled.aside<{ accentColor?: string }>`
 
   ${popoverMixins.popover}
   --popover-radius: 0.5rem;
-  --popover-background-color: hsl(
+  --popover-background-color: ${({ theme }) => theme.popoverBackground};
-    var(--layer-base-hue),
-    var(--layer-base-saturation),
-    calc(var(--layer-base-lightness)),
-    0.9
-  );
   --popover-backdrop-filter: saturate(120%) blur(12px);
 
   display: grid;

src/components/visx/XYChartWithPointerEvents.tsx

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

src/constants/abacus.ts

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

src/constants/analytics.ts

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

src/constants/charts.ts

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

src/constants/dialogs.ts

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

src/constants/localStorage.ts

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

src/constants/localization.ts

@@ -6,6 +6,8 @@ import {
   LOCALE_DATA,
   TOOLTIPS,
   WARNINGS_STRING_KEYS,
+  NOTIFICATIONS_STRING_KEYS,
+  NOTIFICATIONS,
 } from '@dydxprotocol/v4-localization';
 
 import { type LinksConfigs } from '@/hooks/useURLConfigs';
@@ -27,6 +29,7 @@ export enum SupportedLocales {
 
 export const EN_LOCALE_DATA = {
   ...LOCALE_DATA[SupportedLocales.EN],
+  ...NOTIFICATIONS[SupportedLocales.EN],
   TOOLTIPS: TOOLTIPS[SupportedLocales.EN],
 };
 
@@ -34,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;

src/constants/markets.ts

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

src/constants/menus.ts

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

src/constants/networks.ts

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

src/constants/notifications.ts

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

src/constants/numbers.ts

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

src/constants/orderbook.ts

@@ -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;

src/constants/styles/base.ts

@@ -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',
+}

src/constants/styles/colors.ts

@@ -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;
+};

src/constants/tooltips/deposit.ts

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

src/constants/tooltips/withdraw.ts

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

src/constants/trade.ts

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

src/hooks/Orderbook/index.ts

@@ -0,0 +1,4 @@
+export * from './useCenterOrderbook';
+export * from './useSpreadRowScrollListener';
+export * from './useDrawOrderbook';
+export * from './useOrderbookValues';

src/hooks/Orderbook/useCenterOrderbook.ts

@@ -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]);
+};

src/hooks/Orderbook/useDrawOrderbook.ts

@@ -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 };
+};

src/hooks/Orderbook/useOrderbookValues.ts

@@ -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]);
+};

src/hooks/Orderbook/useSpreadRowScrollListener.ts

@@ -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;
+};

src/hooks/index.ts

@@ -22,6 +22,7 @@ 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 {
@@ -49,5 +50,6 @@ export {
   useSelectedNetwork,
   useStringGetter,
   useSubaccount,
+  useTradeFormInputs,
   useURLConfigs,
 };

src/hooks/tradingView/useTradingViewTheme.ts

@@ -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) {

src/hooks/useAccounts.tsx

@@ -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);
+          setDydxSubaccounts(response?.subaccounts);
-          return 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,

src/hooks/useAnalytics.ts

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

src/hooks/useApiState.ts

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

src/hooks/useAppTheme.tsx

@@ -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];
+}

src/hooks/useCurrentMarketId.ts

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

src/hooks/useDisplayedWallets.ts

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

src/hooks/useLocalNotifications.tsx

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

src/hooks/useNotificationTypes.tsx

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

src/hooks/useNotifications.tsx

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

src/hooks/useSquid.tsx

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

src/hooks/useSubaccount.tsx

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

src/hooks/useTokenConfigs.ts

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

src/hooks/useTradeFormInputs.ts

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

src/hooks/useWalletConnection.ts

@@ -1,6 +1,7 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 
+import { EvmDerivedAddresses } from '@/constants/account';
 import { LocalStorageKey } from '@/constants/localStorage';
 import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 
@@ -90,23 +91,31 @@ export const useWalletConnection = () => {
 
   const selectedNetwork = useSelector(getSelectedNetwork);
   const walletConnectConfig = ENVIRONMENT_CONFIG_MAP[selectedNetwork].wallets.walletconnect;
-
+  const wagmiConnector = useMemo(
-  const { connectAsync: connectWagmi } =
+    () =>
-    walletType && walletConnectionType
+      walletType && walletConnectionType
-      ? useConnectWagmi({
+        ? resolveWagmiConnector({
-          connector: resolveWagmiConnector({
             walletType,
             walletConnection: {
               type: walletConnectionType,
             },
             walletConnectConfig,
-          }),
+          })
-        })
+        : undefined,
-      : useConnectWagmi();
+    [walletConnectConfig, walletType, walletConnectionType]
+  );
+
+  const { connectAsync: connectWagmi } = useConnectWagmi({ connector: wagmiConnector });
   const { suggestAndConnect: connectGraz } = useConnectGraz();
+  const [evmDerivedAddresses] = useLocalStorage({
+    key: LocalStorageKey.EvmDerivedAddresses,
+    defaultValue: {} as EvmDerivedAddresses,
+  });
 
   const connectWallet = useCallback(
-    async ({ walletType }: { walletType: WalletType }) => {
+    async ({ walletType, forceConnect }: { walletType?: WalletType; forceConnect?: boolean }) => {
+      if (!walletType) return { walletType, walletConnectionType };
+
       const walletConnection = getWalletConnection({ walletType });
 
       try {
@@ -130,7 +139,11 @@ export const useWalletConnection = () => {
             });
           }
         } else {
-          if (!isConnectedWagmi) {
+          const isAccountConnected = Boolean(
+            evmAddress && evmDerivedAddresses[evmAddress]?.encryptedSignature
+          );
+          // if account connected (via remember me), do not show wagmi popup until forceConnect
+          if (!isConnectedWagmi && (forceConnect || !isAccountConnected)) {
             await connectWagmi({
               connector: resolveWagmiConnector({
                 walletType,
@@ -226,6 +239,12 @@ export const useWalletConnection = () => {
     evmAddressWagmi,
     signerWagmi,
     publicClientWagmi,
+    isConnectedWagmi,
+    connectWallet: () =>
+      connectWallet({
+        walletType: selectedWalletType,
+        forceConnect: true,
+      }),
 
     // Wallet connection (Cosmos)
     dydxAddress,

src/icons/caret-down.svg

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

src/icons/check-circle.svg

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

src/icons/check.svg

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

src/icons/cube.svg

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

src/icons/index.ts

@@ -10,6 +10,7 @@ export { default as CautionCircleIcon } from './caution-circle.svg';
 export { default as CautionCircleStrokeIcon } from './caution-circle-stroke.svg';
 export { default as ChatIcon } from './chat-bubble.svg';
 export { default as CheckIcon } from './check.svg';
+export { default as CheckCircleIcon } from './check-circle.svg';
 export { default as ChevronLeftIcon } from './chevron-left.svg';
 export { default as ChevronRightIcon } from './chevron-right.svg';
 export { default as ClockIcon } from './clock.svg';
@@ -18,7 +19,6 @@ export { default as CoinMarketCapIcon } from './logos/coinmarketcap.svg';
 export { default as CoinsIcon } from './coins.svg';
 export { default as CommentIcon } from './comment.svg';
 export { default as CopyIcon } from './copy.svg';
-export { default as CubeIcon } from './cube.svg';
 export { default as DepositIcon } from './deposit.svg';
 export { default as DepthChartIcon } from './depth-chart.svg';
 export { default as DiscordIcon } from './discord.svg';
@@ -31,6 +31,7 @@ export { default as GiftboxIcon } from './giftbox.svg';
 export { default as HelpCircleIcon } from './help-circle.svg';
 export { default as HideIcon } from './hide.svg';
 export { default as HistoryIcon } from './history.svg';
+export { default as LeaderboardIcon } from './leaderboard.svg';
 export { default as LinkOutIcon } from './link-out.svg';
 export { default as LockIcon } from './lock.svg';
 export { default as LogoShortIcon } from './logo-short';
@@ -38,21 +39,25 @@ export { default as MarketsIcon } from './markets.svg';
 export { default as MenuIcon } from './menu.svg';
 export { default as MigrateIcon } from './migrate.svg';
 export { default as MintscanIcon } from './logos/mintscan.svg';
+export { default as MoonIcon } from './moon.svg';
 export { default as OrderbookIcon } from './orderbook.svg';
 export { default as OverviewIcon } from './overview.svg';
 export { default as PencilIcon } from './pencil.svg';
 export { default as PlayIcon } from './play.svg';
+export { default as PlusIcon } from './plus.svg';
 export { default as PortfolioIcon } from './portfolio.svg';
 export { default as PositionsIcon } from './positions.svg';
 export { default as PriceChartIcon } from './price-chart.svg';
 export { default as PrivacyIcon } from './privacy.svg';
 export { default as ProfileIcon } from './profile.svg';
 export { default as QrIcon } from './qr.svg';
+export { default as RewardStarIcon } from './reward-star.svg';
 export { default as SearchIcon } from './search.svg';
 export { default as SendIcon } from './send.svg';
 export { default as ShareIcon } from './share.svg';
 export { default as ShowIcon } from './show.svg';
 export { default as StarIcon } from './star.svg';
+export { default as SunIcon } from './sun.svg';
 export { default as TerminalIcon } from './terminal.svg';
 export { default as TogglesMenuIcon } from './toggles-menu.svg';
 export { default as TradeIcon } from './trade.svg';