use decimals:

.env.example

@@ -8,14 +8,7 @@ VITE_V3_TOKEN_ADDRESS=
 VITE_TOKEN_MIGRATION_URI=
 
 AMPLITUDE_API_KEY=
-AMPLITUDE_SERVER_URL=
 BUGSNAG_API_KEY=
 IOS_APP_ID=
 INTERCOM_APP_ID=
 STATUS_PAGE_SCRIPT_URI=
-
-SMARTBANNER_APP_NAME=
-SMARTBANNER_ORG_NAME=
-SMARTBANNER_ICON_URL=
-SMARTBANNER_APPSTORE_URL=
-SMARTBANNER_GOOGLEPLAY_URL=

.github/workflows/deploy-testnet.yml

@@ -39,7 +39,6 @@ jobs:
           pnpm run build:inject-amplitude
           pnpm run build:inject-bugsnag
           pnpm run build:inject-statuspage
-          pnpm run build:inject-smartbanner
           sh scripts/inject-app-deeplinks.sh
 
       - name: Upload to IPFS via web3.storage

.ladle/components.tsx

@@ -2,132 +2,74 @@ import '@/polyfills';
 import { useEffect, useState } from 'react';
 import { Provider } from 'react-redux';
 import styled from 'styled-components';
-import { WagmiConfig } from 'wagmi';
-import { GrazProvider } from 'graz';
-import { QueryClient, QueryClientProvider } from 'react-query';
 
-import { SupportedLocales } from '@/constants/localization';
-
-import { AccountsProvider } from '@/hooks/useAccounts';
-import { AppThemeAndColorModeProvider } from '@/hooks/useAppThemeAndColorMode';
-import { DydxProvider } from '@/hooks/useDydxClient';
-import { DialogAreaProvider } from '@/hooks/useDialogArea';
-import { LocaleProvider } from '@/hooks/useLocaleSeparators';
-import { PotentialMarketsProvider } from '@/hooks/usePotentialMarkets';
-import { RestrictionProvider } from '@/hooks/useRestrictions';
-import { SubaccountProvider } from '@/hooks/useSubaccount';
-
-import { GlobalStyle } from '@/styles/globalStyle';
+import { store } from '@/state/_store';
 
 import { SelectMenu, SelectItem } from '@/components/SelectMenu';
 
-import {
-  AppTheme,
-  AppThemeSystemSetting,
-  AppColorMode,
-  setAppThemeSetting,
-  setAppColorMode,
-} from '@/state/configs';
-
-import { setLocaleLoaded, setSelectedLocale } from '@/state/localization';
-import { store } from '@/state/_store';
-
-import { config } from '@/lib/wagmi';
+import { setLocaleLoaded } from '@/state/localization';
 
 import '@/index.css';
 import './ladle.css';
 
-const queryClient = new QueryClient();
-
-const wrapProvider = (Component: React.ComponentType<any>, props?: any) => {
-  // eslint-disable-next-line react/display-name
-  return ({ children }: { children: React.ReactNode }) => (
-    <Component {...props}>{children}</Component>
-  );
-};
-
-const providers = [
-  wrapProvider(QueryClientProvider, { client: queryClient }),
-  wrapProvider(GrazProvider),
-  wrapProvider(WagmiConfig, { config }),
-  wrapProvider(LocaleProvider),
-  wrapProvider(RestrictionProvider),
-  wrapProvider(DydxProvider),
-  wrapProvider(AccountsProvider),
-  wrapProvider(SubaccountProvider),
-  wrapProvider(DialogAreaProvider),
-  wrapProvider(PotentialMarketsProvider),
-  wrapProvider(AppThemeAndColorModeProvider),
-];
-
 export const StoryWrapper: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-  const [theme, setTheme] = useState(AppTheme.Classic);
-  const [colorMode, setColorMode] = useState(AppColorMode.GreenUp);
+  const [theme, setTheme] = useState('Default theme');
 
   useEffect(() => {
-    store.dispatch(setAppThemeSetting(theme));
-    store.dispatch(setAppColorMode(colorMode));
-  }, [theme, colorMode]);
+    switch (theme) {
+      case 'Dark theme': {
+        document?.documentElement?.classList.remove('theme-light');
+        document?.documentElement?.classList.add('theme-dark');
+        break;
+      }
+      case 'Light theme': {
+        document?.documentElement?.classList.remove('theme-dark');
+        document?.documentElement?.classList.add('theme-light');
+        break;
+      }
+      default: {
+        document?.documentElement?.classList.remove('theme-dark', 'theme-light');
+        break;
+      }
+    }
+  }, [theme]);
 
   useEffect(() => {
-    store.dispatch(setSelectedLocale({ locale: SupportedLocales.EN }));
     store.dispatch(setLocaleLoaded(true));
   }, []);
 
-  const content = [...providers].reverse().reduce(
-    (children, Provider) => {
-      return <Provider>{children}</Provider>;
-    },
-    <StoryContent>
-      <GlobalStyle />
-      {children}
-    </StoryContent>
-  );
-
   return (
     <Provider store={store}>
       <StoryHeader>
         <h4>Active Theme:</h4>
-        <SelectMenu value={theme} onValueChange={setTheme}>
+        <SelectMenu
+          value={theme}
+          onValueChange={setTheme}
+        >
           {[
             {
-              value: AppTheme.Classic,
+              value: 'Default theme',
               label: 'Default theme',
             },
             {
-              value: AppThemeSystemSetting.System,
-              label: 'System theme',
-            },
-            {
-              value: AppTheme.Dark,
+              value: 'Dark theme',
               label: 'Dark theme',
             },
             {
-              value: AppTheme.Light,
+              value: 'Light theme',
               label: 'Light theme',
             },
           ].map(({ value, label }) => (
-            <SelectItem key={value} value={value} label={label} />
-          ))}
-        </SelectMenu>
-        <h4>Active Color Mode:</h4>
-        <SelectMenu value={colorMode} onValueChange={setColorMode}>
-          {[
-            {
-              value: AppColorMode.GreenUp,
-              label: 'Green up',
-            },
-            {
-              value: AppColorMode.RedUp,
-              label: 'Red up',
-            },
-          ].map(({ value, label }) => (
-            <SelectItem key={value} value={value} label={label} />
+            <SelectItem
+              key={value}
+              value={value}
+              label={label}
+            />
           ))}
         </SelectMenu>
       </StoryHeader>
       <hr />
-      {content}
+      <StoryContent>{children}</StoryContent>
     </Provider>
   );
 };

README.md

@@ -78,12 +78,11 @@ Set environment variables via `.env`.
 - `VITE_V3_TOKEN_ADDRESS` (optional): Address of the V3 $DYDX token.
 - `VITE_TOKEN_MIGRATION_URI` (optional): The URL of the token migration website.
 - `AMPLITUDE_API_KEY` (optional): Amplitude API key for enabling Amplitude; used with `pnpm run build:inject-amplitude`.
-- `AMPLITUDE_SERVER_URL` (optional): Custom Amplitude server URL
 - `BUGSNAG_API_KEY` (optional): API key for enabling Bugsnag; used with `pnpm run build:inject-bugsnag`.
 - `IOS_APP_ID` (optional): iOS app ID used for enabling deep linking to the iOS app; used with `pnpm run build:inject-app-deeplinks`.
 - `INTERCOM_APP_ID` (optional): Used for enabling Intercom; utilized with `pnpm run build:inject-intercom`.
 - `STATUS_PAGE_SCRIPT_URI` (optional): Used for enabling the status page; used with `pnpm run build:inject-statuspage`.
-- `SMARTBANNER_APP_NAME`, `SMARTBANNER_ORG_NAME`, `SMARTBANNER_ICON_URL`, `SMARTBANNER_APPSTORE_URL` (optional): Used for enabling the smart app banner; used with `pnpm run build:inject-smartbanner`.
+
 
 # Deployments
 
@@ -99,17 +98,9 @@ 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.
 
-If you wish to incorporate smart banner for iOS and/or Android apps, you can use our scripts:
-`pnpm run build:inject-smartbanner`. You will need to provide your own app configurations for these services. In the Environment Variables section, name the variables as `SMARTBANNER_APP_NAME`, `SMARTBANNER_ORG_NAME`, `SMARTBANNER_ICON_URL` and `SMARTBANNER_APPSTORE_URL` or `SMARTBANNER_GOOGLEPLAY_URL` and provide the respective values.
-
 For more details, check out Vercel's [official documentation](https://vercel.com/docs).
 
 ## Deploying to IPFS

package.json

@@ -15,7 +15,6 @@
     "build:inject-bugsnag": "node scripts/inject-bugsnag.js",
     "build:inject-intercom": "node scripts/inject-intercom.js",
     "build:inject-statuspage": "node scripts/inject-statuspage.js",
-    "build:inject-smartbanner": "node scripts/inject-smartbanner.js",
     "deploy:ipfs": "node scripts/upload-ipfs.js --verbose",
     "deploy:update-ipns": "node scripts/update-ipns.js",
     "deploy:update-dnslink": "node scripts/update-dnslink.js",
@@ -34,23 +33,20 @@
   "packageManager": "pnpm@8.6.6",
   "dependencies": {
     "@0xsquid/sdk": "^1.10.0",
-    "@cosmjs/amino": "^0.32.1",
-    "@cosmjs/crypto": "^0.32.1",
-    "@cosmjs/encoding": "^0.32.1",
-    "@cosmjs/proto-signing": "^0.32.1",
-    "@cosmjs/stargate": "^0.32.1",
-    "@cosmjs/tendermint-rpc": "^0.32.1",
-    "@dydxprotocol/v4-abacus": "^1.4.2",
-    "@dydxprotocol/v4-client-js": "^1.0.20",
-    "@dydxprotocol/v4-localization": "^1.1.25",
+    "@cosmjs/amino": "^0.31.0",
+    "@cosmjs/crypto": "^0.31.0",
+    "@cosmjs/encoding": "^0.31.0",
+    "@cosmjs/proto-signing": "^0.31.0",
+    "@cosmjs/stargate": "^0.31.0",
+    "@cosmjs/tendermint-rpc": "^0.31.0",
+    "@dydxprotocol/v4-abacus": "^1.0.10",
+    "@dydxprotocol/v4-client-js": "^1.0.0",
+    "@dydxprotocol/v4-localization": "^1.0.0",
     "@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",
@@ -93,7 +89,6 @@
     "buffer": "^6.0.3",
     "cmdk": "^0.2.0",
     "color": "^4.2.3",
-    "cosmjs-types": "^0.9.0",
     "crypto-js": "^4.1.1",
     "ethers": "^6.6.1",
     "graz": "^0.0.43",
@@ -101,7 +96,6 @@
     "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",
@@ -113,12 +107,12 @@
     "reselect": "^4.1.8",
     "styled-components": "^5.3.11",
     "use-latest": "^1.2.1",
-    "viem": "^1.20.0",
-    "wagmi": "^1.4.12"
+    "viem": "^1.12.2",
+    "wagmi": "^1.3.7"
   },
   "devDependencies": {
     "@babel/core": "^7.22.5",
-    "@ladle/react": "^4.0.2",
+    "@ladle/react": "^2.15.0",
     "@types/color": "^3.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/luxon": "^3.3.0",
@@ -157,10 +151,5 @@
     "vitest": "^0.32.2",
     "w3name": "^1.0.8",
     "web3.storage": "^4.5.4"
-  },
-  "pnpm": {
-    "overrides": {
-      "follow-redirects": "1.15.3"
-    }
   }
 }

public/.well-known/assetlinks.json

@@ -1,22 +0,0 @@
-[
-  {
-    "relation": ["delegate_permission/common.handle_all_urls"],
-    "target": {
-      "namespace": "android_app",
-      "package_name": "exchange.dydx.trading.debug",
-      "sha256_cert_fingerprints": [
-        "8A:9C:CC:49:B0:35:9A:91:67:CB:98:B0:B5:87:92:5F:9E:B7:EF:CE:A0:47:57:85:A4:35:3E:0C:E1:56:9E:A2"
-      ]
-    }
-  },
-  {
-    "relation": ["delegate_permission/common.handle_all_urls"],
-    "target": {
-      "namespace": "android_app",
-      "package_name": "exchange.dydx.trading",
-      "sha256_cert_fingerprints": [
-        "B2:2D:CC:27:9D:52:05:98:63:C9:7B:34:36:70:A3:8E:00:31:28:08:2D:2E:70:76:C9:31:AE:F9:55:21:15:A5"
-      ]
-    }
-  }
-]

public/chart-bars-background.svg

@@ -1,19 +0,0 @@
-<svg width="120" height="97" viewBox="0 0 120 97" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect y="8" width="120" height="1" fill="currentColor"/>
-<rect y="18" width="120" height="1" fill="currentColor"/>
-<rect y="28" width="120" height="1" fill="currentColor"/>
-<rect y="38" width="120" height="1" fill="currentColor"/>
-<rect y="48" width="120" height="1" fill="currentColor"/>
-<rect y="58" width="120" height="1" fill="currentColor"/>
-<rect y="68" width="120" height="1" fill="currentColor"/>
-<rect y="78" width="120" height="1" fill="currentColor"/>
-<rect y="88" width="120" height="1" fill="currentColor"/>
-<rect x="18" width="1" height="97" fill="currentColor"/>
-<rect x="32" width="1" height="97" fill="currentColor"/>
-<rect x="46" width="1" height="97" fill="currentColor"/>
-<rect x="60" width="1" height="97" fill="currentColor"/>
-<rect x="74" width="1" height="97" fill="currentColor"/>
-<rect x="88" width="1" height="97" fill="currentColor"/>
-<rect x="102" width="1" height="97" fill="currentColor"/>
-<path d="M0 0H120V97H0V0Z" fill="url(#paint0_radial_314_37586)"/>
-</svg>

public/chart-bars.svg

@@ -1,20 +0,0 @@
-<svg width="90" height="39" viewBox="0 0 90 39" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect y="31.2344" width="2.57142" height="7.71427" fill="#3ED9A4"/>
-<rect x="5.14258" y="28.6648" width="2.57142" height="5.14284" fill="#E45555"/>
-<rect x="25.7139" y="26.0923" width="2.57142" height="10.2857" fill="#E45555"/>
-<rect x="51.4283" y="28.6648" width="2.57142" height="5.14284" fill="#E45555"/>
-<rect x="56.5712" y="31.2344" width="2.57142" height="5.14284" fill="#E45555"/>
-<rect x="77.1426" y="18.3767" width="2.57142" height="5.14284" fill="#E45555"/>
-<rect x="41.1427" y="23.5198" width="2.57142" height="5.14284" fill="#E45555"/>
-<rect x="10.2856" y="28.6648" width="2.57142" height="10.2857" fill="#3ED9A4"/>
-<rect x="61.7143" y="23.5198" width="2.57142" height="10.2857" fill="#3ED9A4"/>
-<rect x="66.8569" y="20.9492" width="2.57142" height="5.14284" fill="#3ED9A4"/>
-<rect x="71.9997" y="13.2346" width="2.57142" height="7.71427" fill="#3ED9A4"/>
-<rect x="82.2856" y="10.6631" width="2.57142" height="10.2857" fill="#3ED9A4"/>
-<rect x="87.4287" y="0.37793" width="2.57142" height="15.4285" fill="#3ED9A4"/>
-<rect x="15.4284" y="26.0923" width="2.57142" height="5.14284" fill="#3ED9A4"/>
-<rect x="20.5714" y="23.5198" width="2.57142" height="5.14284" fill="#3ED9A4"/>
-<rect x="30.857" y="31.2344" width="2.57142" height="5.14284" fill="#3ED9A4"/>
-<rect x="35.9999" y="26.0923" width="2.57142" height="5.14284" fill="#3ED9A4"/>
-<rect x="46.2853" y="26.0923" width="2.57142" height="2.57142" fill="#3ED9A4"/>
-</svg>

public/configs/cctp.json

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

public/configs/documentation.json

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

public/configs/exchanges.json

@@ -1,8 +0,0 @@
-[
-  {
-      "name": "coinbase",
-      "label": "Coinbase",
-      "icon": "/exchanges/coinbase.png",
-      "depositType": "noble"
-  }
-]

public/configs/markets.json

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

public/configs/wallets.json

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

public/dots-background-2.svg

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

public/smartbanner.html

@@ -1,15 +0,0 @@
-    <!-- Smartbanner: Configure the mobile app -->
-    <meta name="smartbanner:title" content="SMARTBANNER_APP_NAME">
-    <meta name="smartbanner:author" content="SMARTBANNER_ORG_NAME">
-    <meta name="smartbanner:icon-apple" content="SMARTBANNER_ICON_URL">
-    <meta name="smartbanner:icon-google" content="SMARTBANNER_ICON_URL">
-    <!-- Smartbanner: The rest of the configurations can be kept as is -->
-    <meta name="smartbanner:price" content="FREE">
-    <meta name="smartbanner:price-suffix-apple" content=" - On the App Store">
-    <meta name="smartbanner:price-suffix-google" content=" - In Google Play">
-    <meta name="smartbanner:button" content="VIEW">
-    <meta name="smartbanner:close-label" content="Close">
-    <meta name="smartbanner:exclude-user-agent-regex" content="^.*(Windows NT|Intel Mac OS X).*$">
-    <script src="https://cdn.jsdelivr.net/npm/smartbanner.js@1.22.0/dist/smartbanner.min.js"></script>
-    <link href="https://cdn.jsdelivr.net/npm/smartbanner.js@1.22.0/dist/smartbanner.min.css" rel="stylesheet">
-    <!-- Smartbanner: End configuration -->

scripts/README.md

@@ -36,17 +36,3 @@ Customize Intercom Messenger by adding logo and brand colors
 3. Add API key in Github > Secrets and Variables > Actions as `INTERCOM_APP_ID`
 4. In your deploy scripts add `pnpm run build:inject-intercom` after your pnpm build / vite build command.
 5. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-amplitude && pnpm run build:inject-intercom`
-
-### Smartbanner
-Smartbanner to show download links to iOS and/or Android native apps on mobile devices.
-
-<b>To use with dydxprotocol/v4-web:</b>
-1. iOS app App Store link or Android app Google Play link.
-2. Add configurations in Github > Secrets and Variables > Actions as 
-    `SMARTBANNER_APP_NAME` for app name
-    `SMARTBANNER_ORG_NAME` for organization name
-    `SMARTBANNER_ICON_URL` for icon image
-    `SMARTBANNER_APPSTORE_URL` for iOS App Store link
-    `SMARTBANNER_GOOGLEPLAY_URL` for Android Google Play link
-3. In your deploy scripts add `pnpm run build:inject-smartbanner` after your pnpm build / vite build command.
-4. If you are using with the Amplitude deployment scripts, your build command may look like the following: `pnpm build && pnpm run build:inject-smartbanner`

scripts/inject-amplitude.js

@@ -3,13 +3,12 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 
 const AMPLITUDE_API_KEY = process.env.AMPLITUDE_API_KEY;
-const AMPLITUDE_SERVER_URL = process.env.AMPLITUDE_SERVER_URL;
 
 const currentPath = fileURLToPath(import.meta.url);
 const projectRoot = path.dirname(currentPath);
 const htmlFilePath = path.resolve(projectRoot, '../dist/index.html');
 
-if (AMPLITUDE_API_KEY) {
+if(AMPLITUDE_API_KEY){
   try {
     const html = await fs.readFile(htmlFilePath, 'utf-8');
 
@@ -19,34 +18,8 @@ if (AMPLITUDE_API_KEY) {
         `;
 
     const amplitudeListenerScript = `<script type="module">
-      !(function () {
-        var e = "${AMPLITUDE_API_KEY}";
-        e &&
-          (globalThis.amplitude.init(e${
-            AMPLITUDE_SERVER_URL
-              ? `, undefined, {
-                serverUrl: "${AMPLITUDE_SERVER_URL}"
-              }`
-              : ''
-          }),
-          globalThis.amplitude.setOptOut(!1),
-          globalThis.addEventListener("dydx:track", function (e) {
-            var t = e.detail.eventType,
-              d = e.detail.eventData;
-            globalThis.amplitude.track(t, d);
-          }),
-          globalThis.addEventListener("dydx:identify", function (e) {
-            var t = e.detail.property,
-              d = e.detail.propertyValue;
-            if ("walletAddress" === t) globalThis.amplitude.setUserId(d);
-            else {
-              var i = new globalThis.amplitude.Identify();
-              i.set(t, d), globalThis.amplitude.identify(i);
-            }
-          }),
-          console.log("Amplitude enabled."));
-      })();
-    </script>`;
+        !function(){var e="${AMPLITUDE_API_KEY}";e&&(globalThis.amplitude.init(e),globalThis.amplitude.setOptOut(!1),globalThis.addEventListener("dydx:track",function(e){var t=e.detail.eventType,d=e.detail.eventData;globalThis.amplitude.track(t,d)}),globalThis.addEventListener("dydx:identify",function(e){var t=e.detail.property,d=e.detail.propertyValue;if("walletAddress"===t)globalThis.amplitude.setUserId(d);else{var i=new globalThis.amplitude.Identify;i.set(t,d),globalThis.amplitude.identify(i)}}),console.log("Amplitude enabled."))}();
+        </script>`;
 
     const injectedHtml = html.replace(
       '<div id="root"></div>',

scripts/inject-smartbanner.js

@@ -1,60 +0,0 @@
-/* eslint-disable no-console */
-import fs from 'fs/promises';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const SMARTBANNER_APP_NAME = process.env.SMARTBANNER_APP_NAME;
-const SMARTBANNER_ORG_NAME = process.env.SMARTBANNER_ORG_NAME;
-const SMARTBANNER_ICON_URL = process.env.SMARTBANNER_ICON_URL;
-const SMARTBANNER_APPSTORE_URL = process.env.SMARTBANNER_APPSTORE_URL;
-const SMARTBANNER_GOOGLEPLAY_URL = process.env.SMARTBANNER_GOOGLEPLAY_URL;
-
-const currentPath = fileURLToPath(import.meta.url);
-const projectRoot = path.dirname(currentPath);
-const htmlFilePath = path.resolve(projectRoot, '../dist/index.html');
-const smartbannerFilePath = path.resolve(projectRoot, '../dist/smartbanner.html');
-
-if (
-  SMARTBANNER_APP_NAME &&
-  SMARTBANNER_ORG_NAME &&
-  SMARTBANNER_ICON_URL &&
-  (SMARTBANNER_APPSTORE_URL || SMARTBANNER_GOOGLEPLAY_URL)
-) {
-  try {
-    const html = await fs.readFile(htmlFilePath, 'utf-8');
-    let smartbanner = await fs.readFile(smartbannerFilePath, 'utf-8');
-    smartbanner = smartbanner
-      .replace('SMARTBANNER_APP_NAME', SMARTBANNER_APP_NAME)
-      .replace('SMARTBANNER_ORG_NAME', SMARTBANNER_ORG_NAME)
-      .replace('SMARTBANNER_ICON_URL', SMARTBANNER_ICON_URL)
-      .replace('SMARTBANNER_ICON_URL', SMARTBANNER_ICON_URL);
-
-    /* hardcoded injection depending on whether the app is available on App Store and/or Google Play */
-
-    if (SMARTBANNER_APPSTORE_URL) {
-      smartbanner = `\t<meta name="smartbanner:button-url-apple" content="${SMARTBANNER_APPSTORE_URL}">\n` + smartbanner;
-    }
-    if (SMARTBANNER_GOOGLEPLAY_URL) {
-      smartbanner = `\t<meta name="smartbanner:button-url-google" content="${SMARTBANNER_GOOGLEPLAY_URL}">\n` + smartbanner;
-    }
-    if (SMARTBANNER_APPSTORE_URL) {
-      if (SMARTBANNER_GOOGLEPLAY_URL) {
-        smartbanner = `\t<meta name="smartbanner:enabled-platforms" content="android,ios">\n` + smartbanner;
-      } else {
-        smartbanner = `\t<meta name="smartbanner:enabled-platforms" content="ios">\n` + smartbanner;
-      }
-    } else {
-      if (SMARTBANNER_GOOGLEPLAY_URL) {
-        smartbanner = `\t<meta name="smartbanner:enabled-platforms" content="android">\n` + smartbanner;
-      }
-    }
-
-    const injectedHtml = html.replace('</head>', `${smartbanner}\n</head>`);
-
-    await fs.writeFile(htmlFilePath, injectedHtml, 'utf-8');
-
-    console.log('Smartbanner scripts successfully injected.');
-  } catch (err) {
-    console.error('Error injecting Smartbanner scripts:', err);
-  }
-}

src/App.tsx

@@ -1,11 +1,11 @@
-import { lazy, Suspense } from 'react';
+import { Suspense } from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
 import styled, { AnyStyledComponent, css } from 'styled-components';
 import { WagmiConfig } from 'wagmi';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { GrazProvider } from 'graz';
 
-import { AppRoute, DEFAULT_TRADE_ROUTE, MarketsRoute } from '@/constants/routes';
+import { AppRoute, DEFAULT_TRADE_ROUTE } from '@/constants/routes';
 
 import {
   useBreakpoints,
@@ -16,17 +16,26 @@ import {
 } from '@/hooks';
 import { DydxProvider } from '@/hooks/useDydxClient';
 import { AccountsProvider } from '@/hooks/useAccounts';
-import { AppThemeAndColorModeProvider } from '@/hooks/useAppThemeAndColorMode';
 import { DialogAreaProvider, useDialogArea } from '@/hooks/useDialogArea';
 import { LocaleProvider } from '@/hooks/useLocaleSeparators';
 import { NotificationsProvider } from '@/hooks/useNotifications';
 import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
-import { PotentialMarketsProvider } from '@/hooks/usePotentialMarkets';
 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';
@@ -37,25 +46,12 @@ 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 NewMarket = lazy(() => import('@/pages/markets/NewMarket'));
-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 TermsOfUsePage = lazy(() => import('@/pages/TermsOfUsePage'));
-const PrivacyPolicyPage = lazy(() => import('@/pages/PrivacyPolicyPage'));
-const TokenPage = lazy(() => import('@/pages/token/Token'));
-
 const queryClient = new QueryClient();
 
 const Content = () => {
@@ -70,55 +66,49 @@ const Content = () => {
   const { chainTokenLabel } = useTokenConfigs();
 
   return (
-    <>
-      <GlobalStyle />
-      <Styled.Content isShowingHeader={isShowingHeader} isShowingFooter={isShowingFooter}>
-        {isNotTablet && <HeaderDesktop />}
+    <Styled.Content isShowingHeader={isShowingHeader} isShowingFooter={isShowingFooter}>
+      {isNotTablet && <HeaderDesktop />}
 
-        <Styled.Main>
-          <Suspense fallback={<LoadingSpace id="main" />}>
-            <Routes>
-              <Route path={AppRoute.Trade}>
-                <Route path=":market" element={<TradePage />} />
-                <Route path={AppRoute.Trade} element={<TradePage />} />
-              </Route>
+      <Styled.Main>
+        <Suspense fallback={null}>
+          <Routes>
+            <Route path={AppRoute.Trade}>
+              <Route path=":market" element={<TradePage />} />
+              <Route path={AppRoute.Trade} element={<TradePage />} />
+            </Route>
 
-              <Route path={AppRoute.Markets}>
-                <Route path={MarketsRoute.New} element={<NewMarket />} />
-                <Route path={AppRoute.Markets} element={<MarketsPage />} />
-              </Route>
-              <Route path={`/${chainTokenLabel}/*`} element={<TokenPage />} />
-              {isTablet && (
-                <>
-                  <Route path={AppRoute.Alerts} element={<AlertsPage />} />
-                  <Route path={AppRoute.Profile} element={<ProfilePage />} />
-                  <Route path={`${AppRoute.Settings}/*`} element={<SettingsPage />} />
-                </>
-              )}
+            <Route path={AppRoute.Markets} element={<MarketsPage />} />
+            <Route path={`/${chainTokenLabel}`} element={<RewardsPage />} />
+            {isTablet && (
+              <>
+                <Route path={AppRoute.Alerts} element={<AlertsPage />} />
+                <Route path={AppRoute.Profile} element={<ProfilePage />} />
+                <Route path={`${AppRoute.Settings}/*`} element={<SettingsPage />} />
+              </>
+            )}
 
-              <Route element={<GuardedMobileRoute />}>
-                <Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
-              </Route>
+            <Route element={<GuardedMobileRoute />}>
+              <Route path={`${AppRoute.Portfolio}/*`} element={<PortfolioPage />} />
+            </Route>
 
-              <Route path={AppRoute.Terms} element={<TermsOfUsePage />} />
-              <Route path={AppRoute.Privacy} element={<PrivacyPolicyPage />} />
+            <Route path={AppRoute.Terms} element={<TermsOfUsePage />} />
+            <Route path={AppRoute.Privacy} element={<PrivacyPolicyPage />} />
 
-              <Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
-            </Routes>
-          </Suspense>
-        </Styled.Main>
+            <Route path="*" element={<Navigate to={DEFAULT_TRADE_ROUTE} replace />} />
+          </Routes>
+        </Suspense>
+      </Styled.Main>
 
-        {isTablet ? <FooterMobile /> : <FooterDesktop />}
+      {isTablet ? <FooterMobile /> : <FooterDesktop />}
 
-        <Styled.NotificationsToastArea />
+      <Styled.NotificationsToastArea />
 
-        <Styled.DialogArea ref={setDialogArea}>
-          <DialogManager />
-        </Styled.DialogArea>
+      <Styled.DialogArea ref={setDialogArea}>
+        <DialogManager />
+      </Styled.DialogArea>
 
-        <GlobalCommandDialog />
-      </Styled.Content>
-    </>
+      <GlobalCommandDialog />
+    </Styled.Content>
   );
 };
 
@@ -138,11 +128,10 @@ const providers = [
   wrapProvider(DydxProvider),
   wrapProvider(AccountsProvider),
   wrapProvider(SubaccountProvider),
+  wrapProvider(SquidProvider),
   wrapProvider(LocalNotificationsProvider),
   wrapProvider(NotificationsProvider),
   wrapProvider(DialogAreaProvider),
-  wrapProvider(PotentialMarketsProvider),
-  wrapProvider(AppThemeAndColorModeProvider),
 ];
 
 const App = () => {
@@ -207,7 +196,6 @@ Styled.Content = styled.div<{ isShowingHeader: boolean; isShowingFooter: boolean
 
 Styled.Main = styled.main`
   ${layoutMixins.contentSectionAttached}
-  box-shadow: none;
 
   grid-area: Main;
 

src/abi/erc20_usdt.json

@@ -1,390 +0,0 @@
-[
-  {
-    "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

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

src/components/Accordion.tsx

@@ -1,129 +0,0 @@
-import styled, { keyframes, type AnyStyledComponent } from 'styled-components';
-
-import { Root, Item, Header, Trigger, Content } from '@radix-ui/react-accordion';
-
-import { layoutMixins } from '@/styles/layoutMixins';
-import { breakpoints } from '@/styles';
-
-import { PlusIcon } from '@/icons';
-
-export type AccordionItem = {
-  header: React.ReactNode;
-  content: React.ReactNode;
-};
-
-export type AccordionProps = {
-  items: AccordionItem[];
-  className?: string;
-};
-
-export const Accordion = ({ items, className }: AccordionProps) => (
-  <Styled.Root className={className} type="single" collapsible>
-    {items.map(({ header, content }, idx) => (
-      <Styled.Item key={idx} value={idx.toString()}>
-        <Header>
-          <Styled.Trigger>
-            {header}
-            <Styled.Icon>
-              <PlusIcon />
-            </Styled.Icon>
-          </Styled.Trigger>
-        </Header>
-        <Styled.Content>{content}</Styled.Content>
-      </Styled.Item>
-    ))}
-  </Styled.Root>
-);
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Root = styled(Root)`
-  --accordion-paddingY: 1rem;
-  --accordion-paddingX: 1rem;
-
-  @media ${breakpoints.notTablet} {
-    --accordion-paddingX: 1.5rem;
-  }
-
-  > *:not(:last-child) {
-    border-bottom: var(--border-width) solid var(--border-color);
-  }
-`;
-
-Styled.Item = styled(Item)``;
-
-Styled.Icon = styled.div`
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-
-  width: 2.25rem;
-  height: 2.25rem;
-
-  --color-border: var(--color-layer-6);
-  color: var(--color-text-1);
-  background-color: var(--color-layer-5);
-  border: solid var(--border-width) var(--color-border);
-  border-radius: 50%;
-  font: var(--font-small-book);
-
-  svg {
-    height: 1.125em;
-    width: 1.125em;
-  }
-`;
-
-Styled.Trigger = styled(Trigger)`
-  ${layoutMixins.spacedRow}
-  width: 100%;
-  padding: var(--accordion-paddingY) var(--accordion-paddingX);
-  gap: 0.5rem;
-
-  color: var(--color-text-1);
-  text-align: start;
-
-  &:hover {
-    ${Styled.Icon} {
-      color: var(--color-text-2);
-      filter: brightness(var(--hover-filter-base));
-    }
-  }
-
-  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/AlertMessage.tsx

@@ -40,6 +40,9 @@ const AlertContainer = styled.div<StyleProps>`
       case AlertType.Info: {
         return css`
           --alert-accent-color: var(--color-text-1);
+
+          --alert-default-background-opacity: 0.133; // Relative
+          // --alert-background: var(--color-layer-6); // Absolute
         `;
       }
       case AlertType.Success: {

src/components/AssetIcon.tsx

@@ -16,7 +16,6 @@ const assetIcons = {
   AVAX: '/currencies/avax.png',
   BCH: '/currencies/bch.png',
   BLUR: '/currencies/blur.png',
-  BONK: '/currencies/bonk.png',
   BTC: '/currencies/btc.png',
   CELO: '/currencies/celo.png',
   COMP: '/currencies/comp.png',
@@ -31,7 +30,6 @@ const assetIcons = {
   ETH: '/currencies/eth.png',
   FIL: '/currencies/fil.png',
   ICP: '/currencies/icp.png',
-  JUP: '/currencies/jup.png',
   LDO: '/currencies/ldo.png',
   LINK: '/currencies/link.png',
   LTC: '/currencies/ltc.png',
@@ -47,7 +45,6 @@ const assetIcons = {
   SOL: '/currencies/sol.png',
   SUI: '/currencies/sui.png',
   SUSHI: '/currencies/sushi.png',
-  TIA: '/currencies/tia.png',
   TRX: '/currencies/trx.png',
   UMA: '/currencies/uma.png',
   UNI: '/currencies/uni.png',
@@ -74,13 +71,8 @@ export const AssetIcon = ({
 }: {
   symbol?: Nullable<string>;
   className?: string;
-}) => (
-  <Styled.Img
-    src={isAssetSymbol(symbol) ? assetIcons[symbol] : '/currencies/unavailable.png'}
-    className={className}
-    alt={symbol}
-  />
-);
+}) =>
+  isAssetSymbol(symbol) ? <Styled.Img src={assetIcons[symbol]} className={className} /> : null;
 
 const Styled: Record<string, AnyStyledComponent> = {};
 

src/components/BaseButton.tsx

@@ -134,8 +134,8 @@ const ButtonStyle = css<StyleProps>`
 
   --button-textColor: var(--color-text-0);
   --button-backgroundColor: transparent;
-  --button-active-filter: brightness(var(--active-filter));
-  --button-hover-filter: brightness(var(--hover-filter-base));
+  --button-active-filter: brightness(0.9);
+  --button-hover-filter: brightness(1.1);
   --button-hover-textColor: var(--button-textColor);
 
   --button-radius: 0.5em;

src/components/Button.tsx

@@ -61,7 +61,7 @@ export const Button = forwardRef<HTMLButtonElement | HTMLAnchorElement, ButtonPr
 
     return (
       <StyledBaseButton
-        disabled={state[ButtonState.Disabled] || state[ButtonState.Loading]}
+        disabled={state[ButtonState.Disabled]}
         {...{ ref, action, size, shape, state, ...otherProps }}
       >
         {
@@ -89,10 +89,9 @@ const buttonActionVariants = {
     --button-border: solid var(--border-width) var(--color-border);
   `,
   [ButtonAction.Primary]: css`
-    --button-textColor: var(--color-text-button);
+    --button-textColor: var(--color-text-2);
     --button-backgroundColor: var(--color-accent);
     --button-border: solid var(--border-width) var(--color-border-white);
-    --button-hover-filter: brightness(var(--hover-filter-variant));
   `,
 
   [ButtonAction.Secondary]: css`
@@ -102,17 +101,15 @@ const buttonActionVariants = {
   `,
 
   [ButtonAction.Create]: css`
-    --button-textColor: var(--color-text-button);
-    --button-backgroundColor: var(--color-green);
+    --button-textColor: var(--color-text-2);
+    --button-backgroundColor: var(--color-positive);
     --button-border: solid var(--border-width) var(--color-border-white);
-    --button-hover-filter: brightness(var(--hover-filter-variant));
   `,
 
   [ButtonAction.Destroy]: css`
-    --button-textColor: var(--color-text-button);
-    --button-backgroundColor: var(--color-red);
+    --button-textColor: var(--color-text-2);
+    --button-backgroundColor: var(--color-negative);
     --button-border: solid var(--border-width) var(--color-border-white);
-    --button-hover-filter: brightness(var(--hover-filter-variant));
   `,
 
   [ButtonAction.Navigation]: css`
@@ -122,10 +119,9 @@ const buttonActionVariants = {
   `,
 
   [ButtonAction.Reset]: css`
-    --button-textColor: var(--color-red);
+    --button-textColor: var(--color-negative);
     --button-backgroundColor: var(--color-layer-3);
     --button-border: solid var(--border-width) var(--color-border-red);
-    --button-hover-filter: brightness(var(--hover-filter-variant));
   `,
 };
 

src/components/Canvas.tsx

@@ -1,13 +0,0 @@
-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

@@ -5,7 +5,7 @@ import { Checkbox, CheckboxProps } from '@/components/Checkbox';
 
 import { StoryWrapper } from '.ladle/components';
 
-export const CheckboxStory: Story<CheckboxProps> = (args) => {
+export const Checkboxes: Story<CheckboxProps> = (args) => {
   const [isChecked, setIsChecked] = useState(false);
 
   return (
@@ -13,20 +13,10 @@ export const CheckboxStory: Story<CheckboxProps> = (args) => {
       <Checkbox
         {...args}
         checked={isChecked}
-        onCheckedChange={setIsChecked}
-        id="story-checkbox"
-        label="example label"
+        onClick={(e: React.ChangeEvent) => setIsChecked((e.target as HTMLInputElement).checked)}
       />
     </StoryWrapper>
   );
 };
 
-CheckboxStory.args = {};
-
-CheckboxStory.argTypes = {
-  disabled: {
-    options: [true, false],
-    control: { type: 'select' },
-    defaultValue: false,
-  }
-}
+Checkboxes.args = {};

src/components/Checkbox.tsx

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

src/components/Collapsible.stories.tsx

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

src/components/Collapsible.tsx

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

src/components/CollapsibleTabs.tsx

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

src/components/ComboboxDialogMenu.tsx

@@ -22,12 +22,7 @@ type PickComboxMenuProps<
   MenuGroupValue extends string | number
 > = Pick<
   ComboboxMenuProps<MenuItemValue, MenuGroupValue>,
-  | 'inputPlaceholder'
-  | 'onItemSelected'
-  | 'slotEmpty'
-  | 'withItemBorders'
-  | 'withSearch'
-  | 'withStickyLayout'
+  'inputPlaceholder' | 'onItemSelected' | 'slotEmpty' | 'withSearch' | 'withStickyLayout'
 >;
 
 type PickDialogProps = Pick<
@@ -58,7 +53,6 @@ export const ComboboxDialogMenu = <
   onItemSelected,
   inputPlaceholder,
   slotEmpty,
-  withItemBorders,
   withSearch,
   withStickyLayout = true,
   children,
@@ -89,7 +83,6 @@ export const ComboboxDialogMenu = <
       title={title}
       inputPlaceholder={inputPlaceholder}
       slotEmpty={slotEmpty}
-      withItemBorders={withItemBorders}
       withSearch={withSearch}
       withStickyLayout={withStickyLayout}
     />
@@ -102,8 +95,6 @@ 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 */
   & {
@@ -122,12 +113,10 @@ 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(--comboboxDialogMenu-item-gap);
-  --comboboxMenu-item-padding: var(--comboboxDialogMenu-item-padding);
+  --comboboxMenu-item-gap: var(--comboxDialogMenu-item-gap, 0.5rem);
 `;

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 { MenuItem, type MenuConfig } from '@/constants/menus';
+import { type MenuConfig } from '@/constants/menus';
 import { popoverMixins } from '@/styles/popoverMixins';
 import { layoutMixins } from '@/styles/layoutMixins';
 
@@ -20,7 +20,6 @@ type ElementProps<MenuItemValue extends string | number, MenuGroupValue extends
 
 type StyleProps = {
   className?: string;
-  withItemBorders?: boolean;
   withStickyLayout?: boolean;
 };
 
@@ -39,36 +38,38 @@ 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
       label={title}
       // value={highlightedCommand}
       // onValueChange={setHighlightedCommand}
-      filter={(value: string, search: string) =>
-        value.replace(/ /g, '').toLowerCase().includes(search.replace(/ /g, '').toLowerCase())
-          ? 1
-          : 0
-      }
+      filter={(value: string, search: string) => {
+        if (value.replace(/ /g, '').includes(search.replace(/ /g, ''))) return 1;
+        return 0;
+      }}
       className={className}
       $withStickyLayout={withStickyLayout}
     >
       {withSearch && (
         <Styled.Header $withStickyLayout={withStickyLayout}>
           <Styled.Input
-            /**
-             * Mobile Issue: Search Input will always trigger mobile keyboard drawer. There is no fix.
-             * https://github.com/pacocoursey/cmdk/issues/127
-             */
-            autoFocus
+            // ref={inputRef}
             type="search"
             value={searchValue}
             onValueChange={setSearchValue}
+            autoFocus
             placeholder={inputPlaceholder}
           />
         </Styled.Header>
@@ -79,7 +80,6 @@ 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,31 +99,22 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
                     }
                   }}
                   disabled={item.disabled}
-                  $withItemBorders={withItemBorders}
                 >
-                  {
-                    <>
-                      {item.slotBefore}
-                      {item.slotCustomContent ?? (
-                        <Styled.ItemLabel>
-                          <span>
-                            {typeof item.label === 'string'
-                              ? `${item.label}${item.subitems?.length ? '…' : ''}`
-                              : item.label}
-                            {item.tag && (
-                              <>
-                                {' '}
-                                <Tag>{item.tag}</Tag>
-                              </>
-                            )}
-                          </span>
-                          {item.description && <span>{item.description}</span>}
-                        </Styled.ItemLabel>
+                  {item.slotBefore}
+                  <Styled.ItemLabel>
+                    <span>
+                      {`${item.label}${item.subitems?.length ? '…' : ''}`}
+                      {item.tag && (
+                        <>
+                          {' '}
+                          <Tag>{item.tag}</Tag>
+                        </>
                       )}
-                      {item.slotAfter}
-                      {item.subitems && '→'}
-                    </>
-                  }
+                    </span>
+                    {item.description && <span>{item.description}</span>}
+                  </Styled.ItemLabel>
+                  {item.slotAfter}
+                  {item.subitems && '→'}
                 </Styled.Item>
 
                 {searchValue &&
@@ -146,7 +137,6 @@ export const ComboboxMenu = <MenuItemValue extends string, MenuGroupValue extend
                           onItemSelected?.();
                         }}
                         disabled={subitem.disabled}
-                        $withItemBorders={withItemBorders}
                       >
                         {subitem.slotBefore}
                         <Styled.ItemLabel>
@@ -179,17 +169,14 @@ 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;
@@ -238,7 +225,7 @@ Styled.Input = styled(Command.Input)`
   gap: 0.5rem;
 `;
 
-Styled.Group = styled(Command.Group)<{ $withItemBorders?: boolean; $withStickyLayout?: boolean }>`
+Styled.Group = styled(Command.Group)<{ $withStickyLayout?: boolean }>`
   color: var(--color-text-0);
 
   > [cmdk-group-heading] {
@@ -255,21 +242,12 @@ Styled.Group = styled(Command.Group)<{ $withItemBorders?: boolean; $withStickyLa
 
       > [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 }>`
@@ -296,14 +274,13 @@ Styled.List = styled(Command.List)<{ $withStickyLayout?: boolean }>`
     `}
 `;
 
-Styled.Item = styled(Command.Item)<{ $withItemBorders?: boolean }>`
+Styled.Item = styled(Command.Item)`
   ${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);
 
@@ -314,12 +291,6 @@ Styled.Item = styled(Command.Item)<{ $withItemBorders?: boolean }>`
     opacity: 0.75;
     cursor: not-allowed;
   }
-
-  ${({ $withItemBorders }) =>
-    $withItemBorders &&
-    css`
-      ${layoutMixins.withOuterBorder}
-    `}
 `;
 
 Styled.ItemLabel = styled.div`
@@ -338,8 +309,6 @@ Styled.ItemLabel = styled.div`
       opacity: 0.8;
     }
   }
-
-  min-width: 0;
 `;
 
 Styled.Empty = styled(Command.Empty)`

src/components/ContentSection.tsx

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

src/components/ContentSectionHeader.tsx

@@ -6,7 +6,6 @@ import { layoutMixins } from '@/styles/layoutMixins';
 type ElementProps = {
   title: string;
   subtitle?: React.ReactNode;
-  slotLeft?: React.ReactNode;
   slotRight?: React.ReactNode;
 };
 
@@ -17,16 +16,14 @@ type StyleProps = {
 export const ContentSectionHeader = ({
   title,
   subtitle,
-  slotLeft,
   slotRight,
   className,
 }: ElementProps & StyleProps) => (
   <Styled.ContentSectionHeader className={className}>
-    {slotLeft}
-    <Styled.Header>
+    <div>
       {title && <h3>{title}</h3>}
       {subtitle && <p>{subtitle}</p>}
-    </Styled.Header>
+    </div>
     {slotRight}
   </Styled.ContentSectionHeader>
 );
@@ -43,15 +40,9 @@ Styled.ContentSectionHeader = styled.header<StyleProps>`
 
   padding: 1rem var(--header-horizontal-padding);
 
-  @media ${breakpoints.tablet} {
-    flex-wrap: wrap;
-    --header-horizontal-padding: 1.25rem;
+  > div {
+    ${layoutMixins.column}
   }
-`;
-
-Styled.Header = styled.div`
-  ${layoutMixins.column}
-  flex: 1;
 
   h3 {
     color: var(--color-text-2);
@@ -63,4 +54,9 @@ Styled.Header = styled.div`
     font: var(--font-small-book);
     margin-top: 0.25rem;
   }
+
+  @media ${breakpoints.tablet} {
+    flex-wrap: wrap;
+    --header-horizontal-padding: 1.25rem;
+  }
 `;

src/components/CopyButton.stories.tsx

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

src/components/CopyButton.tsx

@@ -9,21 +9,14 @@ 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;
-  buttonType?: 'text' | 'icon' | 'default';
+  shownAsText?: boolean;
   children?: React.ReactNode;
 } & ButtonProps;
 
-export const CopyButton = ({
-  value,
-  buttonType = 'default',
-  children,
-  ...buttonProps
-}: CopyButtonProps) => {
+export const CopyButton = ({ value, shownAsText, children, ...buttonProps }: CopyButtonProps) => {
   const stringGetter = useStringGetter();
   const [copied, setCopied] = useState(false);
 
@@ -35,23 +28,11 @@ export const CopyButton = ({
     setTimeout(() => setCopied(false), 500);
   };
 
-  return buttonType === 'text' ? (
+  return shownAsText ? (
     <Styled.InlineRow onClick={onCopy} copied={copied}>
       {children}
-      <Styled.Icon copied={copied} iconName={copied ? IconName.Check : IconName.Copy} />
+      <Icon iconName={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}
@@ -77,26 +58,8 @@ Styled.InlineRow = styled.div<{ copied: boolean }>`
         `
       : css`
           &:hover {
-            filter: brightness(var(--hover-filter-base));
+            filter: brightness(1.1);
             text-decoration: underline;
           }
         `}
 `;
-
-Styled.Icon = styled(Icon)<{ copied: boolean }>`
-  ${({ copied }) =>
-    copied &&
-    css`
-      color: var(--color-success);
-    `}
-`;
-
-Styled.IconButton = styled(IconButton)<{ copied: boolean }>`
-  ${({ copied }) =>
-    copied &&
-    css`
-      svg {
-        color: var(--color-success);
-      }
-    `}
-`;

src/components/Details.stories.tsx

@@ -7,50 +7,35 @@ import { StoryWrapper } from '.ladle/components';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { layoutMixins } from '@/styles/layoutMixins';
 
-export const DetailsStory: Story<Parameters<typeof Details>[0]> = (args) => (
+export const DetailsStory: Story<Parameters<typeof Details>> = () => (
   <StoryWrapper>
     <Styled.Resizable>
-      <Details {...args} />
+      <Details
+        items={[
+          {
+            key: 'item-1',
+            label: 'Item 1',
+            tooltip: 'leverage',
+            value: 'Value 1',
+          },
+          {
+            key: 'item-2',
+            label: 'Really really really long item name 2',
+            tooltip: 'liquidation-price',
+            value: 'Value 2',
+          },
+          {
+            key: 'item-3',
+            label: 'Item 3',
+            tooltip: 'realized-pnl',
+            value: 'Value 3',
+          },
+        ]}
+      />
     </Styled.Resizable>
   </StoryWrapper>
 );
 
-DetailsStory.args = {
-  items: [
-    {
-      key: 'item-1',
-      label: 'Item 1',
-      tooltip: 'leverage',
-      value: 'Value 1',
-    },
-    {
-      key: 'item-2',
-      label: 'Really really really long item name 2',
-      tooltip: 'liquidation-price',
-      value: 'Value 2',
-    },
-    {
-      key: 'item-3',
-      label: 'Item 3',
-      tooltip: 'realized-pnl',
-      value: 'Value 3',
-    },
-  ],
-  showSubitems: false,
-  isLoading: false,
-  withOverflow: false,
-  withSeparators: false,
-};
-
-DetailsStory.argTypes = {
-  justifyItems: { options: ['start', 'end'], control: { type: 'select' }, defaultValue: 'start' },
-  layout: {
-    options: ['column', 'row', 'rowColumns', 'grid', 'stackColumn'],
-    control: { type: 'select' },
-    defaultValue: 'column',
-  },
-};
-
 const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Resizable = styled.section`

src/components/Details.tsx

@@ -133,7 +133,6 @@ const detailsLayoutVariants = {
   row: css`
     ${layoutMixins.row}
     align-self: stretch;
-    white-space: nowrap;
   `,
 
   rowColumns: css`
@@ -160,16 +159,12 @@ const itemLayoutVariants: Record<string, FlattenInterpolation<ThemeProps<any>>>
 
     ${layoutMixins.spacedRow}
     gap: 0.5rem;
-    align-items: start;
-    padding: 0.5rem 0;
 
     min-height: var(--details-item-height);
 
-    > :first-child > abbr {
-      min-width: auto;
-    }
-
     > :last-child {
+      align-self: stretch;
+
       ${layoutMixins.row}
       ${layoutMixins.stickyRight}
 
@@ -222,6 +217,8 @@ Styled.Details = styled.dl<{
   --details-grid-numColumns: 2;
 
   ${({ layout }) => layout && detailsLayoutVariants[layout]}
+
+  white-space: nowrap;
 `;
 
 Styled.Item = styled.div<{
@@ -234,7 +231,7 @@ Styled.Item = styled.div<{
   ${({ justifyItems }) =>
     justifyItems === 'end' &&
     css`
-      > :nth-child(even) {
+      &:nth-child(even) {
         justify-items: end;
         text-align: end;
       }
@@ -246,7 +243,6 @@ Styled.Item = styled.div<{
     {
       column: css`
         &:not(:hover) > :first-child {
-          white-space: nowrap;
           overflow-x: hidden;
           text-overflow: ellipsis;
         }

src/components/DetailsDialog.tsx

@@ -26,7 +26,7 @@ export const DetailsDialog = ({ slotIcon, title, items, slotFooter, setIsOpen }:
       placement={isTablet ? DialogPlacement.Default : DialogPlacement.Sidebar}
     >
       <Styled.Content>
-        <Styled.Details withSeparators justifyItems="end" items={items} />
+        <Styled.Details withSeparators items={items} />
 
         <Styled.Footer>{slotFooter}</Styled.Footer>
       </Styled.Content>

src/components/Dialog.tsx

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

src/components/DiffArrow.stories.tsx

@@ -14,7 +14,7 @@ export const DiffArrowStory: Story<DiffArrowProps> = (args) => (
 
 DiffArrowStory.argTypes = {
   direction: {
-    options: ['left', 'right', 'up', 'down'],
+    options: ['left', 'right'],
     control: { type: 'select' },
     defaultValue: 'right',
   },

src/components/DiffArrow.tsx

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

src/components/DiffOutput.tsx

@@ -75,7 +75,7 @@ Styled.DiffValue = styled.div<{ hasInvalidNewValue?: boolean }>`
   ${({ hasInvalidNewValue }) =>
     hasInvalidNewValue &&
     css`
-      color: var(--color-error);
+      color: var(--color-negative);
     `}
 `;
 

src/components/DropdownHeaderMenu.tsx

@@ -35,8 +35,8 @@ export const DropdownHeaderMenu = <MenuItemValue extends string>({
     <Root>
       <Styled.Trigger className={className} asChild>
         <div>
-          {children}
-          <Styled.DropdownIconButton iconName={IconName.Caret} isToggle />
+        {children}
+        <Styled.DropdownIconButton iconName={IconName.Caret} isToggle />
         </div>
       </Styled.Trigger>
       <Portal>
@@ -87,7 +87,7 @@ Styled.Trigger = styled(Trigger)`
   outline: none;
 
   :hover {
-    filter: brightness(var(--hover-filter-base));
+    filter: brightness(1.1);
   }
 `;
 

src/components/DropdownMenu.stories.tsx

@@ -4,43 +4,38 @@ import { DropdownMenu } from '@/components/DropdownMenu';
 
 import { StoryWrapper } from '.ladle/components';
 
-export const DropdownMenuStory: Story<Parameters<typeof DropdownMenu>[0]> = (args) => {
+export const DropdownMenuStory: Story<Parameters<typeof DropdownMenu>> = (args) => {
+  const exampleItems = [
+    {
+      value: '1',
+      label: 'Item 1',
+      onSelect: () => alert('Item 1 action'),
+    },
+    {
+      value: '2',
+      label: 'Item 2',
+      onSelect: () => alert('Item 2 action'),
+    },
+    {
+      value: '3',
+      label: 'Item 3',
+      onSelect: () => alert('Item 3 action'),
+    },
+  ];
+
   return (
     <StoryWrapper>
-      <DropdownMenu {...args}>
+      <DropdownMenu
+        {...args}
+        items={exampleItems}
+      >
         <span>Menu</span>
       </DropdownMenu>
     </StoryWrapper>
   );
 };
 
-DropdownMenuStory.args = {
-  items: [
-    {
-      value: '0',
-      label: 'Item 0',
-      onSelect: () => alert('Item 0 action'),
-    },
-    {
-      value: '1',
-      label: 'Item 1 (accent)',
-      onSelect: () => alert('Item 1 action'),
-      highlightColor: 'accent',
-    },
-    {
-      value: '2',
-      label: 'Item 2 (create)',
-      onSelect: () => alert('Item 2 action'),
-      highlightColor: 'create',
-    },
-    {
-      value: '3',
-      label: 'Item 3 (destroy)',
-      onSelect: () => alert('Item 3 action'),
-      highlightColor: 'destroy',
-    },
-  ],
-};
+DropdownMenuStory.args = {};
 
 DropdownMenuStory.argTypes = {
   align: {

src/components/DropdownMenu.tsx

@@ -13,7 +13,7 @@ export type DropdownMenuItem<T> = {
   label: React.ReactNode;
   onSelect?: () => void;
   separator?: boolean;
-  highlightColor?: 'accent' | 'create' | 'destroy';
+  highlightColor?: 'accent' | 'positive' | 'negative';
 };
 
 type StyleProps = {
@@ -82,7 +82,7 @@ Styled.Separator = styled(Separator)`
   margin: 0.25rem 1rem;
 `;
 
-Styled.Item = styled(Item)<{ $highlightColor: 'accent' | 'create' | 'destroy' }>`
+Styled.Item = styled(Item)<{ $highlightColor: 'accent' | 'positive' | 'negative' }>`
   ${popoverMixins.item}
   --item-font-size: var(--dropdownMenu-item-font-size);
   ${({ $highlightColor }) =>
@@ -90,11 +90,11 @@ Styled.Item = styled(Item)<{ $highlightColor: 'accent' | 'create' | 'destroy' }>
       ['accent']: `
         --item-highlighted-textColor: var(--color-accent);
       `,
-      ['create']: `
-        --item-highlighted-textColor: var(--color-green);
+      ['positive']: `
+        --item-highlighted-textColor: var(--color-positive);
       `,
-      ['destroy']: `
-        --item-highlighted-textColor: var(--color-red);
+      ['negative']: `
+        --item-highlighted-textColor: var(--color-negative);
       `,
     }[$highlightColor])}
 

src/components/DropdownSelectMenu.stories.tsx

@@ -28,22 +28,21 @@ const exampleItems = [
   },
 ];
 
-export const DropdownSelectMenuStory: Story<
-  Pick<Parameters<typeof DropdownSelectMenu>[0], 'items' | 'align' | 'sideOffset' | 'disabled'>
-> = (args) => {
+export const DropdownSelectMenuStory: Story<Parameters<typeof DropdownSelectMenu>> = (args) => {
   const [item, setItem] = useState(exampleItems[0].value);
   return (
     <StoryWrapper>
-      <DropdownSelectMenu value={item} onValueChange={(value) => setItem(value)} {...args} />
+      <DropdownSelectMenu
+        items={exampleItems}
+        value={item}
+        onValueChange={(value) => setItem(value)}
+        {...args}
+      />
     </StoryWrapper>
   );
 };
 
-DropdownSelectMenuStory.args = {
-  items: exampleItems,
-  sideOffset: 1,
-  disabled: false,
-};
+DropdownSelectMenuStory.args = {};
 
 DropdownSelectMenuStory.argTypes = {
   align: {

src/components/DropdownSelectMenu.tsx

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

src/components/FormInput.tsx

@@ -32,7 +32,7 @@ export const FormInput = forwardRef<HTMLInputElement, FormInputProps>(
       isValidationAttached={validationConfig?.attached}
     >
       <Styled.InputContainer hasSlotRight={!!slotRight}>
-        <Styled.WithLabel label={label} inputID={id} disabled={otherProps?.disabled}>
+        <Styled.WithLabel label={label} inputID={id}>
           <Input ref={ref} id={id} {...otherProps} />
         </Styled.WithLabel>
         {slotRight}
@@ -85,11 +85,11 @@ Styled.InputContainer = styled.div<{ hasSlotRight?: boolean }>`
     `}
 `;
 
-Styled.WithLabel = styled(WithLabel)<{ disabled?: boolean }>`
+Styled.WithLabel = styled(WithLabel)`
   ${formMixins.inputLabel}
 
   label {
-    ${({ disabled }) => !disabled && 'cursor: text;'}
+    cursor: text;
     padding: var(--form-input-paddingY) var(--form-input-paddingX) 0;
   }
 `;

src/components/GreenCheckCircle.tsx

@@ -1,16 +1,43 @@
 import styled, { AnyStyledComponent } from 'styled-components';
 
+import { layoutMixins } from '@/styles/layoutMixins';
+
 import { Icon, IconName } from '@/components/Icon';
 
 export const GreenCheckCircle = ({ className }: { className?: string }) => (
-  <Styled.Icon className={className} iconName={IconName.CheckCircle} />
+  <Styled.GreenCheckCircle className={className}>
+    <Icon iconName={IconName.Check} />
+  </Styled.GreenCheckCircle>
 );
 
 const Styled: Record<string, AnyStyledComponent> = {};
 
-Styled.Icon = styled(Icon)`
+Styled.GreenCheckCircle = styled.div`
+  ${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.stories.tsx

@@ -4,7 +4,7 @@ import { Icon, IconName } from '@/components/Icon';
 
 import { StoryWrapper } from '.ladle/components';
 
-export const IconStory: Story<Parameters<typeof Icon>[0]> = (args) => {
+export const IconStory: Story<Parameters<typeof Icon>> = (args) => {
   return (
     <StoryWrapper>
       <Icon {...args} />

src/components/Icon.tsx

@@ -13,10 +13,8 @@ import {
   CaretIcon,
   CautionCircleStrokeIcon,
   CautionCircleIcon,
-  ChaosLabsIcon,
   ChatIcon,
   CheckIcon,
-  CheckCircleIcon,
   ChevronLeftIcon,
   ChevronRightIcon,
   ClockIcon,
@@ -25,7 +23,7 @@ import {
   CoinsIcon,
   CommentIcon,
   CopyIcon,
-  CurrencySignIcon,
+  CubeIcon,
   DepositIcon,
   DepthChartIcon,
   DiscordIcon,
@@ -36,18 +34,15 @@ import {
   FundingChartIcon,
   GearIcon,
   GiftboxIcon,
-  GovernanceIcon,
   HelpCircleIcon,
   HideIcon,
   HistoryIcon,
-  LeaderboardIcon,
   LinkOutIcon,
   LockIcon,
   LogoShortIcon,
   MenuIcon,
   MigrateIcon,
   MintscanIcon,
-  MoonIcon,
   OrderbookIcon,
   OrderCanceledIcon,
   OrderFilledIcon,
@@ -57,22 +52,17 @@ import {
   OrderUntriggeredIcon,
   OverviewIcon,
   PencilIcon,
-  PlayIcon,
-  PlusIcon,
   PositionsIcon,
   PriceChartIcon,
   PrivacyIcon,
   QrIcon,
-  RewardStarIcon,
   SearchIcon,
   SendIcon,
   ShareIcon,
   ShowIcon,
   TogglesMenuIcon,
   StarIcon,
-  SunIcon,
   TerminalIcon,
-  TokenIcon,
   TradeIcon,
   TransferIcon,
   TriangleIcon,
@@ -94,10 +84,8 @@ export enum IconName {
   Caret = 'Caret',
   CautionCircle = 'CautionCircle',
   CautionCircleStroked = 'CautionCircleStroked',
-  ChaosLabs = 'ChaosLabs',
   Chat = 'Chat',
   Check = 'Check',
-  CheckCircle = 'CheckCircle',
   ChevronLeft = 'ChevronLeft',
   ChevronRight = 'ChevronRight',
   Clock = 'Clock',
@@ -106,7 +94,7 @@ export enum IconName {
   Coins = 'Coins',
   Comment = 'Comment',
   Copy = 'Copy',
-  CurrencySign = 'CurrencySign',
+  Cube = 'Cube',
   Deposit = 'Deposit',
   DepthChart = 'DepthChart',
   Discord = 'Discord',
@@ -117,18 +105,15 @@ export enum IconName {
   FundingChart = 'FundingChart',
   Gear = 'Gear',
   Giftbox = 'Giftbox',
-  Governance = 'Governance',
   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',
@@ -139,22 +124,17 @@ 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',
-  Token = 'Token',
   Trade = 'Trade',
   Transfer = 'Transfer',
   Triangle = 'Triangle',
@@ -176,10 +156,8 @@ const icons = {
   [IconName.Caret]: CaretIcon,
   [IconName.CautionCircle]: CautionCircleIcon,
   [IconName.CautionCircleStroked]: CautionCircleStrokeIcon,
-  [IconName.ChaosLabs]: ChaosLabsIcon,
   [IconName.Chat]: ChatIcon,
   [IconName.Check]: CheckIcon,
-  [IconName.CheckCircle]: CheckCircleIcon,
   [IconName.ChevronLeft]: ChevronLeftIcon,
   [IconName.ChevronRight]: ChevronRightIcon,
   [IconName.Clock]: ClockIcon,
@@ -188,7 +166,7 @@ const icons = {
   [IconName.Coins]: CoinsIcon,
   [IconName.Comment]: CommentIcon,
   [IconName.Copy]: CopyIcon,
-  [IconName.CurrencySign]: CurrencySignIcon,
+  [IconName.Cube]: CubeIcon,
   [IconName.Deposit]: DepositIcon,
   [IconName.DepthChart]: DepthChartIcon,
   [IconName.Discord]: DiscordIcon,
@@ -199,18 +177,15 @@ const icons = {
   [IconName.FundingChart]: FundingChartIcon,
   [IconName.Gear]: GearIcon,
   [IconName.Giftbox]: GiftboxIcon,
-  [IconName.Governance]: GovernanceIcon,
   [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,
@@ -220,22 +195,17 @@ 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.Token]: TokenIcon,
   [IconName.Trade]: TradeIcon,
   [IconName.Transfer]: TransferIcon,
   [IconName.Triangle]: TriangleIcon,

src/components/Input.tsx

@@ -10,7 +10,7 @@ import {
   USD_DECIMALS,
 } from '@/constants/numbers';
 
-import { BIG_NUMBERS } from '@/lib/numbers';
+import { BIG_NUMBERS, MustBigNumber } from '@/lib/numbers';
 import { useLocaleSeparators } from '@/hooks';
 
 export enum InputType {
@@ -29,38 +29,31 @@ 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;
 };
 
-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 type InputProps = ElementProps & StyleProps;
 
 export const Input = forwardRef<HTMLInputElement, InputProps>(
   (
@@ -136,7 +129,6 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             placeholder={placeholder}
             value={value}
             // Other
-            data-1p-ignore // prevent 1Password fill
             {...otherProps}
           />
         ) : (
@@ -145,7 +137,6 @@ 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}
@@ -169,7 +160,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
                 ? undefined
                 : Number(formattedValue.replace(',', '.'));
 
-              onInput?.({ value, floatValue, formattedValue, ...e });
+              onInput?.({ value, floatValue, formattedValue });
             }}
             // Native
             disabled={disabled}
@@ -177,7 +168,6 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             value={formattedValue}
             autoComplete="off"
             autoCorrect="off"
-            data-1p-ignore // prevent 1Password fill
             {...otherProps}
           />
         )}
@@ -198,6 +188,7 @@ Styled.InputContainer = styled.div`
   border-radius: inherit;
 
   input {
+    user-select: all;
     flex: 1;
     width: 100%;
   }

src/components/Link.stories.tsx

@@ -6,7 +6,7 @@ import { Link } from '@/components/Link';
 import { StoryWrapper } from '.ladle/components';
 import { layoutMixins } from '@/styles/layoutMixins';
 
-export const LinkStory: Story<Parameters<typeof Link>[0]> = (args) => {
+export const LinkStory: Story<Parameters<typeof Link>> = (args) => {
   return (
     <StoryWrapper>
       <Styled.Container>

src/components/Loading/LoadingSpinner.tsx

@@ -11,7 +11,6 @@ export const LoadingSpinner: React.FC<{
   return (
     <Styled.Spinner className={className}>
       <Styled.LoadingSpinnerSvg
-        id={id}
         width="38"
         height="38"
         viewBox="0 0 38 38"

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.stories.tsx

@@ -5,24 +5,8 @@ import { HashRouter } from 'react-router-dom';
 
 import { StoryWrapper } from '.ladle/components';
 
-export const NavigationMenuStory: Story<
-  Pick<Parameters<typeof NavigationMenu>[0], 'items' | 'orientation' | 'submenuPlacement'>
-> = (args) => {
-  return (
-    <StoryWrapper>
-      <HashRouter
-        children={
-          <NavigationMenu {...args}>
-            <span>Menu</span>
-          </NavigationMenu>
-        }
-      />
-    </StoryWrapper>
-  );
-};
-
-NavigationMenuStory.args = {
-  items: [
+export const NavigationMenuStory: Story<Parameters<typeof NavigationMenu>> = (args) => {
+  const exampleItems = [
     {
       group: 'navigation',
       groupLabel: 'Views',
@@ -109,9 +93,23 @@ NavigationMenuStory.args = {
         },
       ],
     },
-  ],
+  ];
+
+  return (
+    <StoryWrapper>
+      <HashRouter
+        children={
+          <NavigationMenu {...args} items={exampleItems}>
+            <span>Menu</span>
+          </NavigationMenu>
+        }
+      />
+    </StoryWrapper>
+  );
 };
 
+NavigationMenuStory.args = {};
+
 NavigationMenuStory.argTypes = {
   orientation: {
     options: ['vertical', 'horizontal'],

src/components/NavigationMenu.tsx

@@ -1,4 +1,4 @@
-import { forwardRef, Ref } from 'react';
+import { forwardRef, Ref, useEffect, useRef, useState } from 'react';
 import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components';
 import { NavLink, matchPath, useLocation } from 'react-router-dom';
 
@@ -21,6 +21,8 @@ import {
 
 import { layoutMixins } from '@/styles/layoutMixins';
 
+import { isTruthy } from '@/lib/isTruthy';
+
 import { Tag } from './Tag';
 import { Icon, IconName } from './Icon';
 
@@ -59,6 +61,7 @@ const NavItem = forwardRef(
       <>
         {slotBefore}
         <span>
+          {/* {`${label}${subitems?.length ? ' ' : ''}`} */}
           {label}
           {tag && (
             <>
@@ -97,6 +100,8 @@ const NavItem = forwardRef(
   }
 );
 
+type TriggerRef = HTMLAnchorElement | HTMLDivElement | HTMLButtonElement | null;
+
 export const NavigationMenu = <MenuItemValue extends string, MenuGroupValue extends string>({
   onSelectItem,
   onSelectGroup,
@@ -107,6 +112,33 @@ 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,
@@ -116,18 +148,18 @@ export const NavigationMenu = <MenuItemValue extends string, MenuGroupValue exte
   }) => (
     <>
       <Styled.SubMenuTrigger
-        asChild
-        onPointerMove={(e: MouseEvent) => e.preventDefault()}
-        onPointerLeave={(e: MouseEvent) => e.preventDefault()}
+        asChild={depth > 0}
+        ref={(ref: TriggerRef) => (triggerRefs.current[item.value] = ref)}
+        onClick={(e: MouseEvent) => {
+          if (clickIsDisabled) {
+            e.preventDefault();
+          }
+        }}
       >
         <Styled.NavItem onSelect={onSelectGroup} orientation={itemOrientation} {...item} />
       </Styled.SubMenuTrigger>
 
-      <Styled.Content
-        onPointerEnter={(e: MouseEvent) => e.preventDefault()}
-        onPointerLeave={(e: MouseEvent) => e.preventDefault()}
-        data-placement={submenuPlacement}
-      >
+      <Styled.Content data-placement={submenuPlacement}>
         <Styled.Sub data-placement={submenuPlacement}>
           <Styled.List
             data-orientation={depth > 0 ? 'menu' : orientation === 'vertical' ? 'vertical' : 'menu'}
@@ -378,12 +410,25 @@ 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)`
@@ -391,6 +436,11 @@ 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;
     }
@@ -402,10 +452,11 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
     subitems?.length
       ? css`
           ${popoverMixins.trigger}
-          --trigger-open-backgroundColor: var(--navigationMenu-item-checked-backgroundColor);
+          --trigger-backgroundColor: transparent;
+          --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);
           }
@@ -419,6 +470,8 @@ 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

@@ -1,201 +0,0 @@
-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/Output.tsx

@@ -65,9 +65,6 @@ type ElementProps = {
     resolution?: number;
     stripRelativeWords?: boolean;
   };
-  timeOptions?: {
-    useUTC?: boolean;
-  };
   tag?: React.ReactNode;
   withParentheses?: boolean;
   locale?: string;
@@ -92,7 +89,6 @@ export const Output = ({
   relativeTimeFormatOptions = {
     format: 'singleCharacter',
   },
-  timeOptions,
   tag,
   withParentheses,
   locale = navigator.language || 'en-US',
@@ -120,7 +116,6 @@ export const Output = ({
           {value?.toString() ?? null}
 
           {tag && <Tag>{tag}</Tag>}
-          {slotRight}
         </Styled.Text>
       );
     }
@@ -170,21 +165,16 @@ export const Output = ({
       if ((typeof value !== 'string' && typeof value !== 'number') || !value) return null;
       const date = new Date(value);
       const dateString = {
-        [OutputType.Date]: date.toLocaleString(selectedLocale, {
-          dateStyle: 'medium',
-          timeZone: timeOptions?.useUTC ? 'UTC' : undefined,
-        }),
+        [OutputType.Date]: date.toLocaleString(selectedLocale, { dateStyle: 'medium' }),
         [OutputType.DateTime]: date.toLocaleString(selectedLocale, {
           dateStyle: 'short',
           timeStyle: 'short',
-          timeZone: timeOptions?.useUTC ? 'UTC' : undefined,
         }),
         [OutputType.Time]: date.toLocaleString(selectedLocale, {
           hour12: false,
           hour: '2-digit',
           minute: '2-digit',
           second: '2-digit',
-          timeZone: timeOptions?.useUTC ? 'UTC' : undefined,
         }),
       }[type];
 

src/components/Panel.stories.tsx

@@ -1,10 +1,10 @@
 import type { Story } from '@ladle/react';
 
-import { Panel, PanelProps } from '@/components/Panel';
+import { Panel } from '@/components/Panel';
 
 import { StoryWrapper } from '.ladle/components';
 
-export const PanelStory: Story<PanelProps> = (args) => {
+export const PanelStory: Story<{ slotHeader: React.ReactNode, children?: React.ReactNode }> = (args) => {
   return (
     <StoryWrapper>
       <Panel {...args} />
@@ -13,8 +13,6 @@ export const PanelStory: Story<PanelProps> = (args) => {
 };
 
 PanelStory.args = {
-  slotHeaderContent: 'Header',
+  slotHeader: 'Header',
   children: 'Content',
-  slotRight: '1️⃣',
-  hasSeparator: true,
 };

src/components/Panel.tsx

@@ -4,10 +4,9 @@ import { Link } from 'react-router-dom';
 import { Icon, IconName } from '@/components/Icon';
 
 import { layoutMixins } from '@/styles/layoutMixins';
-import { breakpoints } from '@/styles';
 
-type ElementProps = {
-  slotHeaderContent?: React.ReactNode;
+type PanelProps = {
+  slotHeaderContent?: string;
   slotHeader?: React.ReactNode;
   slotRight?: React.ReactNode;
   children?: React.ReactNode;
@@ -16,13 +15,11 @@ type ElementProps = {
   onClick?: () => void;
 };
 
-type StyleProps = {
+type PanelStyleProps = {
   className?: string;
   hasSeparator?: boolean;
 };
 
-export type PanelProps = ElementProps & StyleProps;
-
 export const Panel = ({
   slotHeaderContent,
   slotHeader,
@@ -33,7 +30,7 @@ export const Panel = ({
   onClick,
   hasSeparator,
   className,
-}: PanelProps) => (
+}: PanelProps & PanelStyleProps) => (
   <Styled.Panel onClick={onClick} className={className}>
     <Styled.Left>
       {href ? (
@@ -70,12 +67,6 @@ Styled.Panel = styled.section<{ onClick?: () => void }>`
   --panel-content-paddingY: var(--panel-paddingY);
   --panel-content-paddingX: var(--panel-paddingX);
 
-  @media ${breakpoints.notTablet} {
-    --panel-paddingX: 1.5rem;
-    --panel-paddingY: 1.25rem;
-    --panel-content-paddingY: 1rem;
-  }
-
   ${layoutMixins.row}
 
   background-color: var(--color-layer-3);

src/components/QrCode.tsx

@@ -11,7 +11,6 @@ type ElementProps = {
 };
 
 type StyleProps = {
-  className?: string;
   hasLogo?: boolean;
   size?: number;
 };
@@ -19,7 +18,7 @@ type StyleProps = {
 const DARK_LOGO_MARK_URL = '/logos/logo-mark-dark.svg';
 const LIGHT_LOGO_MARK_URL = '/logos/logo-mark-light.svg';
 
-export const QrCode = ({ className, value, hasLogo, size = 300 }: ElementProps & StyleProps) => {
+export const QrCode = ({ value, hasLogo, size = 300 }: ElementProps & StyleProps) => {
   const ref = useRef<HTMLDivElement>(null);
   const appTheme: AppTheme = useSelector(getAppTheme);
 
@@ -75,7 +74,7 @@ export const QrCode = ({ className, value, hasLogo, size = 300 }: ElementProps &
     }
   }, [appTheme, hasLogo]);
 
-  return <Styled.QrCode className={className} ref={ref} />;
+  return <Styled.QrCode ref={ref} />;
 };
 
 const Styled: Record<string, AnyStyledComponent> = {};

src/components/SearchInput.stories.tsx

@@ -7,7 +7,7 @@ import { StoryWrapper } from '.ladle/components';
 import { layoutMixins } from '@/styles/layoutMixins';
 import { InputType } from './Input';
 
-export const SearchInputStory: Story<Parameters<typeof SearchInput>[0]> = (args) => (
+export const SearchInputStory: Story<Parameters<typeof SearchInput>> = (args) => (
   <StoryWrapper>
     <Styled.Container>
       <SearchInput placeholder="Search something..." type={InputType.Search} />

src/components/SearchInput.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useState } from 'react';
 import styled, { type AnyStyledComponent, css } from 'styled-components';
 
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -22,11 +22,6 @@ 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>
@@ -46,7 +41,6 @@ export const SearchInput = ({
       />
       <Styled.Input
         autoFocus
-        ref={inputRef}
         value={value}
         isOpen={isOpen}
         type={type}

src/components/SearchSelectMenu.stories.tsx

@@ -6,7 +6,7 @@ import { SearchSelectMenu } from '@/components/SearchSelectMenu';
 
 import { StoryWrapper } from '.ladle/components';
 
-export const SearchSelectMenuStory: Story<Parameters<typeof SearchSelectMenu>[0]> = (args) => {
+export const SearchSelectMenuStory: Story<Parameters<typeof SearchSelectMenu>> = (args) => {
   const [selectedItem, setSelectedItem] = useState<string>();
 
   const exampleItems = [
@@ -24,7 +24,10 @@ export const SearchSelectMenuStory: Story<Parameters<typeof SearchSelectMenu>[0]
   return (
     <StoryWrapper>
       <Container>
-        <SearchSelectMenu {...args} items={exampleItems}>
+        <SearchSelectMenu
+          {...args}
+          items={exampleItems}
+        >
           {!selectedItem ? <span>Search and Select</span> : <span>{selectedItem}</span>}
         </SearchSelectMenu>
       </Container>

src/components/SearchSelectMenu.tsx

@@ -12,8 +12,6 @@ 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;
@@ -86,30 +84,27 @@ 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: var(--form-input-paddingY) var(--form-input-paddingX);
-
-  @media ${breakpoints.tablet} {
-    height: var(--form-input-height-mobile);
-  }
+  padding: 0 1rem;
 `;
 
 Styled.WithLabel = styled(WithLabel)`
-  ${formMixins.inputLabel}
+  --label-textColor: var(--color-text-0);
+  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.stories.tsx

@@ -26,7 +26,7 @@ const exampleItems: { value: string; label: string }[] = [
   },
 ];
 
-export const SelectMenuStory: Story<Parameters<typeof SelectMenu>[0]> = (args) => {
+export const SelectMenuStory: Story<Parameters<typeof SelectMenu>> = (args) => {
   const [value, setValue] = useState(exampleItems[0].value);
   const [value2, setValue2] = useState(exampleItems[2].value);
 

src/components/SelectMenu.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import styled, { css, type AnyStyledComponent } from 'styled-components';
+import styled, { type AnyStyledComponent } from 'styled-components';
 
 import {
   Root,
@@ -13,13 +13,11 @@ 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,
@@ -46,9 +44,7 @@ export const SelectMenu = <T extends string>({
         ) : (
           <Value />
         )}
-        {React.Children.toArray(children).length > 1 && (
-          <Styled.TriggerIcon iconName={IconName.Triangle} />
-        )}
+        {React.Children.toArray(children).length > 1 && <Styled.DropdownIcon />}
       </Styled.Trigger>
       <Portal>
         <Styled.Content className={className}>
@@ -72,9 +68,7 @@ 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>
 );
 
@@ -94,6 +88,12 @@ 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,9 +116,3 @@ Styled.WithLabel = styled(WithLabel)`
   ${formMixins.inputLabel}
   border-radius: 0;
 `;
-
-Styled.TriggerIcon = styled(Icon)`
-  width: 0.625rem;
-  height: 0.375rem;
-  color: var(--color-text-0);
-`;

src/components/Table.tsx

@@ -33,20 +33,16 @@ import {
 
 import { useAsyncList } from 'react-stately';
 
-import { useBreakpoints, useStringGetter } from '@/hooks';
+import { useBreakpoints } 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';
@@ -83,7 +79,7 @@ export type ColumnDef<TableRowData extends object> = {
   width?: ColumnSize;
 };
 
-export type ElementProps<TableRowData extends object | CustomRowConfig, TableRowKey extends Key> = {
+type ElementProps<TableRowData extends object | CustomRowConfig, TableRowKey extends Key> = {
   label?: string;
   columns: ColumnDef<TableRowData>[];
   data: TableRowData[];
@@ -95,10 +91,6 @@ export type ElementProps<TableRowData extends object | CustomRowConfig, TableRow
   selectionBehavior?: 'replace' | 'toggle';
   onRowAction?: (key: TableRowKey, row: TableRowData) => void;
   slotEmpty?: React.ReactNode;
-  viewMoreConfig?: {
-    initialNumRowsToShow: number;
-    numRowsPerPage?: number;
-  };
   // collection: TableCollection<string>;
   // children: React.ReactNode;
 };
@@ -128,7 +120,6 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
   selectionMode = 'single',
   selectionBehavior = 'toggle',
   slotEmpty,
-  viewMoreConfig,
   // shouldRowRender,
 
   // collection,
@@ -144,18 +135,6 @@ 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(viewMoreConfig?.initialNumRowsToShow);
-  const enableViewMore = viewMoreConfig !== undefined;
-
-  const onViewMoreClick = () => {
-    if (!viewMoreConfig) return;
-    const { numRowsPerPage } = viewMoreConfig;
-    if (numRowsPerPage) {
-      setNumRowsToShow((prev) => (prev ?? 0) + numRowsPerPage);
-    } else {
-      setNumRowsToShow(data.length);
-    }
-  };
 
   const currentBreakpoints = useBreakpoints();
   const shownColumns = columns.filter(
@@ -182,7 +161,10 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
         ? // String
           collator.compare(first as string, second as string)
         : // Number
-          MustBigNumber(first).comparedTo(MustBigNumber(second))) *
+          Math.sign(
+            (parseInt(first as string) || (first as number)) -
+              (parseInt(second as string) || (second as number))
+          )) *
       // Flip the direction if descending order is specified.
       (sortDirection === 'descending' ? -1 : 1)
     );
@@ -229,10 +211,6 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
             onRowAction &&
             ((key: TableRowKey) => onRowAction(key, data.find((row) => getRowKey(row) === key)!))
           }
-          numColumns={shownColumns.length}
-          onViewMoreClick={
-            enableViewMore && numRowsToShow! < data.length ? onViewMoreClick : undefined
-          }
           // shouldRowRender={shouldRowRender}
           hideHeader={hideHeader}
           withGradientCardRows={withGradientCardRows}
@@ -257,7 +235,7 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
             )}
           </TableHeader>
 
-          <TableBody items={enableViewMore ? list.items.slice(0, numRowsToShow) : list.items}>
+          <TableBody items={list.items}>
             {(item) => (
               <Row key={getRowKey(item)}>
                 {(columnKey) => (
@@ -291,8 +269,6 @@ 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;
@@ -302,7 +278,7 @@ const TableRoot = <TableRowData extends object | CustomRowConfig, TableRowKey ex
   withScrollSnapColumns?: boolean;
   withScrollSnapRows?: boolean;
 }) => {
-  const { selectionMode, selectionBehavior, numColumns, onViewMoreClick } = props;
+  const { selectionMode, selectionBehavior } = props;
 
   const state = useTableState<TableRowData>({
     ...props,
@@ -363,7 +339,6 @@ 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) =>
@@ -409,9 +384,6 @@ const TableRoot = <TableRowData extends object | CustomRowConfig, TableRowKey ex
             </TableRow>
           )
         )}
-        {onViewMoreClick ? (
-          <ViewMoreRow colSpan={numColumns} onClick={onViewMoreClick} />
-        ) : undefined}
       </TableBodyRowGroup>
     </Styled.Table>
   );
@@ -445,7 +417,6 @@ const TableBodyRowGroup = ({
   children,
   withGradientCardRows,
   withInnerBorders,
-  withOuterBorder,
 }: { children: React.ReactNode } & StyleProps) => {
   const { rowGroupProps } = useTableRowGroup();
 
@@ -454,7 +425,6 @@ const TableBodyRowGroup = ({
       {...rowGroupProps}
       withGradientCardRows={withGradientCardRows}
       withInnerBorders={withInnerBorders}
-      withOuterBorder={withOuterBorder}
     >
       {children}
     </Styled.Tbody>
@@ -521,23 +491,6 @@ const TableColumnHeader = <TableRowData extends object>({
   );
 };
 
-export const ViewMoreRow = ({ colSpan, onClick }: { colSpan: number; onClick: () => void }) => {
-  const stringGetter = useStringGetter();
-  return (
-    <Styled.ViewMoreTr 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.ViewMoreTr>
-  );
-};
-
 export const TableRow = <TableRowData extends object>({
   item,
   children,
@@ -684,8 +637,6 @@ Styled.TableWrapper = styled.div<{
   --table-lastColumn-cell-align: end; // start | center | end | var(--table-cell-align)
   --tableCell-padding: 0 1rem;
 
-  --tableViewMore-borderColor: inherit;
-
   // Rules
 
   flex: 1;
@@ -711,7 +662,7 @@ Styled.Empty = styled.div<{ withOuterBorder: boolean }>`
 
   justify-items: center;
   align-content: center;
-  padding: 4rem;
+  padding: 2rem;
   gap: 0.75em;
 
   color: var(--color-text-0);
@@ -795,7 +746,7 @@ Styled.Tr = styled.tr<{
       &:focus-visible,
       &:focus-within {
         --tableRow-currentBackgroundColor: var(--tableRow-hover-backgroundColor);
-        filter: brightness(var(--hover-filter-base));
+        filter: brightness(1.1);
       }
     `};
 
@@ -880,7 +831,6 @@ 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);
@@ -889,17 +839,18 @@ Styled.Thead = styled.thead<StyleProps>`
   color: var(--tableHeader-textColor);
   background-color: var(--tableHeader-backgroundColor);
 
-  ${({ withInnerBorders, withGradientCardRows }) =>
-    withInnerBorders &&
-    !withGradientCardRows &&
-    css`
-      ${layoutMixins.withInnerHorizontalBorders}
-    `}
+  @media ${breakpoints.notTablet} {
+    ${({ withInnerBorders, withGradientCardRows }) =>
+      withInnerBorders &&
+      !withGradientCardRows &&
+      css`
+        ${layoutMixins.withInnerHorizontalBorders}
+      `}
+  }
 `;
 
 Styled.Tbody = styled.tbody<StyleProps>`
   ${layoutMixins.stickyArea2}
-  font: var(--font-small-book);
 
   // If <table> height is fixed with not enough rows to overflow, vertically center the rows
   &:before,
@@ -918,22 +869,6 @@ 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 }) =>
@@ -985,19 +920,3 @@ 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;
-  }
-`;
-
-Styled.ViewMoreTr = styled(Styled.Tr)`
-  --border-color: var(--tableViewMore-borderColor);
-`;

src/components/Tabs.stories.tsx

@@ -13,11 +13,29 @@ enum TabItem {
   Item3 = 'Item3',
 }
 
-export const TabsStory: Story<Parameters<typeof Tabs>[0]> = (args) => {
+const TabItems = [
+  {
+    value: TabItem.Item1,
+    label: 'Item 1',
+    content: <div>Item 1 Content</div>,
+  },
+  {
+    value: TabItem.Item2,
+    label: 'Item 2',
+    content: <div>Item 2 Content</div>,
+  },
+  {
+    value: TabItem.Item3,
+    label: 'Item 3',
+    content: <div>Item 3 Content</div>,
+  },
+];
+
+export const TabsStory: Story<Parameters<typeof Tabs>> = (args) => {
   return (
     <StoryWrapper>
       <Styled.Container>
-        <Tabs {...args} />
+        <Tabs items={TabItems} {...args} />
       </Styled.Container>
     </StoryWrapper>
   );
@@ -25,23 +43,6 @@ export const TabsStory: Story<Parameters<typeof Tabs>[0]> = (args) => {
 
 TabsStory.args = {
   fullWidthTabs: false,
-  items: [
-    {
-      value: TabItem.Item1,
-      label: 'Item 1',
-      content: <div>Item 1 Content</div>,
-    },
-    {
-      value: TabItem.Item2,
-      label: 'Item 2',
-      content: <div>Item 2 Content</div>,
-    },
-    {
-      value: TabItem.Item3,
-      label: 'Item 3',
-      content: <div>Item 3 Content</div>,
-    },
-  ],
 };
 
 TabsStory.argTypes = {

src/components/Tabs.tsx

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

src/components/Tag.stories.tsx

@@ -1,10 +1,10 @@
 import type { Story } from '@ladle/react';
 
-import { Tag, TagSign, TagSize, TagType } from '@/components/Tag';
+import { Tag } from '@/components/Tag';
 
 import { StoryWrapper } from '.ladle/components';
 
-export const TagStory: Story<Parameters<typeof Tag>[0]> = (args) => {
+export const TagStory: Story<Parameters<typeof Tag>> = (args) => {
   return (
     <StoryWrapper>
       <Tag {...args} />
@@ -14,23 +14,4 @@ export const TagStory: Story<Parameters<typeof Tag>[0]> = (args) => {
 
 TagStory.args = {
   children: 'USDC',
-  isHighlighted: false,
-};
-
-TagStory.argTypes = {
-  size: {
-    options: Object.values(TagSize),
-    control: { type: 'select' },
-    defaultValue: TagSize.Small,
-  },
-  type: {
-    options: [...Object.values(TagType), undefined],
-    control: { type: 'select' },
-    defaultValue: undefined,
-  },
-  sign: {
-    options: [...Object.values(TagSign), undefined],
-    control: { type: 'select' },
-    defaultValue: undefined,
-  },
 };

src/components/Tag.tsx

@@ -1,20 +1,20 @@
 import styled, { css } from 'styled-components';
 
 export enum TagSize {
-  Small = 'Small',
-  Medium = 'Medium',
+  Small,
+  Medium,
 }
 
 export enum TagType {
-  Asset = 'Asset',
-  Side = 'Side',
-  Number = 'Number',
+  Asset,
+  Side,
+  Number,
 }
 
 export enum TagSign {
-  Positive = 'Positive',
-  Negative = 'Negative',
-  Neutral = 'Neutral',
+  Positive,
+  Negative,
+  Neutral,
 }
 
 type StyleProps = {

src/components/TimeoutButton.tsx

@@ -8,7 +8,6 @@ import { Button, type ButtonStateConfig, type ButtonProps } from '@/components/B
 
 type ElementProps = {
   timeoutInSeconds: number;
-  slotFinal?: ReactNode;
 } & ButtonProps;
 
 export type TimeoutButtonProps = ElementProps;
@@ -16,7 +15,6 @@ export type TimeoutButtonProps = ElementProps;
 export const TimeoutButton = ({
   children,
   timeoutInSeconds,
-  slotFinal,
   ...otherProps
 }: TimeoutButtonProps) => {
   const [timeoutDeadline] = useState(Date.now() + timeoutInSeconds * 1000);
@@ -25,8 +23,6 @@ export const TimeoutButton = ({
 
   const secondsLeft = Math.max(0, (timeoutDeadline - now) / 1000);
 
-  if (slotFinal && secondsLeft <= 0) return slotFinal;
-
   return (
     <Button
       {...otherProps}

src/components/Toast.tsx

@@ -1,19 +1,24 @@
-import { type MouseEvent, useEffect, useRef, useState } from 'react';
-import styled, { keyframes } from 'styled-components';
-import { Root, Action, Close } from '@radix-ui/react-toast';
+import React, { useEffect, useRef, useState } from 'react';
+
+import { Root, Title, Description, 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 { IconName } from './Icon';
+import { CloseIcon } from '@/icons';
+
+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';
@@ -21,22 +26,13 @@ type ElementProps = {
   lastUpdated?: number;
 };
 
-type StyleProps = {
-  className?: string;
-};
-
-type ToastProps = NotificationProps & ElementProps & StyleProps;
+type StyleProps = {};
 
 export const Toast = ({
-  className,
   isOpen = true,
-  notification,
-  onClick,
   setIsOpen,
   slotIcon,
   slotTitle,
-  slotTitleLeft,
-  slotTitleRight,
   slotDescription,
   slotCustomContent,
   slotAction,
@@ -45,7 +41,7 @@ export const Toast = ({
   sensitivity = 'background',
   duration = Infinity,
   lastUpdated,
-}: ToastProps) => {
+}: ElementProps & StyleProps) => {
   // Timeout
   const timeout = useRef<number>();
   const [isPaused, setIsPaused] = useState(false);
@@ -62,45 +58,37 @@ 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?.();
-      }}
     >
-      <Close asChild>
-        <$CloseButton
-          iconName={IconName.Close}
-          shape={ButtonShape.Circle}
-          size={ButtonSize.XSmall}
-          onClick={(e: MouseEvent) => e.stopPropagation()}
-        />
-      </Close>
+      <div>
+        <$Container>
+          <$Header>
+            {slotIcon && <$Icon>{slotIcon}</$Icon>}
 
-      {slotCustomContent ?? (
-        <$Notification
-          isToast
-          notification={notification}
-          slotIcon={slotIcon}
-          slotTitle={slotTitle}
-          slotTitleLeft={slotTitleLeft}
-          slotTitleRight={slotTitleRight}
-          slotDescription={slotDescription}
-          slotAction={
-            actionDescription && (
-              <$Action asChild altText={actionAltText}>
-                {slotAction}
-              </$Action>
-            )
-          }
-        />
-      )}
+            <Close asChild>
+              <$CloseButton
+                iconComponent={CloseIcon}
+                shape={ButtonShape.Square}
+                size={ButtonSize.XSmall}
+              />
+            </Close>
+
+            <$Title>{slotTitle}</$Title>
+          </$Header>
+          {!slotCustomContent && <$Description>{slotDescription}</$Description>}
+          {slotCustomContent}
+          {actionDescription && (
+            <$Action asChild altText={actionAltText}>
+              {slotAction}
+            </$Action>
+          )}
+        </$Container>
+      </div>
     </$Root>
   );
 };
@@ -126,7 +114,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'] {
@@ -175,10 +163,6 @@ 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;
@@ -187,10 +171,6 @@ const $Root = styled(Root)`
     * {
       cursor: inherit;
     }
-
-    & > * {
-      opacity: 0.5;
-    }
   }
 
   &[data-state='closed'],
@@ -218,48 +198,69 @@ const $Root = styled(Root)`
   }
 `;
 
-const $Notification = styled(Notification)`
+const $Container = styled.div`
   // 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;
+`;
 
-  // Absolute
-  position: absolute;
-  top: 0;
-  right: 0;
+const $Title = styled(Title)`
+  flex: 1;
 
-  border: solid var(--border-width) var(--color-border);
+  font: var(--font-base-medium);
+  color: var(--color-text-2);
 
-  ${$Root}:hover & {
-    display: block;
-    z-index: 2;
-  }
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
 
-  @media ${breakpoints.mobile} {
-    display: block;
-    z-index: 2;
-  }
+const $Description = styled(Description)`
+  margin-top: 0.5rem;
+  color: var(--color-text-0);
+  font: var(--font-small-book);
 `;
 
 const $Action = styled(Action)`

src/components/ToastArea.tsx

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

src/components/ToggleButton.stories.tsx

@@ -5,7 +5,7 @@ import { ButtonShape, ButtonSize } from '@/constants/buttons';
 import { StoryWrapper } from '.ladle/components';
 import { ToggleButton } from './ToggleButton';
 
-export const ToggleButtonStory: Story<Parameters<typeof ToggleButton>[0]> = (args) => (
+export const ToggleButtonStory: Story<Parameters<typeof ToggleButton>> = (args) => (
   <StoryWrapper>
     <ToggleButton {...args}>Toggle me</ToggleButton>
   </StoryWrapper>

src/components/ToggleButton.tsx

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

src/components/ToggleGroup.stories.tsx

@@ -21,22 +21,16 @@ const ToggleGroupItems = [
   },
 ];
 
-export const ToggleGroupStory: Story<
-  Pick<Parameters<typeof ToggleGroup>[0], 'items' | 'size' | 'shape'>
-> = (args) => {
+export const ToggleGroupStory: Story<Parameters<typeof ToggleGroup>> = (args) => {
   const [value, setValue] = useState('0');
 
   return (
     <StoryWrapper>
-      <ToggleGroup value={value} onValueChange={setValue} {...args} />
+      <ToggleGroup items={ToggleGroupItems} value={value} onValueChange={setValue} {...args} />
     </StoryWrapper>
   );
 };
 
-ToggleGroupStory.args = {
-  items: ToggleGroupItems,
-};
-
 ToggleGroupStory.argTypes = {
   size: {
     options: Object.values(ButtonSize),

src/components/UsageBars.tsx

@@ -2,9 +2,9 @@ import styled, { type AnyStyledComponent } from 'styled-components';
 
 import { type RiskLevels } from '@/constants/abacus';
 
-import { abacusHelper } from '@/lib/abacus';
-import { UsageColorFromRiskLevel } from '@/lib/styles';
+import { UsageColorFromRiskLevel } from '@/styles/colors';
 
+import { abacusHelper } from '@/lib/abacus';
 type ElementProps = {
   value: number;
 };