Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

thisyahlen/fix for reset balance #6630

Merged
merged 5 commits into from
Sep 29, 2022
Merged

thisyahlen/fix for reset balance #6630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f2eb128
fix for reset balance
thisyahlen-deriv Sep 29, 2022
01be4ff
code refactor
thisyahlen-deriv Sep 29, 2022
481831b
code refactor
thisyahlen-deriv Sep 29, 2022
ab11a5c
console rates fix
thisyahlen-deriv Sep 29, 2022
8361734
Merge branch 'master' into hotfixresetbalance
thisyahlen-deriv Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Utils/ExchangeCurrencyRate/exchange_currency_rate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
};