Bring lastMessage and lastMessageStatus back to conversation

2019-02-27 18:15:24 -08:00 · 2019-02-27 18:15:24 -08:00 · 812f895e12
commit 812f895e12
parent dcd16775c3
2 changed files with 11 additions and 20 deletions
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@ -224,7 +224,13 @@

          this._initialFetchComplete = true;
          await Promise.all(
-            conversations.map(conversation => conversation.updateLastMessage())
+            conversations.map(conversation => {
+              if (!conversation.get('lastMessage')) {
+                return conversation.updateLastMessage();
+              }
+
+              return null;
+            })
          );
          window.log.info('ConversationController: done with initial fetch');
        } catch (error) {