diff --git a/src/hooks/useSquidRouter.tsx b/src/hooks/useSquidRouter.tsx index 9801df7..0266fc7 100644 --- a/src/hooks/useSquidRouter.tsx +++ b/src/hooks/useSquidRouter.tsx @@ -1,7 +1,6 @@ import { createContext, useContext, useEffect, useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; import { Squid } from '@0xsquid/sdk'; -import { USDC_DENOM } from '@dydxprotocol/v4-client'; import { DydxV4Network, isDydxV4Network } from '@/constants/networks'; @@ -14,21 +13,6 @@ const SQUID_BASE_URL: Record = { [DydxV4Network.V4Mainnet]: 'https://api.0xsquid.com', }; -/** - * @description Deposit route defaults for IBC Testnet - * */ -export const SQUID_DEPOSIT_ROUTE_DEFAULTS = { - toChain: 'dydx-testnet-2', - toToken: USDC_DENOM, - enableForecall: false, // instant execution service, defaults to true -}; - -export const SQUID_WITHDRAW_ROUTE_DEFAULTS = { - fromChain: 'dydx-testnet-2', - fromToken: USDC_DENOM, - enableForecall: false, // instant execution service, defaults to true -}; - const useSquidContext = () => { const selectedNetwork = useSelector(getSelectedNetwork); const [_, setInitialized] = useState(false); diff --git a/src/views/AccountInfo/AccountInfoConnectedState.tsx b/src/views/AccountInfo/AccountInfoConnectedState.tsx index fb4db0f..0cc7df9 100644 --- a/src/views/AccountInfo/AccountInfoConnectedState.tsx +++ b/src/views/AccountInfo/AccountInfoConnectedState.tsx @@ -284,7 +284,7 @@ Styled.Header = styled.header` `; Styled.TransferButtons = styled.div` - ${layoutMixins.row} + ${layoutMixins.inlineRow} gap: 1rem; `; diff --git a/src/views/forms/AccountManagementForms/DepositForm.tsx b/src/views/forms/AccountManagementForms/DepositForm.tsx index d0ba32f..5633b00 100644 --- a/src/views/forms/AccountManagementForms/DepositForm.tsx +++ b/src/views/forms/AccountManagementForms/DepositForm.tsx @@ -19,6 +19,7 @@ import { useAccounts, useDebounce, useStringGetter } from '@/hooks'; import { useAccountBalance } from '@/hooks/useAccountBalance'; import { layoutMixins } from '@/styles/layoutMixins'; +import { formMixins } from '@/styles/formMixins'; import { AlertMessage } from '@/components/AlertMessage'; import { Button } from '@/components/Button'; @@ -279,9 +280,9 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => { label={stringGetter({ key: STRING_KEYS.AMOUNT })} value={fromAmount} slotRight={ - + } /> @@ -311,6 +312,8 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => { const Styled: Record = {}; Styled.Form = styled.form` + --form-input-height: 3.5rem; + ${layoutMixins.flexColumn} gap: 1.5rem; @@ -333,3 +336,7 @@ Styled.Link = styled(Link)` Styled.TransactionInfo = styled.span` ${layoutMixins.row} `; + +Styled.FormInputButton = styled(Button)` + ${formMixins.inputInnerButton} +`; diff --git a/src/views/forms/AccountManagementForms/WithdrawForm.tsx b/src/views/forms/AccountManagementForms/WithdrawForm.tsx index 8785742..841a4b7 100644 --- a/src/views/forms/AccountManagementForms/WithdrawForm.tsx +++ b/src/views/forms/AccountManagementForms/WithdrawForm.tsx @@ -80,11 +80,11 @@ export const WithdrawForm = () => { }); return () => { + abacusStateManager.clearTransferInputValues(); abacusStateManager.setTransferValue({ field: TransferInputField.type, value: null, }); - abacusStateManager.clearTransferInputValues(); }; }, []); @@ -272,7 +272,7 @@ export const WithdrawForm = () => { placeholder={stringGetter({ key: STRING_KEYS.ADDRESS })} onChange={onChangeAddress} value={toAddress || ''} - label={stringGetter({ key: STRING_KEYS.ADDRESS })} + label={stringGetter({ key: STRING_KEYS.DESTINATION })} /> {stringGetter({ key: STRING_KEYS.EXCHANGE_RATE })}, - value: withdrawToken && ( + value: withdrawToken && typeof summary?.exchangeRate === 'number' && ( =