Merge pull request #247 from sachaaaaa/fix_friend_request_timer

Fix multiple friend request timers instantiated

js/conversation_controller.js

@@ -277,6 +277,7 @@
               conversation.updateProfile(),
               conversation.updateProfileAvatar(),
               conversation.resetPendingSend(),
+              conversation.setFriendRequestExpiryTimeout(),
             ]);
           });
           await Promise.all(promises);

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);