commit

Merge branch 'feature/friends' of https://github.com/LN-Zap/zap-desktop into feature/friends

app/components/Contacts/ContactModal.js

@@ -55,12 +55,7 @@ const ContactModal = ({
             <div className={`${styles.status} ${channel.active && styles.online}`}>
               <FaCircle style={{ verticalAlign: 'top' }} />
               <span>
-                {
-                  channel.active ?
-                  'Online'
-                  :
-                  'Offline'
-                }
+                {channel.active ? 'Online' : 'Offline'}
               </span>
             </div>
             <div className={styles.closeContainer}>

app/components/Contacts/ContactsForm.js

@@ -142,22 +142,22 @@ class ContactsForm extends React.Component {
                   <li key={node.pub_key}>
                     <section>
                       {
-                          node.alias.length > 0 ?
-                            <h2>
-                              <span>{node.alias.trim()}</span>
-                              <span>({node.pub_key.substr(0, 10)}...{node.pub_key.substr(node.pub_key.length - 10)})</span>
-                            </h2>
-                            :
-                            <h2>
-                              <span>{node.pub_key}</span>
-                            </h2>
-                        }
+                        node.alias.length > 0 ?
+                          <h2>
+                            <span>{node.alias.trim()}</span>
+                            <span>({node.pub_key.substr(0, 10)}...{node.pub_key.substr(node.pub_key.length - 10)})</span>
+                          </h2>
+                          :
+                          <h2>
+                            <span>{node.pub_key}</span>
+                          </h2>
+                      }
                     </section>
                     <section>
                       {renderRightSide(node)}
                     </section>
                   </li>
-                  ))
+                ))
               }
             </ul>
           </div>

app/routes/contacts/components/Contacts.js

@@ -164,7 +164,7 @@ class Contacts extends Component {
               } else if (!channel.active) {
                 return <OfflineContact channel={channel} key={index} openContactModal={openContactModal} />
               }
-                return <span />
+              return <span />
             })
           }
         </ul>