From 968b2efc32fca0f2c51ad594c408148f43c6b11a Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Tue, 22 Mar 2022 21:15:47 +0100
Subject: [PATCH] Empty chat fixes

---
 src/pages/chat.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/chat.js b/src/pages/chat.js
index 7791f49..41cb978 100644
--- a/src/pages/chat.js
+++ b/src/pages/chat.js
@@ -151,10 +151,17 @@ export default class Chat extends React.Component {
       this.connect(this.props.globalData.userId)
     }
 
-    if (prevState.selectedUser) {
+    if (
+      prevState.selectedUser &&
+      prevState.msgs &&
+      prevState.msgs[prevState.selectedUser] &&
+      this.state.msgs &&
+      this.state.msgs[this.state.selectedUser]
+    ) {
       const prevLatest = prevState.msgs[prevState.selectedUser].lastMessage
       const newLatest = this.state.msgs[this.state.selectedUser].lastMessage
-      if (prevLatest.date !== newLatest.date) {
+
+      if (prevLatest && newLatest && prevLatest.date !== newLatest.date) {
         this.scrollToChatBottom()
       }
     }