Merge pull request #570 from Empact/fix/pending-channels-selector

fix: don't show channel suggestions if pending channels exist

app/components/Contacts/Network.js

@@ -32,7 +32,8 @@ class Network extends Component {
         selectedChannel,
         loadingChannelPubkeys,
         closingChannelIds,
-        channels
+        channels,
+        pendingChannels: { pending_open_channels }
       },
       currentChannels,
       balance,
@@ -174,15 +175,7 @@ class Network extends Component {
         </header>
 
         <div className={styles.channels}>
-          {!loadingChannelPubkeys.length &&
+          {loadingChannelPubkeys.length || pending_open_channels.length || channels.length ? (
-            !currentChannels.length &&
-            !channels.length &&
-            !searchQuery.length && <SuggestedNodes {...suggestedNodesProps} />}
-
-          {(loadingChannelPubkeys.length ||
-            currentChannels.length ||
-            channels.length ||
-            searchQuery.length) && (
             <header className={styles.listHeader}>
               <section>
                 <h2 onClick={toggleFilterPulldown} className={styles.filterTitle}>
@@ -211,6 +204,8 @@ class Network extends Component {
                 </span>
               </section>
             </header>
+          ) : (
+            <SuggestedNodes {...suggestedNodesProps} />
           )}
 
           <ul className={filterPulldown && styles.fade}>
@@ -329,7 +324,7 @@ class Network extends Component {
               })}
           </ul>
         </div>
-        {(loadingChannelPubkeys.length || currentChannels.length || searchQuery.length) && (
+        {(loadingChannelPubkeys.length || pending_open_channels.length || channels.length) && (
           <footer className={styles.search}>
             <label htmlFor="search" className={`${styles.label} ${styles.input}`}>
               <Isvg src={search} />

app/reducers/channels.js

@@ -444,10 +444,7 @@ channelsSelectors.nonActiveChannelPubkeys = createSelector(channelsSelector, ope
   openChannels.filter(channel => !channel.active).map(c => c.remote_pubkey)
 )
 
-channelsSelectors.pendingOpenChannels = createSelector(
+channelsSelectors.pendingOpenChannels = pendingOpenChannelsSelector
-  pendingOpenChannelsSelector,
-  pendingOpenChannels => pendingOpenChannels
-)
 
 channelsSelectors.pendingOpenChannelPubkeys = createSelector(
   pendingOpenChannelsSelector,