import order nit

util function for getting mintscan link
use selector for chain id instead
2024-02-15 13:14:18 -05:00 · 2024-02-15 10:38:39 -05:00 · 2024-02-15 10:13:48 -05:00 · 2024-02-14 13:58:58 -05:00 · 2024-02-14 13:55:06 -05:00 · 2024-02-14 13:38:58 -05:00
72 changed files with 277 additions and 1077 deletions
@@ -1,2 +1 @@
 node_modules/
-public/
@@ -40,9 +40,9 @@
    "@cosmjs/proto-signing": "^0.32.1",
    "@cosmjs/stargate": "^0.32.1",
    "@cosmjs/tendermint-rpc": "^0.32.1",
-    "@dydxprotocol/v4-abacus": "^1.4.6",
+    "@dydxprotocol/v4-abacus": "^1.4.5",
    "@dydxprotocol/v4-client-js": "^1.0.20",
-    "@dydxprotocol/v4-localization": "^1.1.31",
+    "@dydxprotocol/v4-localization": "^1.1.30",
    "@ethersproject/providers": "^5.7.2",
    "@js-joda/core": "^5.5.3",
    "@radix-ui/react-accordion": "^1.1.2",
@@ -26,14 +26,14 @@ dependencies:
    specifier: ^0.32.1
    version: 0.32.2
  '@dydxprotocol/v4-abacus':
-    specifier: ^1.4.6
-    version: 1.4.6
+    specifier: ^1.4.5
+    version: 1.4.5
  '@dydxprotocol/v4-client-js':
    specifier: ^1.0.20
    version: 1.0.20
  '@dydxprotocol/v4-localization':
-    specifier: ^1.1.31
-    version: 1.1.31
+    specifier: ^1.1.30
+    version: 1.1.30
  '@ethersproject/providers':
    specifier: ^5.7.2
    version: 5.7.2
@@ -1286,8 +1286,8 @@ packages:
    resolution: {integrity: sha512-Gg5t+eR7vPJMAmhkFt6CZrzPd0EKpAslWwk5rFVYZpJsM8JG5KT9XQ99hgNM3Ov6ScNoIWbXkpX27F6A9cXR4Q==}
    dev: false

-  /@dydxprotocol/v4-abacus@1.4.6:
-    resolution: {integrity: sha512-qYq+4TizcMMxYVXckn0LCucWBe5N9ZNtD1XnowCAuBUUifHSgMGvao5OeZIKMgNM/udSKOXLss4zLy6dH/G2SA==}
+  /@dydxprotocol/v4-abacus@1.4.5:
+    resolution: {integrity: sha512-LhJmpIaUkHCsSiHx+jdk+59euvGp2E+gGFelpfmOYpH1+enZgEXDQvWsgHSFEQxYP3mRiGG4uo+ZYNGdvffg7g==}
    dev: false

  /@dydxprotocol/v4-client-js@1.0.20:
@@ -1319,8 +1319,8 @@ packages:
      - utf-8-validate
    dev: false

-  /@dydxprotocol/v4-localization@1.1.31:
-    resolution: {integrity: sha512-plJVIgFAKq9/hA/gk5GgKgCQFsH3pNtDWfG/yHLDXyiGX0M0mMEi1bTNVs4podFVoHJu1nSL9YPFlpJ00FteGw==}
+  /@dydxprotocol/v4-localization@1.1.30:
+    resolution: {integrity: sha512-TZfWWRSOxcjLHs972wlJVVHkE7+DVqAUnGZSs24HYHsPtUkPhZiNXMOA2Vk9YddQxumhM79xIRH0cmJSe5DDUg==}
    dev: false

  /@dydxprotocol/v4-proto@4.0.0-dev.0:
@@ -1,22 +1,12 @@
 [
-  {
-    "chainId": "1",
-    "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-    "name": "Ethereum"
-  },
-  {
-    "chainId": "5",
-    "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
-    "name": "Ethereum Goerli"
-  },
-  {
-    "chainId": "43114",
-    "tokenAddress": "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
-    "name": "Avalanche"
-  },
-  {
-    "chainId": "10",
-    "tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
-    "name": "optimism"
-  }
-]
+    {
+        "chainId": "1",
+        "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+        "name": "Ethereum"
+    },
+    {
+        "chainId": "5",
+        "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
+        "name": "Ethereum Goerli"
+    }
+]
@@ -98,8 +98,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -127,8 +126,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-dev-2": {
@@ -184,8 +182,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -213,8 +210,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-dev-4": {
@@ -271,8 +267,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -300,8 +295,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-dev-5": {
@@ -357,8 +351,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -386,8 +379,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-staging": {
@@ -445,8 +437,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -474,8 +465,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-staging-forced-update": {
@@ -524,8 +514,7 @@
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
            "blogs": "https://www.dydx.foundation/blog",
-            "newMarketProposalLearnMore": "https://dydx.exchange/blog/new-market-proposals",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "newMarketProposalLearnMore": "https://dydx.exchange/blog/new-market-proposals"
         },
         "wallets": {
            "walletconnect": {
@@ -560,8 +549,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-staging-west": {
@@ -619,8 +607,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -648,8 +635,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-testnet": {
@@ -711,8 +697,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -740,8 +725,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-dydx": {
@@ -800,8 +784,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -829,8 +812,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-nodefleet": {
@@ -889,8 +871,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -918,8 +899,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-kingnodes": {
@@ -978,8 +958,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -1007,8 +986,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-liquify": {
@@ -1067,8 +1045,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -1096,8 +1073,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-polkachu": {
@@ -1147,8 +1123,7 @@
            "community": "https://discord.com/invite/dydx",
            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
            "blogs": "https://www.dydx.foundation/blog",
-            "newMarketProposalLearnMore": "https://dydx.exchange/blog/new-market-proposals",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "newMarketProposalLearnMore": "https://dydx.exchange/blog/new-market-proposals"
         },
         "wallets": {
            "walletconnect": {
@@ -1176,8 +1151,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-bware": {
@@ -1236,8 +1210,7 @@
            "keplrDashboard": "https://testnet.keplr.app/",
            "strideZoneApp": "https://testnet.stride.zone",
            "accountExportLearnmore": "https://help.dydx.exchange",
-            "walletLearnmore": "https://www.dydx.academy/video/defi-wallet",
-            "withdrawalGateLearnMore": "https://help.dydx.exchange"
+            "walletLearnmore": "https://www.dydx.academy/video/defi-wallet"
         },
         "wallets": {
            "walletconnect": {
@@ -1265,8 +1238,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-mainnet": {
@@ -1325,8 +1297,7 @@
            "keplrDashboard": "[HTTP link to keplr dashboard, can be null]",
            "strideZoneApp": "[HTTP link to stride zone app, can be null]",
            "accountExportLearnMore": "[HTTP link to account export learn more, can be null]",
-            "walletLearnMore": "[HTTP link to wallet learn more, can be null]",
-            "withdrawalGateLearnMore": "[HTTP link to withdrawal gate learn more, can be null]"
+            "walletLearnMore": "[HTTP link to wallet learn more, can be null]"
         },
         "wallets": {
            "walletconnect": {
@@ -1354,9 +1325,8 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": false
+            "reduceOnlySupported": false
         }
      }
   }
-}
+}
@@ -20,13 +20,6 @@
    "whitepaperLink": "https://why.cardano.org/en/introduction/motivation/",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/cardano/"
  },
-  "AGIX-USD": {
-    "name": "SingularityNET",
-    "tags": ["AI"],
-    "websiteLink": "https://public.singularitynet.io/whitepaper.pdf", 
-    "whitepaperLink": "https://public.singularitynet.io/whitepaper.pdf", 
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/singularitynet/"
-  },
  "ALGO-USD": {
    "name": "Algorand",
    "tags": ["Layer 1"],
@@ -85,7 +78,7 @@
  },
  "BLUR-USD": {
    "name": "Blur",
-    "tags": ["NFT"],
+    "tags": [],
    "websiteLink": "https://blur.io/",
    "whitepaperLink": "https://docs.blur.foundation/",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/blur-token/"
@@ -98,13 +91,6 @@
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/bnb/"

  },
-  "CHZ-USD": {
-    "name": "Chiliz",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://www.chiliz.com/", 
-    "whitepaperLink": "https://www.chiliz.com/docs/litepaper-v1.1-20230703.pdf", 
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/chiliz/"
-  },
  "CELO-USD": {
    "name": "Celo",
    "tags": [],
@@ -161,13 +147,6 @@
    "whitepaperLink": "https://cdn.enjin.io/downloads/whitepapers/enjin-coin/en.pdf/",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/enjin-coin/"
  },
-  "ENS-USD": {
-    "name": "Ethereum Name Service",
-    "tags": [],
-    "websiteLink": "https://coinmarketcap.com/currencies/ethereum-name-service/", 
-    "whitepaperLink": "https://docs.ens.domains/", 
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ethereum-name-service/"
-  },
  "EOS-USD": {
    "name": "EOS",
    "tags": ["Layer 1"],
@@ -191,13 +170,6 @@
    "displayStepSize": "0.001",
    "displayTickSize": "0.1"
  },
-  "FET-USD": {
-    "name": "Fetch.ai",
-    "tags": ["AI"],
-    "websiteLink": "https://fetch.ai/",
-    "whitepaperLink": "https://www.dropbox.com/s/gxptsecwdl3jjtn/David%20Minarsch%20-%202021-04-26%2010.34.17%20-%20paper_21_finalversion.pdf?e=1&dl=0",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/fetch/"
-  },
  "FIL-USD": {
    "name": "Filecoin",
    "tags": ["Layer 1"],
@@ -205,34 +177,6 @@
    "whitepaperLink": "https://filecoin.io/filecoin.pdf",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/filecoin/"
  },
-  "FTM-USD": {
-    "name": "Fantom",
-    "tags": [],
-    "websiteLink": "https://fantom.foundation/",
-    "whitepaperLink": "https://fantom.foundation/_next/static/media/wp_fantom_v1.6.39329cdc5d0ee59684cbc6f228516383.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/fantom/"
-  },
-  "GALA-USD": {
-    "name": "Gala",
-    "tags": ["Gaming", "Layer 1"],
-    "websiteLink": "https://gala.com/",
-    "whitepaperLink": "https://galahackathon.com/v1.0.0/pdf/sdk-documentation.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/gala/"
-  },
-  "GMT-USD": {
-    "name": "GMT",
-    "tags": ["Gaming"],
-    "websiteLink": "https://stepn.com/", 
-    "whitepaperLink/": "https://whitepaper.stepn.com/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/green-metaverse-token/"
-  },
-  "GRT-USD": {
-    "name": "The Graph",
-    "tags": [],
-    "websiteLink": "https://thegraph.com/", 
-    "whitepaperLink/": "https://github.com/graphprotocol/research/blob/master/papers/whitepaper/the-graph-whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/the-graph/"
-  },
  "HNT-USD": {
    "name": "Helium",
    "tags": ["Layer 1"],
@@ -240,13 +184,6 @@
    "whitepaperLink": "http://whitepaper.helium.com",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/helium/"
  },
-  "HBAR-USD": {
-    "name": "Hedera",
-    "tags": [],
-    "websiteLink": "https://hedera.com/", 
-    "whitepaperLink/": "https://files.hedera.com/hh_whitepaper_v2.2-20230918.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/hedera/"
-  },
  "ICP-USD": {
    "name": "Internet Computer",
    "tags": ["Layer 1"],
@@ -254,27 +191,6 @@
    "whitepaperLink": "https://dfinity.org/whitepaper.pdf",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/internet-computer/"
  },
-  "IMX-USD": {
-    "name": "Immutable X",
-    "tags": ["Gaming", "Layer 2", "NFT"],
-    "websiteLink": "https://www.immutable.com/",
-    "whitepaperLink": "https://assets.website-files.com/646557ee455c3e16e4a9bcb3/6499367de527dd82ab7475a3_Immutable%20Whitepaper%20Update%202023%20(3).pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/immutable-x/"
-  },
-  "INJ-USD": {
-    "name": "Injective",
-    "tags": ["Layer 1", "Defi"],
-    "websiteLink": "https://injective.com/",
-    "whitepaperLink": "https://docs.injective.network/intro/01_overview.html",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/injective/"
-  },
-  "JTO-USD": {
-    "name": "Jito",
-    "tags": ["Defi"],
-    "websiteLink": "https://www.jito.network/",
-    "whitepaperLink": "https://github.com/jito-foundation",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/jito/"
-  },
  "JUP-USD": {
    "name": "Jupiter",
    "tags": ["Defi"],
@@ -282,13 +198,6 @@
    "whitepaperLink": "https://station.jup.ag/blog/green-paper",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/jupiter-ag/"
  },
-  "KAVA-USD": {
-    "name": "Kava",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://www.kava.io/",
-    "whitepaperLink": "https://docsend.com/view/gwbwpc3",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/kava/"
-  },
  "LDO-USD": {
    "name": "Lido DAO",
    "tags": ["Defi"],
@@ -310,20 +219,6 @@
    "whitepaperLink": "https://litecoin.info/index.php/Main_Page",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/litecoin/"
  },
-  "MANA-USD": {
-    "name": "Decentraland",
-    "tags": ["AR/VR"],
-    "websiteLink": "https://decentraland.org/",
-    "whitepaperLink": "https://decentraland.org/whitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/decentraland/"
-  },
-  "MASK-USD": {
-    "name": "Mask Network",
-    "tags": [],
-    "websiteLink": "https://mask.io/",
-    "whitepaperLink": "https://masknetwork.medium.com/introducing-mask-network-maskbook-the-future-of-the-internet-5a973d874edd",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/mask-network/"
-  },
  "MATIC-USD": {
    "name": "Polygon",
    "tags": ["Layer 2"],
@@ -331,13 +226,6 @@
    "whitepaperLink": "https://polygon.technology/lightpaper-polygon.pdf",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/polygon/"
  },
-  "MINA-USD": {
-    "name": "Mina",
-    "tags": ["Layer 1"],
-    "websiteLink": "https://minaprotocol.com/",
-    "whitepaperLink": "https://docs.minaprotocol.com/assets/economicsWhitepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/mina/"
-  },
  "MKR-USD": {
    "name": "Maker",
    "tags": ["Governance"],
@@ -352,13 +240,6 @@
    "whitepaperLink": "https://near.org/papers/the-official-near-white-paper/",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/near-protocol/"
  },
-  "ORDI-USD": {
-    "name": "Ordinals",
-    "tags": ["NFT"],
-    "websiteLink": "https://ordinals.com/",
-    "whitepaperLink": "https://rodarmor.com/blog/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/ordi/"
-  },
  "OP-USD": {
    "name": "Optimism",
    "tags": [],
@@ -372,20 +253,6 @@
    "websiteLink": "https://www.pepe.vip/",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/pepe/"
  },
-  "PYTH-USD": {
-    "name": "Pyth Network",
-    "tags": [],
-    "websiteLink": "https://pyth.network/",
-    "whitepaperLink": "https://pyth.network/whitepaper_v2.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/pyth-network/"
-  },
-  "RNDR-USD": {
-    "name": "Render Token",
-    "tags": ["AI"],
-    "websiteLink": "https://rendernetwork.com/",
-    "whitepaperLink": "https://renderfoundation.com/whitepaper",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/render/"
-  },
  "RUNE-USD": {
    "name": "THORChain",
    "tags": ["Layer 1"],
@@ -393,13 +260,6 @@
    "whitepaperLink": "https://whitepaper.io/document/709/thorchain-whitepaper",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/thorchain/"
  },
-  "SAND-USD": {
-    "name": "The Sandbox",
-    "tags": ["Gaming"],
-    "websiteLink": "https://www.sandbox.game/en/",
-    "whitepaperLink": "https://installers.sandbox.game/The_Sandbox_Whitepaper_2020.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/the-sandbox/"
-  },
  "SEI-USD": {
    "name": "Sei",
    "tags": ["Layer 1", "Defi"],
@@ -428,13 +288,6 @@
    "whitepaperLink": "https://solana.com/solana-whitepaper.pdf",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/"
  },
-  "STX-USD": {
-    "name": "Stacks",
-    "tags": ["Layer 2"],
-    "websiteLink": "https://www.stacks.co/",
-    "whitepaperLink": "https://gaia.blockstack.org/hub/1AxyPunHHAHiEffXWESKfbvmBpGQv138Fp/stacks.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/stacks/"
-  },
  "SUI-USD": {
    "name": "Sui",
    "tags": ["Layer 1"],
@@ -484,13 +337,6 @@
    "whitepaperLink": "https://whitepaper.worldcoin.org/",
    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/worldcoin-org/"
  },
-  "WOO-USD": {
-    "name": "WOO Network",
-    "tags": ["Defi"],
-    "websiteLink": "https://woo.org/",
-    "whitepaperLink": "https://woo.org/Litepaper.pdf",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/wootrade/"
-  },
  "XLM-USD": {
    "name": "Stellar",
    "tags": ["Layer 1"],
@@ -274,7 +274,7 @@
  {
    "baseAsset": "CRV",
    "referencePrice": 0.48346754113361784,
-    "numOracles": 6,
+    "numOracles": 5,
    "liquidityTier": 2,
    "assetName": "Curve DAO Token",
    "p": -1.0,
@@ -325,7 +325,7 @@
  {
    "baseAsset": "DYM",
    "referencePrice": 5.544949130771594,
-    "numOracles": 6,
+    "numOracles": 5,
    "liquidityTier": 2,
    "assetName": "Dymension",
    "p": 0.0,
@@ -412,7 +412,7 @@
    "referencePrice": 0.5560893147613742,
    "numOracles": 6,
    "liquidityTier": 2,
-    "assetName": "Fetch.ai",
+    "assetName": "Fetch AI",
    "p": -1.0,
    "atomicResolution": -5.0,
    "minExchanges": 3,
@@ -480,7 +480,7 @@
    "referencePrice": 0.20404992804891367,
    "numOracles": 6,
    "liquidityTier": 2,
-    "assetName": "GMT",
+    "assetName": "STEPN",
    "p": -1.0,
    "atomicResolution": -5.0,
    "minExchanges": 3,
@@ -514,7 +514,7 @@
    "referencePrice": 0.07686278766140874,
    "numOracles": 6,
    "liquidityTier": 2,
-    "assetName": "Hedera",
+    "assetName": "Hedera Hashgraph",
    "p": -2.0,
    "atomicResolution": -4.0,
    "minExchanges": 3,
@@ -565,7 +565,7 @@
    "referencePrice": 33.427379051845875,
    "numOracles": 7,
    "liquidityTier": 2,
-    "assetName": "Injective",
+    "assetName": "Injective Protocol",
    "p": 1.0,
    "atomicResolution": -7.0,
    "minExchanges": 3,
@@ -597,7 +597,7 @@
  {
    "baseAsset": "JUP",
    "referencePrice": 0.4339790660244292,
-    "numOracles": 6,
+    "numOracles": 5,
    "liquidityTier": 2,
    "assetName": "Jupiter",
    "p": -1.0,
@@ -750,7 +750,7 @@
  {
    "baseAsset": "MKR",
    "referencePrice": 1943.1865605831852,
-    "numOracles": 6,
+    "numOracles": 5,
    "liquidityTier": 2,
    "assetName": "Maker",
    "p": 3.0,
@@ -869,7 +869,7 @@
  {
    "baseAsset": "RUNE",
    "referencePrice": 3.7264809096406806,
-    "numOracles": 6,
+    "numOracles": 5,
    "liquidityTier": 2,
    "assetName": "Thorchain",
    "p": 0.0,
@@ -888,7 +888,7 @@
    "referencePrice": 0.37297439115035663,
    "numOracles": 6,
    "liquidityTier": 2,
-    "assetName": "The Sandbox",
+    "assetName": "SAND",
    "p": -1.0,
    "atomicResolution": -5.0,
    "minExchanges": 3,
@@ -1073,9 +1073,9 @@
  {
    "baseAsset": "WOO",
    "referencePrice": 0.2944897275608197,
-    "numOracles": 6,
+    "numOracles": 5,
    "liquidityTier": 2,
-    "assetName": "WOO Network",
+    "assetName": "Wootrade Network",
    "p": -1.0,
    "atomicResolution": -5.0,
    "minExchanges": 3,
@@ -71,8 +71,7 @@
         "keplrDashboard": "https://testnet.keplr.app/",
         "strideZoneApp": "https://testnet.stride.zone",
         "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-         "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-         "withdrawalGateLearnMore": "https://help.dydx.exchange"
+         "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
      },
      "dydx-testnet-4": {
         "tos": "https://dydx.exchange/v4-terms",
@@ -93,8 +92,7 @@
         "keplrDashboard": "https://testnet.keplr.app/",
         "strideZoneApp": "https://testnet.stride.zone",
         "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-         "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-         "withdrawalGateLearnMore": "https://help.dydx.exchange"
+         "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
      },
      "[mainnet chain id]": {
         "tos": "[HTTP link to TOS]",
@@ -115,8 +113,7 @@
         "keplrDashboard": "[HTTP link to keplr dashboard, can be null]",
         "strideZoneApp": "[HTTP link to stride zone app, can be null]",
         "accountExportLearnMore": "[HTTP link to account export learn more, can be null]",
-         "walletLearnMore": "[HTTP link to wallet learn more, can be null]",
-         "withdrawalGateLearnMore": "[HTTP link to withdrawal gate learn more, can be null]"
+         "walletLearnMore": "[HTTP link to wallet learn more, can be null]"
      }
   },
   "wallets": {
@@ -261,8 +258,7 @@
            "faucet": "https://faucet.v4dev.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-dev-2": {
@@ -287,8 +283,7 @@
            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-dev-4": {
@@ -314,8 +309,7 @@
            "faucet": "https://faucet.v4dev4.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-dev-5": {
@@ -340,8 +334,7 @@
            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-staging": {
@@ -367,8 +360,7 @@
            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-staging-forced-update": {
@@ -401,8 +393,7 @@
            }
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-staging-west": {
@@ -428,8 +419,7 @@
            "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
         },
         "featureFlags": {
-            "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": true
         }
      },
      "dydxprotocol-testnet": {
@@ -459,8 +449,7 @@
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-dydx": {
@@ -486,8 +475,7 @@
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-nodefleet": {
@@ -513,8 +501,7 @@
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-kingnodes": {
@@ -540,8 +527,7 @@
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-liquify": {
@@ -567,8 +553,7 @@
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-polkachu": {
@@ -594,8 +579,7 @@
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-testnet-bware": {
@@ -621,8 +605,7 @@
            "faucet": "https://faucet.v4testnet.dydx.exchange"
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": true
+            "reduceOnlySupported": false
         }
      },
      "dydxprotocol-mainnet": {
@@ -648,9 +631,8 @@
            "nobleValidator": "[noble validator endpoint for mainnet]"
         },
         "featureFlags": {
-            "reduceOnlySupported": false,
-            "withdrawalSafetyEnabled": false
+            "reduceOnlySupported": false
         }
      }
   }
-}
+}
@@ -14,7 +14,7 @@ if (AMPLITUDE_API_KEY) {
    const html = await fs.readFile(htmlFilePath, 'utf-8');

    const amplitudeCdnScript = `<script type="text/javascript">
-        !function(){"use strict";!function(e,t){var n=e.amplitude||{_q:[],_iq:{}};if(n.invoked)e.console&&console.error&&console.error("Amplitude snippet has been loaded.");else{var r=function(e,t){e.prototype[t]=function(){return this._q.push({name:t,args:Array.prototype.slice.call(arguments,0)}),this}},s=function(e,t,n){return function(r){e._q.push({name:t,args:Array.prototype.slice.call(n,0),resolve:r})}},o=function(e,t,n){e[t]=function(){if(n)return{promise:new Promise(s(e,t,Array.prototype.slice.call(arguments)))}}},i=function(e){for(var t=0;t<m.length;t++)o(e,m[t],!1);for(var n=0;n<g.length;n++)o(e,g[n],!0)};n.invoked=!0;var u=t.createElement("script");u.type="text/javascript",u.integrity="sha384-BVo5ZjsjH373rWbcjz9Qjb2L6BgLwLADcZtZZPu3nMl8+7LPDhi1NcUEf0Ate41Y",u.crossOrigin="anonymous",u.async=!0,u.src="/libs/amplitude-analytics-browser-2.0.0-min.js",u.onload=function(){e.amplitude.runQueuedFunctions||console.log("[Amplitude] Error: could not load SDK")};var a=t.getElementsByTagName("script")[0];a.parentNode.insertBefore(u,a);for(var c=function(){return this._q=[],this},p=["add","append","clearAll","prepend","set","setOnce","unset","preInsert","postInsert","remove","getUserProperties"],l=0;l<p.length;l++)r(c,p[l]);n.Identify=c;for(var d=function(){return this._q=[],this},f=["getEventProperties","setProductId","setQuantity","setPrice","setRevenue","setRevenueType","setEventProperties"],v=0;v<f.length;v++)r(d,f[v]);n.Revenue=d;var m=["getDeviceId","setDeviceId","getSessionId","setSessionId","getUserId","setUserId","setOptOut","setTransport","reset","extendSession"],g=["init","add","remove","track","logEvent","identify","groupIdentify","setGroup","revenue","flush"];i(n),n.createInstance=function(e){return n._iq[e]={_q:[]},i(n._iq[e]),n._iq[e]},e.amplitude=n}}(window,document)}();
+        !function(){"use strict";!function(e,t){var n=e.amplitude||{_q:[],_iq:{}};if(n.invoked)e.console&&console.error&&console.error("Amplitude snippet has been loaded.");else{var r=function(e,t){e.prototype[t]=function(){return this._q.push({name:t,args:Array.prototype.slice.call(arguments,0)}),this}},s=function(e,t,n){return function(r){e._q.push({name:t,args:Array.prototype.slice.call(n,0),resolve:r})}},o=function(e,t,n){e[t]=function(){if(n)return{promise:new Promise(s(e,t,Array.prototype.slice.call(arguments)))}}},i=function(e){for(var t=0;t<m.length;t++)o(e,m[t],!1);for(var n=0;n<g.length;n++)o(e,g[n],!0)};n.invoked=!0;var u=t.createElement("script");u.type="text/javascript",u.integrity="sha384-x0ik2D45ZDEEEpYpEuDpmj05fY91P7EOZkgdKmq4dKL/ZAVcufJ+nULFtGn0HIZE",u.crossOrigin="anonymous",u.async=!0,u.src="https://cdn.amplitude.com/libs/analytics-browser-2.0.0-min.js.gz",u.onload=function(){e.amplitude.runQueuedFunctions||console.log("[Amplitude] Error: could not load SDK")};var a=t.getElementsByTagName("script")[0];a.parentNode.insertBefore(u,a);for(var c=function(){return this._q=[],this},p=["add","append","clearAll","prepend","set","setOnce","unset","preInsert","postInsert","remove","getUserProperties"],l=0;l<p.length;l++)r(c,p[l]);n.Identify=c;for(var d=function(){return this._q=[],this},f=["getEventProperties","setProductId","setQuantity","setPrice","setRevenue","setRevenueType","setEventProperties"],v=0;v<f.length;v++)r(d,f[v]);n.Revenue=d;var m=["getDeviceId","setDeviceId","getSessionId","setSessionId","getUserId","setUserId","setOptOut","setTransport","reset","extendSession"],g=["init","add","remove","track","logEvent","identify","groupIdentify","setGroup","revenue","flush"];i(n),n.createInstance=function(e){return n._iq[e]={_q:[]},i(n._iq[e]),n._iq[e]},e.amplitude=n}}(window,document)}();
        </script>
        `;

@@ -8,7 +8,6 @@ const assetIcons = {
  '1INCH': '/currencies/1inch.png',
  AAVE: '/currencies/aave.png',
  ADA: '/currencies/ada.png',
-  AGIX: '/currencies/agix.png',
  ALGO: '/currencies/algo.png',
  APE: '/currencies/ape.png',
  APT: '/currencies/apt.png',
@@ -21,7 +20,6 @@ const assetIcons = {
  BONK: '/currencies/bonk.png',
  BTC: '/currencies/btc.png',
  CELO: '/currencies/celo.png',
-  CHZ: '/currencies/chz.png',
  COMP: '/currencies/comp.png',
  CRV: '/currencies/crv.png',
  DAI: '/currencies/dai.png',
@@ -30,44 +28,25 @@ const assetIcons = {
  DYDX: '/currencies/dydx.png',
  DYM: '/currencies/dym.png',
  ENJ: '/currencies/enj.png',
-  ENS: '/currencies/ens.png', 
  EOS: '/currencies/eos.png',
  ETC: '/currencies/etc.png',
  ETH: '/currencies/eth.png',
-  FET: '/currencies/fet.png',
  FIL: '/currencies/fil.png',
-  FTM: '/currencies/ftm.png',
-  GALA: "/currencies/gala.png",
-  GMT: "/currencies/gmt.png",
-  GRT: "/currencies/grt.png",
-  HBAR: "/currencies/hbar.png",
  ICP: '/currencies/icp.png',
-  IMX: '/currencies/imx.png',
-  INJ: '/currencies/inj.png',
-  JTO: '/currencies/jto.png',
  JUP: '/currencies/jup.png',
-  KAVA: '/currencies/kava.png',
  LDO: '/currencies/ldo.png',
  LINK: '/currencies/link.png',
  LTC: '/currencies/ltc.png',
-  MANA: '/currencies/mana.png',
  MATIC: '/currencies/matic.png',
-  MASK: '/currencies/mask.png',
-  MINA: '/currencies/mina.png',
  MKR: '/currencies/mkr.png',
  NEAR: '/currencies/near.png',
-  ORDI: "/currencies/ordi.png",
  OP: '/currencies/op.png',
  PEPE: '/currencies/pepe.png',
-  PYTH: '/currencies/pyth.png',
-  RNDR: '/currencies/rndr.png',
  RUNE: '/currencies/rune.png',
-  SAND: '/currencies/sand.png',
  SEI: '/currencies/sei.png',
  SHIB: '/currencies/shib.png',
  SNX: '/currencies/snx.png',
  SOL: '/currencies/sol.png',
-  STX: '/currencies/stx.png',
  SUI: '/currencies/sui.png',
  SUSHI: '/currencies/sushi.png',
  TIA: '/currencies/tia.png',
@@ -78,7 +57,6 @@ const assetIcons = {
  USDT: '/currencies/usdt.png',
  WBTC: '/currencies/wbtc.png',
  WETH: '/currencies/weth.png',
-  WOO: '/currencies/woo.png',
  WLD: '/currencies/wld.png',
  XLM: '/currencies/xlm.png',
  XMR: '/currencies/xmr.png',
@@ -7,12 +7,7 @@ type ElementProps = {
  onClick?: () => void;
 };

-type StyleProps = {
-  className?: string;
-};
-
 export const BackButton = ({
-  className,
  onClick = () => {
    // @ts-ignore
    const navigation = globalThis.navigation;
@@ -26,9 +21,8 @@ export const BackButton = ({
      navigation.navigate('/', { replace: true });
    }
  },
-}: ElementProps & StyleProps) => (
+}: ElementProps) => (
  <IconButton
-    className={className}
    onClick={onClick}
    iconName={IconName.ChevronLeft}
    size={ButtonSize.Small}
@@ -47,7 +47,6 @@ type StyleProps = {
  hasHeaderBorder?: boolean;
  children?: React.ReactNode;
  className?: string;
-  stacked?: boolean;
  withAnimation?: boolean;
 };

@@ -82,7 +81,6 @@ export const Dialog = ({
  slotTrigger,
  slotHeaderInner,
  slotFooter,
-  stacked,
  withClose = true,
  placement = DialogPlacement.Default,
  portalContainer,
@@ -111,48 +109,27 @@ export const Dialog = ({
              e.preventDefault();
            }
          }}
-          $stacked={stacked}
          $withAnimation={withAnimation}
        >
-          {stacked ? (
-            <Styled.StackedHeaderTopRow $withBorder={hasHeaderBorder}>
-              {onBack && <Styled.BackButton onClick={onBack} />}
+          <Styled.Header $withBorder={hasHeaderBorder}>
+            <Styled.HeaderTopRow>
+              {onBack && <BackButton onClick={onBack} />}

-              {slotIcon}
-
-              {!preventClose && withClose && (
-                <Styled.Close ref={closeButtonRef} $absolute={stacked}>
-                  <Icon iconName={IconName.Close} />
-                </Styled.Close>
-              )}
+              {slotIcon && <Styled.Icon>{slotIcon}</Styled.Icon>}

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

-              {description && <Styled.Description>{description}</Styled.Description>}
+              {!preventClose && withClose && (
+                <Styled.Close ref={closeButtonRef}>
+                  <Icon iconName={IconName.Close} />
+                </Styled.Close>
+              )}
+            </Styled.HeaderTopRow>

-              {slotHeaderInner}
-            </Styled.StackedHeaderTopRow>
-          ) : (
-            <Styled.Header $withBorder={hasHeaderBorder}>
-              <Styled.HeaderTopRow>
-                {onBack && <BackButton onClick={onBack} />}
+            {description && <Styled.Description>{description}</Styled.Description>}

-                {slotIcon && <Styled.Icon>{slotIcon}</Styled.Icon>}
-
-                {title && <Styled.Title>{title}</Styled.Title>}
-
-                {!preventClose && withClose && (
-                  <Styled.Close ref={closeButtonRef}>
-                    <Icon iconName={IconName.Close} />
-                  </Styled.Close>
-                )}
-              </Styled.HeaderTopRow>
-
-              {description && <Styled.Description>{description}</Styled.Description>}
-
-              {slotHeaderInner}
-            </Styled.Header>
-          )}
+            {slotHeaderInner}
+          </Styled.Header>

          <Styled.Content>{children}</Styled.Content>

@@ -196,11 +173,7 @@ Styled.Overlay = styled(Overlay)`
  }
 `;

-Styled.Container = styled(Content)<{
-  placement: DialogPlacement;
-  $stacked?: boolean;
-  $withAnimation?: boolean;
-}>`
+Styled.Container = styled(Content)<{ placement: DialogPlacement; $withAnimation?: boolean }>`
  /* Params */
  --dialog-inset: 1rem;
  --dialog-width: 30rem;
@@ -380,13 +353,6 @@ Styled.Container = styled(Content)<{
        bottom: 0;
      `,
    }[placement])}
-
-  ${({ $stacked }) =>
-    $stacked &&
-    css`
-      justify-content: center;
-      text-align: center;
-    `}
 `;

 Styled.Header = styled.header<{ $withBorder: boolean }>`
@@ -413,21 +379,9 @@ Styled.HeaderTopRow = styled.div`
  gap: var(--dialog-title-gap);
 `;

-Styled.StackedHeaderTopRow = styled.div<{ $withBorder: boolean }>`
-  ${layoutMixins.flexColumn}
-  align-items: center;
-  justify-content: center;
-  padding: var(--dialog-header-paddingTop) var(--dialog-header-paddingLeft)
-    var(--dialog-header-paddingBottom) var(--dialog-header-paddingRight);
-  border-top-left-radius: inherit;
-  border-top-right-radius: inherit;
-
-  ${({ $withBorder }) =>
-    $withBorder &&
-    css`
-      ${layoutMixins.withOuterBorder};
-      background: var(--dialog-backgroundColor);
-    `};
+Styled.HeaderTopRow = styled.div`
+  ${layoutMixins.row}
+  gap: var(--dialog-title-gap);
 `;

 Styled.Content = styled.div`
@@ -458,7 +412,7 @@ Styled.Icon = styled.div`
  line-height: 1;
 `;

-Styled.Close = styled(Close)<{ $absolute?: boolean }>`
+Styled.Close = styled(Close)`
  width: 0.7813rem;
  height: 0.7813rem;

@@ -484,14 +438,6 @@ Styled.Close = styled(Close)<{ $absolute?: boolean }>`
    color: var(--color-text-2);
  }

-  ${({ $absolute }) =>
-    $absolute &&
-    css`
-      position: absolute;
-      right: var(--dialog-header-paddingRight);
-      top: var(--dialog-header-paddingTop);
-    `}
-
  @media ${breakpoints.tablet} {
    width: 1rem;
    height: 1rem;
@@ -499,12 +445,6 @@ Styled.Close = styled(Close)<{ $absolute?: boolean }>`
  }
 `;

-Styled.BackButton = styled(BackButton)`
-  position: absolute;
-  left: var(--dialog-header-paddingLeft);
-  top: var(--dialog-header-paddingTop);
-`;
-
 Styled.Title = styled(Title)`
  flex: 1;

@@ -39,7 +39,7 @@ export const SearchSelectMenu = ({
  disabled,
  label,
  items,
-  withSearch = true,
+  withSearch,
  withReceiptItems,
 }: SearchSelectMenuProps) => {
  const [open, setOpen] = useState(false);
@@ -77,7 +77,6 @@ export const SearchSelectMenu = ({
            withSearch={withSearch}
            onItemSelected={() => setOpen(false)}
            withStickyLayout
-            $withSearch={withSearch}
          />
        </Styled.Popover>
      </Styled.WithDetailsReceipt>
@@ -128,7 +127,7 @@ Styled.Popover = styled(Popover)`
  box-shadow: none;
 `;

-Styled.ComboboxMenu = styled(ComboboxMenu)<{ $withSearch?: boolean }>`
+Styled.ComboboxMenu = styled(ComboboxMenu)`
  ${layoutMixins.withInnerHorizontalBorders}

  --comboboxMenu-backgroundColor: var(--color-layer-4);
@@ -141,8 +140,7 @@ Styled.ComboboxMenu = styled(ComboboxMenu)<{ $withSearch?: boolean }>`
  --comboboxMenu-item-checked-textColor: var(--color-text-2);
  --comboboxMenu-item-highlighted-textColor: var(--color-text-2);

-  --stickyArea1-topHeight: ${({ $withSearch }) =>
-    !$withSearch ? '0' : 'var(--form-input-height)'};
+  --stickyArea1-topHeight: var(--form-input-height);

  input:focus-visible {
    outline: none;
@@ -33,9 +33,4 @@ TagStory.argTypes = {
    control: { type: 'select' },
    defaultValue: undefined,
  },
-  isHighlighted: {
-    options: [true, false],
-    control: { type: 'select' },
-    defaultValue: false,
-  },
 };
@@ -76,6 +76,5 @@ export const Tag = styled.span<StyleProps>`
    isHighlighted &&
    css`
      background-color: var(--color-accent);
-      color: var(--color-text-button);
    `}
 `;
@@ -1,4 +1,4 @@
-import { type ReactNode, useState, useEffect } from 'react';
+import { type ReactNode, useState } from 'react';

 import { ButtonAction, ButtonState } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
@@ -8,7 +8,6 @@ import { Button, type ButtonStateConfig, type ButtonProps } from '@/components/B

 type ElementProps = {
  timeoutInSeconds: number;
-  onTimeOut?: () => void;
  slotFinal?: ReactNode;
 } & ButtonProps;

@@ -17,7 +16,6 @@ export type TimeoutButtonProps = ElementProps;
 export const TimeoutButton = ({
  children,
  timeoutInSeconds,
-  onTimeOut,
  slotFinal,
  ...otherProps
 }: TimeoutButtonProps) => {
@@ -27,11 +25,6 @@ export const TimeoutButton = ({

  const secondsLeft = Math.max(0, (timeoutDeadline - now) / 1000);

-  useEffect(() => {
-    if (secondsLeft > 0) return;
-    onTimeOut?.();
-  }, [secondsLeft]);
-
  if (slotFinal && secondsLeft <= 0) return slotFinal;

  return (
@@ -144,17 +144,9 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
        validatorUrl: string;
      }
    : T extends AnalyticsEvent.TransferDeposit
-    ? {
-        chainId?: string;
-        tokenAddress?: string;
-        tokenSymbol?: string;
-      }
+    ? {}
    : T extends AnalyticsEvent.TransferWithdraw
-    ? {
-        chainId?: string;
-        tokenAddress?: string;
-        tokenSymbol?: string;
-      }
+    ? {}
    : // Trading
    T extends AnalyticsEvent.TradeOrderTypeSelected
    ? {
@@ -9,11 +9,8 @@ export enum DialogTypes {
  FillDetails = 'FillDetails',
  Help = 'Help',
  ExternalNavKeplr = 'ExternalNavKeplr',
-  ManageFunds = 'ManageFunds',
  MnemonicExport = 'MnemonicExport',
  MobileSignIn = 'MobileSignIn',
-  NewMarketAgreement = 'NewMarketAgreement',
-  NewMarketMessageDetails = 'NewMarketMessageDetails',
  Onboarding = 'Onboarding',
  OrderDetails = 'OrderDetails',
  Preferences = 'Preferences',
@@ -23,7 +20,9 @@ export enum DialogTypes {
  Trade = 'Trade',
  Transfer = 'Transfer',
  Withdraw = 'Withdraw',
-  WithdrawalGated = 'WithdrawalGated',
+  ManageFunds = 'ManageFunds',
+  NewMarketMessageDetails = 'NewMarketMessageDetails',
+  NewMarketAgreement = 'NewMarketAgreement',
 }

 export enum TradeBoxDialogTypes {
@@ -140,7 +140,6 @@ export type TransferNotifcation = {
  isCctp?: boolean;
  errorCount?: number;
  status?: StatusResponse;
-  isExchange?: boolean;
 };

 /**
@@ -22,5 +22,4 @@ export enum NumberSign {

 // Deposit/Withdraw
 export const MAX_CCTP_TRANSFER_AMOUNT = 1_000_000;
-export const MIN_CCTP_TRANSFER_AMOUNT = 10;
 export const MAX_PRICE_IMPACT = 0.02; // 2%
@@ -7,7 +7,6 @@ import { useDebounce } from './useDebounce';
 import { useInterval } from './useInterval';
 import { useDocumentTitle } from './useDocumentTitle';
 import { useDydxClient } from './useDydxClient';
-import { useEnvFeatures } from './useEnvFeatures';
 import { useGovernanceVariables } from './useGovernanceVariables';
 import { useAccountBalance } from './useAccountBalance';
 import { useAccounts } from './useAccounts';
@@ -27,7 +26,6 @@ import { useStringGetter } from './useStringGetter';
 import { useSubaccount } from './useSubaccount';
 import { useTradeFormInputs } from './useTradeFormInputs';
 import { useURLConfigs } from './useURLConfigs';
-import { useWithdrawalInfo } from './useWithdrawalInfo';

 export {
  useApiState,
@@ -38,7 +36,6 @@ export {
  useDebounce,
  useDocumentTitle,
  useDydxClient,
-  useEnvFeatures,
  useGovernanceVariables,
  useAccountBalance,
  useAccounts,
@@ -59,5 +56,4 @@ export {
  useSubaccount,
  useTradeFormInputs,
  useURLConfigs,
-  useWithdrawalInfo,
 };
@@ -27,26 +27,19 @@ export const useChartMarketAndResolution = ({
  const dispatch = useDispatch();

  const currentMarketId: string = useSelector(getCurrentMarketId) || DEFAULT_MARKETID;
-
  const selectedResolution: string =
    useSelector(getSelectedResolutionForMarket(currentMarketId)) || DEFAULT_RESOLUTION;

  const chart = isWidgetReady ? tvWidget?.chart() : undefined;
  const chartResolution = chart?.resolution?.();

-  /**
-   * @description Hook to handle changing markets - intentionally should avoid triggering on change of resolutions.
-   */
  useEffect(() => {
    if (currentMarketId && isWidgetReady) {
      const resolution = savedResolution || selectedResolution;
      tvWidget?.setSymbol(currentMarketId, resolution as ResolutionString, () => {});
    }
-  }, [currentMarketId, isWidgetReady]);
+  }, [currentMarketId, isWidgetReady, savedResolution, selectedResolution]);

-  /**
-   * @description Hook to handle changing chart resolution
-   */
  useEffect(() => {
    if (chartResolution) {
      if (chartResolution !== selectedResolution) {
@@ -251,17 +251,6 @@ const useDydxClientContext = () => {
    [compositeClient]
  );

-  const getWithdrawalAndTransferGatingStatus = useCallback(async () => {
-    return await compositeClient?.validatorClient.get.GetWithdrawalAndTransferGatingStatus();
-  }, [compositeClient]);
-
-  const getWithdrawalCapacityByDenom = useCallback(
-    async ({ denom }: { denom: string }) => {
-      return await compositeClient?.validatorClient.get.getWithdrawalCapacityByDenom(denom);
-    },
-    [compositeClient]
-  );
-
  return {
    // Client initialization
    connect: setNetworkConfig,
@@ -278,7 +267,5 @@ const useDydxClientContext = () => {
    requestAllGovernanceProposals,
    getCandlesForDatafeed,
    screenAddresses,
-    getWithdrawalAndTransferGatingStatus,
-    getWithdrawalCapacityByDenom,
  };
 };
@@ -1,15 +0,0 @@
-import { useSelector } from 'react-redux';
-
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
-
-import { getSelectedNetwork } from '@/state/appSelectors';
-
-export interface EnvironmentFeatures {
-  reduceOnlySupported: boolean;
-  withdrawalSafetyEnabled: boolean;
-}
-
-export const useEnvFeatures = (): EnvironmentFeatures => {
-  const selectedNetwork = useSelector(getSelectedNetwork);
-  return ENVIRONMENT_CONFIG_MAP[selectedNetwork].featureFlags;
-};
@@ -82,30 +82,24 @@ const useLocalNotificationsContext = () => {
              isCctp,
              errorCount,
              status: currentStatus,
-              isExchange,
            } = transferNotification;

-            const hasErrors =
-              // @ts-ignore status.errors is not in the type definition but can be returned
-              // also error can some time come back as an empty object so we need to ignore for that
-              !!currentStatus?.errors ||
-              (currentStatus?.error && Object.keys(currentStatus.error).length !== 0);
+            // @ts-ignore status.errors is not in the type definition but can be returned
+            // also error can some time come back as an empty object so we need to ignore for that
+            const hasErrors = !!currentStatus?.errors || 
+                 (currentStatus?.error && Object.keys(currentStatus.error).length !== 0);

            if (
-              !isExchange &&
              !hasErrors &&
              (!currentStatus?.squidTransactionStatus ||
                currentStatus?.squidTransactionStatus === 'ongoing')
            ) {
              try {
-                const status = await fetchSquidStatus(
-                  {
-                    transactionId: txHash,
-                    toChainId,
-                    fromChainId,
-                  },
-                  isCctp
-                );
+                const status = await fetchSquidStatus({
+                  transactionId: txHash,
+                  toChainId,
+                  fromChainId,
+                }, isCctp);

                if (status) {
                  transferNotification.status = status;
@@ -179,9 +179,8 @@ export const notificationTypes: NotificationTypeConfig[] = [

      useEffect(() => {
        for (const transfer of transferNotifications) {
-          const { fromChainId, status, txHash, toAmount, type, isExchange } = transfer;
-          const isFinished =
-            (Boolean(status) && status?.squidTransactionStatus !== 'ongoing') || isExchange;
+          const { fromChainId, status, txHash, toAmount, type } = transfer;
+          const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
          const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />;

          const transferType =
@@ -27,7 +27,6 @@ export interface LinksConfigs {
  strideZoneApp?: string;
  accountExportLearnMore?: string;
  walletLearnMore?: string;
-  withdrawalGateLearnMore?: string;
 }

 export const useURLConfigs = (): LinksConfigs => {
@@ -55,6 +54,5 @@ export const useURLConfigs = (): LinksConfigs => {
    strideZoneApp: linksConfigs.strideZoneApp || FALLBACK_URL,
    accountExportLearnMore: linksConfigs.accountExportLearnMore || FALLBACK_URL,
    walletLearnMore: linksConfigs.walletLearnMore || FALLBACK_URL,
-    withdrawalGateLearnMore: linksConfigs.withdrawalGateLearnMore || FALLBACK_URL,
  };
 };
@@ -1,131 +0,0 @@
-import { useEffect, useMemo } from 'react';
-import { useQuery } from 'react-query';
-import BigNumber from 'bignumber.js';
-import { encodeJson } from '@dydxprotocol/v4-client-js';
-import { ByteArrayEncoding } from '@dydxprotocol/v4-client-js/build/src/lib/helpers';
-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-
-import { DialogTypes } from '@/constants/dialogs';
-import { isMainnet } from '@/constants/networks';
-import { useEnvFeatures } from './useEnvFeatures';
-
-import { getApiState } from '@/state/appSelectors';
-import { closeDialog, openDialog } from '@/state/dialogs';
-import { getSelectedLocale } from '@/state/localizationSelectors';
-
-import { formatRelativeTime } from '@/lib/dateTime';
-import { BIG_NUMBERS, MustBigNumber } from '@/lib/numbers';
-import { log } from '@/lib/telemetry';
-
-import { useDydxClient } from './useDydxClient';
-import { useTokenConfigs } from './useTokenConfigs';
-
-const BLOCK_TIME = isMainnet ? 1_000 : 1_500;
-
-export const useWithdrawalInfo = ({
-  transferType,
-}: {
-  transferType: 'withdrawal' | 'transfer';
-}) => {
-  const { getWithdrawalAndTransferGatingStatus, getWithdrawalCapacityByDenom } = useDydxClient();
-  const { usdcDenom, usdcDecimals } = useTokenConfigs();
-  const apiState = useSelector(getApiState, shallowEqual);
-  const { height } = apiState || {};
-  const selectedLocale = useSelector(getSelectedLocale);
-  const dispatch = useDispatch();
-  const { withdrawalSafetyEnabled } = useEnvFeatures();
-
-  const { data: usdcWithdrawalCapacity } = useQuery({
-    enabled: withdrawalSafetyEnabled,
-    queryKey: 'usdcWithdrawalCapacity',
-    queryFn: async () => {
-      try {
-        const response = await getWithdrawalCapacityByDenom({ denom: usdcDenom });
-        return JSON.parse(encodeJson(response, ByteArrayEncoding.BIGINT));
-      } catch (error) {
-        log('useWithdrawalInfo/getWithdrawalCapacityByDenom', error);
-      }
-    },
-    refetchInterval: 60_000,
-    staleTime: 60_000,
-  });
-
-  const { data: withdrawalAndTransferGatingStatus } = useQuery({
-    enabled: withdrawalSafetyEnabled,
-    queryKey: 'withdrawalTransferGateStatus',
-    queryFn: async () => {
-      try {
-        return await getWithdrawalAndTransferGatingStatus();
-      } catch (error) {
-        log('useWithdrawalInfo/getWithdrawalAndTransferGatingStatus', error);
-      }
-    },
-    refetchInterval: 60_000,
-    staleTime: 60_000,
-  });
-
-  const capacity = useMemo(() => {
-    const capacityList = usdcWithdrawalCapacity?.limiterCapacityList;
-    if (!capacityList || capacityList.length < 2) {
-      if (!withdrawalSafetyEnabled) {
-        return BigNumber(Infinity);
-      }
-
-      return BIG_NUMBERS.ZERO;
-    }
-
-    const [{ capacity: daily }, { capacity: weekly }] = capacityList;
-    const dailyBN = MustBigNumber(daily);
-    const weeklyBN = MustBigNumber(weekly);
-    return BigNumber.minimum(dailyBN, weeklyBN).div(10 ** usdcDecimals);
-  }, [usdcDecimals, usdcWithdrawalCapacity]);
-
-  const withdrawalAndTransferGatingStatusValue = useMemo(() => {
-    const { withdrawalsAndTransfersUnblockedAtBlock } = withdrawalAndTransferGatingStatus ?? {};
-    if (
-      height &&
-      withdrawalsAndTransfersUnblockedAtBlock &&
-      height < withdrawalsAndTransfersUnblockedAtBlock &&
-      withdrawalSafetyEnabled
-    ) {
-      return {
-        estimatedUnblockTime: formatRelativeTime(
-          Date.now() + (withdrawalsAndTransfersUnblockedAtBlock - height) * BLOCK_TIME,
-          {
-            locale: selectedLocale,
-            largestUnit: 'day',
-          }
-        ),
-        isGated: true,
-      };
-    }
-    return {
-      estimatedUnblockTime: null,
-      isGated: false,
-    };
-  }, [height, withdrawalAndTransferGatingStatus, withdrawalSafetyEnabled]);
-
-  useEffect(() => {
-    if (
-      withdrawalAndTransferGatingStatusValue.isGated &&
-      withdrawalAndTransferGatingStatusValue.estimatedUnblockTime &&
-      withdrawalSafetyEnabled
-    ) {
-      dispatch(closeDialog());
-      dispatch(
-        openDialog({
-          type: DialogTypes.WithdrawalGated,
-          dialogProps: {
-            transferType,
-            estimatedUnblockTime: withdrawalAndTransferGatingStatusValue.estimatedUnblockTime,
-          },
-        })
-      );
-    }
-  }, [transferType, withdrawalAndTransferGatingStatusValue.isGated, withdrawalSafetyEnabled]);
-
-  return {
-    usdcWithdrawalCapacity: capacity,
-    withdrawalAndTransferGatingStatus,
-  };
-};
@@ -11,27 +11,26 @@ import { DepositDialog } from '@/views/dialogs/DepositDialog';
 import { DisconnectDialog } from '@/views/dialogs/DisconnectDialog';
 import { DisplaySettingsDialog } from '@/views/dialogs/DisplaySettingsDialog';
 import { ExchangeOfflineDialog } from '@/views/dialogs/ExchangeOfflineDialog';
-import { ExternalNavStrideDialog } from '@/views/dialogs/ExternalNavStrideDialog';
 import { HelpDialog } from '@/views/dialogs/HelpDialog';
 import { ExternalLinkDialog } from '@/views/dialogs/ExternalLinkDialog';
 import { ExternalNavKeplrDialog } from '@/views/dialogs/ExternalNavKeplrDialog';
-import { ManageFundsDialog } from '@/views/dialogs/ManageFundsDialog';
 import { MnemonicExportDialog } from '@/views/dialogs/MnemonicExportDialog';
 import { MobileSignInDialog } from '@/views/dialogs/MobileSignInDialog';
-import { NewMarketAgreementDialog } from '@/views/dialogs/NewMarketAgreementDialog';
-import { NewMarketMessageDetailsDialog } from '@/views/dialogs/NewMarketMessageDetailsDialog';
 import { OnboardingDialog } from '@/views/dialogs/OnboardingDialog';
 import { PreferencesDialog } from '@/views/dialogs/PreferencesDialog';
 import { RateLimitDialog } from '@/views/dialogs/RateLimitDialog';
 import { RestrictedGeoDialog } from '@/views/dialogs/RestrictedGeoDialog';
-import { RestrictedWalletDialog } from '@/views/dialogs/RestrictedWalletDialog';
 import { TradeDialog } from '@/views/dialogs/TradeDialog';
 import { TransferDialog } from '@/views/dialogs/TransferDialog';
+import { RestrictedWalletDialog } from '@/views/dialogs/RestrictedWalletDialog';
 import { WithdrawDialog } from '@/views/dialogs/WithdrawDialog';
-import { WithdrawalGateDialog } from '@/views/dialogs/WithdrawalGateDialog';
+import { ManageFundsDialog } from '@/views/dialogs/ManageFundsDialog';

 import { OrderDetailsDialog } from '@/views/dialogs/DetailsDialog/OrderDetailsDialog';
 import { FillDetailsDialog } from '@/views/dialogs/DetailsDialog/FillDetailsDialog';
+import { NewMarketMessageDetailsDialog } from '@/views/dialogs/NewMarketMessageDetailsDialog';
+import { NewMarketAgreementDialog } from '@/views/dialogs/NewMarketAgreementDialog';
+import { ExternalNavStrideDialog } from '@/views/dialogs/ExternalNavStrideDialog';

 export const DialogManager = () => {
  const dispatch = useDispatch();
@@ -73,7 +72,6 @@ export const DialogManager = () => {
    [DialogTypes.Trade]: <TradeDialog {...modalProps} />,
    [DialogTypes.Transfer]: <TransferDialog {...modalProps} />,
    [DialogTypes.Withdraw]: <WithdrawDialog {...modalProps} />,
-    [DialogTypes.WithdrawalGated]: <WithdrawalGateDialog {...modalProps} />,
    [DialogTypes.ManageFunds]: <ManageFundsDialog {...modalProps} />,
    [DialogTypes.NewMarketMessageDetails]: <NewMarketMessageDetailsDialog {...modalProps} />,
    [DialogTypes.NewMarketAgreement]: <NewMarketAgreementDialog {...modalProps} />,
@@ -34,7 +34,7 @@ import {
 import { DEFAULT_TRANSACTION_MEMO } from '@/constants/analytics';
 import { DialogTypes } from '@/constants/dialogs';
 import { UNCOMMITTED_ORDER_TIMEOUT_MS } from '@/constants/trade';
-import { DydxChainId, isTestnet } from '@/constants/networks';
+import { DydxNetwork, isTestnet } from '@/constants/networks';

 import { RootStore } from '@/state/_store';
 import { addUncommittedOrderClientId, removeUncommittedOrderClientId } from '@/state/account';
@@ -44,10 +44,7 @@ import { StatefulOrderError } from '../errors';
 import { bytesToBigInt } from '../numbers';
 import { log } from '../telemetry';
 import { hashFromTx, getMintscanTxLink } from '../txUtils';
-
-(BigInt.prototype as any).toJSON = function () {
-  return this.toString();
-};
+import { getDydxChainIdFromNetwork } from '../network';

 class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
  private compositeClient: CompositeClient | undefined;
@@ -242,7 +239,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {

      if (isTestnet) {
        console.log(
-          getMintscanTxLink(this.compositeClient.network.getString() as DydxChainId, hash)
+          getMintscanTxLink(
+            getDydxChainIdFromNetwork(this.compositeClient.network.getString() as DydxNetwork),
+            hash
+          )
        );
      } else console.log(`txHash: ${hash}`);

@@ -538,6 +538,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
          const result = await this.cctpWithdraw(params);
          callback(result);
          break;
+          break;
        }
        default: {
          break;
@@ -25,22 +25,3 @@ export function convertBech32Address({
 }): string {
  return toBech32(bech32Prefix, fromHex(toHex(fromBech32(address).data)));
 }
-
-/**
- * Validates a Cosmos address with a specific prefix.
- * @param {string} address The Cosmos address to validate.
- * @param {string} prefix The expected prefix for the address.
- * @returns {boolean} True if the address is valid and matches the prefix, false otherwise.
- */
-export function validateCosmosAddress(address: string, prefix: string) {
-  try {
-    // Decode the address to verify its structure and prefix
-    const { prefix: decodedPrefix } = fromBech32(address);
-
-    // Check if the decoded address has the expected prefix
-    return decodedPrefix === prefix;
-  } catch (error) {
-    // If decoding fails, the address is not valid
-    return false;
-  }
-}
@@ -1,4 +1,8 @@
 import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP, type DydxChainId } from '@/constants/networks';

 export const validateAgainstAvailableEnvironments = (value: DydxNetwork) =>
-  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
+  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
+
+export const getDydxChainIdFromNetwork = (network: DydxNetwork) => {
+  return ENVIRONMENT_CONFIG_MAP[network].dydxChainId as DydxChainId;
+};
@@ -31,13 +31,13 @@ export const fetchSquidStatus = async (

  const response = await fetch(url, {
    headers: {
-      'x-integrator-id': integratorId || 'dYdX-api',
+      "x-integrator-id": integratorId || 'dYdX-api'
    },
  });

  if (!response.ok) {
    const error = await response.json();
-    throw error;
+    throw new Error(error);
  }

  return response.json();
@@ -45,4 +45,4 @@ export const fetchSquidStatus = async (

 export const getNobleChainId = () => {
  return isMainnet ? 'noble-1' : 'grand-1';
-};
+}
@@ -19,17 +19,13 @@ class TestFlags {
    return !!this.queryParams.displayinitializingmarkets;
  }

-  get addressOverride(): string {
+  get addressOverride():string {
    return this.queryParams.address;
  }
-
+  
  get showTradingRewards() {
    return !!this.queryParams.tradingrewards;
  }
-
-  get showCexWithdrawal() {
-    return !!this.queryParams.cexwithdrawal;
-  }
 }

 export const testFlags = new TestFlags();
@@ -26,6 +26,8 @@ import { openDialog } from '@/state/dialogs';

 import { log } from '@/lib/telemetry';

+const SEASON_NUMBER = 2;
+
 export const LaunchIncentivesPanel = ({ className }: { className?: string }) => {
  const { isNotTablet } = useBreakpoints();
  const dispatch = useDispatch();
@@ -72,38 +74,14 @@ const EstimatedRewards = () => {
  const stringGetter = useStringGetter();
  const { dydxAddress } = useAccounts();

-  const { data: seasonNumber } = useQuery({
-    queryKey: 'chaos_labs_season_number',
-    queryFn: async () => {
-      const resp = await fetch('https://cloud.chaoslabs.co/query/ccar-perpetuals', {
-        method: 'POST',
-        headers: {
-          'apollographql-client-name': 'dydx-v4',
-          'content-type': 'application/json',
-          protocol: 'dydx-v4',
-        },
-        body: JSON.stringify({
-          operationName: 'TradingSeasons',
-          variables: {},
-          query: `query TradingSeasons {
-        tradingSeasons {
-          label
-        }
-      }`,
-        }),
-      });
-      const seasons = (await resp.json())?.data?.tradingSeasons;
-      return seasons && seasons.length > 0 ? seasons[seasons.length - 1].label : undefined;
-    },
-    onError: (error: Error) => log('LaunchIncentives/fetchSeasonNumber', error),
-  });
-
  const { data, isLoading } = useQuery({
    enabled: !!dydxAddress,
-    queryKey: `launch_incentives_rewards_${dydxAddress ?? ''}`,
+    queryKey: `launch_incentives_rewards_${dydxAddress ?? ''}_${SEASON_NUMBER}`,
    queryFn: async () => {
      if (!dydxAddress) return undefined;
-      const resp = await fetch(`https://cloud.chaoslabs.co/query/api/dydx/points/${dydxAddress}`);
+      const resp = await fetch(
+        `https://cloud.chaoslabs.co/query/api/dydx/points/${dydxAddress}?n=${SEASON_NUMBER}`
+      );
      return (await resp.json())?.incentivePoints;
    },
    onError: (error: Error) => log('LaunchIncentives/fetchPoints', error),
@@ -114,14 +92,12 @@ const EstimatedRewards = () => {
      <Styled.EstimatedRewardsCardContent>
        <div>
          <span>{stringGetter({ key: STRING_KEYS.ESTIMATED_REWARDS })}</span>
-          {seasonNumber !== undefined && (
-            <Styled.Season>
-              {stringGetter({
-                key: STRING_KEYS.LAUNCH_INCENTIVES_SEASON_NUM,
-                params: { SEASON_NUMBER: seasonNumber },
-              })}
-            </Styled.Season>
-          )}
+          <Styled.Season>
+            {stringGetter({
+              key: STRING_KEYS.LAUNCH_INCENTIVES_SEASON_NUM,
+              params: { SEASON_NUMBER },
+            })}
+          </Styled.Season>
        </div>

        <Styled.Points>
@@ -1,5 +0,0 @@
-import { ThemeColorBase } from '@/constants/styles/colors';
-
-declare module 'styled-components' {
-  export interface DefaultTheme extends ThemeColorBase {}
-}
@@ -13,6 +13,8 @@ export const DepositDialog = ({ setIsOpen }: ElementProps) => {
  const stringGetter = useStringGetter();
  const { isMobile } = useBreakpoints();

+  const closeDialog = () => setIsOpen?.(false);
+
  return (
    <Dialog
      isOpen
@@ -20,7 +22,7 @@ export const DepositDialog = ({ setIsOpen }: ElementProps) => {
      title={stringGetter({ key: STRING_KEYS.DEPOSIT })}
      placement={isMobile ? DialogPlacement.FullScreen : DialogPlacement.Default}
    >
-      <DepositDialogContent />
+      <DepositDialogContent onDeposit={closeDialog} />
    </Dialog>
  );
 };
@@ -2,7 +2,6 @@ import { useEffect, useState } from 'react';
 import styled, { type AnyStyledComponent } from 'styled-components';

 import { TransferInputField, TransferType } from '@/constants/abacus';
-import { AnalyticsEvent } from '@/constants/analytics';
 import { isMainnet } from '@/constants/networks';
 import { layoutMixins } from '@/styles/layoutMixins';

@@ -10,7 +9,6 @@ import { DepositForm } from '@/views/forms/AccountManagementForms/DepositForm';
 import { TestnetDepositForm } from '@/views/forms/AccountManagementForms/TestnetDepositForm';

 import abacusStateManager from '@/lib/abacus';
-import { track } from '@/lib/analytics';

 type ElementProps = {
  onDeposit?: () => void;
@@ -36,19 +34,9 @@ export const DepositDialogContent = ({ onDeposit }: ElementProps) => {
  return (
    <Styled.Content>
      {isMainnet || !showFaucet ? (
-        <DepositForm
-          onDeposit={(event) => {
-            track(AnalyticsEvent.TransferDeposit, event);
-            onDeposit?.();
-          }}
-        />
+        <DepositForm onDeposit={onDeposit} />
      ) : (
-        <TestnetDepositForm
-          onDeposit={() => {
-            track(AnalyticsEvent.TransferFaucet);
-            onDeposit?.();
-          }}
-        />
+        <TestnetDepositForm onDeposit={onDeposit} />
      )}
      {!isMainnet && (
        <Styled.TextToggle onClick={() => setShowFaucet(!showFaucet)}>
@@ -105,8 +105,8 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => {
              <Styled.Content>
                {isMainnet ? (
                  <DepositForm
-                    onDeposit={(event) => {
-                      track(AnalyticsEvent.TransferDeposit, event);
+                    onDeposit={() => {
+                      track(AnalyticsEvent.TransferDeposit);
                    }}
                  />
                ) : (
@@ -1,101 +0,0 @@
-import styled, { AnyStyledComponent } from 'styled-components';
-
-import { ButtonAction, ButtonType } from '@/constants/buttons';
-import { STRING_KEYS } from '@/constants/localization';
-import { useStringGetter, useURLConfigs } from '@/hooks';
-import { LinkOutIcon } from '@/icons';
-import { layoutMixins } from '@/styles/layoutMixins';
-
-import { Button } from '@/components/Button';
-import { Dialog } from '@/components/Dialog';
-import { Icon, IconName } from '@/components/Icon';
-
-type ElementProps = {
-  setIsOpen: (open: boolean) => void;
-  transferType: 'withdrawal' | 'transfer';
-  estimatedUnblockTime?: string | null;
-};
-
-export const WithdrawalGateDialog = ({
-  setIsOpen,
-  estimatedUnblockTime,
-  transferType,
-}: ElementProps) => {
-  const stringGetter = useStringGetter();
-  const { withdrawalGateLearnMore } = useURLConfigs();
-
-  return (
-    <Dialog
-      isOpen
-      stacked
-      setIsOpen={setIsOpen}
-      title={
-        {
-          withdrawal: stringGetter({ key: STRING_KEYS.WITHDRAWALS_PAUSED }),
-          transfer: stringGetter({ key: STRING_KEYS.TRANSFERS_PAUSED }),
-        }[transferType]
-      }
-      slotIcon={
-        <Styled.IconContainer>
-          <Styled.Icon iconName={IconName.Warning} />
-        </Styled.IconContainer>
-      }
-      slotFooter={
-        <Styled.ButtonRow>
-          <Button
-            type={ButtonType.Link}
-            action={ButtonAction.Secondary}
-            href={withdrawalGateLearnMore}
-          >
-            {stringGetter({ key: STRING_KEYS.LEARN_MORE })}
-            <LinkOutIcon />
-          </Button>
-          <Button action={ButtonAction.Primary} onClick={() => setIsOpen(false)}>
-            {stringGetter({ key: STRING_KEYS.CLOSE })}
-          </Button>
-        </Styled.ButtonRow>
-      }
-    >
-      <Styled.Content>
-        {stringGetter({
-          key: STRING_KEYS.WITHDRAWALS_PAUSED_DESC,
-          params: {
-            ESTIMATED_DURATION: estimatedUnblockTime,
-          },
-        })}
-      </Styled.Content>
-    </Dialog>
-  );
-};
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.IconContainer = styled.div`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  width: 4.5rem;
-  height: 4.5rem;
-  border-radius: 50%;
-  min-width: 4.5rem;
-  min-height: 4.5rem;
-  background-color: var(--color-gradient-warning);
-`;
-
-Styled.Icon = styled(Icon)`
-  color: var(--color-warning);
-  font-size: 2.5rem;
-  margin-bottom: 0.125rem;
-`;
-
-Styled.Content = styled.div`
-  ${layoutMixins.column}
-  gap: 1rem;
-`;
-
-Styled.ButtonRow = styled.div`
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 1rem;
-`;
@@ -7,7 +7,6 @@ import { Abi, parseUnits } from 'viem';
 import erc20 from '@/abi/erc20.json';
 import erc20_usdt from '@/abi/erc20_usdt.json';
 import { TransferInputField, TransferInputTokenResource, TransferType } from '@/constants/abacus';
-import { AnalyticsEvent, AnalyticsEventData } from '@/constants/analytics';
 import { AlertType } from '@/constants/alerts';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
@@ -49,7 +48,7 @@ import { DepositButtonAndReceipt } from './DepositForm/DepositButtonAndReceipt';
 import { NobleDeposit } from '../NobleDeposit';

 type DepositFormProps = {
-  onDeposit?: (event?: AnalyticsEventData<AnalyticsEvent.TransferDeposit>) => void;
+  onDeposit?: () => void;
  onError?: () => void;
 };

@@ -133,7 +132,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
    if (error) onError?.();
  }, [error]);

-  const onSelectNetwork = useCallback((name: string, type: 'chain' | 'exchange') => {
+  const onSelectChain = useCallback((name: string, type: 'chain' | 'exchange') => {
    if (name) {
      abacusStateManager.clearTransferInputValues();
      setFromAmount('');
@@ -259,6 +258,8 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
        };
        const txHash = await signerWagmi.sendTransaction(tx);

+        onDeposit?.();
+
        if (txHash) {
          addTransferNotification({
            txHash: txHash,
@@ -270,12 +271,6 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
          });
          abacusStateManager.clearTransferInputValues();
          setFromAmount('');
-
-          onDeposit?.({
-            chainId: chainIdStr || undefined,
-            tokenAddress: sourceToken?.address || undefined,
-            tokenSymbol: sourceToken?.symbol || undefined,
-          });
        }
      } catch (error) {
        log('DepositForm/onSubmit', error);
@@ -284,7 +279,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
        setIsLoading(false);
      }
    },
-    [requestPayload, signerWagmi, chainId, sourceToken, sourceChain]
+    [requestPayload, signerWagmi, chainId]
  );

  const amountInputReceipt = [
@@ -383,7 +378,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
      <SourceSelectMenu
        selectedChain={chainIdStr || undefined}
        selectedExchange={exchange || undefined}
-        onSelect={onSelectNetwork}
+        onSelect={onSelectChain}
      />
      {exchange && nobleAddress ? (
        <NobleDeposit />
@@ -14,7 +14,6 @@ import { popoverMixins } from '@/styles/popoverMixins';
 import { getTransferInputs } from '@/state/inputsSelectors';

 import { isTruthy } from '@/lib/isTruthy';
-import { testFlags } from '@/lib/testFlags';

 type ElementProps = {
  label?: string;
@@ -63,12 +62,11 @@ export const SourceSelectMenu = ({
  return (
    <SearchSelectMenu
      items={[
-        exchangeItems.length > 0 &&
-          (testFlags.showCexWithdrawal || type === TransferType.deposit) && {
-            group: 'exchanges',
-            groupLabel: stringGetter({ key: STRING_KEYS.EXCHANGES }),
-            items: exchangeItems,
-          },
+        exchangeItems.length > 0 && {
+          group: 'exchanges',
+          groupLabel: stringGetter({ key: STRING_KEYS.EXCHANGES }),
+          items: exchangeItems,
+        },
        chainItems.length > 0 && {
          group: 'chains',
          groupLabel: stringGetter({ key: STRING_KEYS.CHAINS }),
@@ -17,10 +17,9 @@ import { getTransferInputs } from '@/state/inputsSelectors';
 type ElementProps = {
  selectedToken?: TransferInputTokenResource;
  onSelectToken: (token: TransferInputTokenResource) => void;
-  isExchange?: boolean;
 };

-export const TokenSelectMenu = ({ selectedToken, onSelectToken, isExchange }: ElementProps) => {
+export const TokenSelectMenu = ({ selectedToken, onSelectToken }: ElementProps) => {
  const stringGetter = useStringGetter();
  const { type, depositOptions, withdrawalOptions, resources } =
    useSelector(getTransferInputs, shallowEqual) || {};
@@ -48,24 +47,19 @@ export const TokenSelectMenu = ({ selectedToken, onSelectToken, isExchange }: El
        },
      ]}
      label={stringGetter({ key: STRING_KEYS.ASSET })}
-      withSearch={!isExchange}
-      withReceiptItems={
-        !isExchange
-          ? [
-              {
-                key: 'swap',
-                label: stringGetter({ key: STRING_KEYS.SWAP }),
-                value: selectedToken && (
-                  <>
-                    <Tag>{type === TransferType.deposit ? selectedToken?.symbol : 'USDC'}</Tag>
-                    <DiffArrow />
-                    <Tag>{type === TransferType.deposit ? 'USDC' : selectedToken?.symbol}</Tag>
-                  </>
-                ),
-              },
-            ]
-          : undefined
-      }
+      withReceiptItems={[
+        {
+          key: 'swap',
+          label: stringGetter({ key: STRING_KEYS.SWAP }),
+          value: selectedToken && (
+            <>
+              <Tag>{type === TransferType.deposit ? selectedToken?.symbol : 'USDC'}</Tag>
+              <DiffArrow />
+              <Tag>{type === TransferType.deposit ? 'USDC' : selectedToken?.symbol}</Tag>
+            </>
+          ),
+        },
+      ]}
    >
      <Styled.AssetRow>
        {selectedToken ? (
@@ -7,18 +7,11 @@ import { isAddress } from 'viem';

 import { TransferInputField, TransferInputTokenResource, TransferType } from '@/constants/abacus';
 import { AlertType } from '@/constants/alerts';
-import { AnalyticsEvent } from '@/constants/analytics';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
 import { isMainnet } from '@/constants/networks';
 import { TransferNotificationTypes } from '@/constants/notifications';
-import {
-  MAX_CCTP_TRANSFER_AMOUNT,
-  MAX_PRICE_IMPACT,
-  MIN_CCTP_TRANSFER_AMOUNT,
-  NumberSign,
-  TOKEN_DECIMALS,
-} from '@/constants/numbers';
+import { MAX_CCTP_TRANSFER_AMOUNT, MAX_PRICE_IMPACT, NumberSign } from '@/constants/numbers';

 import {
  useAccounts,
@@ -28,8 +21,6 @@ import {
  useSelectedNetwork,
  useStringGetter,
  useSubaccount,
-  useTokenConfigs,
-  useWithdrawalInfo,
 } from '@/hooks';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';

@@ -59,8 +50,6 @@ import { getNobleChainId } from '@/lib/squid';

 import { TokenSelectMenu } from './TokenSelectMenu';
 import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt';
-import { validateCosmosAddress } from '@/lib/addressUtils';
-import { track } from '@/lib/analytics';

 export const WithdrawForm = () => {
  const stringGetter = useStringGetter();
@@ -74,7 +63,6 @@ export const WithdrawForm = () => {
  const {
    requestPayload,
    token,
-    exchange,
    chain: chainIdStr,
    address: toAddress,
    resources,
@@ -88,8 +76,6 @@ export const WithdrawForm = () => {
  const [withdrawAmount, setWithdrawAmount] = useState('');
  const [slippage, setSlippage] = useState(isCctp ? 0 : 0.01); // 0.1% slippage
  const debouncedAmount = useDebounce<string>(withdrawAmount, 500);
-  const { usdcLabel } = useTokenConfigs();
-  const { usdcWithdrawalCapacity } = useWithdrawalInfo({ transferType: 'withdrawal' });

  const isValidAddress = toAddress && isAddress(toAddress);

@@ -188,27 +174,18 @@ export const WithdrawForm = () => {
            requestPayload.data,
            isCctp
          );
-          const nobleChainId = getNobleChainId();
-          const toChainId = Boolean(exchange) ? nobleChainId : chainIdStr || undefined;
-          if (txHash && toChainId) {
+          if (txHash) {
            addTransferNotification({
              txHash: txHash,
              type: TransferNotificationTypes.Withdrawal,
-              fromChainId: !isCctp ? selectedDydxChainId : nobleChainId,
-              toChainId,
+              fromChainId: !isCctp ? selectedDydxChainId : getNobleChainId(),
+              toChainId: chainIdStr || undefined,
              toAmount: debouncedAmountBN.toNumber(),
              triggeredAt: Date.now(),
              isCctp,
-              isExchange: Boolean(exchange),
            });
            abacusStateManager.clearTransferInputValues();
            setWithdrawAmount('');
-
-            track(AnalyticsEvent.TransferWithdraw, {
-              chainId: toChainId,
-              tokenAddress: toToken?.address || undefined,
-              tokenSymbol: toToken?.symbol || undefined,
-            });
          }
        }
      } catch (error) {
@@ -231,17 +208,7 @@ export const WithdrawForm = () => {
        setIsLoading(false);
      }
    },
-    [
-      requestPayload,
-      debouncedAmountBN,
-      chainIdStr,
-      toAddress,
-      selectedDydxChainId,
-      exchange,
-      toToken,
-      screenAddresses,
-      stringGetter,
-    ]
+    [requestPayload, debouncedAmountBN, chainIdStr, toAddress, screenAddresses, stringGetter]
  );

  const onChangeAddress = useCallback((e: ChangeEvent<HTMLInputElement>) => {
@@ -274,20 +241,13 @@ export const WithdrawForm = () => {
    setWithdrawAmount(freeCollateralBN.toString());
  }, [freeCollateralBN, setWithdrawAmount]);

-  const onSelectNetwork = useCallback((name: string, type: 'chain' | 'exchange') => {
-    if (name) {
+  const onSelectChain = useCallback((chain: string) => {
+    if (chain) {
+      abacusStateManager.setTransferValue({
+        field: TransferInputField.chain,
+        value: chain,
+      });
      setWithdrawAmount('');
-      if (type === 'chain') {
-        abacusStateManager.setTransferValue({
-          field: TransferInputField.chain,
-          value: name,
-        });
-      } else {
-        abacusStateManager.setTransferValue({
-          field: TransferInputField.exchange,
-          value: name,
-        });
-      }
    }
  }, []);

@@ -326,102 +286,55 @@ export const WithdrawForm = () => {

  const { sanctionedAddresses } = useRestrictions();

-  const { alertType, errorMessage } = useMemo(() => {
+  const errorMessage = useMemo(() => {
    if (error) {
-      return {
-        errorMessage: error,
-      };
+      return error;
    }

    if (routeErrors) {
-      return {
-        errorMessage: routeErrorMessage
-          ? stringGetter({
-              key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-              params: { ERROR_MESSAGE: routeErrorMessage },
-            })
-          : stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG }),
-      };
+      return routeErrorMessage
+        ? stringGetter({
+            key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
+            params: { ERROR_MESSAGE: routeErrorMessage },
+          })
+        : stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG });
    }

-    if (!toAddress) {
-      return {
-        alertType: AlertType.Warning,
-        errorMessage: stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_ADDRESS }),
-      };
-    }
+    if (!toAddress) return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_ADDRESS });

    if (sanctionedAddresses.has(toAddress))
-      return {
-        errorMessage: stringGetter({
-          key: STRING_KEYS.TRANSFER_INVALID_DYDX_ADDRESS,
-        }),
-      };
+      return stringGetter({
+        key: STRING_KEYS.TRANSFER_INVALID_DYDX_ADDRESS,
+      });

    if (debouncedAmountBN) {
-      if (!chainIdStr && !exchange) {
-        return {
-          errorMessage: stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_CHAIN }),
-        };
+      if (!chainIdStr) {
+        return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_CHAIN });
      } else if (!toToken) {
-        return {
-          errorMessage: stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_ASSET }),
-        };
+        return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_ASSET });
      }
    }

-    if (debouncedAmountBN.gt(MustBigNumber(freeCollateralBN))) {
-      return {
-        errorMessage: stringGetter({ key: STRING_KEYS.WITHDRAW_MORE_THAN_FREE }),
-      };
+    if (MustBigNumber(debouncedAmountBN).gt(MustBigNumber(freeCollateralBN))) {
+      return stringGetter({ key: STRING_KEYS.WITHDRAW_MORE_THAN_FREE });
    }

    if (isCctp) {
-      if (debouncedAmountBN.gte(MAX_CCTP_TRANSFER_AMOUNT)) {
-        return {
-          errorMessage: stringGetter({
-            key: STRING_KEYS.MAX_CCTP_TRANSFER_LIMIT_EXCEEDED,
-            params: {
-              MAX_CCTP_TRANSFER_AMOUNT: MAX_CCTP_TRANSFER_AMOUNT,
-            },
-          }),
-        };
-      }
-      if (
-        !debouncedAmountBN.isZero() &&
-        MustBigNumber(debouncedAmountBN).lte(MIN_CCTP_TRANSFER_AMOUNT)
-      ) {
-        return {
-          errorMessage: 'Amount must be greater than 10 USDC',
-        };
+      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 { errorMessage: stringGetter({ key: STRING_KEYS.PRICE_IMPACT_TOO_HIGH }) };
+      return stringGetter({ key: STRING_KEYS.PRICE_IMPACT_TOO_HIGH });
    }

-    // Withdrawal Safety
-    if (usdcWithdrawalCapacity.gt(0) && debouncedAmountBN.gt(usdcWithdrawalCapacity)) {
-      return {
-        alertType: AlertType.Warning,
-        errorMessage: stringGetter({
-          key: STRING_KEYS.WITHDRAWAL_LIMIT_OVER,
-          params: {
-            USDC_LIMIT: (
-              <span>
-                {usdcWithdrawalCapacity.toFormat(TOKEN_DECIMALS)}
-                <Styled.Tag>{usdcLabel}</Styled.Tag>
-              </span>
-            ),
-          },
-        }),
-      };
-    }
-
-    return {
-      errorMessage: undefined,
-    };
+    return undefined;
  }, [
    error,
    routeErrors,
@@ -434,22 +347,16 @@ export const WithdrawForm = () => {
    sanctionedAddresses,
    stringGetter,
    summary,
-    usdcWithdrawalCapacity,
  ]);

-  const isInvalidNobleAddress = Boolean(
-    exchange && toAddress && !validateCosmosAddress(toAddress, 'noble')
-  );
-
  const isDisabled =
    !!errorMessage ||
    !toToken ||
-    (!chainIdStr && !exchange) ||
+    !chainIdStr ||
    !toAddress ||
    debouncedAmountBN.isNaN() ||
    debouncedAmountBN.isZero() ||
-    isLoading ||
-    isInvalidNobleAddress;
+    isLoading;

  return (
    <Styled.Form onSubmit={onSubmit}>
@@ -467,21 +374,12 @@ export const WithdrawForm = () => {
          }
        />
        <SourceSelectMenu
-          selectedExchange={exchange || undefined}
+          label={stringGetter({ key: STRING_KEYS.NETWORK })}
          selectedChain={chainIdStr || undefined}
-          onSelect={onSelectNetwork}
+          onSelect={onSelectChain}
        />
      </Styled.DestinationRow>
-      {isInvalidNobleAddress && (
-        <AlertMessage type={AlertType.Error}>
-          {stringGetter({ key: STRING_KEYS.NOBLE_ADDRESS_VALIDATION })}
-        </AlertMessage>
-      )}
-      <TokenSelectMenu
-        selectedToken={toToken || undefined}
-        onSelectToken={onSelectToken}
-        isExchange={Boolean(exchange)}
-      />
+      <TokenSelectMenu selectedToken={toToken || undefined} onSelectToken={onSelectToken} />
      <Styled.WithDetailsReceipt side="bottom" detailItems={amountInputReceipt}>
        <FormInput
          type={InputType.Number}
@@ -495,11 +393,7 @@ export const WithdrawForm = () => {
          }
        />
      </Styled.WithDetailsReceipt>
-      {errorMessage && (
-        <Styled.AlertMessage type={alertType ?? AlertType.Error}>
-          {errorMessage}
-        </Styled.AlertMessage>
-      )}
+      {errorMessage && <AlertMessage type={AlertType.Error}>{errorMessage}</AlertMessage>}
      <Styled.Footer>
        <WithdrawButtonAndReceipt
          isDisabled={isDisabled}
@@ -516,10 +410,6 @@ export const WithdrawForm = () => {

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

-Styled.Tag = styled(Tag)`
-  margin-left: 0.5ch;
-`;
-
 Styled.DiffOutput = styled(DiffOutput)`
  --diffOutput-valueWithDiff-fontSize: 1em;
 `;
@@ -539,10 +429,6 @@ Styled.DestinationRow = styled.div`
  gap: 1rem;
 `;

-Styled.AlertMessage = styled(AlertMessage)`
-  display: inline;
-`;
-
 Styled.WithDetailsReceipt = styled(WithDetailsReceipt)`
  --withReceipt-backgroundColor: var(--color-layer-2);
 `;
@@ -27,8 +27,6 @@ import { calculateCanAccountTrade } from '@/state/accountCalculators';
 import { getSubaccount } from '@/state/accountSelectors';
 import { getTransferInputs } from '@/state/inputsSelectors';

-import { isTruthy } from '@/lib/isTruthy';
-
 import { SlippageEditor } from '../SlippageEditor';

 type ElementProps = {
@@ -57,7 +55,7 @@ export const WithdrawButtonAndReceipt = ({
  const stringGetter = useStringGetter();

  const { leverage } = useSelector(getSubaccount, shallowEqual) || {};
-  const { summary, requestPayload, exchange } = useSelector(getTransferInputs, shallowEqual) || {};
+  const { summary, requestPayload } = useSelector(getTransferInputs, shallowEqual) || {};
  const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
  const { usdcLabel } = useTokenConfigs();

@@ -94,7 +92,7 @@ export const WithdrawButtonAndReceipt = ({
      value: <Output type={OutputType.Fiat} value={totalFees} />,
      subitems: feeSubitems,
    },
-    !exchange && {
+    {
      key: 'exchange-rate',
      label: <span>{stringGetter({ key: STRING_KEYS.EXCHANGE_RATE })}</span>,
      value: withdrawToken && typeof summary?.exchangeRate === 'number' && (
@@ -135,9 +133,7 @@ export const WithdrawButtonAndReceipt = ({
          {withdrawToken && <Tag>{withdrawToken?.symbol}</Tag>}
        </span>
      ),
-      value: (
-        <Output type={OutputType.Asset} value={summary?.toAmount} fractionDigits={TOKEN_DECIMALS} />
-      ),
+      value: <Output type={OutputType.Asset} value={summary?.toAmount} fractionDigits={TOKEN_DECIMALS} />,
      subitems: [
        {
          key: 'minimum-amount-received',
@@ -148,17 +144,13 @@ export const WithdrawButtonAndReceipt = ({
            </span>
          ),
          value: (
-            <Output
-              type={OutputType.Asset}
-              value={summary?.toAmountMin}
-              fractionDigits={TOKEN_DECIMALS}
-            />
+            <Output type={OutputType.Asset} value={summary?.toAmountMin} fractionDigits={TOKEN_DECIMALS} />
          ),
          tooltip: 'minimum-amount-received',
        },
      ],
    },
-    !exchange && {
+    {
      key: 'slippage',
      label: <span>{stringGetter({ key: STRING_KEYS.MAX_SLIPPAGE })}</span>,
      value: (
@@ -183,7 +175,7 @@ export const WithdrawButtonAndReceipt = ({
        />
      ),
    },
-  ].filter(isTruthy);
+  ];

  const isFormValid = !isDisabled && !isEditingSlippage;

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

 import { OpacityToken } from '@/constants/styles/base';
 import { STRING_KEYS } from '@/constants/localization';
@@ -10,6 +10,7 @@ import { useAccounts, useStringGetter } from '@/hooks';
 import { CopyButton } from '@/components/CopyButton';
 import { QrCode } from '@/components/QrCode';
 import { Checkbox } from '@/components/Checkbox';
+import { Icon, IconName } from '@/components/Icon';
 import { TimeoutButton } from '@/components/TimeoutButton';
 import { WithDetailsReceipt } from '@/components/WithDetailsReceipt';
 import { WithReceipt } from '@/components/WithReceipt';
@@ -18,7 +19,6 @@ import { generateFadedColorVariant } from '@/lib/styles';

 export const NobleDeposit = () => {
  const [hasAcknowledged, setHasAcknowledged] = useState(false);
-  const [hasTimedout, setHasTimedout] = useState(false);
  const stringGetter = useStringGetter();
  const { nobleAddress } = useAccounts();

@@ -30,21 +30,23 @@ export const NobleDeposit = () => {
          {
            key: 'nobleAddress',
            label: stringGetter({ key: STRING_KEYS.NOBLE_ADDRESS }),
-            value:
-              hasAcknowledged && hasTimedout
-                ? nobleAddress
-                : stringGetter({ key: STRING_KEYS.ACKNOWLEDGE_TO_REVEAL }),
+            value: nobleAddress,
          },
        ]}
      >
-        <Styled.QrCode
-          hasLogo
-          size={432}
-          value={nobleAddress || ''}
-          blurred={!hasAcknowledged || !hasTimedout}
-        />
+        <Styled.QrCodeContainer>
+          <Styled.QrCode size={432} value={nobleAddress || ''} />
+        </Styled.QrCodeContainer>
      </WithDetailsReceipt>

+      <Styled.WaitingSpan>
+        <Styled.CautionIconContainer>
+          <Icon iconName={IconName.CautionCircleStroked} />
+        </Styled.CautionIconContainer>
+
+        <p>{stringGetter({ key: STRING_KEYS.NOBLE_WARNING })}</p>
+      </Styled.WaitingSpan>
+
      <Styled.WithReceipt
        slotReceipt={
          <Styled.CheckboxContainer>
@@ -61,12 +63,7 @@ export const NobleDeposit = () => {
      >
        <TimeoutButton
          timeoutInSeconds={8}
-          onTimeOut={() => setHasTimedout(true)}
-          slotFinal={
-            <CopyButton state={{ isDisabled: !hasAcknowledged }} value={nobleAddress}>
-              {!hasAcknowledged ? stringGetter({ key: STRING_KEYS.ACKNOWLEDGE_RISKS }) : undefined}
-            </CopyButton>
-          }
+          slotFinal={<CopyButton state={{ isDisabled: !hasAcknowledged }} value={nobleAddress} />}
        />
      </Styled.WithReceipt>
    </>
@@ -85,14 +82,23 @@ Styled.WithReceipt = styled(WithReceipt)`
  --withReceipt-backgroundColor: var(--color-layer-2);
 `;

-Styled.QrCode = styled(QrCode)<{ blurred: boolean }>`
-  border-radius: 0.5em;
+Styled.QrCodeContainer = styled.div`
+  display: flex;
+  justify-content: center;

-  ${({ blurred }) =>
-    blurred &&
-    css`
-      filter: blur(8px);
-    `}
+  padding: 0.5rem;
+
+  background-color: var(--color-layer-2);
+  border-radius: 0.5rem;
+`;
+
+Styled.QrCode = styled(QrCode)`
+  max-height: 20rem;
+  width: fit-content;
+
+  svg {
+    max-height: 20rem;
+  }
 `;

 Styled.CheckboxContainer = styled.div`
@@ -20,7 +20,6 @@ import {
  useStringGetter,
  useSubaccount,
  useTokenConfigs,
-  useWithdrawalInfo,
 } from '@/hooks';

 import { formMixins } from '@/styles/formMixins';
@@ -65,7 +64,6 @@ export const TransferForm = ({
  const { nativeTokenBalance, usdcBalance } = useAccountBalance();
  const selectedDydxChainId = useSelector(getSelectedDydxChainId);
  const { tokensConfigs, usdcLabel, chainTokenLabel } = useTokenConfigs();
-  useWithdrawalInfo({ transferType: 'transfer' });

  const {
    address: recipientAddress,
@@ -40,7 +40,7 @@ export const TransferStatusNotification = ({
  const stringGetter = useStringGetter();
  const [open, setOpen] = useState<boolean>(false);
  const [secondsLeft, setSecondsLeft] = useState<number>(0);
-  const { fromChainId, status, txHash, toAmount, isExchange } = transfer;
+  const { fromChainId, status, txHash, toAmount } = transfer;

  // @ts-ignore status.errors is not in the type definition but can be returned
  const error = status?.errors?.length ? status?.errors[0] : status?.error;
@@ -54,8 +54,6 @@ export const TransferStatusNotification = ({

  useInterval({ callback: updateSecondsLeft });

-  const isComplete = status?.squidTransactionStatus === 'success' || isExchange;
-
  const inProgressStatusString =
    type === TransferNotificationTypes.Deposit
      ? secondsLeft > 0
@@ -67,10 +65,10 @@ export const TransferStatusNotification = ({

  const statusString =
    type === TransferNotificationTypes.Deposit
-      ? isComplete
+      ? status?.squidTransactionStatus === 'success'
        ? STRING_KEYS.DEPOSIT_COMPLETE
        : inProgressStatusString
-      : isComplete
+      : status?.squidTransactionStatus === 'success'
      ? STRING_KEYS.WITHDRAW_COMPLETE
      : inProgressStatusString;

@@ -110,12 +108,12 @@ export const TransferStatusNotification = ({
      slotIcon={isToast && slotIcon}
      slotTitle={slotTitle}
      slotCustomContent={
-        !status && !isExchange ? (
+        !status ? (
          <LoadingDots size={3} />
        ) : (
          <Styled.BridgingStatus>
            {content}
-            {!isToast && !isComplete && !hasError && (
+            {!isToast && status?.squidTransactionStatus !== 'success' && !hasError && (
              <Styled.TransferStatusSteps status={status} type={type} />
            )}
          </Styled.BridgingStatus>
@@ -22,6 +22,6 @@
      "@/*": ["src/*"]
    }
  },
-  "include": ["src", "scripts", "styled.d.ts"],
+  "include": ["src", "scripts"],
  "references": [{ "path": "./tsconfig.node.json" }]
 }
Author	SHA1	Message	Date
Aleka Cheung	e70d98c01e	import order nit	2024-02-15 13:14:18 -05:00
Aleka Cheung	191e492647	util function for getting mintscan link	2024-02-15 10:38:39 -05:00
Aleka Cheung	3f601d28ef	use selector for chain id instead	2024-02-15 10:13:48 -05:00
Aleka Cheung	de5dddad10	bump abacus to 1.4.5	2024-02-14 13:58:58 -05:00
Aleka Cheung	bf645125a9	use new config path	2024-02-14 13:55:06 -05:00
Aleka Cheung	99395b34c5	bump abacus + use new env config format	2024-02-14 13:38:58 -05:00