From 2852b0b92ce9e88cb48a022ea56ecb27af59be49 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 24 Mar 2020 13:25:43 -0700
Subject: [PATCH] Reaction Send: Include current conversation timer

---
 js/models/conversations.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 052d57df9..3443fb04c 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1037,6 +1037,8 @@
     async sendReactionMessage(reaction, target) {
       const timestamp = Date.now();
       const outgoingReaction = { ...reaction, ...target };
+      const expireTimer = this.get('expireTimer');
+
       const reactionModel = Whisper.Reactions.add({
         ...outgoingReaction,
         fromId:
@@ -1099,7 +1101,7 @@
             null,
             outgoingReaction,
             timestamp,
-            null,
+            expireTimer,
             profileKey
           );
           return message.sendSyncMessageOnly(dataMessage);
@@ -1118,7 +1120,7 @@
               null,
               outgoingReaction,
               timestamp,
-              null,
+              expireTimer,
               profileKey,
               options
             );
@@ -1134,7 +1136,7 @@
             null,
             outgoingReaction,
             timestamp,
-            null,
+            expireTimer,
             profileKey,
             options
           );