Note to Self timer fixes for bugs reported by beta users

js/models/conversations.js

@@ -1257,10 +1257,24 @@
       const sendOptions = this.getSendOptions();
       let promise;
 
+      if (this.isMe()) {
+        const dataMessage = await textsecure.messaging.getMessageProto(
+          this.get('id'),
+          null,
+          [],
+          null,
+          [],
+          message.get('sent_at'),
+          expireTimer,
+          profileKey
+        );
+        return message.sendSyncMessageOnly(dataMessage);
+      }
+
       if (this.get('type') === 'private') {
         promise = textsecure.messaging.sendExpirationTimerUpdateToNumber(
           this.get('id'),
-          this.get('expireTimer'),
+          expireTimer,
           message.get('sent_at'),
           profileKey,
           sendOptions
@@ -1269,7 +1283,7 @@
         promise = textsecure.messaging.sendExpirationTimerUpdateToGroup(
           this.get('id'),
           this.getRecipients(),
-          this.get('expireTimer'),
+          expireTimer,
           message.get('sent_at'),
           profileKey,
           sendOptions