fix network as chain id

package.json

@@ -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.9",
+    "@dydxprotocol/v4-abacus": "^1.4.5",
     "@dydxprotocol/v4-client-js": "^1.0.20",
-    "@dydxprotocol/v4-localization": "^1.1.34",
+    "@dydxprotocol/v4-localization": "^1.1.30",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-accordion": "^1.1.2",

pnpm-lock.yaml

@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 overrides:
   follow-redirects: 1.15.3
 
@@ -30,14 +26,14 @@ dependencies:
     specifier: ^0.32.1
     version: 0.32.2
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.4.9
-    version: 1.4.9
+    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.34
-    version: 1.1.34
+    specifier: ^1.1.30
+    version: 1.1.30
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -1290,8 +1286,8 @@ packages:
     resolution: {integrity: sha512-Gg5t+eR7vPJMAmhkFt6CZrzPd0EKpAslWwk5rFVYZpJsM8JG5KT9XQ99hgNM3Ov6ScNoIWbXkpX27F6A9cXR4Q==}
     dev: false
 
-  /@dydxprotocol/v4-abacus@1.4.9:
-    resolution: {integrity: sha512-OnrD5Db7AGSxyQE+gWRmkBuXbkZMfSEDB+v2s+ft0zgd4D5j/WTZkk1RG0fn8ISV4AffoN5T24jBWxLfqVlmZw==}
+  /@dydxprotocol/v4-abacus@1.4.5:
+    resolution: {integrity: sha512-LhJmpIaUkHCsSiHx+jdk+59euvGp2E+gGFelpfmOYpH1+enZgEXDQvWsgHSFEQxYP3mRiGG4uo+ZYNGdvffg7g==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.20:
@@ -1323,8 +1319,8 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@1.1.34:
-    resolution: {integrity: sha512-I7zivjv8gS+6b9n7/wh7PY9QEUDIIyLx9ugZ5K6ybar0xT/06yupOVdVE6iLivQ/IAsVi/RFHkD8bQd0DWCetg==}
+  /@dydxprotocol/v4-localization@1.1.30:
+    resolution: {integrity: sha512-TZfWWRSOxcjLHs972wlJVVHkE7+DVqAUnGZSs24HYHsPtUkPhZiNXMOA2Vk9YddQxumhM79xIRH0cmJSe5DDUg==}
     dev: false
 
   /@dydxprotocol/v4-proto@4.0.0-dev.0:
@@ -16053,3 +16049,7 @@ packages:
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: true
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false

public/configs/cctp.json

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

public/configs/markets.json

@@ -428,13 +428,6 @@
     "whitepaperLink": "https://solana.com/solana-whitepaper.pdf",
     "coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/"
   },
-  "STRK-USD": {
-    "name": "Starknet",
-    "tags": ["Layer 2"],
-    "websiteLink": "https://www.starknet.io/en",
-    "whitepaperLink": "https://docs.starknet.io/documentation/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/starknet-token/"
-  },
   "STX-USD": {
     "name": "Stacks",
     "tags": ["Layer 2"],

public/configs/otherMarketExchangeConfig.json

@@ -513,14 +513,6 @@
     { "exchangeName": "Okx", "ticker": "SOL-USDT", "adjustByMarket": "USDT-USD" },
     { "exchangeName": "Mexc", "ticker": "SOL_USDT", "adjustByMarket": "USDT-USD" }
   ],
-  "STRK": [
-    { "exchangeName": "Binance", "ticker": "STRKUSDT", "adjustByMarket": "USDT-USD" },
-    { "exchangeName": "Bybit", "ticker": "STRKUSDT", "adjustByMarket": "USDT-USD" },
-    { "exchangeName": "Kraken", "ticker": "STRKUSD" },
-    { "exchangeName": "Kucoin", "ticker": "STRK-USDT", "adjustByMarket": "USDT-USD" },
-    { "exchangeName": "Okx", "ticker": "STRK-USDT", "adjustByMarket": "USDT-USD" },
-    { "exchangeName": "Gate", "ticker": "STRK_USDT", "adjustByMarket": "USDT-USD" }
-  ],
   "STX": [
     { "exchangeName": "Binance", "ticker": "STXUSDT", "adjustByMarket": "USDT-USD" },
     { "exchangeName": "Bybit", "ticker": "STXUSDT", "adjustByMarket": "USDT-USD" },

public/configs/otherMarketParameters.json

@@ -968,23 +968,6 @@
     "minOrderSize": 1000000,
     "quantumConversionExponent": -9
   },
-  {
-    "baseAsset": "STRK",
-    "referencePrice": 2.05,
-    "numOracles": 6,
-    "liquidityTier": 2,
-    "assetName": "Starknet",
-    "p": 0.0,
-    "atomicResolution": -6.0,
-    "minExchanges": 3,
-    "minPriceChangePpm": 4000,
-    "priceExponent": -9.0,
-    "stepBaseQuantum": 1000000,
-    "ticksizeExponent": -3,
-    "subticksPerTick": 1000000,
-    "minOrderSize": 1000000,
-    "quantumConversionExponent": -9
-  },
   {
     "baseAsset": "STX",
     "referencePrice": 1.5144048703611412,

src/components/SearchSelectMenu.tsx

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

src/components/TimeoutButton.tsx

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

src/constants/analytics.ts

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

src/constants/notifications.ts

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

src/hooks/tradingView/useChartLines.ts

@@ -9,16 +9,14 @@ import type { ChartLine, TvWidget } from '@/constants/tvchart';
 
 import { useStringGetter } from '@/hooks';
 
-import {
-  getCurrentMarketOrders,
-  getCurrentMarketPositionData,
-  getIsAccountConnected,
-} from '@/state/accountSelectors';
+import { getCurrentMarketOrders, getCurrentMarketPositionData } from '@/state/accountSelectors';
 import { getAppTheme, getAppColorMode } from '@/state/configsSelectors';
 
 import { MustBigNumber } from '@/lib/numbers';
 import { getChartLineColors } from '@/lib/tradingView/utils';
 
+let chartLines: Record<string, ChartLine> = {};
+
 /**
  * @description Hook to handle drawing chart lines
  */
@@ -27,47 +25,43 @@ export const useChartLines = ({
   tvWidget,
   displayButton,
   isChartReady,
-  chartLinesRef,
 }: {
   tvWidget: TvWidget | null;
   displayButton: HTMLElement | null;
-  isChartReady: boolean;
-  chartLinesRef: React.MutableRefObject<Record<string, ChartLine>>;
+  isChartReady?: boolean;
 }) => {
-  const [showOrderLines, setShowOrderLines] = useState(true);
+  const [showOrderLines, setShowOrderLines] = useState(false);
 
   const stringGetter = useStringGetter();
 
   const appTheme = useSelector(getAppTheme);
   const appColorMode = useSelector(getAppColorMode);
 
-  const isAccountConnected = useSelector(getIsAccountConnected);
-
   const currentMarketPositionData = useSelector(getCurrentMarketPositionData, shallowEqual);
   const currentMarketOrders: SubaccountOrder[] = useSelector(getCurrentMarketOrders, shallowEqual);
 
   useEffect(() => {
     if (isChartReady && displayButton) {
-      displayButton.onclick = () => setShowOrderLines(!showOrderLines);
+      displayButton.onclick = () => {
+        const newShowOrderLinesState = !showOrderLines;
+        if (newShowOrderLinesState) {
+          displayButton?.classList?.add('order-lines-active');
+        } else {
+          displayButton?.classList?.remove('order-lines-active');
+        }
+        setShowOrderLines(newShowOrderLinesState);
+      };
     }
   }, [isChartReady, showOrderLines]);
 
   useEffect(() => {
-    if (!isAccountConnected) {
-      deleteChartLines();
-    }
-  }, [isAccountConnected]);
-
-  useEffect(() => {
-    if (isChartReady && tvWidget) {
+    if (tvWidget && isChartReady) {
       tvWidget.onChartReady(() => {
         tvWidget.chart().dataReady(() => {
           if (showOrderLines) {
-            displayButton?.classList?.add('order-lines-active');
             drawOrderLines();
             drawPositionLine();
           } else {
-            displayButton?.classList?.remove('order-lines-active');
             deleteChartLines();
           }
         });
@@ -84,13 +78,13 @@ export const useChartLines = ({
     const key = currentMarketPositionData.id;
     const price = MustBigNumber(entryPrice).toNumber();
 
-    const maybePositionLine = chartLinesRef.current[key]?.line;
+    const maybePositionLine = chartLines[key]?.line;
     const shouldShow = size && size !== 0;
 
     if (!shouldShow) {
       if (maybePositionLine) {
         maybePositionLine.remove();
-        delete chartLinesRef.current[key];
+        delete chartLines[key];
         return;
       }
     } else {
@@ -112,9 +106,9 @@ export const useChartLines = ({
           .setQuantity(quantity);
 
         if (positionLine) {
-          const chartLine: ChartLine = { line: positionLine, chartLineType: 'position' };
+          const chartLine = { line: positionLine, chartLineType: 'position' };
           setLineColors({ chartLine: chartLine });
-          chartLinesRef.current[key] = chartLine;
+          chartLines[key] = chartLine;
         }
       }
     }
@@ -149,12 +143,12 @@ export const useChartLines = ({
           !cancelReason &&
           (status === AbacusOrderStatus.open || status === AbacusOrderStatus.untriggered);
 
-        const maybeOrderLine = chartLinesRef.current[key]?.line;
+        const maybeOrderLine = chartLines[key]?.line;
 
         if (!shouldShow) {
           if (maybeOrderLine) {
             maybeOrderLine.remove();
-            delete chartLinesRef.current[key];
+            delete chartLines[key];
             return;
           }
         } else {
@@ -176,7 +170,7 @@ export const useChartLines = ({
                 chartLineType: ORDER_SIDES[side.name],
               };
               setLineColors({ chartLine: chartLine });
-              chartLinesRef.current[key] = chartLine;
+              chartLines[key] = chartLine;
             }
           }
         }
@@ -185,10 +179,10 @@ export const useChartLines = ({
   };
 
   const deleteChartLines = () => {
-    Object.values(chartLinesRef.current).forEach(({ line }) => {
+    Object.values(chartLines).forEach(({ line }) => {
       line.remove();
     });
-    chartLinesRef.current = {};
+    chartLines = {};
   };
 
   const setLineColors = ({ chartLine }: { chartLine: ChartLine }) => {
@@ -210,4 +204,6 @@ export const useChartLines = ({
     maybeQuantityColor &&
       line.setLineColor(maybeQuantityColor).setQuantityBackgroundColor(maybeQuantityColor);
   };
+
+  return { chartLines };
 };

src/hooks/tradingView/useChartMarketAndResolution.ts

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

src/hooks/useLocalNotifications.tsx

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

src/hooks/useNotificationTypes.tsx

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

src/lib/addressUtils.ts

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

src/lib/squid.ts

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

src/lib/testFlags.ts

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

src/views/charts/TvChart.tsx

@@ -4,7 +4,7 @@ import styled, { type AnyStyledComponent, css } from 'styled-components';
 
 import type { ResolutionString } from 'public/tradingview/charting_library';
 
-import type { ChartLine, TvWidget } from '@/constants/tvchart';
+import type { TvWidget } from '@/constants/tvchart';
 
 import {
   useChartLines,
@@ -27,16 +27,13 @@ export const TvChart = () => {
   const displayButtonRef = useRef<HTMLElement | null>(null);
   const displayButton = displayButtonRef.current;
 
-  const chartLinesRef = useRef<Record<string, ChartLine>>({});
-  const chartLines = chartLinesRef.current;
-
   const { savedResolution } = useTradingView({ tvWidgetRef, displayButtonRef, setIsChartReady });
   useChartMarketAndResolution({
     tvWidget,
     isWidgetReady,
     savedResolution: savedResolution as ResolutionString | undefined,
   });
-  useChartLines({ tvWidget, displayButton, isChartReady, chartLinesRef });
+  const { chartLines } = useChartLines({ tvWidget, displayButton, isChartReady });
   useTradingViewTheme({ tvWidget, isWidgetReady, chartLines });
 
   return (

src/views/dialogs/DepositDialog.tsx

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

src/views/dialogs/DepositDialog/DepositDialogContent.tsx

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

src/views/dialogs/OnboardingDialog.tsx

@@ -105,8 +105,8 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => {
               <Styled.Content>
                 {isMainnet ? (
                   <DepositForm
-                    onDeposit={(event) => {
-                      track(AnalyticsEvent.TransferDeposit, event);
+                    onDeposit={() => {
+                      track(AnalyticsEvent.TransferDeposit);
                     }}
                   />
                 ) : (

src/views/forms/AccountManagementForms/DepositForm.tsx

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

src/views/forms/AccountManagementForms/SourceSelectMenu.tsx

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

src/views/forms/AccountManagementForms/TokenSelectMenu.tsx

@@ -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 ? (

src/views/forms/AccountManagementForms/WithdrawForm.tsx

@@ -7,7 +7,6 @@ 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';
@@ -56,8 +55,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();
@@ -71,7 +68,6 @@ export const WithdrawForm = () => {
   const {
     requestPayload,
     token,
-    exchange,
     chain: chainIdStr,
     address: toAddress,
     resources,
@@ -183,27 +179,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) {
@@ -226,17 +213,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>) => {
@@ -269,20 +246,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,
-        });
-      }
     }
   }, []);
 
@@ -343,7 +313,7 @@ export const WithdrawForm = () => {
       });
 
     if (debouncedAmountBN) {
-      if (!chainIdStr && !exchange) {
+      if (!chainIdStr) {
         return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_CHAIN });
       } else if (!toToken) {
         return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_ASSET });
@@ -390,19 +360,14 @@ export const WithdrawForm = () => {
     summary,
   ]);
 
-  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}>
@@ -420,21 +385,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}

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

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

src/views/forms/NobleDeposit.tsx

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

src/views/notifications/TransferStatusNotification/index.tsx

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