Fixed UI blocking when creating conversation, more review comments

js/conversation_controller.js

@@ -182,11 +182,10 @@
         }
 
         try {
-          const swarmNodes = await window.LokiSnodeAPI.getFreshSwarmNodes(id);
-          conversation.set({ swarmNodes });
           await window.Signal.Data.saveConversation(conversation.attributes, {
             Conversation: Whisper.Conversation,
           });
+          window.LokiSnodeAPI.refreshSwarmNodesForPubKey(id);
         } catch (error) {
           window.log.error(
             'Conversation save failed! ',

js/modules/data.js

@@ -678,11 +678,9 @@ async function getSwarmNodesByPubkey(pubkey) {
 async function saveSwarmNodesForPubKey(pubKey, swarmNodes, { Conversation }) {
   const conversation = await getConversationById(pubKey, { Conversation });
   conversation.set({ swarmNodes });
-  await updateConversation(
+  await updateConversation(conversation.id, conversation.attributes, {
-    conversation.id,
+    Conversation,
-    conversation.attributes,
+  });
-    { Conversation }
-  );
 }
 
 async function getConversationCount() {

js/modules/loki_message_api.js

@@ -123,11 +123,9 @@ class LokiMessageAPI {
             new Error('Ran out of swarm nodes to query')
           );
         }
-        await window.Signal.Data.saveSwarmNodesForPubkey(
+        await window.Signal.Data.saveSwarmNodesForPubKey(pubKey, swarmNodes, {
-          pubKey,
+          Conversation: Whisper.Conversation,
-          swarmNodes,
+        });
-          { Conversation: Whisper.Conversation }
-        );
       }
       const remainingRequests =
         MINIMUM_SUCCESSFUL_REQUESTS - completedNodes.length;

js/modules/loki_snode_api.js

@@ -106,6 +106,13 @@ class LokiSnodeAPI {
     return this.ourSwarmNodes;
   }
 
+  async refreshSwarmNodesForPubKey(pubKey) {
+    const newNodes = await this.getFreshSwarmNodes(pubKey);
+    await window.Signal.Data.saveSwarmNodesForPubKey(pubKey, newNodes, {
+      Conversation: Whisper.Conversation,
+    });
+  }
+
   async getFreshSwarmNodes(pubKey) {
     if (!(pubKey in this.swarmsPendingReplenish)) {
       this.swarmsPendingReplenish[pubKey] = new Promise(async resolve => {

libloki/api.js

@@ -12,13 +12,15 @@
     const friendKeys = await window.Signal.Data.getPubKeysWithFriendStatus(
       window.friends.friendRequestStatusEnum.friends
     );
-    await Promise.all(friendKeys.map(async pubKey => {
+    await Promise.all(
-      try {
+      friendKeys.map(async pubKey => {
-        await sendOnlineBroadcastMessage(pubKey);
+        try {
-      } catch(e) {
+          await sendOnlineBroadcastMessage(pubKey);
-        log.warn(`Failed to send online broadcast message to ${pubKey}`);
+        } catch (e) {
-      }
+          log.warn(`Failed to send online broadcast message to ${pubKey}`);
-    }));
+        }
+      })
+    );
   }
 
   async function sendOnlineBroadcastMessage(pubKey) {