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.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",

pnpm-lock.yaml

@@ -26,14 +26,14 @@ dependencies:
     specifier: ^0.32.1
     version: 0.32.2
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.4.6
+    specifier: ^1.4.5
-    version: 1.4.6
+    version: 1.4.5
   '@dydxprotocol/v4-client-js':
     specifier: ^1.0.20
     version: 1.0.20
   '@dydxprotocol/v4-localization':
-    specifier: ^1.1.31
+    specifier: ^1.1.30
-    version: 1.1.31
+    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:
+  /@dydxprotocol/v4-abacus@1.4.5:
-    resolution: {integrity: sha512-qYq+4TizcMMxYVXckn0LCucWBe5N9ZNtD1XnowCAuBUUifHSgMGvao5OeZIKMgNM/udSKOXLss4zLy6dH/G2SA==}
+    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:
+  /@dydxprotocol/v4-localization@1.1.30:
-    resolution: {integrity: sha512-plJVIgFAKq9/hA/gk5GgKgCQFsH3pNtDWfG/yHLDXyiGX0M0mMEi1bTNVs4podFVoHJu1nSL9YPFlpJ00FteGw==}
+    resolution: {integrity: sha512-TZfWWRSOxcjLHs972wlJVVHkE7+DVqAUnGZSs24HYHsPtUkPhZiNXMOA2Vk9YddQxumhM79xIRH0cmJSe5DDUg==}
     dev: false
 
   /@dydxprotocol/v4-proto@4.0.0-dev.0:

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 }) =>
+  --stickyArea1-topHeight: var(--form-input-height);
-    !$withSearch ? '0' : '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/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
-              // @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
-              // also error can some time come back as an empty object so we need to ignore for that
+            const hasErrors = !!currentStatus?.errors || 
-              !!currentStatus?.errors ||
+                 (currentStatus?.error && Object.keys(currentStatus.error).length !== 0);
-              (currentStatus?.error && Object.keys(currentStatus.error).length !== 0);
 
             if (
-              !isExchange &&
               !hasErrors &&
               (!currentStatus?.squidTransactionStatus ||
                 currentStatus?.squidTransactionStatus === 'ongoing')
             ) {
               try {
-                const status = await fetchSquidStatus(
+                const status = await fetchSquidStatus({
-                  {
+                  transactionId: txHash,
-                    transactionId: txHash,
+                  toChainId,
-                    toChainId,
+                  fromChainId,
-                    fromChainId,
+                }, isCctp);
-                  },
-                  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 { fromChainId, status, txHash, toAmount, type } = transfer;
-          const isFinished =
+          const isFinished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
-            (Boolean(status) && status?.squidTransactionStatus !== 'ongoing') || isExchange;
           const icon = <Icon iconName={isFinished ? IconName.Transfer : IconName.Clock} />;
 
           const transferType =

src/lib/abacus/dydxChainTransactions.ts

@@ -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 { DydxNetwork, isTestnet } from '@/constants/networks';
+import { DydxChainId, isTestnet } from '@/constants/networks';
 
 import { RootStore } from '@/state/_store';
 import { addUncommittedOrderClientId, removeUncommittedOrderClientId } from '@/state/account';
@@ -44,7 +44,10 @@ import { StatefulOrderError } from '../errors';
 import { bytesToBigInt } from '../numbers';
 import { log } from '../telemetry';
 import { hashFromTx, getMintscanTxLink } from '../txUtils';
-import { getDydxChainIdFromNetwork } from '../network';
+
+(BigInt.prototype as any).toJSON = function () {
+  return this.toString();
+};
 
 class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
   private compositeClient: CompositeClient | undefined;
@@ -239,10 +242,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
 
       if (isTestnet) {
         console.log(
-          getMintscanTxLink(
+          getMintscanTxLink(this.compositeClient.network.getString() as DydxChainId, hash)
-            getDydxChainIdFromNetwork(this.compositeClient.network.getString() as DydxNetwork),
-            hash
-          )
         );
       } else console.log(`txHash: ${hash}`);
 
@@ -538,7 +538,6 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
           const result = await this.cctpWithdraw(params);
           callback(result);
           break;
-          break;
         }
         default: {
           break;

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/network.ts

@@ -1,8 +1,4 @@
 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;
-};

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/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
+        <DepositForm onDeposit={onDeposit} />
-          onDeposit={(event) => {
-            track(AnalyticsEvent.TransferDeposit, event);
-            onDeposit?.();
-          }}
-        />
       ) : (
-        <TestnetDepositForm
+        <TestnetDepositForm onDeposit={onDeposit} />
-          onDeposit={() => {
-            track(AnalyticsEvent.TransferFaucet);
-            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) => {
+                    onDeposit={() => {
-                      track(AnalyticsEvent.TransferDeposit, event);
+                      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 &&
+        exchangeItems.length > 0 && {
-          (testFlags.showCexWithdrawal || type === TransferType.deposit) && {
+          group: 'exchanges',
-            group: 'exchanges',
+          groupLabel: stringGetter({ key: STRING_KEYS.EXCHANGES }),
-            groupLabel: stringGetter({ key: STRING_KEYS.EXCHANGES }),
+          items: exchangeItems,
-            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={[
-      withReceiptItems={
+        {
-        !isExchange
+          key: 'swap',
-          ? [
+          label: stringGetter({ key: STRING_KEYS.SWAP }),
-              {
+          value: selectedToken && (
-                key: 'swap',
+            <>
-                label: stringGetter({ key: STRING_KEYS.SWAP }),
+              <Tag>{type === TransferType.deposit ? selectedToken?.symbol : 'USDC'}</Tag>
-                value: selectedToken && (
+              <DiffArrow />
-                  <>
+              <Tag>{type === TransferType.deposit ? 'USDC' : selectedToken?.symbol}</Tag>
-                    <Tag>{type === TransferType.deposit ? selectedToken?.symbol : 'USDC'}</Tag>
+            </>
-                    <DiffArrow />
+          ),
-                    <Tag>{type === TransferType.deposit ? 'USDC' : selectedToken?.symbol}</Tag>
+        },
-                  </>
+      ]}
-                ),
-              },
-            ]
-          : undefined
-      }
     >
       <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();
+          if (txHash) {
-          const toChainId = Boolean(exchange) ? nobleChainId : chainIdStr || undefined;
-          if (txHash && toChainId) {
             addTransferNotification({
               txHash: txHash,
               type: TransferNotificationTypes.Withdrawal,
-              fromChainId: !isCctp ? selectedDydxChainId : nobleChainId,
+              fromChainId: !isCctp ? selectedDydxChainId : getNobleChainId(),
-              toChainId,
+              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, screenAddresses, stringGetter]
-      requestPayload,
-      debouncedAmountBN,
-      chainIdStr,
-      toAddress,
-      selectedDydxChainId,
-      exchange,
-      toToken,
-      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') => {
+  const onSelectChain = useCallback((chain: string) => {
-    if (name) {
+    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 ||
+    isLoading;
-    isInvalidNobleAddress;
 
   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 && (
+      <TokenSelectMenu selectedToken={toToken || undefined} onSelectToken={onSelectToken} />
-        <AlertMessage type={AlertType.Error}>
-          {stringGetter({ key: STRING_KEYS.NOBLE_ADDRESS_VALIDATION })}
-        </AlertMessage>
-      )}
-      <TokenSelectMenu
-        selectedToken={toToken || undefined}
-        onSelectToken={onSelectToken}
-        isExchange={Boolean(exchange)}
-      />
       <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: (
+      value: <Output type={OutputType.Asset} value={summary?.toAmount} fractionDigits={TOKEN_DECIMALS} />,
-        <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
+            <Output type={OutputType.Asset} value={summary?.toAmountMin} fractionDigits={TOKEN_DECIMALS} />
-              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:
+            value: nobleAddress,
-              hasAcknowledged && hasTimedout
-                ? nobleAddress
-                : stringGetter({ key: STRING_KEYS.ACKNOWLEDGE_TO_REVEAL }),
           },
         ]}
       >
-        <Styled.QrCode
+        <Styled.QrCodeContainer>
-          hasLogo
+          <Styled.QrCode size={432} value={nobleAddress || ''} />
-          size={432}
+        </Styled.QrCodeContainer>
-          value={nobleAddress || ''}
-          blurred={!hasAcknowledged || !hasTimedout}
-        />
       </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} />}
-          slotFinal={
-            <CopyButton state={{ isDisabled: !hasAcknowledged }} value={nobleAddress}>
-              {!hasAcknowledged ? stringGetter({ key: STRING_KEYS.ACKNOWLEDGE_RISKS }) : undefined}
-            </CopyButton>
-          }
         />
       </Styled.WithReceipt>
     </>
@@ -85,14 +82,23 @@ Styled.WithReceipt = styled(WithReceipt)`
   --withReceipt-backgroundColor: var(--color-layer-2);
 `;
 
-Styled.QrCode = styled(QrCode)<{ blurred: boolean }>`
+Styled.QrCodeContainer = styled.div`
-  border-radius: 0.5em;
+  display: flex;
+  justify-content: center;
 
-  ${({ blurred }) =>
+  padding: 0.5rem;
-    blurred &&
+
-    css`
+  background-color: var(--color-layer-2);
-      filter: blur(8px);
+  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>