From cb0696d59dfca01538b6f5580f902fe8dba66192 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Tue, 22 Jun 2021 08:03:09 -0700
Subject: [PATCH] Prevent deadlock in `maybeApplyUniversalTimer`

---
 ts/models/conversations.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index ce1b72741..c7741f249 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -2751,7 +2751,9 @@ export class ConversationModel extends window.Backbone
 
     const expireTimer = universalExpireTimer.get();
     if (expireTimer) {
-      await this.updateExpirationTimer(expireTimer);
+      // `updateExpirationTimer` calls `modifyGroupV2` and shouldn't be awaited
+      // since we run both on conversation's queue.
+      this.updateExpirationTimer(expireTimer);
     }
 
     this.set('pendingUniversalTimer', undefined);