From dda589c2e83ac76e0a908f7a84c3a7a3b1d45d3e Mon Sep 17 00:00:00 2001
From: Rohan Sircar <rohansircar@tuta.io>
Date: Fri, 19 Jun 2020 17:18:31 +0530
Subject: [PATCH] Test to fix duplicate message issue

---
 src/main/javascript/ts/src/model/UserModel.ts |  8 +++++++-
 src/main/javascript/ts/src/view/ChatView.ts   | 15 ++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/javascript/ts/src/model/UserModel.ts b/src/main/javascript/ts/src/model/UserModel.ts
index 8d6403f..235b6f2 100644
--- a/src/main/javascript/ts/src/model/UserModel.ts
+++ b/src/main/javascript/ts/src/model/UserModel.ts
@@ -62,6 +62,12 @@ export class UserModel implements Subject<ActiveUserViewModel> {
     this.notify();
   }
 
+  updateLastActive(username: String, lastActive: Date): void {
+    this._activeUsersList
+      .filter(u => u.userName == username)
+      .forEach(u => u.lastActive = lastActive)
+  }
+
   /**
    * getActiveUsers
    */
@@ -106,5 +112,5 @@ export class UserModel implements Subject<ActiveUserViewModel> {
     });
   }
 
-  private helperMethod() {}
+  private helperMethod() { }
 }
diff --git a/src/main/javascript/ts/src/view/ChatView.ts b/src/main/javascript/ts/src/view/ChatView.ts
index 038e45b..0a7f184 100644
--- a/src/main/javascript/ts/src/view/ChatView.ts
+++ b/src/main/javascript/ts/src/view/ChatView.ts
@@ -83,13 +83,13 @@ export class ChatView implements Observer<ChatMessageViewModel> {
           //   this._userModel.notify();
           // }
           $(this._messageContainer)
-          .stop()
-          .animate(
-            {
-              scrollTop: $(this._messageContainer)[0].scrollHeight,
-            },
-            1500
-          );
+            .stop()
+            .animate(
+              {
+                scrollTop: $(this._messageContainer)[0].scrollHeight,
+              },
+              1500
+            );
         }
         break;
       case "page":
@@ -181,6 +181,7 @@ export class ChatView implements Observer<ChatMessageViewModel> {
     };
 
     this.update({ data: new Array(context), op: "new" });
+    this._userModel.updateLastActive(contactName, msgTime)
     this._userModel.notify();
 
     let messageCipher: MessageCipherDTO = this._encryptionService.encrypt(