From 174f8747b62b1a75ac5e5597bc11c3cb82e6b850 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 1 Feb 2019 14:44:46 +1100
Subject: [PATCH] Review fixes. Revert promises back to old style.

---
 js/conversation_controller.js | 15 +++++++--------
 js/modules/data.js            |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index d52278fc2..7a15d689a 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -253,6 +253,7 @@
       if (!this.p2pListenersSet) {
         lokiP2pAPI.on('online', this._handleOnline.bind(this));
         lokiP2pAPI.on('offline', this._handleOffline.bind(this));
+        this.p2pListenersSet = true;
       }
 
       if (conversations.length) {
@@ -270,14 +271,12 @@
           this._initialFetchComplete = true;
           const promises = [];
           conversations.forEach(conversation => {
-            promises.push(async () => {
-              // We need to await each one as
-              //  we don't want to simultaneously call writes on the sql database
-              await conversation.updateLastMessage();
-              await conversation.updateProfile();
-              await conversation.updateProfileAvatar();
-              await conversation.resetPendingSend();
-            });
+            promises.concat([
+              conversation.updateLastMessage(),
+              conversation.updateProfile(),
+              conversation.updateProfileAvatar(),
+              conversation.resetPendingSend(),
+            ]);
           });
           await Promise.all(promises);
 
diff --git a/js/modules/data.js b/js/modules/data.js
index 1a46ba568..e850c723d 100644
--- a/js/modules/data.js
+++ b/js/modules/data.js
@@ -689,7 +689,7 @@ async function getConversationCount() {
 }
 
 async function saveConversation(data) {
-  const cleaned = omit(data, 'isOnine');
+  const cleaned = omit(data, 'isOnline');
   await channels.saveConversation(cleaned);
 }