From 1b3c606c5bba592c1fc498ceb45e304779aa0e80 Mon Sep 17 00:00:00 2001
From: Roland Osborne <roland.osborne@gmail.com>
Date: Mon, 19 Dec 2022 15:22:22 -0800
Subject: [PATCH] fix delay on loading message

---
 .../src/session/conversation/Conversation.jsx |  6 ++--
 .../conversation/useConversation.hook.js      | 30 ++++++++-----------
 .../profile/profileBody/ProfileBody.jsx       | 10 ++++---
 .../profileBody/useProfileBody.hook.js        |  5 ++--
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/app/mobile/src/session/conversation/Conversation.jsx b/app/mobile/src/session/conversation/Conversation.jsx
index 25a9f983..9f47573d 100644
--- a/app/mobile/src/session/conversation/Conversation.jsx
+++ b/app/mobile/src/session/conversation/Conversation.jsx
@@ -87,7 +87,9 @@ export function ConversationBody() {
 <View style={styles.thread}>
         { state.topics.length === 0 && (
           <View style={styles.empty}>
-            <Text style={styles.emptyText}>No Messages</Text>
+            { state.init && (
+              <Text style={styles.emptyText}>No Messages</Text>
+            )}
           </View>
         )}
         { state.topics.length !== 0 && (
@@ -107,7 +109,7 @@ export function ConversationBody() {
             keyExtractor={item => item.topicId}
           />
         )}
-        { !state.init && (
+        { !state.init && state.delayed && (
           <View style={styles.loading}>
             <ActivityIndicator size="large" color={Colors.primary} />
           </View>
diff --git a/app/mobile/src/session/conversation/useConversation.hook.js b/app/mobile/src/session/conversation/useConversation.hook.js
index 856b33a5..216f3b3c 100644
--- a/app/mobile/src/session/conversation/useConversation.hook.js
+++ b/app/mobile/src/session/conversation/useConversation.hook.js
@@ -19,12 +19,15 @@ export function useConversation() {
     editData: null,
     editMessage: null,
     init: false,
+    delayed: false,
     error: false,
     keyboard: false,
     locked: false,
     sealKey: null,
+    delayed: false,
   });
 
+  const init = useRef(true);
   const delay = useRef(null);
   const conversation = useContext(ConversationContext);
   const account = useContext(AccountContext);
@@ -33,15 +36,6 @@ export function useConversation() {
     setState((s) => ({ ...s, ...value }));
   }
 
-const converPem = (str) => {
-  var result = '';
-  while (str.length > 0) {
-    result += str.substring(0, 64) + '\n';
-    str = str.substring(64);
-  }
-  return result;
-}
-
   useEffect(() => {
     let sealKey;
     const { locked, seals } = conversation.state;
@@ -59,6 +53,7 @@ const converPem = (str) => {
 
   useEffect(() => {
     const { error, subject, logo, topics, host, init } = conversation.state;
+
     const items = Array.from(topics.values());
     const sorted = items.sort((a, b) => {
       const aTimestamp = a?.detail?.created;
@@ -72,18 +67,17 @@ const converPem = (str) => {
       return -1;
     });
     const filtered = sorted.filter(item => !(item.blocked === 1));
-    updateState({ subject, logo, host, error, topics: filtered });
-    if (init) {
-      clearTimeout(delay.current);
-      updateState({ init: true });
+
+    if (!init) {
+      setTimeout(() => {
+        updateState({ delayed: true });
+      }, 500);
     }
     else {
-      if (!delay.current) {
-        delay.current = setTimeout(() => {
-          updateState({ init: false });
-        }, 500);
-      }
+      updateState({ delayed: false });
     }
+
+    updateState({ init, subject, logo, host, error, topics: filtered });
   }, [conversation]);
 
   const actions = {
diff --git a/app/mobile/src/session/profile/profileBody/ProfileBody.jsx b/app/mobile/src/session/profile/profileBody/ProfileBody.jsx
index 1415a02e..6272841e 100644
--- a/app/mobile/src/session/profile/profileBody/ProfileBody.jsx
+++ b/app/mobile/src/session/profile/profileBody/ProfileBody.jsx
@@ -157,10 +157,12 @@ export function ProfileBody({ navigation }) {
         </TouchableOpacity>
         <Switch style={styles.visibleSwitch} value={state.pushEnabled} onValueChange={setNotifications} trackColor={styles.switch}/>
       </View>
-      <TouchableOpacity style={styles.link} onPress={actions.showSealEdit}>
-        <Ionicons name="setting" size={14} color={Colors.primary} />
-        <Text style={styles.linkText}>Sealed Topics</Text>
-      </TouchableOpacity>
+      { state.sealable && (
+        <TouchableOpacity style={styles.link} onPress={actions.showSealEdit}>
+          <Ionicons name="setting" size={14} color={Colors.primary} />
+          <Text style={styles.linkText}>Sealed Topics</Text>
+        </TouchableOpacity>
+      )}
       <TouchableOpacity style={styles.link} onPress={actions.showLoginEdit}>
         <Ionicons name="lock" size={14} color={Colors.primary} />
         <Text style={styles.linkText}>Change Login</Text>
diff --git a/app/mobile/src/session/profile/profileBody/useProfileBody.hook.js b/app/mobile/src/session/profile/profileBody/useProfileBody.hook.js
index 8a37aa73..e7ed5e10 100644
--- a/app/mobile/src/session/profile/profileBody/useProfileBody.hook.js
+++ b/app/mobile/src/session/profile/profileBody/useProfileBody.hook.js
@@ -17,6 +17,7 @@ export function useProfileBody() {
     description: null,
     node: null,
     imageSource: null,
+    sealable: false,
     searchable: null,
     notifications: null,
     showDetailEdit: false,
@@ -83,11 +84,11 @@ export function useProfileBody() {
   }, [profile]);
 
   useEffect(() => {
-    const { searchable, pushEnabled, seal } = account.state.status;
+    const { searchable, pushEnabled, seal, sealable } = account.state.status;
     const sealKey = account.state.sealKey;
     const sealEnabled = seal?.publicKey != null;
     const sealUnlocked = seal?.publicKey === sealKey?.public && sealKey?.private && sealKey?.public;
-    updateState({ searchable, pushEnabled, seal, sealKey, sealEnabled, sealUnlocked });
+    updateState({ searchable, sealable, pushEnabled, seal, sealKey, sealEnabled, sealUnlocked });
   }, [account]);
 
   useEffect(() => {