diff --git a/src/views/dialogs/TradeDialog.tsx b/src/views/dialogs/TradeDialog.tsx index a4190fa..0cd9a14 100644 --- a/src/views/dialogs/TradeDialog.tsx +++ b/src/views/dialogs/TradeDialog.tsx @@ -37,7 +37,7 @@ export const TradeDialog = ({ isOpen, setIsOpen, slotTrigger }: ElementProps) => const selectedTradeType = getSelectedTradeType(type); const { typeOptions } = useSelector(getInputTradeOptions, shallowEqual) ?? {}; - const allTradeTypeItems = typeOptions?.toArray()?.map(({ type, stringKey }) => ({ + const allTradeTypeItems = (typeOptions?.toArray() ?? []).map(({ type, stringKey }) => ({ value: type, label: stringGetter({ key: stringKey as StringKey, diff --git a/src/views/forms/TradeForm.tsx b/src/views/forms/TradeForm.tsx index e67f7c0..352b4ca 100644 --- a/src/views/forms/TradeForm.tsx +++ b/src/views/forms/TradeForm.tsx @@ -322,7 +322,6 @@ export const TradeForm = ({ summary={summary ?? undefined} currentStep={currentStep} showDeposit={inputAlert?.errorAction === TradeInputErrorAction.DEPOSIT} - showConnectWallet={inputAlert?.errorAction === TradeInputErrorAction.CONNECT_WALLET} /> diff --git a/src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx b/src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx index 0a5f280..27844e5 100644 --- a/src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx +++ b/src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx @@ -7,9 +7,8 @@ import { DialogTypes } from '@/constants/dialogs'; import { STRING_KEYS } from '@/constants/localization'; import { TRADE_TYPE_STRINGS, MobilePlaceOrderSteps } from '@/constants/trade'; -import { useStringGetter } from '@/hooks'; +import { useStringGetter, useTokenConfigs } from '@/hooks'; -import { AssetIcon } from '@/components/AssetIcon'; import { Button } from '@/components/Button'; import { Output, OutputType, ShowSign } from '@/components/Output'; import { WithDetailsReceipt } from '@/components/WithDetailsReceipt'; @@ -47,6 +46,7 @@ export const PlaceOrderButtonAndReceipt = ({ }: ElementProps) => { const stringGetter = useStringGetter(); const dispatch = useDispatch(); + const { chainTokenLabel } = useTokenConfigs(); const canAccountTrade = useSelector(calculateCanAccountTrade); const subaccountNumber = useSelector(getSubaccountId); @@ -88,7 +88,14 @@ export const PlaceOrderButtonAndReceipt = ({ {/* */} ), - value: , + value: ( + + ), tooltip: 'max-reward', }, { @@ -111,7 +118,7 @@ export const PlaceOrderButtonAndReceipt = ({ ? actionStringKey : STRING_KEYS.UNAVAILABLE, buttonAction: ButtonAction.Primary, - buttonState: { isDisabled: !shouldEnableTrade }, + buttonState: { isDisabled: !shouldEnableTrade, isLoading: hasMissingData }, }, [MobilePlaceOrderSteps.PreviewOrder]: { @@ -148,7 +155,10 @@ export const PlaceOrderButtonAndReceipt = ({ const buttonState = currentStep ? buttonStatesPerStep[currentStep].buttonState - : { isDisabled: !shouldEnableTrade || isLoading, isLoading }; + : { + isDisabled: !shouldEnableTrade || isLoading, + isLoading: isLoading || hasMissingData, + }; return (