From 7665ecacfb7c36d54f25cb6873f539a76300076f Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 3 Jul 2020 10:28:33 +1000
Subject: [PATCH] Fix incorrect sent timestamps

---
 js/models/conversations.js | 10 +++++-----
 stylesheets/_modules.scss  |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index be10cd40f..ff8769c00 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1302,7 +1302,7 @@
           const chatMessage = new libsession.Messages.Outgoing.ChatMessage({
             body: uploads.body,
             identifier: id,
-            timestamp: Date.now(),
+            timestamp: now,
             attachments: uploads.attachments,
             expireTimer,
             preview: uploads.preview,
@@ -1322,7 +1322,7 @@
 
             const openGroupParams = {
               body,
-              timestamp: Date.now(),
+              timestamp: now,
               group: openGroup,
               attachments: uploads.attachments,
               preview: uploads.preview,
@@ -1821,7 +1821,7 @@
         const { chainKey, keyIdx } = senderKey;
 
         const createParams = {
-          timestamp: Date.now(),
+          timestamp: now,
           groupId: id,
           identifier: messageId,
           groupSecretKey: secretKey,
@@ -1849,7 +1849,7 @@
 
       const updateParams = {
         // if we do set an identifier here, be sure to not sync the message two times in msg.handleMessageSentSuccess()
-        timestamp: Date.now(),
+        timestamp: now,
         groupId: this.id,
         name: this.get('name'),
         avatar: this.get('avatar'),
@@ -1921,7 +1921,7 @@
 
         // FIXME what about public groups?
         const quitGroup = {
-          timestamp: Date.now(),
+          timestamp: now,
           groupId: this.id,
           // if we do set an identifier here, be sure to not sync it a second time in handleMessageSentSuccess()
         };
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 797094830..98a9e62f4 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1630,6 +1630,7 @@
   height: 12px;
   display: inline-block;
   margin-bottom: 2px;
+  margin-left: 5px;
 }
 
 .module-message-detail__contact__status-icon--sending {