diff --git a/packages/cashier/src/pages/account-transfer/account-transfer.tsx b/packages/cashier/src/pages/account-transfer/account-transfer.tsx index aa807a71fd56..e91e9237e86a 100644 --- a/packages/cashier/src/pages/account-transfer/account-transfer.tsx +++ b/packages/cashier/src/pages/account-transfer/account-transfer.tsx @@ -1,12 +1,11 @@ import React from 'react'; import { Loading } from '@deriv/components'; -import { routes, WS } from '@deriv/shared'; +import { WS } from '@deriv/shared'; import { useStore, observer } from '@deriv/stores'; import Error from '../../components/error'; import NoBalance from '../../components/no-balance'; import { Virtual } from '../../components/cashier-container'; import CashierLocked from '../../components/cashier-locked'; -import CryptoTransactionsHistory from '../../components/crypto-transactions-history'; import AccountTransferReceipt from './account-transfer-receipt'; import AccountTransferForm from './account-transfer-form'; import AccountTransferNoAccount from './account-transfer-no-account'; @@ -24,8 +23,7 @@ type TAccountTransferProps = { const AccountTransfer = observer(({ onClickDeposit, onClickNotes, onClose, setSideNotes }: TAccountTransferProps) => { const { client } = useStore(); - const { account_transfer, general_store, transaction_history } = useCashierStore(); - + const { account_transfer, general_store } = useCashierStore(); const { accounts_list, error, @@ -39,10 +37,8 @@ const AccountTransfer = observer(({ onClickDeposit, onClickNotes, onClose, setSi } = account_transfer; const { is_loading } = general_store; const is_cashier_locked = useCashierLocked(); - const { is_crypto_transactions_visible } = transaction_history; const { is_switching, is_virtual } = client; const [is_loading_status, setIsLoadingStatus] = React.useState(true); - const is_from_outside_cashier = !location.pathname.startsWith(routes.cashier); React.useEffect(() => { onMount(); @@ -91,9 +87,6 @@ const AccountTransfer = observer(({ onClickDeposit, onClickNotes, onClose, setSi if (is_transfer_confirm) { return ; } - if (!is_from_outside_cashier && is_crypto_transactions_visible) { - return ; - } return ( { ...(/^(eUSDT)$/i.test(currency) ? [] : []), ]; - setSideNotes?.([ - ...side_notes.map((side_note, index) => ( - - {side_note} - - )), - ]); + if (is_crypto_transactions_visible) { + setSideNotes?.([]); + } else { + setSideNotes?.([ + ...side_notes.map((side_note, index) => ( + + {side_note} + + )), + ]); + } } else setSideNotes?.([]); } @@ -114,7 +118,7 @@ const Withdrawal = observer(({ setSideNotes }: TWithdrawalProps) => { setSideNotes?.([]); }; // eslint-disable-next-line react-hooks/exhaustive-deps - }, [currency, tab_index]); + }, [currency, tab_index, is_crypto_transactions_visible]); // TODO: Fix if conditions, use else if and combine conditions when possible if (is_system_maintenance) { @@ -139,6 +143,8 @@ const Withdrawal = observer(({ setSideNotes }: TWithdrawalProps) => { return ; } + if (is_crypto_transactions_visible) return ; + if (!Number(balance)) { return ( <> @@ -169,10 +175,6 @@ const Withdrawal = observer(({ setSideNotes }: TWithdrawalProps) => { return ; } - if (is_crypto_transactions_visible) { - return ; - } - return ( <>