From 669648d9cbca621916ce93d4d091ad265095dada Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 3 Jul 2020 16:38:50 +1000
Subject: [PATCH] Fix expire timer

---
 js/models/conversations.js                                | 6 +++---
 ts/components/conversation/TimerNotification.tsx          | 8 +++++++-
 .../outgoing/content/data/ExpirationTimerUpdateMessage.ts | 8 ++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index d32ffb3d6..4beb66bf6 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1629,9 +1629,9 @@
           fromGroupUpdate: options.fromGroupUpdate,
         },
       });
-      if (this.isPrivate()) {
-        message.set({ destination: this.id });
-      }
+
+      message.set({ destination: this.id });
+
       if (message.isOutgoing()) {
         message.set({ recipients: this.getRecipients() });
       }
diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx
index 9d8db2ec7..2d08c4497 100644
--- a/ts/components/conversation/TimerNotification.tsx
+++ b/ts/components/conversation/TimerNotification.tsx
@@ -32,6 +32,10 @@ export class TimerNotification extends React.Component<Props> {
       ? 'disabledDisappearingMessages'
       : 'theyChangedTheTimer';
 
+    const displayedPubkey = profileName
+      ? window.shortenPubkey(phoneNumber)
+      : phoneNumber;
+
     switch (type) {
       case 'fromOther':
         return (
@@ -42,9 +46,11 @@ export class TimerNotification extends React.Component<Props> {
               <ContactName
                 i18n={i18n}
                 key="external-1"
-                phoneNumber={phoneNumber}
+                phoneNumber={displayedPubkey}
                 profileName={profileName}
                 name={name}
+                module="module-message__author"
+                boldProfileName={true}
               />,
               timespan,
             ]}
diff --git a/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts b/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts
index f13d0717e..93ba71770 100644
--- a/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts
+++ b/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts
@@ -32,14 +32,18 @@ export class ExpirationTimerUpdateMessage extends DataMessage {
   public dataProto(): SignalService.DataMessage {
     const data = new SignalService.DataMessage();
 
-    const groupMessage = new SignalService.GroupContext();
+    data.flags = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE;
+
     if (this.groupId) {
+      const groupMessage = new SignalService.GroupContext();
       groupMessage.id = new Uint8Array(
         StringUtils.encode(this.groupId.key, 'utf8')
       );
       groupMessage.type = SignalService.GroupContext.Type.DELIVER;
+
+      data.group = groupMessage;
     }
-    data.flags = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE;
+
     if (this.expireTimer) {
       data.expireTimer = this.expireTimer;
     }