From 926c9ce3caa7097c444644eadc4a1d3f740e283f Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Tue, 5 Mar 2019 17:32:05 +1100
Subject: [PATCH] Fix multiple friend request timers instantiated

---
 js/conversation_controller.js | 1 +
 js/models/conversations.js    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index 6d3bd2bf9..5c55d4308 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -277,6 +277,7 @@
               conversation.updateProfile(),
               conversation.updateProfileAvatar(),
               conversation.resetPendingSend(),
+              conversation.setFriendRequestExpiryTimeout(),
             ]);
           });
           await Promise.all(promises);
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 44ed4dec4..cd315b575 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -155,7 +155,6 @@
       this.unset('lastMessage');
       this.unset('lastMessageStatus');
 
-      this.setFriendRequestExpiryTimeout();
       this.typingRefreshTimer = null;
       this.typingPauseTimer = null;
 
@@ -722,6 +721,9 @@
         const ms = 60 * 60 * 1000 * hourLockDuration;
 
         this.set({ unlockTimestamp: Date.now() + ms });
+        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+          Conversation: Whisper.Conversation,
+        });
         this.setFriendRequestExpiryTimeout();
       }
       await this.setFriendRequestStatus(FriendRequestStatusEnum.requestSent);