From 26c7ccdef670034bcf7dafd246a2035186179cd6 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Thu, 19 Jul 2018 15:31:14 -0400
Subject: [PATCH 1/3] refactor: no need for identity select intermediary

The pendingOpenChannelsSelector does what we need here.
---
 app/reducers/channels.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/reducers/channels.js b/app/reducers/channels.js
index c2269756..6a05db8b 100644
--- a/app/reducers/channels.js
+++ b/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(
-  pendingOpenChannelsSelector,
-  pendingOpenChannels => pendingOpenChannels
-)
+channelsSelectors.pendingOpenChannels = pendingOpenChannelsSelector
 
 channelsSelectors.pendingOpenChannelPubkeys = createSelector(
   pendingOpenChannelsSelector,

From b15d68de18528126a0a3d4805657613be181f247 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Thu, 19 Jul 2018 15:33:51 -0400
Subject: [PATCH 2/3] refactor: avoid repeating a conditional in Network

---
 app/components/Contacts/Network.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/components/Contacts/Network.js b/app/components/Contacts/Network.js
index 48019cae..18128ed0 100644
--- a/app/components/Contacts/Network.js
+++ b/app/components/Contacts/Network.js
@@ -174,15 +174,10 @@ class Network extends Component {
         </header>
 
         <div className={styles.channels}>
-          {!loadingChannelPubkeys.length &&
-            !currentChannels.length &&
-            !channels.length &&
-            !searchQuery.length && <SuggestedNodes {...suggestedNodesProps} />}
-
-          {(loadingChannelPubkeys.length ||
-            currentChannels.length ||
-            channels.length ||
-            searchQuery.length) && (
+          {loadingChannelPubkeys.length ||
+          currentChannels.length ||
+          channels.length ||
+          searchQuery.length ? (
             <header className={styles.listHeader}>
               <section>
                 <h2 onClick={toggleFilterPulldown} className={styles.filterTitle}>
@@ -211,6 +206,8 @@ class Network extends Component {
                 </span>
               </section>
             </header>
+          ) : (
+            <SuggestedNodes {...suggestedNodesProps} />
           )}
 
           <ul className={filterPulldown && styles.fade}>

From 673829821a4301129230f063cab36c1561967af2 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Thu, 19 Jul 2018 15:49:10 -0400
Subject: [PATCH 3/3] fix: don't show channel suggestions if pending channels
 exist

---
 app/components/Contacts/Network.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/components/Contacts/Network.js b/app/components/Contacts/Network.js
index 18128ed0..5a04a5c8 100644
--- a/app/components/Contacts/Network.js
+++ b/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,10 +175,7 @@ class Network extends Component {
         </header>
 
         <div className={styles.channels}>
-          {loadingChannelPubkeys.length ||
-          currentChannels.length ||
-          channels.length ||
-          searchQuery.length ? (
+          {loadingChannelPubkeys.length || pending_open_channels.length || channels.length ? (
             <header className={styles.listHeader}>
               <section>
                 <h2 onClick={toggleFilterPulldown} className={styles.filterTitle}>
@@ -326,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} />