From 7abc4a61fe4e3e3c1cd4b00ee1590afb393df57f Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Tue, 23 Apr 2019 13:44:08 +0200
Subject: [PATCH] fix selected coins at start, handle not visible coins
 properly

---
 src/actions/LocalStorageActions.js                   |  2 +-
 .../LeftNavigation/components/CoinMenu/index.js      |  6 +++---
 src/views/Wallet/views/Dashboard/index.js            |  2 +-
 .../views/WalletSettings/components/Coins/index.js   | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/actions/LocalStorageActions.js b/src/actions/LocalStorageActions.js
index bfc652cc..7f242269 100644
--- a/src/actions/LocalStorageActions.js
+++ b/src/actions/LocalStorageActions.js
@@ -367,7 +367,7 @@ export const handleCoinVisibility = (
     let newConfig: Array<string> = configuration;
     const isAlreadyHidden = configuration.find(coin => coin === coinShortcut);
 
-    if (isAlreadyHidden && shouldBeVisible) {
+    if (shouldBeVisible) {
         newConfig = configuration.filter(coin => coin !== coinShortcut);
     } else if (!isAlreadyHidden) {
         newConfig = [...configuration, coinShortcut];
diff --git a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
index ee3e7e20..93be4c52 100644
--- a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
+++ b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js
@@ -60,7 +60,7 @@ class CoinMenu extends PureComponent<Props> {
         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 => !hiddenCoins.includes(item.id))
             .map(coin => {
                 const row = (
                     <RowCoin
@@ -105,7 +105,7 @@ class CoinMenu extends PureComponent<Props> {
         const { hiddenCoins } = this.props.wallet;
         const numberOfVisibleNetworks = coins
             .filter(item => !item.isHidden)
-            .filter(item => hiddenCoins.includes(item.id));
+            .filter(item => !hiddenCoins.includes(item.id));
 
         return numberOfVisibleNetworks.length <= 0;
     }
@@ -129,7 +129,7 @@ class CoinMenu extends PureComponent<Props> {
                 )}
                 {config.networks
                     .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)
                     .map(item => (
                         <NavLink
diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js
index 258c4e09..3140d2f2 100644
--- a/src/views/Wallet/views/Dashboard/index.js
+++ b/src/views/Wallet/views/Dashboard/index.js
@@ -76,7 +76,7 @@ const Dashboard = (props: Props) => (
                 <Coins>
                     {props.localStorage.config.networks
                         .filter(item => !item.isHidden)
-                        .filter(item => props.wallet.hiddenCoins.includes(item.shortcut))
+                        .filter(item => !props.wallet.hiddenCoins.includes(item.shortcut))
                         .map(network => (
                             <StyledNavLink
                                 key={network.shortcut}
diff --git a/src/views/Wallet/views/WalletSettings/components/Coins/index.js b/src/views/Wallet/views/WalletSettings/components/Coins/index.js
index ed18de98..7d3ae0ef 100644
--- a/src/views/Wallet/views/WalletSettings/components/Coins/index.js
+++ b/src/views/Wallet/views/WalletSettings/components/Coins/index.js
@@ -107,10 +107,10 @@ const CoinsSettings = (props: Props) => (
                             </Left>
                             <Right>
                                 <Switch
-                                    onChange={isVisible => {
-                                        props.handleCoinVisibility(network.shortcut, !isVisible);
+                                    onChange={visible => {
+                                        props.handleCoinVisibility(network.shortcut, visible);
                                     }}
-                                    checked={props.hiddenCoins.includes(network.shortcut)}
+                                    checked={!props.hiddenCoins.includes(network.shortcut)}
                                 />
                             </Right>
                         </CoinRow>
@@ -139,10 +139,10 @@ const CoinsSettings = (props: Props) => (
                             </Left>
                             <Right>
                                 <Switch
-                                    onChange={isVisible => {
-                                        props.handleCoinVisibility(network.id, !isVisible);
+                                    onChange={visible => {
+                                        props.handleCoinVisibility(network.id, visible);
                                     }}
-                                    checked={props.hiddenCoins.includes(network.id)}
+                                    checked={!props.hiddenCoins.includes(network.id)}
                                 />
                             </Right>
                         </CoinRow>