remove testnet cctp chains

Update deposit and withdrawal receipts (#212 )
* Update receipts * Remove duplicate const * Restore env * format * Try using raw * Use 3 spaces T.T * copy from main * Update abacus, display proper toAmount and toAmountMin * nits
2024-01-03 11:38:32 -08:00 · 2024-01-03 09:56:01 -08:00 · 2023-12-23 01:17:41 -08:00 · 2023-12-22 17:31:32 -08:00 · 2023-12-22 11:12:41 -08:00 · 2023-12-21 15:08:08 -05:00
40 changed files with 1122 additions and 1094 deletions
@@ -39,9 +39,9 @@
    "@cosmjs/proto-signing": "^0.31.0",
    "@cosmjs/stargate": "^0.31.0",
    "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^1.1.23",
+    "@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-checkbox": "^1.0.4",
@@ -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"
    }
 ]
@@ -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"
        }
    ]
 }
@@ -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]",
@@ -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/"
    }
 }
@@ -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 />} />
@@ -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> = {};
@@ -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)
    );
@@ -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',
 ];
@@ -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%
@@ -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 }),
@@ -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 }),
@@ -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
@@ -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(
@@ -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;
@@ -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');
    }
@@ -369,7 +364,8 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
      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) {
@@ -391,22 +387,20 @@ 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(
@@ -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');
    }
@@ -452,7 +443,8 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
      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) {
@@ -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(
      '',
@@ -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;
  }
@@ -146,7 +146,7 @@ const getConnectors = (walletConnectConfig: WalletConnectConfig) => [
  new CoinbaseWalletConnector({
    chains,
    options: {
-      appName: 'wagmi',
+      appName: 'dYdX',
      reloadOnDisconnect: false,
    },
  }),
@@ -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;
@@ -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`
@@ -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`
@@ -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 ? (
@@ -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`
@@ -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;
@@ -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,
@@ -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;
@@ -94,7 +94,7 @@ export const FillDetailsDialog = ({ fillId, setIsOpen }: ElementProps) => {
  return (
    <DetailsDialog
-      slotIcon={<Styled.AssetIcon symbol={asset.id} />}
+      slotIcon={<Styled.AssetIcon symbol={asset?.id} />}
      title={resources.typeStringKey && stringGetter({ key: resources.typeStringKey })}
      items={detailItems}
      setIsOpen={setIsOpen}
@@ -194,7 +194,7 @@ export const OrderDetailsDialog = ({ orderId, setIsOpen }: ElementProps) => {
  return (
    <DetailsDialog
-      slotIcon={<Styled.AssetIcon symbol={asset.id} />}
+      slotIcon={<Styled.AssetIcon symbol={asset?.id} />}
      title={!resources.typeStringKey ? '' : stringGetter({ key: resources.typeStringKey })}
      slotFooter={
        isAccountViewOnly ? null : isOrderStatusClearable(status) ? (
@@ -8,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);
  }
 `;
@@ -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) || {};
@@ -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 =
@@ -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;
@@ -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 =
@@ -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[] = [];
@@ -92,6 +85,26 @@ export const WithdrawButtonAndReceipt = ({
  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;
@@ -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()}
@@ -366,6 +366,7 @@ Styled.InlineRow = styled.div`
 Styled.AssetIcon = styled(AssetIcon)`
  ${layoutMixins.inlineRow}
  min-width: unset;
  font-size: 2.25rem;
 `;
Author	SHA1	Message	Date
Bill He	4e7527b797	remove testnet cctp chains	2024-01-03 11:38:32 -08:00
Jared Vu	29526b927f	Update deposit and withdrawal receipts (#212 ) * Update receipts * Remove duplicate const * Restore env * format * Try using raw * Use 3 spaces T.T * copy from main * Update abacus, display proper toAmount and toAmountMin * nits	2024-01-03 09:56:01 -08:00
Jared Vu	503e089efa	temp hide fees for cctp route (#213 )	2023-12-23 01:17:41 -08:00
Jared Vu	c3495f462c	Additional Withdraw/Deposit validation (#211 ) * Add cctp amount check and price impact check * 2.5% -> 2%	2023-12-22 17:31:32 -08:00
Billandjaredvu	6da6eeb2a4	Enable CCTP (#194 ) * Enable CCTP * Handle base64 encode * Update localization package --------- Co-authored-by: jaredvu <jaredvu@gmail.com>	2023-12-22 11:12:41 -08:00
mike-dydx	0cf3e81bd7	Create documentation.json (#205 )	2023-12-21 15:08:08 -05:00
aleka	f8cf1d364b	update coinbase connect app name (#208 )	2023-12-21 10:58:57 -08:00
Jared Vu	6f344c6b5d	Update comparison function in Table (#207 )	2023-12-21 10:53:56 -08:00
Jared Vu	133856afca	Export secret phrase help article (#206 ) * Update config with correct article link * Remove auto-format of json	2023-12-21 10:49:52 -08:00
Jared Vu	33c543daaf	Update bridgeFee in Withdraw/Deposit forms (#202 ) * Update Withdraw form receipt * Bump abacus 1.1.27 * pnpm-lock * bump v4-localization	2023-12-19 23:36:13 -08:00
Jared Vu	c77e727d2b	TRCL-3406: firefox mobile position table row has stretched icon (#204 ) * Fix PositionsTable assetIcon * Mobile width of HelpDialog	2023-12-19 23:33:36 -08:00
Jared Vu	b94538711d	Lazy load Pages (#203 ) * Lazy import pages * Fix import order	2023-12-19 23:30:51 -08:00
Jared Vu	b83479f45c	Handle New Markets added by Gov (#201 ) * Add celestia assets * Handle symbol not yet added	2023-12-19 23:25:14 -08:00
Jared Vu	001aad3abc	Navigate to the Markets page if the current marketId is not included in subscribed markets (#198 ) * Navigate to markets if current url is invalid * nits	2023-12-19 15:58:49 -08:00
Jared Vu	f8db5e1ba0	Update abacus to 1.1.25: Good til time fix (#199 )	2023-12-19 09:49:51 -08:00
Jared Vu	f8bec0fb3d	Update Withdraw form receipt (#200 )	2023-12-19 09:49:37 -08:00
Bill	8bf23b7e9c	bump abacus (#197 )	2023-12-15 15:12:35 -08:00