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

Quick fix for useWalletList hook #9256

Merged
merged 4 commits into from
Jul 5, 2023
Merged

Quick fix for useWalletList hook #9256

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a25d86
fix: useWalletsList.ts
rostislav-deriv Jul 5, 2023
9a11304
refactor: changes requested by @heorhi-deriv
rostislav-deriv Jul 5, 2023
978943b
refactor: changes requested by @sergei-deriv
rostislav-deriv Jul 5, 2023
cbb32da
refactor: remove unnecessary falsy check
rostislav-deriv Jul 5, 2023
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
50 changes: 27 additions & 23 deletions packages/hooks/src/useWalletsList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getWalletCurrencyIcon } from '@deriv/utils';

const useWalletsList = () => {
const { client, ui } = useStore();
const { accounts, currency, loginid, is_crypto } = client;
const { accounts, loginid, is_crypto } = client;
const { is_dark_mode_on } = ui;
const { data, ...reset } = useFetch('authorize', {
payload: { authorize: accounts[loginid || ''].token },
Expand All @@ -19,28 +19,32 @@ const useWalletsList = () => {

// Modify the wallets to include the missing balance from the API response
// Should remove this once the API is fixed
const modified_wallets = wallets?.map(wallet => ({
...wallet,
/** Indicating whether the wallet is the currently selected wallet. */
is_selected: wallet.loginid === loginid,
/** Indicating whether the wallet is a virtual-money wallet. */
is_demo: wallet.is_virtual === 1,
/** Wallet balance */
balance: balance_data?.balance?.accounts?.[wallet.loginid || '']?.balance || 0,
/** Landing company shortcode the account belongs to. Use this instead of landing_company_shortcode for wallets */
landing_company_name: wallet.landing_company_name === 'maltainvest' ? 'malta' : wallet.landing_company_name,
icon: getWalletCurrencyIcon(wallet.is_virtual ? 'demo' : currency, is_dark_mode_on),
is_malta_wallet: wallet.landing_company_name === 'malta',
gradient_header_class: `wallet-header__${
wallet.is_virtual === 1 ? 'demo' : wallet.currency?.toLowerCase()
}-bg${is_dark_mode_on ? '--dark' : ''}`,
gradient_card_class: `wallet-card__${wallet.is_virtual === 1 ? 'demo' : wallet.currency?.toLowerCase()}-bg${
is_dark_mode_on ? '--dark' : ''
}`,
name: `${wallet.is_virtual ? 'Demo ' : ''}${currency} ${'Wallet'}`,
is_disabled: Boolean(wallet.is_disabled),
is_virtual: Boolean(wallet.is_virtual),
}));
const modified_wallets = wallets?.map(wallet => {
const wallet_currency = wallet.currency || '';
return {
...wallet,
/** Indicating whether the wallet is the currently selected wallet. */
is_selected: wallet.loginid === loginid,
/** Indicating whether the wallet is a virtual-money wallet. */
is_demo: wallet.is_virtual === 1,
/** Wallet balance */
balance: balance_data?.balance?.accounts?.[wallet.loginid || '']?.balance || 0,
/** Landing company shortcode the account belongs to. Use this instead of landing_company_shortcode for wallets */
landing_company_name:
wallet.landing_company_name === 'maltainvest' ? 'malta' : wallet.landing_company_name,
icon: getWalletCurrencyIcon(wallet.is_virtual ? 'demo' : wallet_currency || '', is_dark_mode_on),
is_malta_wallet: wallet.landing_company_name === 'malta',
gradient_header_class: `wallet-header__${
wallet.is_virtual === 1 ? 'demo' : wallet_currency.toLowerCase()
}-bg${is_dark_mode_on ? '--dark' : ''}`,
gradient_card_class: `wallet-card__${
wallet.is_virtual === 1 ? 'demo' : wallet_currency.toLowerCase()
}-bg${is_dark_mode_on ? '--dark' : ''}`,
name: `${wallet.is_virtual ? 'Demo ' : ''}${wallet_currency} Wallet`,
is_disabled: Boolean(wallet.is_disabled),
is_virtual: Boolean(wallet.is_virtual),
};
});

// Sort the wallets alphabetically by fiat, crypto, then virtual
return modified_wallets?.sort((a, b) => {
Expand Down