From 59a3284e67ba8a3470118ce15648ecaade87e3cc Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Tue, 23 Apr 2019 16:39:43 +0200 Subject: [PATCH 1/4] part of show all --- src/actions/LocalStorageActions.js | 31 ++++++++++++- .../Wallet/views/WalletSettings/Container.js | 10 ++--- .../WalletSettings/components/Coins/index.js | 43 ++++++++++++++++++- .../Wallet/views/WalletSettings/index.js | 6 ++- 4 files changed, 80 insertions(+), 10 deletions(-) diff --git a/src/actions/LocalStorageActions.js b/src/actions/LocalStorageActions.js index 74e5d6f5..d4f3badf 100644 --- a/src/actions/LocalStorageActions.js +++ b/src/actions/LocalStorageActions.js @@ -12,7 +12,6 @@ import * as buildUtils from 'utils/build'; import * as storageUtils from 'utils/storage'; import * as WalletActions from 'actions/WalletActions'; import * as l10nUtils from 'utils/l10n'; - import { getAccountTokens } from 'reducers/utils'; import type { Account } from 'reducers/AccountsReducer'; import type { Token } from 'reducers/TokensReducer'; @@ -380,7 +379,35 @@ export const handleCoinVisibility = ( }); }; -// export const handleAllCoinsVisibility => (); +export const handleAllCoinsVisibility = ( + checked: boolean, + allCoins: Array, + hiddenCoins: Array +): ThunkAction => (dispatch: Dispatch) => { + const configuration: Array = getHiddenCoins(); + const newConfig: Array = configuration; + let result = []; + + console.log('old config', newConfig); + + if (checked) { + const intersection = allCoins.filter(x => hiddenCoins.includes(x)); + if (intersection) { + result = newConfig.filter(x => !intersection.includes(x)); + } + } else { + const intersection = allCoins.filter(x => hiddenCoins.includes(x)); + console.log('intersection', intersection); + result = [configuration, ...intersection]; + } + + dispatch({ + type: WALLET.SET_HIDDEN_COINS, + hiddenCoins: result, + }); + + storageUtils.set(TYPE, KEY_HIDDEN_COINS, JSON.stringify(result)); +}; export const getHiddenCoins = (): Array => { const coinsConfig: ?string = storageUtils.get(TYPE, KEY_HIDDEN_COINS); diff --git a/src/views/Wallet/views/WalletSettings/Container.js b/src/views/Wallet/views/WalletSettings/Container.js index 70ff7869..0e185bb6 100644 --- a/src/views/Wallet/views/WalletSettings/Container.js +++ b/src/views/Wallet/views/WalletSettings/Container.js @@ -23,7 +23,7 @@ type DispatchProps = {| setLocalCurrency: typeof WalletActions.setLocalCurrency, setHideBalance: typeof WalletActions.setHideBalance, handleCoinVisibility: typeof LocalStorageActions.handleCoinVisibility, - // handleAllCoinsVisibility: typeof LocalStorageActions.handleAllCoinsVisibility, + handleAllCoinsVisibility: typeof LocalStorageActions.handleAllCoinsVisibility, |}; export type Props = {| ...OwnProps, ...StateProps, ...DispatchProps |}; @@ -38,10 +38,10 @@ const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({ setLocalCurrency: bindActionCreators(WalletActions.setLocalCurrency, dispatch), setHideBalance: bindActionCreators(WalletActions.setHideBalance, dispatch), handleCoinVisibility: bindActionCreators(LocalStorageActions.handleCoinVisibility, dispatch), - // handleAllCoinsVisibility: bindActionCreators( - // LocalStorageActions.handleAllCoinsVisibility, - // dispatch - // ), + handleAllCoinsVisibility: bindActionCreators( + LocalStorageActions.handleAllCoinsVisibility, + dispatch + ), }); export default injectIntl( diff --git a/src/views/Wallet/views/WalletSettings/components/Coins/index.js b/src/views/Wallet/views/WalletSettings/components/Coins/index.js index 724157f7..8b86ed2f 100644 --- a/src/views/Wallet/views/WalletSettings/components/Coins/index.js +++ b/src/views/Wallet/views/WalletSettings/components/Coins/index.js @@ -14,6 +14,7 @@ type Props = { networks: Array, hiddenCoins: Array, handleCoinVisibility: typeof LocalStorageActions.handleCoinVisibility, + handleAllCoinsVisibility: typeof LocalStorageActions.handleAllCoinsVisibility, }; const Wrapper = styled.div` @@ -85,6 +86,10 @@ const LogoWrapper = styled.div` align-items: center; `; +const ToggleAll = styled.span` + cursor: pointer; +`; + const CoinsSettings = (props: Props) => ( @@ -106,7 +111,25 @@ const CoinsSettings = (props: Props) => ( /> - Show all + + { + const allCoins = props.networks + .filter(x => !x.isHidden) + .map(item => item.shortcut); + + props.handleAllCoinsVisibility( + checked, + allCoins, + props.hiddenCoins + ); + }} + > + {props.hiddenCoins.every(val => props.networks.includes(val)) + ? 'Hide all' + : 'Show all'} + + {props.networks .filter(network => !network.isHidden) @@ -150,7 +173,23 @@ const CoinsSettings = (props: Props) => ( /> - Show all + + { + const allCoins = coins + .filter(x => !x.isHidden) + .map(coin => coin.id); + + props.handleAllCoinsVisibility( + checked, + allCoins, + props.hiddenCoins + ); + }} + > + Show all + + {coins .sort((a, b) => a.order - b.order) diff --git a/src/views/Wallet/views/WalletSettings/index.js b/src/views/Wallet/views/WalletSettings/index.js index 3642b6ba..677cd5f2 100644 --- a/src/views/Wallet/views/WalletSettings/index.js +++ b/src/views/Wallet/views/WalletSettings/index.js @@ -73,7 +73,10 @@ const TooltipIcon = styled(Icon)` `; const buildCurrencyOption = currency => { - return { value: currency, label: currency.toUpperCase() }; + return { + value: currency, + label: currency.toUpperCase(), + }; }; const WalletSettings = (props: Props) => ( @@ -117,6 +120,7 @@ const WalletSettings = (props: Props) => ( From e32d7a32bd386496c67e665d30ec8f569c45ec4a Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Wed, 24 Apr 2019 14:05:07 +0200 Subject: [PATCH 2/4] split hidden coins, toggle all --- src/actions/LocalStorageActions.js | 106 +++++++++++------- src/actions/WalletActions.js | 4 + src/actions/constants/wallet.js | 2 + src/reducers/WalletReducer.js | 8 ++ .../Wallet/views/WalletSettings/Container.js | 6 +- .../WalletSettings/components/Coins/index.js | 29 ++--- .../Wallet/views/WalletSettings/index.js | 3 +- 7 files changed, 99 insertions(+), 59 deletions(-) diff --git a/src/actions/LocalStorageActions.js b/src/actions/LocalStorageActions.js index d4f3badf..c2fb7790 100644 --- a/src/actions/LocalStorageActions.js +++ b/src/actions/LocalStorageActions.js @@ -60,6 +60,7 @@ const KEY_LANGUAGE: string = `${STORAGE_PATH}language`; const KEY_LOCAL_CURRENCY: string = `${STORAGE_PATH}localCurrency`; const KEY_HIDE_BALANCE: string = `${STORAGE_PATH}hideBalance`; const KEY_HIDDEN_COINS: string = `${STORAGE_PATH}hiddenCoins`; +const KEY_HIDDEN_COINS_EXTERNAL: string = `${STORAGE_PATH}hiddenCoinsExternal`; // https://github.com/STRML/react-localstorage/blob/master/react-localstorage.js // or @@ -247,13 +248,18 @@ const loadStorageData = (): ThunkAction => (dispatch: Dispatch): void => { }); } - const hiddenCoins = getHiddenCoins(); - if (hiddenCoins) { - dispatch({ - type: WALLET.SET_HIDDEN_COINS, - hiddenCoins, - }); - } + const hiddenCoins = getHiddenCoins(false); + dispatch({ + type: WALLET.SET_HIDDEN_COINS, + hiddenCoins, + }); + + const isExternal = true; + const hiddenCoinsExternal = getHiddenCoins(isExternal); + dispatch({ + type: WALLET.SET_HIDDEN_COINS_EXTERNAL, + hiddenCoinsExternal, + }); const userTokens: ?string = storageUtils.get(TYPE, KEY_TOKENS); if (userTokens) { @@ -360,9 +366,10 @@ export const getImportedAccounts = (): ?Array => { export const handleCoinVisibility = ( coinShortcut: string, - shouldBeVisible: boolean + shouldBeVisible: boolean, + isExternal: boolean ): ThunkAction => (dispatch: Dispatch): void => { - const configuration: Array = getHiddenCoins(); + const configuration: Array = getHiddenCoins(isExternal); let newConfig: Array = configuration; const isAlreadyHidden = configuration.find(coin => coin === coinShortcut); @@ -372,45 +379,68 @@ export const handleCoinVisibility = ( newConfig = [...configuration, coinShortcut]; } - storageUtils.set(TYPE, KEY_HIDDEN_COINS, JSON.stringify(newConfig)); - dispatch({ - type: WALLET.SET_HIDDEN_COINS, - hiddenCoins: newConfig, - }); + console.log(coinShortcut, shouldBeVisible, isExternal); + + if (isExternal) { + storageUtils.set(TYPE, KEY_HIDDEN_COINS_EXTERNAL, JSON.stringify(newConfig)); + dispatch({ + type: WALLET.SET_HIDDEN_COINS_EXTERNAL, + hiddenCoinsExternal: newConfig, + }); + } else { + storageUtils.set(TYPE, KEY_HIDDEN_COINS, JSON.stringify(newConfig)); + dispatch({ + type: WALLET.SET_HIDDEN_COINS, + hiddenCoins: newConfig, + }); + } }; -export const handleAllCoinsVisibility = ( - checked: boolean, +export const toggleGroupCoinsVisibility = ( allCoins: Array, - hiddenCoins: Array + checked: boolean, + isExternal: boolean ): ThunkAction => (dispatch: Dispatch) => { - const configuration: Array = getHiddenCoins(); - const newConfig: Array = configuration; - let result = []; - - console.log('old config', newConfig); + if (checked && isExternal) { + dispatch({ + type: WALLET.SET_HIDDEN_COINS_EXTERNAL, + hiddenCoinsExternal: [], + }); + storageUtils.set(TYPE, KEY_HIDDEN_COINS_EXTERNAL, JSON.stringify([])); + } - if (checked) { - const intersection = allCoins.filter(x => hiddenCoins.includes(x)); - if (intersection) { - result = newConfig.filter(x => !intersection.includes(x)); - } - } else { - const intersection = allCoins.filter(x => hiddenCoins.includes(x)); - console.log('intersection', intersection); - result = [configuration, ...intersection]; + if (!checked && isExternal) { + dispatch({ + type: WALLET.SET_HIDDEN_COINS_EXTERNAL, + hiddenCoinsExternal: allCoins, + }); + storageUtils.set(TYPE, KEY_HIDDEN_COINS_EXTERNAL, JSON.stringify(allCoins)); } - dispatch({ - type: WALLET.SET_HIDDEN_COINS, - hiddenCoins: result, - }); + if (checked && !isExternal) { + dispatch({ + type: WALLET.SET_HIDDEN_COINS, + hiddenCoins: [], + }); + storageUtils.set(TYPE, KEY_HIDDEN_COINS, JSON.stringify([])); + } - storageUtils.set(TYPE, KEY_HIDDEN_COINS, JSON.stringify(result)); + if (!checked && !isExternal) { + dispatch({ + type: WALLET.SET_HIDDEN_COINS, + hiddenCoins: allCoins, + }); + storageUtils.set(TYPE, KEY_HIDDEN_COINS, JSON.stringify(allCoins)); + } }; -export const getHiddenCoins = (): Array => { - const coinsConfig: ?string = storageUtils.get(TYPE, KEY_HIDDEN_COINS); +export const getHiddenCoins = (isExternal: boolean): Array => { + let coinsConfig: ?string = ''; + if (isExternal) { + coinsConfig = storageUtils.get(TYPE, KEY_HIDDEN_COINS_EXTERNAL); + } else { + coinsConfig = storageUtils.get(TYPE, KEY_HIDDEN_COINS); + } if (coinsConfig) { return JSON.parse(coinsConfig); } diff --git a/src/actions/WalletActions.js b/src/actions/WalletActions.js index 221c7c1d..ed84b5e8 100644 --- a/src/actions/WalletActions.js +++ b/src/actions/WalletActions.js @@ -29,6 +29,10 @@ export type WalletAction = type: typeof WALLET.SET_HIDDEN_COINS, hiddenCoins: Array, } + | { + type: typeof WALLET.SET_HIDDEN_COINS_EXTERNAL, + hiddenCoinsExternal: Array, + } | { type: typeof WALLET.TOGGLE_DEVICE_DROPDOWN, opened: boolean, diff --git a/src/actions/constants/wallet.js b/src/actions/constants/wallet.js index a32cddfa..562cd539 100644 --- a/src/actions/constants/wallet.js +++ b/src/actions/constants/wallet.js @@ -20,3 +20,5 @@ export const SET_LANGUAGE: 'wallet__set_language' = 'wallet__set_language'; export const SET_LOCAL_CURRENCY: 'wallet__set_local_currency' = 'wallet__set_local_currency'; export const SET_HIDE_BALANCE: 'wallet__set_hide_balance' = 'wallet__set_hide_balance'; export const SET_HIDDEN_COINS: 'wallet__set_hidden_coins' = 'wallet__set_hidden_coins'; +export const SET_HIDDEN_COINS_EXTERNAL: 'wallet__set_hidden_coins_external' = + 'wallet__set_hidden_coins_external'; diff --git a/src/reducers/WalletReducer.js b/src/reducers/WalletReducer.js index 9a940e0a..04d3a15e 100644 --- a/src/reducers/WalletReducer.js +++ b/src/reducers/WalletReducer.js @@ -25,6 +25,7 @@ type State = { disconnectRequest: ?TrezorDevice, selectedDevice: ?TrezorDevice, hiddenCoins: Array, + hiddenCoinsExternal: Array, }; const initialState: State = { @@ -43,6 +44,7 @@ const initialState: State = { disconnectRequest: null, selectedDevice: null, hiddenCoins: [], + hiddenCoinsExternal: [], }; export default function wallet(state: State = initialState, action: Action): State { @@ -153,6 +155,12 @@ export default function wallet(state: State = initialState, action: Action): Sta hiddenCoins: action.hiddenCoins, }; + case WALLET.SET_HIDDEN_COINS_EXTERNAL: + return { + ...state, + hiddenCoinsExternal: action.hiddenCoinsExternal, + }; + default: return state; } diff --git a/src/views/Wallet/views/WalletSettings/Container.js b/src/views/Wallet/views/WalletSettings/Container.js index 0e185bb6..56a5a4ff 100644 --- a/src/views/Wallet/views/WalletSettings/Container.js +++ b/src/views/Wallet/views/WalletSettings/Container.js @@ -23,7 +23,7 @@ type DispatchProps = {| setLocalCurrency: typeof WalletActions.setLocalCurrency, setHideBalance: typeof WalletActions.setHideBalance, handleCoinVisibility: typeof LocalStorageActions.handleCoinVisibility, - handleAllCoinsVisibility: typeof LocalStorageActions.handleAllCoinsVisibility, + toggleGroupCoinsVisibility: typeof LocalStorageActions.toggleGroupCoinsVisibility, |}; export type Props = {| ...OwnProps, ...StateProps, ...DispatchProps |}; @@ -38,8 +38,8 @@ const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({ setLocalCurrency: bindActionCreators(WalletActions.setLocalCurrency, dispatch), setHideBalance: bindActionCreators(WalletActions.setHideBalance, dispatch), handleCoinVisibility: bindActionCreators(LocalStorageActions.handleCoinVisibility, dispatch), - handleAllCoinsVisibility: bindActionCreators( - LocalStorageActions.handleAllCoinsVisibility, + toggleGroupCoinsVisibility: bindActionCreators( + LocalStorageActions.toggleGroupCoinsVisibility, dispatch ), }); diff --git a/src/views/Wallet/views/WalletSettings/components/Coins/index.js b/src/views/Wallet/views/WalletSettings/components/Coins/index.js index 8b86ed2f..c2215c06 100644 --- a/src/views/Wallet/views/WalletSettings/components/Coins/index.js +++ b/src/views/Wallet/views/WalletSettings/components/Coins/index.js @@ -13,8 +13,9 @@ import l10nMessages from '../../index.messages'; type Props = { networks: Array, hiddenCoins: Array, + hiddenCoinsExternal: Array, handleCoinVisibility: typeof LocalStorageActions.handleCoinVisibility, - handleAllCoinsVisibility: typeof LocalStorageActions.handleAllCoinsVisibility, + toggleGroupCoinsVisibility: typeof LocalStorageActions.toggleGroupCoinsVisibility, }; const Wrapper = styled.div` @@ -118,16 +119,10 @@ const CoinsSettings = (props: Props) => ( .filter(x => !x.isHidden) .map(item => item.shortcut); - props.handleAllCoinsVisibility( - checked, - allCoins, - props.hiddenCoins - ); + props.toggleGroupCoinsVisibility(allCoins, checked, false); }} > - {props.hiddenCoins.every(val => props.networks.includes(val)) - ? 'Hide all' - : 'Show all'} + {props.hiddenCoins.length > 0 ? 'Show all' : 'Hide all'} @@ -147,7 +142,11 @@ const CoinsSettings = (props: Props) => ( checkedIcon={false} uncheckedIcon={false} onChange={visible => { - props.handleCoinVisibility(network.shortcut, visible); + props.handleCoinVisibility( + network.shortcut, + visible, + false + ); }} checked={!props.hiddenCoins.includes(network.shortcut)} /> @@ -180,11 +179,7 @@ const CoinsSettings = (props: Props) => ( .filter(x => !x.isHidden) .map(coin => coin.id); - props.handleAllCoinsVisibility( - checked, - allCoins, - props.hiddenCoins - ); + props.toggleGroupCoinsVisibility(allCoins, checked, true); }} > Show all @@ -207,9 +202,9 @@ const CoinsSettings = (props: Props) => ( checkedIcon={false} uncheckedIcon={false} onChange={visible => { - props.handleCoinVisibility(network.id, visible); + props.handleCoinVisibility(network.id, visible, true); }} - checked={!props.hiddenCoins.includes(network.id)} + checked={!props.hiddenCoinsExternal.includes(network.id)} /> diff --git a/src/views/Wallet/views/WalletSettings/index.js b/src/views/Wallet/views/WalletSettings/index.js index 677cd5f2..a9b4626b 100644 --- a/src/views/Wallet/views/WalletSettings/index.js +++ b/src/views/Wallet/views/WalletSettings/index.js @@ -120,8 +120,9 @@ const WalletSettings = (props: Props) => ( From a6002667862b7bbddb7a33d8c8f83c85d38bc6bd Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Wed, 24 Apr 2019 14:42:02 +0200 Subject: [PATCH 3/4] fixed state checking --- src/actions/LocalStorageActions.js | 33 ++- .../WalletSettings/components/Coins/index.js | 271 ++++++++++-------- 2 files changed, 178 insertions(+), 126 deletions(-) diff --git a/src/actions/LocalStorageActions.js b/src/actions/LocalStorageActions.js index c2fb7790..1439a1b2 100644 --- a/src/actions/LocalStorageActions.js +++ b/src/actions/LocalStorageActions.js @@ -401,21 +401,9 @@ export const toggleGroupCoinsVisibility = ( checked: boolean, isExternal: boolean ): ThunkAction => (dispatch: Dispatch) => { - if (checked && isExternal) { - dispatch({ - type: WALLET.SET_HIDDEN_COINS_EXTERNAL, - hiddenCoinsExternal: [], - }); - storageUtils.set(TYPE, KEY_HIDDEN_COINS_EXTERNAL, JSON.stringify([])); - } + // supported coins - if (!checked && isExternal) { - dispatch({ - type: WALLET.SET_HIDDEN_COINS_EXTERNAL, - hiddenCoinsExternal: allCoins, - }); - storageUtils.set(TYPE, KEY_HIDDEN_COINS_EXTERNAL, JSON.stringify(allCoins)); - } + console.log('checked', checked); if (checked && !isExternal) { dispatch({ @@ -432,6 +420,23 @@ export const toggleGroupCoinsVisibility = ( }); storageUtils.set(TYPE, KEY_HIDDEN_COINS, JSON.stringify(allCoins)); } + + // external coins + if (checked && isExternal) { + dispatch({ + type: WALLET.SET_HIDDEN_COINS_EXTERNAL, + hiddenCoinsExternal: [], + }); + storageUtils.set(TYPE, KEY_HIDDEN_COINS_EXTERNAL, JSON.stringify([])); + } + + if (!checked && isExternal) { + dispatch({ + type: WALLET.SET_HIDDEN_COINS_EXTERNAL, + hiddenCoinsExternal: allCoins, + }); + storageUtils.set(TYPE, KEY_HIDDEN_COINS_EXTERNAL, JSON.stringify(allCoins)); + } }; export const getHiddenCoins = (isExternal: boolean): Array => { diff --git a/src/views/Wallet/views/WalletSettings/components/Coins/index.js b/src/views/Wallet/views/WalletSettings/components/Coins/index.js index c2215c06..0df8ee99 100644 --- a/src/views/Wallet/views/WalletSettings/components/Coins/index.js +++ b/src/views/Wallet/views/WalletSettings/components/Coins/index.js @@ -1,6 +1,6 @@ /* @flow */ import styled from 'styled-components'; -import React from 'react'; +import React, { PureComponent } from 'react'; import { FormattedMessage } from 'react-intl'; import { FONT_SIZE } from 'config/variables'; import coins from 'constants/coins'; @@ -18,6 +18,11 @@ type Props = { toggleGroupCoinsVisibility: typeof LocalStorageActions.toggleGroupCoinsVisibility, }; +type State = { + showAllCoins: boolean, + showAllCoinsExternal: boolean, +}; + const Wrapper = styled.div` display: flex; flex-direction: column; @@ -87,131 +92,173 @@ const LogoWrapper = styled.div` align-items: center; `; -const ToggleAll = styled.span` +const ToggleAll = styled.div` cursor: pointer; `; -const CoinsSettings = (props: Props) => ( - - - - - {props.networks - .filter(network => !network.isHidden) - .map(network => ( - +class CoinsSettings extends PureComponent { + constructor(props: Props) { + super(props); + this.state = { + showAllCoins: this.props.hiddenCoins.length === 0, + showAllCoinsExternal: this.props.hiddenCoinsExternal.length === 0, + }; + } + + render() { + const { props } = this; + return ( + + + + {console.log('hidden coins', props.hiddenCoins)} + {console.log('hidden coins', props.hiddenCoins)} + {console.log('hidden coins external', props.hiddenCoinsExternal)} + - ))} - - - - {coins - .sort((a, b) => a.order - b.order) - .map(network => ( - + + {props.networks + .filter(network => !network.isHidden) + .map(network => ( + + + + + + {network.name} + + + { + props.handleCoinVisibility( + network.shortcut, + visible, + false + ); + }} + checked={!props.hiddenCoins.includes(network.shortcut)} + /> + + + ))} + + + - - -); + + {coins + .sort((a, b) => a.order - b.order) + .map(network => ( + + + + + + {network.coinName} + + + { + props.handleCoinVisibility( + network.id, + visible, + true + ); + }} + checked={ + !props.hiddenCoinsExternal.includes(network.id) + } + /> + + + ))} + + + + ); + } +} export default CoinsSettings; From 88394eede2a93980f7bd6b5e0edb6ea24318ba1f Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Wed, 24 Apr 2019 14:46:16 +0200 Subject: [PATCH 4/4] cleanup --- src/actions/LocalStorageActions.js | 5 ----- .../LeftNavigation/components/CoinMenu/index.js | 8 ++++---- .../Wallet/views/WalletSettings/components/Coins/index.js | 3 --- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/actions/LocalStorageActions.js b/src/actions/LocalStorageActions.js index 1439a1b2..c44cdb33 100644 --- a/src/actions/LocalStorageActions.js +++ b/src/actions/LocalStorageActions.js @@ -379,8 +379,6 @@ export const handleCoinVisibility = ( newConfig = [...configuration, coinShortcut]; } - console.log(coinShortcut, shouldBeVisible, isExternal); - if (isExternal) { storageUtils.set(TYPE, KEY_HIDDEN_COINS_EXTERNAL, JSON.stringify(newConfig)); dispatch({ @@ -402,9 +400,6 @@ export const toggleGroupCoinsVisibility = ( isExternal: boolean ): ThunkAction => (dispatch: Dispatch) => { // supported coins - - console.log('checked', checked); - if (checked && !isExternal) { dispatch({ type: WALLET.SET_HIDDEN_COINS, diff --git a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js index 5a63ef48..c1e1ce2b 100644 --- a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js @@ -56,11 +56,11 @@ class CoinMenu extends PureComponent { } getOtherCoins() { - const { hiddenCoins } = this.props.wallet; + const { hiddenCoinsExternal } = this.props.wallet; return coins .sort((a, b) => a.order - b.order) .filter(item => !item.isHidden) // hide coins globally in config - .filter(item => !hiddenCoins.includes(item.id)) + .filter(item => !hiddenCoinsExternal.includes(item.id)) .map(coin => { const row = ( { } isBottomMenuEmpty() { - const { hiddenCoins } = this.props.wallet; + const { hiddenCoinsExternal } = this.props.wallet; const numberOfVisibleNetworks = coins .filter(item => !item.isHidden) - .filter(item => !hiddenCoins.includes(item.id)); + .filter(item => !hiddenCoinsExternal.includes(item.id)); return numberOfVisibleNetworks.length <= 0; } diff --git a/src/views/Wallet/views/WalletSettings/components/Coins/index.js b/src/views/Wallet/views/WalletSettings/components/Coins/index.js index 0df8ee99..21aab25a 100644 --- a/src/views/Wallet/views/WalletSettings/components/Coins/index.js +++ b/src/views/Wallet/views/WalletSettings/components/Coins/index.js @@ -111,9 +111,6 @@ class CoinsSettings extends PureComponent { - {console.log('hidden coins', props.hiddenCoins)} - {console.log('hidden coins', props.hiddenCoins)} - {console.log('hidden coins external', props.hiddenCoinsExternal)}