Merge branch 'main' into canvas-orderbook

* Update receipts

* Remove duplicate const

* Restore env

* format

* Try using raw

* Use 3 spaces T.T

* copy from main

* Update abacus, display proper toAmount and toAmountMin

* nits

package.json

@@ -39,11 +39,12 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^1.1.24",
+    "@dydxprotocol/v4-abacus": "^1.1.32",
     "@dydxprotocol/v4-client-js": "^1.0.11",
-    "@dydxprotocol/v4-localization": "^1.0.18",
+    "@dydxprotocol/v4-localization": "^1.1.5",
     "@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",

public/configs/cctp.json

@@ -4,38 +4,9 @@
         "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
         "name": "Ethereum"
     },
-    {
-        "chainId": "421613",
-        "tokenAddress": "0xfd064a18f3bf249cf1f87fc203e90d8f650f2d63",
-        "name": "Arbitrum Goerli"
-    },
-    {
-        "chainId": "43113",
-        "tokenAddress": "0x5425890298aed601595a70AB815c96711a31Bc65",
-        "name": "Avalanche Fuji"
-    },
-    {
-        "chainId": "84531",
-        "tokenAddress": "0xf175520c52418dfe19c8098071a252da48cd1c19",
-        "name": "Base Goerli"
-    },
     {
         "chainId": "5",
         "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
         "name": "Ethereum Goerli"
-    },
-    {
-        "chainId": "grand-1",
-        "tokenAddress": "uusdc",
-        "name": "Noble Testnet"
-    },
-    {
-        "chainId": "420",
-        "tokenAddress": "0xe05606174bac4a6364b31bd0eca4bf4dd368f8c6",
-        "name": "OP Goerli"
-    },
-    {
-        "chainId": "103",
-        "name": "Solana Devnet"
     }
 ]

public/configs/documentation.json

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

public/configs/env.json

@@ -89,7 +89,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -162,7 +162,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -235,7 +235,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -308,7 +308,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -383,7 +383,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -531,7 +531,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -610,7 +610,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -686,7 +686,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -762,7 +762,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -838,7 +838,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -914,7 +914,7 @@
             "governanceLearnMore": "https://help.dydx.exchange",
             "stakingLearnMore": "https://help.dydx.exchange",
             "keplrDashboard": "https://testnet.keplr.app/",
-            "accountExportLearnMore": "https://help.dydx.exchange",
+            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
             "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
          },
          "wallets": {
@@ -1126,7 +1126,7 @@
             "blogs": "[HTTP link to blogs, can be null]",
             "foundation": "[HTTP link to foundation, can be null]",
             "initialMarginFractionLearnMore": "[HTTP link to initial margin fraction learn more, can be null]",
-            "reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
+            "reduceOnlyLearnMore": "[HTTP link to reduce-only learn more, can be null]",
             "documentation": "[HTTP link to documentation, can be null]",
             "community": "[HTTP link to community, can be null]",
             "help": "[HTTP link to help page, can be null]",

public/configs/markets.json

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

src/App.tsx

@@ -1,4 +1,4 @@
-import { Suspense } from 'react';
+import { lazy, Suspense } from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
 import styled, { AnyStyledComponent, css } from 'styled-components';
 import { WagmiConfig } from 'wagmi';
@@ -25,16 +25,6 @@ import { SubaccountProvider } from '@/hooks/useSubaccount';
 
 import { GuardedMobileRoute } from '@/components/GuardedMobileRoute';
 
-import MarketsPage from '@/pages/markets/Markets';
-import PortfolioPage from '@/pages/portfolio/Portfolio';
-import { AlertsPage } from '@/pages/AlertsPage';
-import ProfilePage from '@/pages/Profile';
-import { SettingsPage } from '@/pages/settings/Settings';
-import TradePage from '@/pages/trade/Trade';
-import { RewardsPage } from '@/pages/rewards/RewardsPage';
-import { TermsOfUsePage } from '@/pages/TermsOfUsePage';
-import { PrivacyPolicyPage } from '@/pages/PrivacyPolicyPage';
-
 import { HeaderDesktop } from '@/layout/Header/HeaderDesktop';
 import { FooterDesktop } from '@/layout/Footer/FooterDesktop';
 import { FooterMobile } from '@/layout/Footer/FooterMobile';
@@ -46,11 +36,22 @@ import { config } from '@/lib/wagmi';
 
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
+import { LoadingSpace } from './components/Loading/LoadingSpinner';
 
 import '@/styles/constants.css';
 import '@/styles/fonts.css';
 import '@/styles/web3modal.css';
 
+const MarketsPage = lazy(() => import('@/pages/markets/Markets'));
+const PortfolioPage = lazy(() => import('@/pages/portfolio/Portfolio'));
+const AlertsPage = lazy(() => import('@/pages/AlertsPage'));
+const ProfilePage = lazy(() => import('@/pages/Profile'));
+const SettingsPage = lazy(() => import('@/pages/settings/Settings'));
+const TradePage = lazy(() => import('@/pages/trade/Trade'));
+const RewardsPage = lazy(() => import('@/pages/rewards/RewardsPage'));
+const TermsOfUsePage = lazy(() => import('@/pages/TermsOfUsePage'));
+const PrivacyPolicyPage = lazy(() => import('@/pages/PrivacyPolicyPage'));
+
 const queryClient = new QueryClient();
 
 const Content = () => {
@@ -69,7 +70,7 @@ const Content = () => {
       {isNotTablet && <HeaderDesktop />}
 
       <Styled.Main>
-        <Suspense fallback={null}>
+        <Suspense fallback={<LoadingSpace id="main" />}>
           <Routes>
             <Route path={AppRoute.Trade}>
               <Route path=":market" element={<TradePage />} />

src/components/Accordion.tsx

@@ -0,0 +1,119 @@
+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 { PlusIcon } from '@/icons';
+
+export type AccordionItem = {
+  header: React.ReactNode;
+  content: React.ReactNode;
+};
+
+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)`
+  > *: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: 1rem 0.75rem;
+
+  color: var(--color-text-1);
+  text-align: start;
+
+  &:hover {
+    ${Styled.Icon} {
+      color: var(--color-text-2);
+      filter: brightness(1.1);
+    }
+  }
+
+  svg {
+    color: var(--color-text-0);
+    transition: transform 0.3s var(--ease-out-expo);
+  }
+
+  &[data-state='open'] svg {
+    transform: rotate(45deg);
+  }
+`;
+
+Styled.Content = styled(Content)`
+  overflow: hidden;
+  margin: 0 0.75rem 1rem;
+
+  color: var(--color-text-0);
+
+  &[data-state='open'] {
+    animation: ${keyframes`
+      from {
+        height: 0;
+      }
+      to {
+        height: var(--radix-accordion-content-height);
+      }
+    `} 0.3s var(--ease-out-expo);
+  }
+
+  &[data-state='closed'] {
+    animation: ${keyframes`
+      from {
+        height: var(--radix-accordion-content-height);
+      }
+      to {
+        height: 0;
+      }
+    `} 0.1s var(--ease-in-expo);
+  }
+`;

src/components/AssetIcon.tsx

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

src/components/Canvas.tsx

@@ -0,0 +1,16 @@
+import { forwardRef } from 'react';
+
+type StyleProps = {
+  className?: string;
+};
+
+type ElementProps = {
+  width: number | string;
+  height: number | string;
+};
+
+export const Canvas = forwardRef<HTMLCanvasElement, ElementProps & StyleProps>(
+  ({ className, width, height }, canvasRef) => (
+    <canvas ref={canvasRef} className={className} width={width ?? 0} height={height ?? 0} />
+  )
+);

src/components/Icon.tsx

@@ -55,6 +55,7 @@ import {
   OverviewIcon,
   PencilIcon,
   PlayIcon,
+  PlusIcon,
   PositionsIcon,
   PriceChartIcon,
   PrivacyIcon,
@@ -130,6 +131,7 @@ export enum IconName {
   Overview = 'Overview',
   Pencil = 'Pencil',
   Play = 'Play',
+  Plus = 'Plus',
   Positions = 'Positions',
   PriceChart = 'PriceChart',
   Privacy = 'Privacy',
@@ -204,6 +206,7 @@ const icons = {
   [IconName.Overview]: OverviewIcon,
   [IconName.Pencil]: PencilIcon,
   [IconName.Play]: PlayIcon,
+  [IconName.Plus]: PlusIcon,
   [IconName.Positions]: PositionsIcon,
   [IconName.PriceChart]: PriceChartIcon,
   [IconName.Privacy]: PrivacyIcon,

src/components/Table.tsx

@@ -43,6 +43,7 @@ import { layoutMixins } from '@/styles/layoutMixins';
 
 import { Icon, IconName } from './Icon';
 import { Tag } from './Tag';
+import { MustBigNumber } from '@/lib/numbers';
 
 export { TableCell } from './Table/TableCell';
 export { TableColumnHeader } from './Table/TableColumnHeader';
@@ -161,10 +162,7 @@ export const Table = <TableRowData extends object, TableRowKey extends Key>({
         ? // String
           collator.compare(first as string, second as string)
         : // Number
-          Math.sign(
+          MustBigNumber(first).comparedTo(MustBigNumber(second))) *
-            (parseInt(first as string) || (first as number)) -
-              (parseInt(second as string) || (second as number))
-          )) *
       // Flip the direction if descending order is specified.
       (sortDirection === 'descending' ? -1 : 1)
     );

src/components/Tabs.tsx

@@ -118,6 +118,7 @@ export const Tabs = <TabItemsValue extends string>({
               forceMount={forceMount}
               $hide={forceMount && currentItem?.value !== value}
               $withTransitions={withTransitions}
+              asChild={asChild}
             >
               {content}
             </Styled.Content>

src/constants/markets.ts

@@ -26,39 +26,3 @@ export enum FundingDirection {
   ToShort = 'ToShort',
   ToLong = 'ToLong',
 }
-
-export const MARKETS_TO_DISPLAY = [
-  'BTC-USD',
-  'ETH-USD',
-  'LINK-USD',
-  'SOL-USD',
-  'MATIC-USD',
-  'ATOM-USD',
-  'AVAX-USD',
-  'APE-USD',
-  'XRP-USD',
-  'UNI-USD',
-  'ADA-USD',
-  'TRX-USD',
-  'OP-USD',
-  'MKR-USD',
-  'DOGE-USD',
-  'SHIB-USD',
-  'COMP-USD',
-  'LDO-USD',
-  'NEAR-USD',
-  'APT-USD',
-  'SUI-USD',
-  'DOT-USD',
-  'ETC-USD',
-  'ARB-USD',
-  'CRV-USD',
-  'BLUR-USD',
-  'FIL-USD',
-  'XLM-USD',
-  'PEPE-USD',
-  'WLD-USD',
-  'SEI-USD',
-  'LTC-USD',
-  'BCH-USD',
-];

src/constants/numbers.ts

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

src/constants/tooltips/deposit.ts

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

src/constants/tooltips/withdraw.ts

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

src/hooks/orderbook/index.ts

@@ -0,0 +1,11 @@
+import { useCalculateOrderbookData } from './useCalculateOrderbookData';
+import { useCenterOrderbook } from './useCenterOrderbook';
+import { useDrawOrderbook } from './useDrawOrderbook';
+import { useSpreadRowScrollListener } from './useSpreadRowScrollListener';
+
+export {
+  useCalculateOrderbookData,
+  useCenterOrderbook,
+  useDrawOrderbook,
+  useSpreadRowScrollListener,
+};

src/hooks/orderbook/useCalculateOrderbookData.ts

@@ -0,0 +1,55 @@
+import { useMemo } from 'react';
+import { useSelector, shallowEqual } from 'react-redux';
+import { OrderSide } from '@dydxprotocol/v4-client-js';
+
+import { OrderbookLine } from '@/constants/abacus';
+
+import { getCurrentMarketOrderbook } from '@/state/perpetualsSelectors';
+import { getSubaccountOpenOrdersBySideAndPrice } from '@/state/accountSelectors';
+
+import type { RowData } from '@/views/Orderbook/OrderbookRow';
+
+import { MustBigNumber } from '@/lib/numbers';
+
+export const useCalculateOrderbookData = ({ maxRowsPerSide }: { maxRowsPerSide: number }) => {
+  const orderbook = useSelector(getCurrentMarketOrderbook, shallowEqual);
+
+  const openOrdersBySideAndPrice =
+    useSelector(getSubaccountOpenOrdersBySideAndPrice, shallowEqual) || {};
+
+  return useMemo(() => {
+    const asks = (orderbook?.asks?.toArray() ?? [])
+      .map(
+        (row: OrderbookLine) =>
+          ({
+            side: 'ask',
+            mine: openOrdersBySideAndPrice[OrderSide.SELL]?.[row.price]?.size,
+            ...row,
+          } as RowData)
+      )
+      .slice(0, maxRowsPerSide);
+
+    const bids = (orderbook?.bids?.toArray() ?? [])
+      .map(
+        (row: OrderbookLine) =>
+          ({
+            side: 'bid',
+            mine: openOrdersBySideAndPrice[OrderSide.BUY]?.[row.price]?.size,
+            ...row,
+          } as RowData)
+      )
+      .slice(0, maxRowsPerSide);
+
+    const spread =
+      asks[0] && bids[0] ? MustBigNumber(asks[0]?.price ?? 0).minus(bids[0]?.price ?? 0) : null;
+
+    const spreadPercent = orderbook?.spreadPercent;
+
+    const histogramRange = Math.max(
+      Number(bids[bids.length - 1]?.depth),
+      Number(asks[asks.length - 1]?.depth)
+    );
+
+    return { asks, bids, spread, spreadPercent, histogramRange, hasOrderbook: !!orderbook };
+  }, [orderbook, openOrdersBySideAndPrice]);
+};

src/hooks/orderbook/useCenterOrderbook.ts

@@ -0,0 +1,22 @@
+import { type RefObject, useEffect } from 'react';
+
+type ElementProps = {
+  marketId: string;
+  orderbookRef: RefObject<HTMLDivElement>;
+};
+
+/**
+ * @description Center Orderbook on load and market change
+ * Assumed that the two sides are the same height
+ */
+export const useCenterOrderbook = ({ marketId, orderbookRef }: ElementProps) => {
+  const orderbookEl = orderbookRef.current;
+  const { clientHeight, scrollHeight } = orderbookEl ?? {};
+  const shouldScroll = !!scrollHeight && !!clientHeight && scrollHeight > clientHeight;
+
+  useEffect(() => {
+    if (orderbookEl && shouldScroll) {
+      orderbookEl.scrollTo({ top: (scrollHeight - clientHeight) / 2 });
+    }
+  }, [shouldScroll, marketId]);
+};

src/hooks/orderbook/useDrawOrderbook.ts

@@ -0,0 +1,380 @@
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useSelector } from 'react-redux';
+
+import type { Nullable } from '@/constants/abacus';
+import { SMALL_USD_DECIMALS, TOKEN_DECIMALS } from '@/constants/numbers';
+import { useLocaleSeparators } from '@/hooks/useLocaleSeparators';
+
+import { getAppTheme } from '@/state/configsSelectors';
+
+import { ROW_HEIGHT, ROW_PADDING_RIGHT, type RowData } from '@/views/Orderbook/OrderbookRow';
+
+import { MustBigNumber } from '@/lib/numbers';
+import { log } from '@/lib/telemetry';
+import { Colors } from '@/styles/colors';
+
+type ElementProps = {
+  data: RowData[];
+  histogramRange: number;
+  hoveredRow?: number;
+  stepSizeDecimals: Nullable<number>;
+  tickSizeDecimals: Nullable<number>;
+};
+
+type StyleProps = {
+  histogramSide?: 'left' | 'right';
+};
+
+export const useDrawOrderbook = ({
+  data,
+  histogramRange,
+  stepSizeDecimals,
+  tickSizeDecimals,
+  histogramSide = 'right',
+  hoveredRow,
+}: ElementProps & StyleProps) => {
+  const theme = useSelector(getAppTheme);
+  const canvasRef = useRef<HTMLCanvasElement>(null);
+  const hoverCanvasRef = useRef<HTMLCanvasElement>(null);
+  const canvas = canvasRef.current;
+  const hoverCanvas = hoverCanvasRef.current;
+
+  /**
+   *         to === 'right'                to === 'left'
+   *         |===================|         |===================|
+   * bar:    a                   b         c                   d
+   * a = 0
+   * b = depthBarWidth
+   * c = canvasWidth - depthBarWidth
+   * d = canvasWidth
+   *
+   */
+  const getXYValues = ({
+    barWidth,
+    canvasWidth,
+    gradientMultiplier,
+  }: {
+    barWidth: number;
+    canvasWidth: number;
+    gradientMultiplier: number;
+  }) => {
+    const gradient = {
+      x1: Math.floor(histogramSide === 'left' ? barWidth : canvasWidth - barWidth),
+      x2: Math.floor(
+        histogramSide === 'left'
+          ? 0 - (canvasWidth * gradientMultiplier - canvasWidth)
+          : canvasWidth * gradientMultiplier
+      ),
+    };
+    const bar = {
+      x1: Math.floor(histogramSide === 'left' ? 0 : canvasWidth - barWidth),
+      x2: Math.floor(
+        histogramSide === 'left' ? Math.min(barWidth, canvasWidth - 2) : canvasWidth - 2
+      ),
+    };
+
+    return {
+      bar,
+      gradient,
+    };
+  };
+
+  const getYFromIndex = (idx: number, type: 'text' | 'bar' | 'rect') => {
+    return (
+      idx * ROW_HEIGHT +
+      {
+        text: ROW_HEIGHT / 2, // center of the row
+        bar: 1, // 1px off the top and bottom so the histograms do not touch
+        rect: 0,
+      }[type]
+    );
+  };
+
+  // Get X value by column, colIdx starts at 0
+  const getXByColumn = ({ canvasWidth, colIdx }: { canvasWidth: number; colIdx: number }) => {
+    return Math.floor(((colIdx + 1) * canvasWidth) / 3);
+  };
+
+  const drawBars = ({
+    value,
+    canvasWidth,
+    ctx,
+    gradientMultiplier,
+    histogramAccentColor,
+    idx,
+    histogramSide,
+  }: {
+    value: Nullable<number>;
+    canvasWidth: number;
+    ctx: CanvasRenderingContext2D;
+    gradientMultiplier: number;
+    histogramAccentColor: string;
+    idx: number;
+    histogramSide: 'left' | 'right';
+  }) => {
+    const histogramBarWidth = canvasWidth - 2;
+    const barWidth = value ? (value / histogramRange) * histogramBarWidth : 0;
+    const { gradient, bar } = getXYValues({ barWidth, canvasWidth, gradientMultiplier });
+
+    let linearGradient;
+
+    try {
+      linearGradient = ctx.createLinearGradient(
+        gradient.x1,
+        ROW_HEIGHT / 2,
+        gradient.x2,
+        ROW_HEIGHT / 2
+      );
+
+      linearGradient.addColorStop(0, histogramAccentColor);
+      linearGradient.addColorStop(1, 'rgba(0, 0, 0, 0)');
+      ctx.fillStyle = linearGradient;
+    } catch (err) {
+      log('Orderbook/createLinearGradient', err, {
+        x1: gradient.x1,
+        y1: ROW_HEIGHT / 2,
+        x2: gradient.x2,
+        y2: ROW_HEIGHT / 2,
+      });
+
+      ctx.fillStyle = 'rgba(0, 0, 0, 0)';
+    }
+
+    ctx.beginPath();
+
+    ctx.roundRect
+      ? ctx.roundRect?.(
+          bar.x1,
+          getYFromIndex(idx, 'bar'),
+          bar.x2,
+          ROW_HEIGHT - 2,
+          histogramSide === 'right' ? [2, 0, 0, 2] : [0, 2, 2, 0]
+        )
+      : ctx.rect(bar.x1, getYFromIndex(idx, 'bar'), bar.x2, ROW_HEIGHT - 2);
+    ctx.fill();
+  };
+
+  const { decimal: LOCALE_DECIMAL_SEPARATOR } = useLocaleSeparators();
+
+  const formatOptions = {
+    decimalSeparator: LOCALE_DECIMAL_SEPARATOR,
+  };
+
+  const drawText = useCallback(
+    ({
+      ctx,
+      canvasWidth,
+      idx,
+      size,
+      price,
+      mine,
+      animationType,
+    }: {
+      ctx: CanvasRenderingContext2D;
+      canvasWidth: number;
+      idx: number;
+      size?: Nullable<number>;
+      price?: Nullable<number>;
+      mine?: Nullable<number>;
+      animationType?: 'remove' | 'add';
+    }) => {
+      const y = getYFromIndex(idx, 'text');
+      const rectY = getYFromIndex(idx, 'rect');
+
+      let startTime: number;
+      let textColor: string = Colors[theme].text2;
+      const animateColor = (timestamp: number) => {
+        if (!startTime) startTime = timestamp;
+        const animationTime = timestamp - startTime;
+
+        // Linear transition for demonstration purposes
+        textColor = animationType
+          ? {
+              add: Colors[theme].green,
+              remove: Colors[theme].red,
+            }[animationType]
+          : Colors[theme].text2;
+
+        if (animationTime < 500) {
+          // Continue the animation for 500ms (adjust as needed)
+          requestAnimationFrame(animateColor);
+        } else {
+          textColor = Colors[theme].text2;
+        }
+
+        if (animationType) {
+          // TODO: Clear rect and redraw text
+          // ctx.clearRect(0, rectY, canvasWidth, rectY + ROW_HEIGHT);
+        }
+      };
+
+      requestAnimationFrame(animateColor);
+
+      // Size text
+      if (size) {
+        ctx.fillStyle = textColor;
+        ctx.fillText(
+          MustBigNumber(size).toFormat(stepSizeDecimals ?? TOKEN_DECIMALS, formatOptions),
+          getXByColumn({ canvasWidth, colIdx: 0 }) - ROW_PADDING_RIGHT,
+          y
+        );
+      }
+
+      // Price text
+      if (price) {
+        ctx.fillStyle = textColor;
+        ctx.fillText(
+          MustBigNumber(price).toFormat(tickSizeDecimals ?? SMALL_USD_DECIMALS, formatOptions),
+          getXByColumn({ canvasWidth, colIdx: 1 }) - ROW_PADDING_RIGHT,
+          y
+        );
+      }
+
+      // Mine text
+      if (mine) {
+        ctx.fillStyle = Colors[theme].text2;
+        ctx.fillText(
+          MustBigNumber(mine).toFormat(stepSizeDecimals ?? TOKEN_DECIMALS, formatOptions),
+          getXByColumn({ canvasWidth, colIdx: 2 }) - ROW_PADDING_RIGHT,
+          y
+        );
+      }
+    },
+    [theme, LOCALE_DECIMAL_SEPARATOR, tickSizeDecimals, stepSizeDecimals]
+  );
+
+  /**
+   * Scale canvas using device pixel ratio to unblur drawn text
+   * @returns adjusted canvas width used in coordinates for drawing
+   **/
+  const canvasWidth = useMemo(() => {
+    const devicePixelRatio = window.devicePixelRatio || 1;
+
+    if (!canvas || !hoverCanvas) return 300 / devicePixelRatio;
+
+    const ctx = canvas.getContext('2d');
+    const hoverCtx = hoverCanvas.getContext('2d');
+
+    const backingStoreRatio =
+      // @ts-ignore
+      ctx.webkitBackingStorePixelRatio ||
+      // @ts-ignore
+      ctx.mozBackingStorePixelRatio ||
+      // @ts-ignore
+      ctx.msBackingStorePixelRatio ||
+      // @ts-ignore
+      ctx.oBackingStorePixelRatio ||
+      // @ts-ignore
+      ctx.backingStorePixelRatio ||
+      1;
+
+    const ratio = devicePixelRatio / backingStoreRatio;
+    canvas.width = canvas.offsetWidth * ratio;
+    canvas.height = canvas.offsetHeight * ratio;
+    hoverCanvas.width = hoverCanvas.offsetWidth * ratio;
+    hoverCanvas.height = hoverCanvas.offsetHeight * ratio;
+
+    if (hoverCtx) {
+      hoverCtx.scale(ratio, ratio);
+    }
+
+    if (ctx) {
+      ctx.scale(ratio, ratio);
+      ctx.font = `12.5px Satoshi`;
+      ctx.textAlign = 'right';
+      ctx.textBaseline = 'middle';
+      ctx.imageSmoothingQuality = 'high';
+    }
+
+    return canvas.width / ratio;
+  }, [canvas, hoverCanvas]);
+
+  //Handle Row Hover
+  const lastHoveredRowRef = useRef<number>();
+  const lastHoveredRow = lastHoveredRowRef.current;
+  useEffect(() => {
+    const hoverCtx = hoverCanvas?.getContext('2d');
+
+    if (!!!hoverCtx) return;
+
+    if (hoveredRow !== lastHoveredRow) {
+      const y = getYFromIndex(lastHoveredRow ?? 0, 'rect');
+      hoverCtx.clearRect(0, y, canvasWidth, ROW_HEIGHT);
+      lastHoveredRowRef.current = hoveredRow;
+    }
+
+    if (hoveredRow !== undefined) {
+      hoverCtx.fillStyle = 'rgba(255, 255, 255, 0.02)';
+      hoverCtx.fillRect(0, hoveredRow * 20, canvasWidth, 20);
+    }
+  }, [lastHoveredRow, hoveredRow]);
+
+  // Row Removal Animation state
+  const previousDataRef = useRef<{
+    [key: string]: number;
+  }>(Object.fromEntries(data.map((row: RowData) => [row.price, row.size])));
+
+  //Update histograms and row contents on data change
+  useEffect(() => {
+    const ctx = canvas?.getContext('2d');
+
+    if (!canvas || !ctx) return;
+
+    // Clear canvas before redraw
+    ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
+
+    // Draw histograms
+    data.forEach(({ depth, mine, price, size, side }, idx) => {
+      const histogramAccentColor =
+        side === 'bid' ? `hsla(159, 67%, 39%,  0.15)` : `hsla(360, 73%, 61%,  0.15)`;
+
+      // Depth Bar
+      drawBars({
+        value: depth,
+        canvasWidth,
+        ctx,
+        gradientMultiplier: 1.3,
+        histogramAccentColor,
+        idx,
+        histogramSide,
+      });
+
+      // Size Bar
+      drawBars({
+        value: size,
+        canvasWidth,
+        ctx,
+        gradientMultiplier: 5,
+        histogramAccentColor,
+        idx,
+        histogramSide,
+      });
+
+      const isNew = !previousDataRef.current[price];
+      const wasRemoved = previousDataRef.current[price] && !data.find((row) => row.price === price);
+
+      // Size, Price, Mine
+      drawText({
+        ctx,
+        canvasWidth,
+        idx,
+        size,
+        price,
+        mine,
+        animationType: isNew ? 'add' : wasRemoved ? 'remove' : undefined,
+      });
+    });
+
+    previousDataRef.current = Object.fromEntries(data.map((row: RowData) => [row.price, row.size]));
+  }, [
+    canvasWidth,
+    data,
+    drawText,
+    histogramRange,
+    stepSizeDecimals,
+    tickSizeDecimals,
+    histogramSide,
+  ]);
+
+  return { canvasRef, hoverCanvasRef };
+};

src/hooks/orderbook/useSpreadRowScrollListener.ts

@@ -0,0 +1,39 @@
+import { type RefObject, useEffect, useState, Dispatch } from 'react';
+
+export const useSpreadRowScrollListener = ({
+  orderbookRef,
+  spreadRowRef,
+}: {
+  orderbookRef: RefObject<HTMLDivElement>;
+  spreadRowRef: RefObject<HTMLDivElement>;
+}) => {
+  const [displaySide, setDisplaySide] = useState<string>();
+
+  useEffect(() => {
+    const onScroll = () => {
+      if (spreadRowRef.current && orderbookRef.current) {
+        const { clientHeight } = orderbookRef.current;
+        const parent = orderbookRef.current.getBoundingClientRect();
+        const spread = spreadRowRef.current.getBoundingClientRect();
+        const spreadTop = spread.top - parent.top;
+        const spreadBottom = spread.bottom - parent.top;
+
+        if (spreadBottom > clientHeight) {
+          setDisplaySide('bottom');
+        } else if (spreadTop < 0) {
+          setDisplaySide('top');
+        } else {
+          setDisplaySide(undefined);
+        }
+      }
+    };
+
+    orderbookRef.current?.addEventListener('scroll', onScroll, false);
+
+    return () => {
+      orderbookRef.current?.removeEventListener('scroll', onScroll, false);
+    };
+  }, [orderbookRef.current, spreadRowRef.current]);
+
+  return displaySide;
+};

src/hooks/useCurrentMarketId.ts

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

src/hooks/useMarketsData.ts

@@ -1,14 +1,7 @@
 import { useMemo } from 'react';
 import { useSelector, shallowEqual } from 'react-redux';
 
-import {
+import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constants/markets';
-  MarketFilters,
-  MARKET_FILTER_LABELS,
-  type MarketData,
-  MARKETS_TO_DISPLAY,
-} from '@/constants/markets';
-
-import { testFlags } from '@/lib/testFlags';
 
 import { getAssets } from '@/state/assetsSelectors';
 import { getPerpetualMarkets } from '@/state/perpetualsSelectors';
@@ -49,9 +42,7 @@ export const useMarketsData = (
   }, [allPerpetualMarkets, allAssets]);
 
   const filteredMarkets = useMemo(() => {
-    const filtered = markets
+    const filtered = markets.filter(filterFunctions[filter]);
-      .filter(filterFunctions[filter])
-      .filter(({ id }) => (testFlags.displayAllMarkets ? true : MARKETS_TO_DISPLAY.includes(id)));
 
     if (searchFilter) {
       return filtered.filter(

src/hooks/useNotificationTypes.tsx

@@ -157,8 +157,8 @@ export const notificationTypes: NotificationTypeConfig[] = [
           const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
           const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />;
 
-          const transferType = type ??
+          const transferType =
-            fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
+            type ?? fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
               ? TransferNotificationTypes.Withdrawal
               : TransferNotificationTypes.Deposit;
 

src/icons/index.ts

@@ -44,6 +44,7 @@ export { default as OrderbookIcon } from './orderbook.svg';
 export { default as OverviewIcon } from './overview.svg';
 export { default as PencilIcon } from './pencil.svg';
 export { default as PlayIcon } from './play.svg';
+export { default as PlusIcon } from './plus.svg';
 export { default as PortfolioIcon } from './portfolio.svg';
 export { default as PositionsIcon } from './positions.svg';
 export { default as PriceChartIcon } from './price-chart.svg';

src/icons/plus.svg

@@ -0,0 +1 @@
+<svg fill="none" height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6.75.75c0-.198912-.07902-.389678-.21967-.53033-.14065-.1406525-.33142-.21967-.53033-.21967s-.38968.0790175-.53033.21967c-.14065.140652-.21967.331418-.21967.53033v4.5h-4.5c-.198912 0-.389678.07902-.53033.21967-.1406525.14065-.21967.33142-.21967.53033s.0790175.38968.21967.53033c.140652.14065.331418.21967.53033.21967h4.5v4.5c0 .1989.07902.3897.21967.5303.14065.1407.33142.2197.53033.2197s.38968-.079.53033-.2197c.14065-.1406.21967-.3314.21967-.5303v-4.5h4.5c.1989 0 .3897-.07902.5303-.21967.1407-.14065.2197-.33142.2197-.53033s-.079-.38968-.2197-.53033c-.1406-.14065-.3314-.21967-.5303-.21967h-4.5z" fill="currentColor"/></svg>

src/lib/abacus/dydxChainTransactions.ts

@@ -212,8 +212,8 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
         timeInForce as OrderTimeInForce,
         goodTilTimeInSeconds ?? 0,
         execution as OrderExecution,
-        postOnly,
+        postOnly ?? undefined,
-        reduceOnly,
+        reduceOnly ?? undefined,
         triggerPrice ?? undefined
       );
 
@@ -351,12 +351,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
     }
   }
 
-  async sendNobleIBC(
+  async sendNobleIBC(params: { msgTypeUrl: string; msg: any }): Promise<string> {
-    params: {
-      msgTypeUrl: string,
-      msg: any,
-    }
-  ): Promise<string> {
     if (!this.nobleClient?.isConnected) {
       throw new Error('Missing nobleClient or localWallet');
     }
@@ -367,15 +362,16 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
         value: params.msg,
       };
       const fee = await this.nobleClient.simulateTransaction([ibcMsg]);
-  
+
       // take out fee from amount before sweeping
-      const amount = parseInt(ibcMsg.value.token.amount, 10) -
+      const amount =
+        parseInt(ibcMsg.value.token.amount, 10) -
         Math.floor(parseInt(fee.amount[0].amount, 10) * GAS_MULTIPLIER);
-  
+
       if (amount <= 0) {
         throw new Error('noble balance does not cover fees');
       }
-  
+
       ibcMsg.value.token.amount = amount.toString();
       const tx = await this.nobleClient.send([ibcMsg]);
 
@@ -391,23 +387,21 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
     }
   }
 
-  async withdrawToNobleIBC(
+  async withdrawToNobleIBC(params: {
-    params: {
+    subaccountNumber: number;
-      subaccountNumber: number,
+    amount: string;
-      amount: string,
+    ibcPayload: string;
-      ibcPayload: string,
+  }): Promise<string> {
-    }
-  ): Promise<string> {
     if (!this.compositeClient || !this.localWallet) {
       throw new Error('Missing compositeClient or localWallet');
     }
 
     const { subaccountNumber, amount, ibcPayload } = params ?? {};
     const parsedIbcPayload: {
-      msgTypeUrl: string,
+      msgTypeUrl: string;
-      msg: any,
+      msg: any;
-    } = ibcPayload ? JSON.parse(ibcPayload) : undefined;
+    } = ibcPayload ? JSON.parse(atob(ibcPayload)) : undefined;
-  
+
     try {
       const msg = this.compositeClient.withdrawFromSubaccountMessage(
         new SubaccountClient(this.localWallet, subaccountNumber),
@@ -425,7 +419,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
       );
 
       return JSON.stringify({
-        txHash: hashFromTx(tx?.hash)
+        txHash: hashFromTx(tx?.hash),
       });
     } catch (error) {
       log('DydxChainTransactions/withdrawToNobleIBC', error);
@@ -436,10 +430,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
     }
   }
 
-  async cctpWithdraw(params: {
+  async cctpWithdraw(params: { typeUrl: string; value: any }): Promise<string> {
-    typeUrl: string,
-    value: any,
-  }): Promise<string> {
     if (!this.nobleClient?.isConnected) {
       throw new Error('Missing nobleClient or localWallet');
     }
@@ -450,17 +441,18 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
         value: params.value,
       };
       const fee = await this.nobleClient.simulateTransaction([ibcMsg]);
-  
+
       // take out fee from amount before sweeping
-      const amount = parseInt(ibcMsg.value.amount, 10) -
+      const amount =
+        parseInt(ibcMsg.value.amount, 10) -
         Math.floor(parseInt(fee.amount[0].amount, 10) * GAS_MULTIPLIER);
-  
+
       if (amount <= 0) {
         throw new Error('noble balance does not cover fees');
       }
-  
+
       ibcMsg.value.amount = amount.toString();
-  
+
       const tx = await this.nobleClient.send([ibcMsg]);
 
       const parsedTx = this.parseToPrimitives(tx);

src/lib/abacus/index.ts

@@ -84,8 +84,7 @@ class AbacusStateManager {
     );
 
     const appConfigs = AbacusAppConfig.Companion.forWeb;
-    if (!isMainnet || testFlags.withCCTP)
+    appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2;
-      appConfigs.squidVersion = AbacusAppConfig.SquidVersion.V2;
 
     this.stateManager = new AsyncAbacusStateManager(
       '',

src/lib/testFlags.ts

@@ -5,13 +5,13 @@ class TestFlags {
     this.queryParams = {};
     const hash = window.location.hash;
     const queryIndex = hash.indexOf('?');
-    if (queryIndex === -1) return
+    if (queryIndex === -1) return;
 
     const queryParamsString = hash.substring(queryIndex + 1);
     const params = new URLSearchParams(queryParamsString);
 
     for (const [key, value] of params) {
-        this.queryParams[key] = value;
+      this.queryParams[key] = value;
     }
   }
 
@@ -19,10 +19,6 @@ class TestFlags {
     return !!this.queryParams.displayInitializingMarkets;
   }
 
-  get displayAllMarkets() {
-    return !!this.queryParams.displayAllMarkets;
-  }
-
   get withCCTP() {
     return !!this.queryParams.withCCTP;
   }

src/lib/wagmi.ts

@@ -146,7 +146,7 @@ const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
   new CoinbaseWalletConnector({
     chains,
     options: {
-      appName: 'wagmi',
+      appName: 'dYdX',
       reloadOnDisconnect: false,
     },
   }),

src/pages/AlertsPage.tsx

@@ -1,4 +1,6 @@
 import { DialogPlacement } from '@/components/Dialog';
 import { NotificationsMenu } from '@/views/menus/NotificationsMenu';
 
-export const AlertsPage = () => <NotificationsMenu placement={DialogPlacement.Inline} />;
+const AlertsPage = () => <NotificationsMenu placement={DialogPlacement.Inline} />;
+
+export default AlertsPage;

src/pages/PrivacyPolicyPage.tsx

@@ -2,7 +2,7 @@ import styled, { AnyStyledComponent } from 'styled-components';
 
 import { articleMixins } from '@/styles/articleMixins';
 
-export const PrivacyPolicyPage = () => (
+const PrivacyPolicyPage = () => (
   <Styled.Article>
     <header>
       <h1>Privacy Policy</h1>
@@ -10,6 +10,8 @@ export const PrivacyPolicyPage = () => (
   </Styled.Article>
 );
 
+export default PrivacyPolicyPage;
+
 const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Article = styled.article`

src/pages/TermsOfUsePage.tsx

@@ -2,7 +2,7 @@ import styled, { AnyStyledComponent } from 'styled-components';
 
 import { articleMixins } from '@/styles/articleMixins';
 
-export const TermsOfUsePage = () => (
+const TermsOfUsePage = () => (
   <Styled.Article>
     <header>
       <h1>Sample Terms of Use</h1>
@@ -1076,6 +1076,8 @@ export const TermsOfUsePage = () => (
   </Styled.Article>
 );
 
+export default TermsOfUsePage;
+
 const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Article = styled.article`

src/pages/portfolio/Portfolio.tsx

@@ -1,17 +1,20 @@
+import { lazy, Suspense } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { Navigate, Route, Routes } from 'react-router-dom';
 
 import { OnboardingState } from '@/constants/account';
+import { ButtonAction } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
 import { HistoryRoute, PortfolioRoute } from '@/constants/routes';
-
 import { useAccountBalance, useBreakpoints, useDocumentTitle, useStringGetter } from '@/hooks';
+import { layoutMixins } from '@/styles/layoutMixins';
 
 import { FillsTable, FillsTableColumnKey } from '@/views/tables/FillsTable';
 import { FundingPaymentsTable } from '@/views/tables/FundingPaymentsTable';
 import { TransferHistoryTable } from '@/views/tables/TransferHistoryTable';
+import { Button } from '@/components/Button';
 import { Icon, IconName } from '@/components/Icon';
 import { NavigationMenu } from '@/components/NavigationMenu';
 import { WithSidebar } from '@/components/WithSidebar';
@@ -20,15 +23,15 @@ import { getOnboardingState, getSubaccount } from '@/state/accountSelectors';
 import { openDialog } from '@/state/dialogs';
 
 import { PortfolioNavMobile } from './PortfolioNavMobile';
-import { Overview } from './Overview';
+import { LoadingSpace } from '@/components/Loading/LoadingSpinner';
-import { Positions } from './Positions';
-import { Orders } from './Orders';
-import { Fees } from './Fees';
-import { History } from './History';
 
-import { layoutMixins } from '@/styles/layoutMixins';
+const Overview = lazy(() => import('./Overview').then((module) => ({ default: module.Overview })));
-import { Button } from '@/components/Button';
+const Positions = lazy(() =>
-import { ButtonAction } from '@/constants/buttons';
+  import('./Positions').then((module) => ({ default: module.Positions }))
+);
+const Orders = lazy(() => import('./Orders').then((module) => ({ default: module.Orders })));
+const Fees = lazy(() => import('./Fees').then((module) => ({ default: module.Fees })));
+const History = lazy(() => import('./History').then((module) => ({ default: module.History })));
 
 export default () => {
   const dispatch = useDispatch();
@@ -44,49 +47,51 @@ export default () => {
   useDocumentTitle(stringGetter({ key: STRING_KEYS.PORTFOLIO }));
 
   const routesComponent = (
-    <Routes>
+    <Suspense fallback={<LoadingSpace id="portfolio" />}>
-      <Route path={PortfolioRoute.Overview} element={<Overview />} />
+      <Routes>
-      <Route path={PortfolioRoute.Positions} element={<Positions />} />
+        <Route path={PortfolioRoute.Overview} element={<Overview />} />
-      <Route path={PortfolioRoute.Orders} element={<Orders />} />
+        <Route path={PortfolioRoute.Positions} element={<Positions />} />
-      <Route path={PortfolioRoute.Fees} element={<Fees />} />
+        <Route path={PortfolioRoute.Orders} element={<Orders />} />
-      <Route path={PortfolioRoute.History} element={<History />}>
+        <Route path={PortfolioRoute.Fees} element={<Fees />} />
-        <Route index path="*" element={<Navigate to={HistoryRoute.Trades} />} />
+        <Route path={PortfolioRoute.History} element={<History />}>
-        <Route
+          <Route index path="*" element={<Navigate to={HistoryRoute.Trades} />} />
-          path={HistoryRoute.Trades}
+          <Route
-          element={
+            path={HistoryRoute.Trades}
-            <FillsTable
+            element={
-              columnKeys={
+              <FillsTable
-                isTablet
+                columnKeys={
-                  ? [
+                  isTablet
-                      FillsTableColumnKey.Time,
+                    ? [
-                      FillsTableColumnKey.TypeAmount,
+                        FillsTableColumnKey.Time,
-                      FillsTableColumnKey.PriceFee,
+                        FillsTableColumnKey.TypeAmount,
-                    ]
+                        FillsTableColumnKey.PriceFee,
-                  : [
+                      ]
-                      FillsTableColumnKey.Time,
+                    : [
-                      FillsTableColumnKey.Market,
+                        FillsTableColumnKey.Time,
-                      FillsTableColumnKey.Side,
+                        FillsTableColumnKey.Market,
-                      FillsTableColumnKey.AmountPrice,
+                        FillsTableColumnKey.Side,
-                      FillsTableColumnKey.TotalFee,
+                        FillsTableColumnKey.AmountPrice,
-                      FillsTableColumnKey.Type,
+                        FillsTableColumnKey.TotalFee,
-                      FillsTableColumnKey.Liquidity,
+                        FillsTableColumnKey.Type,
-                    ]
+                        FillsTableColumnKey.Liquidity,
-              }
+                      ]
-              withOuterBorder={isNotTablet}
+                }
-            />
+                withOuterBorder={isNotTablet}
-          }
+              />
-        />
+            }
-        <Route
+          />
-          path={HistoryRoute.Transfers}
+          <Route
-          element={<TransferHistoryTable withOuterBorder={isNotTablet} />}
+            path={HistoryRoute.Transfers}
-        />
+            element={<TransferHistoryTable withOuterBorder={isNotTablet} />}
-        <Route
+          />
-          path={HistoryRoute.Payments}
+          <Route
-          element={<FundingPaymentsTable withOuterBorder={isNotTablet} />}
+            path={HistoryRoute.Payments}
-        />
+            element={<FundingPaymentsTable withOuterBorder={isNotTablet} />}
-      </Route>
+          />
-      <Route path="*" element={<Navigate to={PortfolioRoute.Overview} replace />} />
+        </Route>
-    </Routes>
+        <Route path="*" element={<Navigate to={PortfolioRoute.Overview} replace />} />
+      </Routes>
+    </Suspense>
   );
 
   return isTablet ? (
@@ -191,7 +196,7 @@ Styled.SideBar = styled.div`
 Styled.Footer = styled.div`
   ${layoutMixins.row}
   flex-wrap: wrap;
-  
+
   padding: 1rem;
 
   gap: 0.5rem;

src/pages/rewards/RewardsHelpPanel.tsx

@@ -0,0 +1,80 @@
+import styled, { AnyStyledComponent } from 'styled-components';
+
+import { STRING_KEYS } from '@/constants/localization';
+import { layoutMixins } from '@/styles/layoutMixins';
+import { useStringGetter } from '@/hooks';
+
+import { Accordion } from '@/components/Accordion';
+import { Link } from '@/components/Link';
+import { Panel } from '@/components/Panel';
+
+const REWARDS_LEARN_MORE_LINK = ''; // to be configured
+
+export const RewardsHelpPanel = () => {
+  const stringGetter = useStringGetter();
+
+  return (
+    <Styled.HelpCard
+      slotHeader={
+        <Styled.Header>
+          <h3>{stringGetter({ key: STRING_KEYS.HELP })}</h3>
+          {REWARDS_LEARN_MORE_LINK && (
+            <Link withIcon href={REWARDS_LEARN_MORE_LINK}>
+              {stringGetter({ key: STRING_KEYS.LEARN_MORE })}
+            </Link>
+          )}
+        </Styled.Header>
+      }
+    >
+      <Accordion
+        items={[
+          {
+            header: 'Who is eligible for trading rewards?',
+            content: 'All traders are eligible for trading rewards.',
+          },
+          {
+            header: 'How do trading rewards work?',
+            content:
+              'Immediately after each fill, trading rewards are sent directly to the trader’s dYdX Chain address, based on the amount of fees paid by the trader.',
+          },
+          {
+            header: 'How do I claim my rewards?',
+            content:
+              'Each block, trading rewards are automatically sent directly to the trader’s dYdX Chain address.',
+          },
+        ]}
+      />
+    </Styled.HelpCard>
+  );
+};
+
+const Styled: Record<string, AnyStyledComponent> = {};
+
+Styled.HelpCard = styled(Panel)`
+  --panel-content-paddingY: 0;
+  width: 100%;
+  height: max-content;
+  padding: 0;
+  gap: 0;
+
+  text-align: start;
+`;
+
+Styled.Header = styled.div`
+  ${layoutMixins.spacedRow}
+  gap: 1ch;
+
+  padding: 1.25rem 1.5rem;
+  border-bottom: var(--border-width) solid var(--border-color);
+
+  font: var(--font-small-book);
+
+  h3 {
+    font: var(--font-medium-book);
+    color: var(--color-text-2);
+  }
+`;
+
+Styled.Link = styled(Link)`
+  display: inline-flex;
+`;

src/pages/rewards/RewardsPage.tsx

@@ -21,7 +21,7 @@ import { DYDXBalancePanel } from './DYDXBalancePanel';
 import { MigratePanel } from './MigratePanel';
 import { LaunchIncentivesPanel } from './LaunchIncentivesPanel';
 
-export const RewardsPage = () => {
+const RewardsPage = () => {
   const dispatch = useDispatch();
   const stringGetter = useStringGetter();
   const { governanceLearnMore, stakingLearnMore } = useURLConfigs();
@@ -84,6 +84,8 @@ export const RewardsPage = () => {
   );
 };
 
+export default RewardsPage;
+
 const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.Page = styled.div`

src/pages/settings/Settings.tsx

@@ -25,7 +25,7 @@ import { useNetworks } from '@/views/menus/useNetworks';
 import { SettingsHeader } from './SettingsHeader';
 import { ComingSoonSpace } from '@/components/ComingSoon';
 
-export const SettingsPage = () => {
+const SettingsPage = () => {
   const stringGetter = useStringGetter();
   const { pathname } = useLocation();
   const dispatch = useDispatch();
@@ -105,3 +105,5 @@ export const SettingsPage = () => {
     </>
   );
 };
+
+export default SettingsPage;

src/pages/trade/HorizontalPanel.tsx

@@ -83,7 +83,6 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
   const tabItems = useMemo(
     () => [
       {
-        asChild: true,
         value: InfoSection.Position,
         label: stringGetter({
           key: showCurrentMarket ? STRING_KEYS.POSITION : STRING_KEYS.POSITIONS,

src/pages/trade/VerticalPanel.tsx

@@ -1,6 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
-import { useSelector } from 'react-redux';
-import styled, { AnyStyledComponent } from 'styled-components';
 
 import { TradeLayouts } from '@/constants/layout';
 import { STRING_KEYS } from '@/constants/localization';
@@ -9,11 +7,9 @@ import { useStringGetter } from '@/hooks';
 
 import { Tabs } from '@/components/Tabs';
 
-import { Orderbook, orderbookMixins, OrderbookScrollBehavior } from '@/views/tables/Orderbook';
+import { Orderbook } from '@/views/Orderbook';
 import { LiveTrades } from '@/views/tables/LiveTrades';
 
-import { getCurrentMarketId } from '@/state/perpetualsSelectors';
-
 enum Tab {
   Orderbook = 'Orderbook',
   Trades = 'Trades',
@@ -27,22 +23,13 @@ const HISTOGRAM_SIDES_BY_LAYOUT = {
 
 export const VerticalPanel = ({ tradeLayout }: { tradeLayout: TradeLayouts }) => {
   const stringGetter = useStringGetter();
-
   const [value, setValue] = useState(Tab.Orderbook);
-  const [scrollBehavior, setScrollBehavior] = useState<OrderbookScrollBehavior>('snapToCenter');
-
-  const marketId = useSelector(getCurrentMarketId);
-
-  useEffect(() => {
-    setScrollBehavior('snapToCenter');
-  }, [marketId]);
 
   return (
-    <Styled.Tabs
+    <Tabs
       fullWidthTabs
       value={value}
       onValueChange={(value: Tab) => {
-        setScrollBehavior('snapToCenter');
         setValue(value);
       }}
       items={[
@@ -50,6 +37,7 @@ export const VerticalPanel = ({ tradeLayout }: { tradeLayout: TradeLayouts }) =>
           content: <Orderbook histogramSide={HISTOGRAM_SIDES_BY_LAYOUT[tradeLayout]} />,
           label: stringGetter({ key: STRING_KEYS.ORDERBOOK_SHORT }),
           value: Tab.Orderbook,
+          asChild: true,
         },
         {
           content: <LiveTrades histogramSide={HISTOGRAM_SIDES_BY_LAYOUT[tradeLayout]} />,
@@ -57,26 +45,7 @@ export const VerticalPanel = ({ tradeLayout }: { tradeLayout: TradeLayouts }) =>
           value: Tab.Trades,
         },
       ]}
-      onWheel={() => setScrollBehavior('free')}
       withTransitions={false}
-      isShowingOrderbook={value === Tab.Orderbook}
-      scrollBehavior={scrollBehavior}
-      // style={{
-      //   scrollSnapType: {
-      //     'snapToCenter': 'y mandatory',
-      //     'free': 'none',
-      //     'snapToCenterUnlessHovered': 'none',
-      //   }[scrollBehavior],
-      // }}
     />
   );
 };
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Tabs = styled(Tabs)<{
-  isShowingOrderbook: boolean;
-  scrollBehavior: OrderbookScrollBehavior;
-}>`
-  ${orderbookMixins.scrollArea}
-`;

src/views/ExchangeBillboards.tsx

@@ -2,9 +2,7 @@ import styled, { type AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';
 
 import { STRING_KEYS } from '@/constants/localization';
-import { MARKETS_TO_DISPLAY } from '@/constants/markets';
 import { useBreakpoints, useStringGetter } from '@/hooks';
-import { testFlags } from '@/lib/testFlags';
 import { breakpoints } from '@/styles';
 import { layoutMixins } from '@/styles/layoutMixins';
 
@@ -34,7 +32,6 @@ export const ExchangeBillboards: React.FC<ExchangeBillboardsProps> = ({
 
   Object.values(perpetualMarkets)
     .filter(Boolean)
-    .filter(({ id }) => (testFlags.displayAllMarkets ? true : MARKETS_TO_DISPLAY.includes(id)))
     .forEach(({ oraclePrice, perpetual }) => {
       const { volume24H, trades24H, openInterest = 0 } = perpetual || {};
       volume24HUSDC += volume24H ?? 0;

src/views/Orderbook.tsx

@@ -0,0 +1,317 @@
+import { useCallback, useMemo, useRef, useState } from 'react';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
+import styled, { css } from 'styled-components';
+
+import { Nullable } from '@/constants/abacus';
+import { STRING_KEYS } from '@/constants/localization';
+
+import { useBreakpoints, useStringGetter } from '@/hooks';
+import {
+  useCalculateOrderbookData,
+  useCenterOrderbook,
+  useDrawOrderbook,
+  useSpreadRowScrollListener,
+} from '@/hooks/orderbook';
+
+import { calculateCanViewAccount } from '@/state/accountCalculators';
+import { getCurrentMarketAssetData } from '@/state/assetsSelectors';
+import { getCurrentMarketConfig } from '@/state/perpetualsSelectors';
+import { setTradeFormInputs } from '@/state/inputs';
+import { getCurrentInput } from '@/state/inputsSelectors';
+
+import { Canvas } from '@/components/Canvas';
+import { LoadingSpace } from '@/components/Loading/LoadingSpinner';
+import { Tag } from '@/components/Tag';
+
+import { ROW_HEIGHT, Row, type RowData } from './Orderbook/OrderbookRow';
+import { SpreadRow } from './Orderbook/SpreadRow';
+import { Output, OutputType } from '@/components/Output';
+
+const ORDERBOOK_MAX_ROWS_PER_SIDE = 35;
+
+type ElementProps = {
+  maxRowsPerSide?: number;
+  layout?: 'vertical' | 'horizontal';
+};
+
+type StyleProps = {
+  hideHeader?: boolean;
+  histogramSide?: 'left' | 'right';
+  className?: string;
+};
+
+const getEmptyRow = (side: 'bid' | 'ask') => ({
+  side,
+  size: undefined,
+  price: undefined,
+  offset: 0,
+  depth: undefined,
+});
+
+export const Orderbook = ({
+  histogramSide,
+  maxRowsPerSide = ORDERBOOK_MAX_ROWS_PER_SIDE,
+}: ElementProps & StyleProps) => {
+  const dispatch = useDispatch();
+  const stringGetter = useStringGetter();
+  const { isTablet } = useBreakpoints();
+
+  const showMineColumn = useSelector(calculateCanViewAccount) && !isTablet;
+  const currentInput = useSelector(getCurrentInput);
+  const { id = '' } = useSelector(getCurrentMarketAssetData, shallowEqual) ?? {};
+  const { stepSizeDecimals, tickSizeDecimals } =
+    useSelector(getCurrentMarketConfig, shallowEqual) ?? {};
+
+  const { asks, bids, spread, spreadPercent, histogramRange, hasOrderbook } =
+    useCalculateOrderbookData({
+      maxRowsPerSide,
+    });
+
+  const { askLevels, asksSlice, bidLevels, bidsSlice, numRows } = useMemo(() => {
+    const bidsSlice = bids.slice(0, maxRowsPerSide).reverse();
+    const asksSlice = asks.slice(0, maxRowsPerSide);
+
+    const numRows = maxRowsPerSide; // Math.max(bidsSlice.length, asksSlice.length);
+
+    if (asksSlice.length < numRows) {
+      const emptyRows = new Array(numRows - asksSlice.length).fill(getEmptyRow('ask'));
+      asksSlice.push(...emptyRows);
+    }
+
+    if (bidsSlice.length < numRows) {
+      const emptyRows = new Array(numRows - bidsSlice.length).fill(getEmptyRow('bid'));
+      bidsSlice.unshift(...emptyRows);
+    }
+
+    const askLevels = new Set(asksSlice.map(({ price }: { price: number }) => price));
+    const bidLevels = new Set(bidsSlice.map(({ price }: { price: number }) => price));
+
+    return { askLevels, asksSlice, bidLevels, bidsSlice, numRows };
+  }, [asks, bids]);
+
+  const orderbookRef = useRef<HTMLDivElement>(null);
+  useCenterOrderbook({ orderbookRef, marketId: id });
+
+  /**
+   * Display top or bottom spreadRow when center spreadRow is off screen
+   */
+  const spreadRowRef = useRef<HTMLDivElement>(null);
+
+  const displaySide = useSpreadRowScrollListener({
+    orderbookRef,
+    spreadRowRef,
+  });
+
+  /**
+   * Row action and hover
+   */
+  const onRowAction = useCallback(
+    (price: Nullable<number>) => {
+      if (currentInput === 'trade' && price) {
+        dispatch(setTradeFormInputs({ limitPriceInput: price?.toString() }));
+      }
+    },
+    [currentInput]
+  );
+
+  const [hoveredRow, setHoveredRow] = useState<{
+    idx: number;
+    side: 'bid' | 'ask';
+  }>();
+
+  const { canvasRef: asksCanvasRef, hoverCanvasRef: asksHoverRef } = useDrawOrderbook({
+    data: asksSlice.reverse(),
+    histogramRange,
+    stepSizeDecimals,
+    tickSizeDecimals,
+    hoveredRow: hoveredRow?.side === 'ask' ? hoveredRow.idx : undefined,
+    histogramSide,
+  });
+
+  const { canvasRef: bidsCanvasRef, hoverCanvasRef: bidsHoverRef } = useDrawOrderbook({
+    data: bidsSlice.reverse(),
+    histogramRange,
+    stepSizeDecimals,
+    tickSizeDecimals,
+    hoveredRow: hoveredRow?.side === 'bid' ? hoveredRow.idx : undefined,
+    histogramSide,
+  });
+
+  return (
+    <$OrderbookContainer>
+      <$OrderbookContent isLoading={!hasOrderbook}>
+        <$Header>
+          <span>
+            {stringGetter({ key: STRING_KEYS.SIZE })} {id && <Tag>{id}</Tag>}
+          </span>
+          <span>
+            {stringGetter({ key: STRING_KEYS.PRICE })} <Tag>USD</Tag>
+          </span>
+          <span>{showMineColumn && stringGetter({ key: STRING_KEYS.MINE })}</span>
+        </$Header>
+        {displaySide === 'top' && (
+          <$SpreadRow
+            side="top"
+            spread={spread}
+            spreadPercent={spreadPercent}
+            tickSizeDecimals={tickSizeDecimals}
+          />
+        )}
+        <$OrderbookWrapper ref={orderbookRef}>
+          {!hasOrderbook ? (
+            <LoadingSpace id="orderbook" />
+          ) : (
+            <>
+              <$OrderbookSideContainer
+                numRows={numRows}
+                side="ask"
+                onMouseLeave={() => setHoveredRow(undefined)}
+              >
+                <$OrderbookCanvas ref={asksCanvasRef} width="100%" height={numRows * ROW_HEIGHT} />
+                <$HoverCanvas ref={asksHoverRef} width="100%" height={numRows * ROW_HEIGHT} />
+                <$HoverRows>
+                  {asksSlice.map((row: RowData, idx) =>
+                    row.price ? (
+                      <$Row
+                        key={idx}
+                        title={`${row.price}`}
+                        onClick={() => onRowAction(row.price)}
+                        onMouseOver={(e) => setHoveredRow({ idx, side: 'ask' })}
+                      >
+                        <span></span>
+                        <span></span>
+                        <span>
+                          <Output
+                            type={OutputType.Fiat}
+                            value={row.price}
+                            fractionDigits={tickSizeDecimals}
+                          />
+                        </span>
+                      </$Row>
+                    ) : (
+                      <$Row key={idx} onMouseOver={(e) => setHoveredRow(undefined)} />
+                    )
+                  )}
+                </$HoverRows>
+              </$OrderbookSideContainer>
+
+              <SpreadRow
+                ref={spreadRowRef}
+                spread={spread}
+                spreadPercent={spreadPercent}
+                tickSizeDecimals={tickSizeDecimals}
+              />
+
+              <$OrderbookSideContainer
+                numRows={numRows}
+                side="bid"
+                onMouseLeave={() => setHoveredRow(undefined)}
+              >
+                <$OrderbookCanvas ref={bidsCanvasRef} width="100%" height={numRows * ROW_HEIGHT} />
+                <$HoverCanvas ref={bidsHoverRef} width="100%" height={numRows * ROW_HEIGHT} />
+                <$HoverRows>
+                  {bidsSlice.map((row: RowData, idx) =>
+                    row.price ? (
+                      <$Row
+                        key={idx}
+                        title={`${row.price}`}
+                        onClick={() => onRowAction(row.price)}
+                        onMouseOver={(e) => setHoveredRow({ idx, side: 'bid' })}
+                      >
+                        <span></span>
+                        <span></span>
+                        <span>
+                          <Output
+                            type={OutputType.Fiat}
+                            value={row.price}
+                            fractionDigits={tickSizeDecimals}
+                          />
+                        </span>
+                      </$Row>
+                    ) : (
+                      <$Row key={idx} onMouseOver={(e) => setHoveredRow(undefined)} />
+                    )
+                  )}
+                </$HoverRows>
+              </$OrderbookSideContainer>
+            </>
+          )}
+        </$OrderbookWrapper>
+        {displaySide === 'bottom' && (
+          <$SpreadRow
+            side="bottom"
+            spread={spread}
+            spreadPercent={spreadPercent}
+            tickSizeDecimals={tickSizeDecimals}
+          />
+        )}
+      </$OrderbookContent>
+    </$OrderbookContainer>
+  );
+};
+
+const $OrderbookContainer = styled.div`
+  display: flex;
+  flex: 1 1 0%;
+  flex-direction: column;
+  overflow: hidden;
+`;
+
+const $OrderbookContent = styled.div<{ isLoading?: boolean }>`
+  max-height: 100%;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+
+  ${({ isLoading }) => isLoading && 'flex: 1;'}
+`;
+
+const $Header = styled(Row)`
+  height: 2rem;
+  border-bottom: 1px solid var(--color-border);
+  color: var(--color-text-0);
+`;
+
+const $OrderbookWrapper = styled.div`
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 0%;
+`;
+
+const $OrderbookSideContainer = styled.div<{ numRows: number; side: 'bid' | 'ask' }>`
+  ${({ numRows }) => css`
+    min-height: calc(${numRows} * 1.25rem);
+  `}
+
+  ${({ side }) => css`
+    --accent-color: ${side === 'bid' ? 'var(--color-positive)' : 'var(--color-negative)'};
+  `}
+  position: relative;
+`;
+
+const $OrderbookCanvas = styled(Canvas)`
+  width: 100%;
+  height: 100%;
+
+  position: absolute;
+  top: 0;
+  right: 0;
+
+  font-feature-settings: var(--fontFeature-monoNumbers);
+`;
+
+const $HoverCanvas = styled($OrderbookCanvas)``;
+
+const $HoverRows = styled.div`
+  position: absolute;
+  width: 100%;
+`;
+
+const $Row = styled(Row)<{ onClick?: () => void }>`
+  ${({ onClick }) => (onClick ? 'cursor: pointer;' : 'cursor: default;')}
+`;
+
+const $SpreadRow = styled(SpreadRow)`
+  position: absolute;
+`;

src/views/Orderbook/OrderbookRow.tsx

@@ -0,0 +1,26 @@
+import styled from 'styled-components';
+
+import { OrderbookLine } from '@/constants/abacus';
+export type RowData = OrderbookLine & { side: 'bid' | 'ask'; mine?: number };
+
+export const ROW_HEIGHT = 20;
+export const ROW_PADDING_RIGHT = 8;
+
+export const Row = styled.div`
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
+  height: ${ROW_HEIGHT}px;
+  min-height: ${ROW_HEIGHT}px;
+
+  font: var(--font-mini-book);
+
+  position: relative;
+  padding-right: 0.5rem;
+
+  > span {
+    flex: 1 1 0%;
+    text-align: right;
+    padding-bottom: 2px;
+  }
+`;

src/views/Orderbook/SpreadRow.tsx

@@ -0,0 +1,61 @@
+import { forwardRef } from 'react';
+import styled, { css } from 'styled-components';
+import BigNumber from 'bignumber.js';
+
+import type { Nullable } from '@/constants/abacus';
+import { STRING_KEYS } from '@/constants/localization';
+import { useStringGetter } from '@/hooks';
+
+import { Output, OutputType } from '@/components/Output';
+import { WithTooltip } from '@/components/WithTooltip';
+
+import { Row } from './OrderbookRow';
+
+type StyleProps = {
+  side?: 'top' | 'bottom';
+};
+
+type ElementProps = {
+  spread: BigNumber | null;
+  spreadPercent: Nullable<number>;
+  tickSizeDecimals: Nullable<number>;
+};
+
+export const SpreadRow = forwardRef<HTMLDivElement, StyleProps & ElementProps>(
+  ({ side, spread, spreadPercent, tickSizeDecimals }, ref) => {
+    const stringGetter = useStringGetter();
+
+    return (
+      <$SpreadRow ref={ref} side={side}>
+        <span>
+          <WithTooltip tooltip="spread">
+            {stringGetter({ key: STRING_KEYS.ORDERBOOK_SPREAD })}
+          </WithTooltip>
+        </span>
+        <span>
+          <Output type={OutputType.Number} value={spread} fractionDigits={tickSizeDecimals} />
+        </span>
+        <span>
+          <Output type={OutputType.Percent} value={spreadPercent} />
+        </span>
+      </$SpreadRow>
+    );
+  }
+);
+
+const $SpreadRow = styled(Row)<{ side?: 'top' | 'bottom' }>`
+  height: 2rem;
+  border-top: 1px solid var(--color-border);
+  border-bottom: 1px solid var(--color-border);
+
+  ${({ side }) =>
+    side &&
+    {
+      top: css`
+        border-top: none;
+      `,
+      bottom: css`
+        border-bottom: none;
+      `,
+    }[side]}
+`;

src/views/dialogs/DetailsDialog/FillDetailsDialog.tsx

@@ -94,7 +94,7 @@ export const FillDetailsDialog = ({ fillId, setIsOpen }: ElementProps) => {
 
   return (
     <DetailsDialog
-      slotIcon={<Styled.AssetIcon symbol={asset.id} />}
+      slotIcon={<Styled.AssetIcon symbol={asset?.id} />}
       title={resources.typeStringKey && stringGetter({ key: resources.typeStringKey })}
       items={detailItems}
       setIsOpen={setIsOpen}

src/views/dialogs/DetailsDialog/OrderDetailsDialog.tsx

@@ -194,7 +194,7 @@ export const OrderDetailsDialog = ({ orderId, setIsOpen }: ElementProps) => {
 
   return (
     <DetailsDialog
-      slotIcon={<Styled.AssetIcon symbol={asset.id} />}
+      slotIcon={<Styled.AssetIcon symbol={asset?.id} />}
       title={!resources.typeStringKey ? '' : stringGetter({ key: resources.typeStringKey })}
       slotFooter={
         isAccountViewOnly ? null : isOrderStatusClearable(status) ? (

src/views/dialogs/HelpDialog.tsx

@@ -8,6 +8,7 @@ import { ComboboxDialogMenu } from '@/components/ComboboxDialogMenu';
 import { Icon, IconName } from '@/components/Icon';
 
 import { isTruthy } from '@/lib/isTruthy';
+import { breakpoints } from '@/styles';
 
 type ElementProps = {
   setIsOpen: (open: boolean) => void;
@@ -72,8 +73,11 @@ export const HelpDialog = ({ setIsOpen }: ElementProps) => {
 const Styled: Record<string, AnyStyledComponent> = {};
 
 Styled.ComboboxDialogMenu = styled(ComboboxDialogMenu)`
-  --dialog-width: var(--dialog-small-width);
   --dialog-content-paddingTop: 1rem;
   --dialog-content-paddingBottom: 1rem;
   --comboxDialogMenu-item-gap: 1rem;
+
+  @media ${breakpoints.notMobile} {
+    --dialog-width: var(--dialog-small-width);
+  }
 `;

src/views/forms/AccountManagementForms/ChainSelectMenu.tsx

@@ -18,11 +18,7 @@ type ElementProps = {
   onSelectChain: (chain: string) => void;
 };
 
-export const ChainSelectMenu = ({
+export const ChainSelectMenu = ({ label, selectedChain, onSelectChain }: ElementProps) => {
-  label,
-  selectedChain,
-  onSelectChain,
-}: ElementProps) => {
   const stringGetter = useStringGetter();
   const { type, depositOptions, withdrawalOptions, resources } =
     useSelector(getTransferInputs, shallowEqual) || {};
@@ -38,7 +34,7 @@ export const ChainSelectMenu = ({
     slotBefore: <Styled.Img src={chain.iconUrl} alt="" />,
   }));
 
-  const selectedOption = chains.find((item) => item.type === selectedChain); 
+  const selectedOption = chains.find((item) => item.type === selectedChain);
 
   return (
     <SearchSelectMenu
@@ -81,4 +77,4 @@ Styled.ChainRow = styled.div`
   gap: 0.5rem;
   color: var(--color-text-2);
   font: var(--font-base-book);
-`;
+`;

src/views/forms/AccountManagementForms/DepositForm.tsx

@@ -10,9 +10,8 @@ import { TransferInputField, TransferInputTokenResource, TransferType } from '@/
 import { AlertType } from '@/constants/alerts';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { ENVIRONMENT_CONFIG_MAP, isMainnet } from '@/constants/networks';
-import { NotificationStatus } from '@/constants/notifications';
+import { MAX_CCTP_TRANSFER_AMOUNT, MAX_PRICE_IMPACT, NumberSign } from '@/constants/numbers';
-import { NumberSign } from '@/constants/numbers';
 import type { EvmAddress } from '@/constants/wallets';
 
 import { useAccounts, useDebounce, useStringGetter, useSelectedNetwork } from '@/hooks';
@@ -253,7 +252,9 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
         if (txHash) {
           addTransferNotification({
             txHash: txHash,
-            toChainId: !isCctp ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId : getNobleChainId(),
+            toChainId: !isCctp
+              ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
+              : getNobleChainId(),
             fromChainId: chainIdStr || undefined,
             toAmount: summary?.usdcSize || undefined,
             triggeredAt: Date.now(),
@@ -324,6 +325,21 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
       return stringGetter({ key: STRING_KEYS.DEPOSIT_MORE_THAN_BALANCE });
     }
 
+    if (isCctp) {
+      if (MustBigNumber(debouncedAmountBN).gte(MAX_CCTP_TRANSFER_AMOUNT)) {
+        return stringGetter({
+          key: STRING_KEYS.MAX_CCTP_TRANSFER_LIMIT_EXCEEDED,
+          params: {
+            MAX_CCTP_TRANSFER_AMOUNT: MAX_CCTP_TRANSFER_AMOUNT,
+          },
+        });
+      }
+    }
+
+    if (isMainnet && MustBigNumber(summary?.aggregatePriceImpact).gte(MAX_PRICE_IMPACT)) {
+      return stringGetter({ key: STRING_KEYS.PRICE_IMPACT_TOO_HIGH });
+    }
+
     return undefined;
   }, [
     error,
@@ -334,6 +350,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
     fromAmount,
     sourceToken,
     stringGetter,
+    summary,
   ]);
 
   const isDisabled =

src/views/forms/AccountManagementForms/DepositForm/DepositButtonAndReceipt.tsx

@@ -1,21 +1,16 @@
-import { type Dispatch, type SetStateAction, useState, type ReactNode } from 'react';
+import { type Dispatch, type ReactNode, type SetStateAction, useState, useMemo } from 'react';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';
 import type { RouteData } from '@0xsquid/sdk';
+import { formatUnits } from 'viem';
 
-import {
+import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons';
-  ButtonAction,
-  ButtonShape,
-  ButtonSize,
-  ButtonState,
-  ButtonType,
-} from '@/constants/buttons';
 
 import { TransferInputTokenResource } from '@/constants/abacus';
 import { STRING_KEYS } from '@/constants/localization';
-import { NumberSign } from '@/constants/numbers';
+import { NumberSign, TOKEN_DECIMALS } from '@/constants/numbers';
 
-import { useStringGetter } from '@/hooks';
+import { useStringGetter, useTokenConfigs } from '@/hooks';
 import { useMatchingEvmNetwork } from '@/hooks/useMatchingEvmNetwork';
 
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -34,6 +29,7 @@ import { calculateCanAccountTrade } from '@/state/accountCalculators';
 import { getSubaccountBuyingPower, getSubaccountEquity } from '@/state/accountSelectors';
 import { getTransferInputs } from '@/state/inputsSelectors';
 
+import { isTruthy } from '@/lib/isTruthy';
 import { MustBigNumber } from '@/lib/numbers';
 
 import { SlippageEditor } from '../SlippageEditor';
@@ -83,7 +79,8 @@ export const DepositButtonAndReceipt = ({
   const { current: buyingPower, postOrder: newBuyingPower } =
     useSelector(getSubaccountBuyingPower, shallowEqual) || {};
 
-  const { summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
+  const { isCctp, summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
+  const { usdcDecimals, usdcLabel } = useTokenConfigs();
 
   const feeSubitems: DetailsItem[] = [];
 
@@ -98,7 +95,7 @@ export const DepositButtonAndReceipt = ({
   if (typeof summary?.bridgeFee === 'number') {
     feeSubitems.push({
       key: 'bridge-fees',
-      label: <span>Bridge Fee</span>,
+      label: <span>{stringGetter({ key: STRING_KEYS.BRIDGE_FEE })}</span>,
       value: <Output type={OutputType.Fiat} value={summary?.bridgeFee} />,
     });
   }
@@ -111,12 +108,68 @@ export const DepositButtonAndReceipt = ({
 
   const totalFees = (summary?.bridgeFee || 0) + (summary?.gasFee || 0);
 
+  const { toAmount, toAmountMin } = useMemo(() => {
+    if (isCctp) {
+      return {
+        toAmount: summary?.toAmount,
+        toAmountMin: summary?.toAmountMin,
+      };
+    } else {
+      return {
+        toAmount: summary?.toAmount && formatUnits(BigInt(summary.toAmount), usdcDecimals),
+        toAmountMin: summary?.toAmountMin && formatUnits(BigInt(summary.toAmountMin), usdcDecimals),
+      };
+    }
+  }, [isCctp, summary]);
+
   const submitButtonReceipt = [
+    {
+      key: 'expected-deposit-amount',
+      label: (
+        <span>
+          {stringGetter({ key: STRING_KEYS.EXPECTED_DEPOSIT_AMOUNT })} <Tag>{usdcLabel}</Tag>
+        </span>
+      ),
+      value: <Output type={OutputType.Fiat} fractionDigits={TOKEN_DECIMALS} value={toAmount} />,
+      subitems: [
+        {
+          key: 'minimum-deposit-amount',
+          label: (
+            <span>
+              {stringGetter({ key: STRING_KEYS.MINIMUM_DEPOSIT_AMOUNT })} <Tag>{usdcLabel}</Tag>
+            </span>
+          ),
+          value: (
+            <Output type={OutputType.Fiat} fractionDigits={TOKEN_DECIMALS} value={toAmountMin} />
+          ),
+          tooltip: 'minimum-deposit-amount',
+        },
+      ],
+    },
+    {
+      key: 'exchange-rate',
+      label: <span>{stringGetter({ key: STRING_KEYS.EXCHANGE_RATE })}</span>,
+      value:
+        typeof summary?.exchangeRate === 'number' ? (
+          <Styled.ExchangeRate>
+            <Output
+              type={OutputType.Asset}
+              value={1}
+              fractionDigits={0}
+              tag={sourceToken?.symbol}
+            />
+            =
+            <Output type={OutputType.Asset} value={summary?.exchangeRate} tag={usdcLabel} />
+          </Styled.ExchangeRate>
+        ) : (
+          <Output type={OutputType.Asset} />
+        ),
+    },
     {
       key: 'equity',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.EQUITY })} <Tag>USDC</Tag>
+          {stringGetter({ key: STRING_KEYS.EQUITY })} <Tag>{usdcLabel}</Tag>
         </span>
       ),
       value: (
@@ -133,7 +186,7 @@ export const DepositButtonAndReceipt = ({
       key: 'buying-power',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.BUYING_POWER })} <Tag>USDC</Tag>
+          {stringGetter({ key: STRING_KEYS.BUYING_POWER })} <Tag>{usdcLabel}</Tag>
         </span>
       ),
       value: (
@@ -146,18 +199,7 @@ export const DepositButtonAndReceipt = ({
         />
       ),
     },
-    {
+    !isCctp && {
-      key: 'exchange-rate',
-      label: <span>{stringGetter({ key: STRING_KEYS.EXCHANGE_RATE })}</span>,
-      value: typeof summary?.exchangeRate === 'number' && (
-        <Styled.ExchangeRate>
-          <Output type={OutputType.Asset} value={1} fractionDigits={0} tag={sourceToken?.symbol} />
-          =
-          <Output type={OutputType.Asset} value={summary?.exchangeRate} tag="USDC" />
-        </Styled.ExchangeRate>
-      ),
-    },
-    {
       key: 'total-fees',
       label: <span>{stringGetter({ key: STRING_KEYS.TOTAL_FEES })}</span>,
       value: <Output type={OutputType.Fiat} value={totalFees} />,
@@ -165,7 +207,7 @@ export const DepositButtonAndReceipt = ({
     },
     {
       key: 'slippage',
-      label: <span>{stringGetter({ key: STRING_KEYS.SLIPPAGE })}</span>,
+      label: <span>{stringGetter({ key: STRING_KEYS.MAX_SLIPPAGE })}</span>,
       value: (
         <SlippageEditor
           disabled
@@ -178,22 +220,26 @@ export const DepositButtonAndReceipt = ({
     {
       key: 'estimatedRouteDuration',
       label: <span>{stringGetter({ key: STRING_KEYS.ESTIMATED_TIME })}</span>,
-      value: typeof summary?.estimatedRouteDuration === 'number' && (
+      value: (
         <Output
           type={OutputType.Text}
-          value={stringGetter({
+          value={
-            key: STRING_KEYS.X_MINUTES_LOWERCASED,
+            typeof summary?.estimatedRouteDuration === 'number'
-            params: {
+              ? stringGetter({
-              X:
+                  key: STRING_KEYS.X_MINUTES_LOWERCASED,
-                summary?.estimatedRouteDuration < 60
+                  params: {
-                  ? '< 1'
+                    X:
-                  : Math.round(summary?.estimatedRouteDuration / 60),
+                      summary?.estimatedRouteDuration < 60
-            },
+                        ? '< 1'
-          })}
+                        : Math.round(summary?.estimatedRouteDuration / 60),
+                  },
+                })
+              : null
+          }
         />
       ),
     },
-  ];
+  ].filter(isTruthy);
 
   const isFormValid = !isDisabled && !isEditingSlippage;
 

src/views/forms/AccountManagementForms/WithdrawForm.tsx

@@ -9,9 +9,9 @@ import { TransferInputField, TransferInputTokenResource, TransferType } from '@/
 import { AlertType } from '@/constants/alerts';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
+import { ENVIRONMENT_CONFIG_MAP, isMainnet } from '@/constants/networks';
-import { NotificationStatus, TransferNotificationTypes } from '@/constants/notifications';
+import { TransferNotificationTypes } from '@/constants/notifications';
-import { NumberSign } from '@/constants/numbers';
+import { MAX_CCTP_TRANSFER_AMOUNT, MAX_PRICE_IMPACT, NumberSign } from '@/constants/numbers';
 
 import {
   useAccounts,
@@ -67,7 +67,8 @@ export const WithdrawForm = () => {
     resources,
     errors: routeErrors,
     errorMessage: routeErrorMessage,
-    isCctp
+    isCctp,
+    summary,
   } = useSelector(getTransferInputs, shallowEqual) || {};
 
   // User input
@@ -75,7 +76,6 @@ export const WithdrawForm = () => {
   const [slippage, setSlippage] = useState(isCctp ? 0 : 0.01); // 0.1% slippage
   const debouncedAmount = useDebounce<string>(withdrawAmount, 500);
 
-
   const isValidAddress = toAddress && isAddress(toAddress);
 
   const toToken = useMemo(
@@ -168,12 +168,18 @@ export const WithdrawForm = () => {
             })
           );
         } else {
-          const txHash = await sendSquidWithdraw(debouncedAmountBN.toNumber(), requestPayload.data, isCctp);
+          const txHash = await sendSquidWithdraw(
+            debouncedAmountBN.toNumber(),
+            requestPayload.data,
+            isCctp
+          );
           if (txHash) {
             addTransferNotification({
               txHash: txHash,
               type: TransferNotificationTypes.Withdrawal,
-              fromChainId: !isCctp ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId : getNobleChainId(),
+              fromChainId: !isCctp
+                ? ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId
+                : getNobleChainId(),
               toChainId: chainIdStr || undefined,
               toAmount: debouncedAmountBN.toNumber(),
               triggeredAt: Date.now(),
@@ -283,10 +289,7 @@ export const WithdrawForm = () => {
 
   const errorMessage = useMemo(() => {
     if (error) {
-      return stringGetter({
+      return error;
-        key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-        params: { ERROR_MESSAGE: error },
-      });
     }
 
     if (routeErrors) {
@@ -317,6 +320,21 @@ export const WithdrawForm = () => {
       return stringGetter({ key: STRING_KEYS.WITHDRAW_MORE_THAN_FREE });
     }
 
+    if (isCctp) {
+      if (MustBigNumber(debouncedAmountBN).gte(MAX_CCTP_TRANSFER_AMOUNT)) {
+        return stringGetter({
+          key: STRING_KEYS.MAX_CCTP_TRANSFER_LIMIT_EXCEEDED,
+          params: {
+            MAX_CCTP_TRANSFER_AMOUNT: MAX_CCTP_TRANSFER_AMOUNT,
+          },
+        });
+      }
+    }
+
+    if (isMainnet && MustBigNumber(summary?.aggregatePriceImpact).gte(MAX_PRICE_IMPACT)) {
+      return stringGetter({ key: STRING_KEYS.PRICE_IMPACT_TOO_HIGH });
+    }
+
     return undefined;
   }, [
     error,
@@ -329,6 +347,7 @@ export const WithdrawForm = () => {
     toAddress,
     sanctionedAddresses,
     stringGetter,
+    summary,
   ]);
 
   const isDisabled =

src/views/forms/AccountManagementForms/WithdrawForm/WithdrawButtonAndReceipt.tsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { formatUnits } from 'viem';
@@ -6,14 +6,11 @@ import { formatUnits } from 'viem';
 import { TransferInputTokenResource } from '@/constants/abacus';
 import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { NumberSign } from '@/constants/numbers';
+import { NumberSign, TOKEN_DECIMALS } from '@/constants/numbers';
-
-import { formatSeconds } from '@/lib/timeUtils';
 
 import { layoutMixins } from '@/styles/layoutMixins';
 
-import { useStringGetter } from '@/hooks';
+import { useStringGetter, useTokenConfigs } from '@/hooks';
-import { useAccountBalance } from '@/hooks/useAccountBalance';
 
 import { Button } from '@/components/Button';
 
@@ -58,13 +55,9 @@ export const WithdrawButtonAndReceipt = ({
   const stringGetter = useStringGetter();
 
   const { leverage } = useSelector(getSubaccount, shallowEqual) || {};
-  const { summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
+  const { isCctp, summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
   const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
-
+  const { usdcLabel } = useTokenConfigs();
-  const toAmount =
-    summary?.toAmount &&
-    withdrawToken?.decimals &&
-    formatUnits(BigInt(summary.toAmount), withdrawToken?.decimals);
 
   const feeSubitems: DetailsItem[] = [];
 
@@ -89,9 +82,29 @@ export const WithdrawButtonAndReceipt = ({
   const showSubitemsToggle = showFeeBreakdown
     ? stringGetter({ key: STRING_KEYS.HIDE_ALL_DETAILS })
     : stringGetter({ key: STRING_KEYS.SHOW_ALL_DETAILS });
-  
+
   const totalFees = (summary?.bridgeFee || 0) + (summary?.gasFee || 0);
 
+  const { toAmount, toAmountMin } = useMemo(() => {
+    if (isCctp) {
+      return {
+        toAmount: summary?.toAmount,
+        toAmountMin: summary?.toAmountMin,
+      };
+    } else {
+      return {
+        toAmount:
+          summary?.toAmount &&
+          withdrawToken?.decimals &&
+          formatUnits(BigInt(summary.toAmount), withdrawToken.decimals),
+        toAmountMin:
+          summary?.toAmountMin &&
+          withdrawToken?.decimals &&
+          formatUnits(BigInt(summary.toAmountMin), withdrawToken.decimals),
+      };
+    }
+  }, [isCctp, summary, withdrawToken]);
+
   const submitButtonReceipt = [
     {
       key: 'total-fees',
@@ -99,43 +112,12 @@ export const WithdrawButtonAndReceipt = ({
       value: <Output type={OutputType.Fiat} value={totalFees} />,
       subitems: feeSubitems,
     },
-    {
-      key: 'wallet',
-      label: (
-        <span>
-          {stringGetter({ key: STRING_KEYS.AMOUNT_RECEIVED })}{' '}
-          {withdrawToken && <Tag>{withdrawToken?.symbol}</Tag>}
-        </span>
-      ),
-      value: (
-        <Styled.DiffOutput
-          type={OutputType.Asset}
-          value={'0'}
-          newValue={toAmount}
-          sign={NumberSign.Positive}
-          withDiff={Boolean(toAmount)}
-        />
-      ),
-    },
-    {
-      key: 'leverage',
-      label: <span>{stringGetter({ key: STRING_KEYS.ACCOUNT_LEVERAGE })}</span>,
-      value: (
-        <Styled.DiffOutput
-          type={OutputType.Multiple}
-          value={leverage?.current}
-          newValue={leverage?.postOrder}
-          sign={NumberSign.Negative}
-          withDiff={Boolean(leverage?.current && leverage.current !== leverage?.postOrder)}
-        />
-      ),
-    },
     {
       key: 'exchange-rate',
       label: <span>{stringGetter({ key: STRING_KEYS.EXCHANGE_RATE })}</span>,
       value: withdrawToken && typeof summary?.exchangeRate === 'number' && (
         <Styled.ExchangeRate>
-          <Output type={OutputType.Asset} value={1} fractionDigits={0} tag="USDC" />
+          <Output type={OutputType.Asset} value={1} fractionDigits={0} tag={usdcLabel} />
           =
           <Output
             type={OutputType.Asset}
@@ -146,19 +128,7 @@ export const WithdrawButtonAndReceipt = ({
       ),
     },
     {
-      key: 'slippage',
+      key: 'estimated-route-duration',
-      label: <span>{stringGetter({ key: STRING_KEYS.SLIPPAGE })}</span>,
-      value: (
-        <SlippageEditor
-          disabled
-          slippage={slippage}
-          setIsEditing={setIsEditingSlipapge}
-          setSlippage={setSlippage}
-        />
-      ),
-    },
-    {
-      key: 'estimatedRouteDuration',
       label: <span>{stringGetter({ key: STRING_KEYS.ESTIMATED_TIME })}</span>,
       value: typeof summary?.estimatedRouteDuration === 'number' && (
         <Output
@@ -175,6 +145,56 @@ export const WithdrawButtonAndReceipt = ({
         />
       ),
     },
+    {
+      key: 'expected-amount-received',
+      label: (
+        <span>
+          {stringGetter({ key: STRING_KEYS.EXPECTED_AMOUNT_RECEIVED })}{' '}
+          {withdrawToken && <Tag>{withdrawToken?.symbol}</Tag>}
+        </span>
+      ),
+      value: <Output type={OutputType.Asset} value={toAmount} fractionDigits={TOKEN_DECIMALS} />,
+      subitems: [
+        {
+          key: 'minimum-amount-received',
+          label: (
+            <span>
+              {stringGetter({ key: STRING_KEYS.MINIMUM_AMOUNT_RECEIVED })}{' '}
+              {withdrawToken && <Tag>{withdrawToken?.symbol}</Tag>}
+            </span>
+          ),
+          value: (
+            <Output type={OutputType.Asset} value={toAmountMin} fractionDigits={TOKEN_DECIMALS} />
+          ),
+          tooltip: 'minimum-amount-received',
+        },
+      ],
+    },
+    {
+      key: 'slippage',
+      label: <span>{stringGetter({ key: STRING_KEYS.MAX_SLIPPAGE })}</span>,
+      value: (
+        <SlippageEditor
+          disabled
+          slippage={slippage}
+          setIsEditing={setIsEditingSlipapge}
+          setSlippage={setSlippage}
+        />
+      ),
+    },
+    {
+      key: 'leverage',
+      label: <span>{stringGetter({ key: STRING_KEYS.ACCOUNT_LEVERAGE })}</span>,
+      value: (
+        <Styled.DiffOutput
+          type={OutputType.Multiple}
+          value={leverage?.current}
+          newValue={leverage?.postOrder}
+          sign={NumberSign.Negative}
+          withDiff={Boolean(leverage?.current && leverage.current !== leverage?.postOrder)}
+        />
+      ),
+    },
   ];
 
   const isFormValid = !isDisabled && !isEditingSlippage;

src/views/tables/MarketsTable.tsx

@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 
 import { STRING_KEYS } from '@/constants/localization';
 import { MarketFilters, type MarketData } from '@/constants/markets';
-import { LARGE_TOKEN_DECIMALS } from '@/constants/numbers';
+import { FUNDING_DECIMALS, LARGE_TOKEN_DECIMALS } from '@/constants/numbers';
 import { AppRoute } from '@/constants/routes';
 
 import { useBreakpoints, useStringGetter } from '@/hooks';
@@ -128,7 +128,8 @@ export const MarketsTable = ({ className }: { className?: string }) => {
               label: stringGetter({ key: STRING_KEYS.FUNDING_RATE_1H_SHORT }),
               renderCell: (row) => (
                 <Styled.Output
-                  type={OutputType.SmallPercent}
+                  type={OutputType.Percent}
+                  fractionDigits={FUNDING_DECIMALS}
                   value={row.nextFundingRate}
                   isPositive={MustBigNumber(row.nextFundingRate).gt(0)}
                   isNegative={MustBigNumber(row.nextFundingRate).isNegative()}

src/views/tables/PositionsTable.tsx

@@ -366,6 +366,7 @@ Styled.InlineRow = styled.div`
 
 Styled.AssetIcon = styled(AssetIcon)`
   ${layoutMixins.inlineRow}
+  min-width: unset;
   font-size: 2.25rem;
 `;