From f1f652bf64fd2dae4b82dc045da8376409da0523 Mon Sep 17 00:00:00 2001
From: Roland Osborne <roland.osborne@gmail.com>
Date: Thu, 19 Jan 2023 00:12:32 -0800
Subject: [PATCH] more refactor of webapp channel list

---
 net/web/src/session/channels/Channels.jsx        |  9 +++------
 net/web/src/session/channels/useChannels.hook.js | 11 +++--------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/net/web/src/session/channels/Channels.jsx b/net/web/src/session/channels/Channels.jsx
index f7f293c2..78e68391 100644
--- a/net/web/src/session/channels/Channels.jsx
+++ b/net/web/src/session/channels/Channels.jsx
@@ -14,10 +14,6 @@ export function Channels({ open, active }) {
     open(id);
   };
 
-  const cancelled = () => {
-    actions.clearShowAdd();
-  }
-
   return (
     <ChannelsWrapper>
       <div class="search">
@@ -49,8 +45,9 @@ export function Channels({ open, active }) {
           <Button type="primary" icon={<CommentOutlined />} onClick={actions.setShowAdd}>New Topic</Button>
         </div>
       )}
-      <Modal title="New Topic" centered visible={state.showAdd} footer={null}>
-        <AddChannel added={added} cancelled={cancelled} />
+      <Modal title="New Topic" centered visible={state.showAdd} footer={null} destroyOnClose={true}
+          onCancel={actions.clearShowAdd}>
+        <AddChannel added={added} cancelled={actions.clearShowAdd} />
       </Modal>
     </ChannelsWrapper>
   );
diff --git a/net/web/src/session/channels/useChannels.hook.js b/net/web/src/session/channels/useChannels.hook.js
index d9778e1f..982b9a46 100644
--- a/net/web/src/session/channels/useChannels.hook.js
+++ b/net/web/src/session/channels/useChannels.hook.js
@@ -125,6 +125,7 @@ export function useChannels() {
         item.subject = null;
       }
     }
+
     if (item.subject == null || typeof item.subject !== 'string') {
       item.subject = item.label;
     }
@@ -178,10 +179,7 @@ export function useChannels() {
         if (!item) {
           item = { cardId, channelId };
         }
-        if (item.detailRevision !== detailRevision ||
-            item.sealKey !== sealKey) {
-          syncChannelDetail(item, cardValue, channelValue);
-        }
+        syncChannelDetail(item, cardValue, channelValue);
         if (item.topicRevision !== topicRevision ||
             item.sealKey !== sealKey) {
           syncChannelSummary(item, channelValue);
@@ -204,10 +202,7 @@ export function useChannels() {
       if (!item) {
         item = { channelId };
       }
-      if (item.detailRevision !== detailRevision ||
-          item.sealKey !== sealKey) {
-        syncChannelDetail(item, null, channelValue);
-      }
+      syncChannelDetail(item, null, channelValue);
       if (item.topicRevision !== topicRevision ||
           item.sealKey !== sealKey) {
         syncChannelSummary(item, channelValue);