arno
/
trezor-wallet
mirror of https://github.com/trezor/trezor-wallet
1
0
Fork 0
Code Issues Releases Wiki Activity

fix selected coins at start, handle not visible coins properly

Browse Source
pull/513/head
Vladimir Volek 5 years ago
parent bf47a1684b
commit 7abc4a61fe
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
src/actions/LocalStorageActions.js
Unescape View File

@ -367,7 +367,7 @@ export const handleCoinVisibility = (
let newConfig: Array<string> = configuration; let newConfig: Array<string> = configuration;
const isAlreadyHidden = configuration.find(coin => coin === coinShortcut); const isAlreadyHidden = configuration.find(coin => coin === coinShortcut);
if (isAlreadyHidden && shouldBeVisible) { if (shouldBeVisible) {
newConfig = configuration.filter(coin => coin !== coinShortcut); newConfig = configuration.filter(coin => coin !== coinShortcut);
} else if (!isAlreadyHidden) { } else if (!isAlreadyHidden) {
newConfig = [...configuration, coinShortcut]; newConfig = [...configuration, coinShortcut];

6
src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
Unescape View File

@ -60,7 +60,7 @@ class CoinMenu extends PureComponent<Props> {
return coins return coins
.sort((a, b) => a.order - b.order) .sort((a, b) => a.order - b.order)
.filter(item => !item.isHidden) // hide coins globally in config .filter(item => !item.isHidden) // hide coins globally in config
.filter(item => hiddenCoins.includes(item.id)) .filter(item => !hiddenCoins.includes(item.id))
.map(coin => { .map(coin => {
const row = ( const row = (
<RowCoin <RowCoin
@ -105,7 +105,7 @@ class CoinMenu extends PureComponent<Props> {
const { hiddenCoins } = this.props.wallet; const { hiddenCoins } = this.props.wallet;
const numberOfVisibleNetworks = coins const numberOfVisibleNetworks = coins
.filter(item => !item.isHidden) .filter(item => !item.isHidden)
.filter(item => hiddenCoins.includes(item.id)); .filter(item => !hiddenCoins.includes(item.id));
return numberOfVisibleNetworks.length <= 0; return numberOfVisibleNetworks.length <= 0;
} }
@ -129,7 +129,7 @@ class CoinMenu extends PureComponent<Props> {
)} )}
{config.networks {config.networks
.filter(item => !item.isHidden) // hide coins globally in config .filter(item => !item.isHidden) // hide coins globally in config
.filter(item => hiddenCoins.includes(item.shortcut)) // hide coins by user settings .filter(item => !hiddenCoins.includes(item.shortcut)) // hide coins by user settings
.sort((a, b) => a.order - b.order) .sort((a, b) => a.order - b.order)
.map(item => ( .map(item => (
<NavLink <NavLink

2
src/views/Wallet/views/Dashboard/index.js
Unescape View File

@ -76,7 +76,7 @@ const Dashboard = (props: Props) => (
<Coins> <Coins>
{props.localStorage.config.networks {props.localStorage.config.networks
.filter(item => !item.isHidden) .filter(item => !item.isHidden)
.filter(item => props.wallet.hiddenCoins.includes(item.shortcut)) .filter(item => !props.wallet.hiddenCoins.includes(item.shortcut))
.map(network => ( .map(network => (
<StyledNavLink <StyledNavLink
key={network.shortcut} key={network.shortcut}

12
src/views/Wallet/views/WalletSettings/components/Coins/index.js
Unescape View File

@ -107,10 +107,10 @@ const CoinsSettings = (props: Props) => (
</Left> </Left>
<Right> <Right>
<Switch <Switch
onChange={isVisible => { onChange={visible => {
props.handleCoinVisibility(network.shortcut, !isVisible); props.handleCoinVisibility(network.shortcut, visible);
}} }}
checked={props.hiddenCoins.includes(network.shortcut)} checked={!props.hiddenCoins.includes(network.shortcut)}
/> />
</Right> </Right>
</CoinRow> </CoinRow>
@ -139,10 +139,10 @@ const CoinsSettings = (props: Props) => (
</Left> </Left>
<Right> <Right>
<Switch <Switch
onChange={isVisible => { onChange={visible => {
props.handleCoinVisibility(network.id, !isVisible); props.handleCoinVisibility(network.id, visible);
}} }}
checked={props.hiddenCoins.includes(network.id)} checked={!props.hiddenCoins.includes(network.id)}
/> />
</Right> </Right>
</CoinRow> </CoinRow>

Write Preview
Loading…
Cancel
Save