diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx index 4002bd7d4288..f410d3460419 100644 --- a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx +++ b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx @@ -501,7 +501,7 @@ const AccountSwitcher = props => { const canResetBalance = account => { const account_init_balance = 10000; - return account.is_virtual && account.balance < account_init_balance; + return account.is_virtual && account.balance !== account_init_balance; }; const checkMultipleSvgAcc = () => { diff --git a/packages/core/src/Utils/ExchangeCurrencyRate/exchange_currency_rate.js b/packages/core/src/Utils/ExchangeCurrencyRate/exchange_currency_rate.js index 1fa08688af99..50e78e3b1197 100644 --- a/packages/core/src/Utils/ExchangeCurrencyRate/exchange_currency_rate.js +++ b/packages/core/src/Utils/ExchangeCurrencyRate/exchange_currency_rate.js @@ -3,5 +3,5 @@ import BinarySocket from '_common/base/socket_base'; export const getExchangeRate = async (from_currency, to_currency) => { const { exchange_rates } = await BinarySocket.exchange_rates(from_currency); - return exchange_rates.rates[to_currency]; + return exchange_rates?.rates?.[to_currency]; };