Merge branch 'master' into dh-copy-visual

src/components/admin-lte/wallet/index.js

@@ -20,24 +20,31 @@ class Wallet extends React.Component {
     return (
       <Content>
         <InfoWallets />
-
+        {/* Show wallet info is this exists */}
         {_this.props.walletInfo.mnemonic && (
           <WalletInfo walletInfo={_this.props.walletInfo} />
         )}
 
-        <NewWallet
-          updateBalance={_this.props.updateBalance}
-          setWalletInfo={_this.props.setWalletInfo}
-          setBchWallet={_this.props.setBchWallet}
-          walletInfo={_this.props.walletInfo}
-        />
+        {/** Shows the 'create' and 'import' cards
+         *   if there's not a wallet created
+         */}
+        {!_this.props.walletInfo.mnemonic && (
+          <>
+            <NewWallet
+              updateBalance={_this.props.updateBalance}
+              setWalletInfo={_this.props.setWalletInfo}
+              setBchWallet={_this.props.setBchWallet}
+              walletInfo={_this.props.walletInfo}
+            />
 
-        <ImportWallet
-          updateBalance={_this.props.updateBalance}
-          setWalletInfo={_this.props.setWalletInfo}
-          setBchWallet={_this.props.setBchWallet}
-          walletInfo={_this.props.walletInfo}
-        />
+            <ImportWallet
+              updateBalance={_this.props.updateBalance}
+              setWalletInfo={_this.props.setWalletInfo}
+              setBchWallet={_this.props.setBchWallet}
+              walletInfo={_this.props.walletInfo}
+            />
+          </>
+        )}
 
         {this.props.importComponents}
       </Content>

src/components/admin-lte/wallet/info.js

@@ -28,7 +28,8 @@ class InfoWallets extends React.Component {
                 <p>
                   This is an open source, non-custodial web wallet
                   supporting Bitcoin Cash (BCH) and SLP tokens. Web wallets
-                  offer user convenience, by they are inherently insecure.{' '}
+                  offer user convenience, but they are inherently insecure and
+                  bad for privacy.{' '}
                   <b>Storing large amounts of money on a web wallet is not
                     recommended!
                   </b>