Merge pull request #304 from LN-Zap/fix/network-circle-icons

Fix/network tool tips

app/components/Contacts/Network.js

@@ -99,7 +99,7 @@ class Network extends Component {
               {btc.satoshisToBtc(balance.channelBalance)}BTC ≈ ${usdAmount ? usdAmount.toLocaleString() : ''}
             </span>
           </section>
-          <section className={styles.addChannel} onClick={openContactsForm}>
+          <section className={`${styles.addChannel} hint--bottom-left`} onClick={openContactsForm} data-hint='Open a channel'>
             <Isvg src={plus} />
           </section>
         </header>
@@ -140,7 +140,9 @@ class Network extends Component {
                 return (
                   <li key={index} className={styles.channel} onClick={() => openContactModal(channelObj)}>
                     <span>{displayNodeName(channel)}</span>
-                    <span className={styles[channelStatus(channelObj)]}><FaCircle /></span>
+                    <span className={`${styles[channelStatus(channelObj)]} hint--left`} data-hint={channelStatus(channelObj)}>
+                      <FaCircle />
+                    </span>
                   </li>
                 )
               })

app/components/Contacts/Network.scss

@@ -41,6 +41,8 @@
 
 .channels {
   padding: 20px;
+  height: 100%;
+  overflow-y: scroll;
 
   .listHeader {
     position: relative;
@@ -99,6 +101,8 @@
 
   ul {
     margin-top: 20px;
+    height: 100%;
+    overflow-y: scroll;
   }
 
   .fade {
@@ -130,6 +134,10 @@
       color: $darkestgrey;
     }
 
+    .closing {
+      color: $red;
+    }
+
     svg {
       width: 5px;
       height: 5px;
@@ -143,6 +151,7 @@
   width: calc(100% - 40px);
   padding: 10px 20px;
   border-top: 1px solid $darkestgrey;
+  background: #2D303B;
 
   .input {
     display: inline-block;

app/components/Wallet/Wallet.js

@@ -32,8 +32,7 @@ class Wallet extends Component {
     } = this.props
 
     const { modalOpen, qrCodeType } = this.state
-    const usdAmount = btc.satoshisToUsd(balance.channelBalance, currentTicker.price_usd)
+    const usdAmount = btc.satoshisToUsd((parseInt(balance.walletBalance, 10) + parseInt(balance.channelBalance, 10)), currentTicker.price_usd)
-    console.log('usdAmount: ', usdAmount)
 
     const changeQrCode = () => {
       const qrCodeNum = this.state.qrCodeType === 1 ? 2 : 1