From efebd8ba24d0ae1465341e2286064583639af637 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 20 Sep 2021 05:52:59 +0200
Subject: [PATCH] bump to 1.7.2 (#1926)

* do not consider expire timer update unread messages #1881

* cleanup conversation props in redux to only have what cannot be derived

* fix app not starting without the await on convo creation

* cleanup props of message model

* bump to 1.7.2
---
 package.json                           | 2 +-
 ts/components/ConversationListItem.tsx | 2 --
 ts/models/message.ts                   | 8 +++-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 97fd86d7b..7eac174a1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "license": "GPL-3.0",
   "author": {
     "name": "Loki Project",
diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index f1de55bfc..cdb1921f3 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -181,7 +181,6 @@ const MessageItem = (props: {
   lastMessage?: LastMessageType;
   isTyping: boolean;
   unreadCount: number;
-  convoId: string;
 }) => {
   const { lastMessage, isTyping, unreadCount } = props;
 
@@ -324,7 +323,6 @@ const ConversationListItem = (props: Props) => {
             currentNotificationSetting={currentNotificationSetting || 'all'}
           />
           <MessageItem
-            convoId={conversationId}
             isTyping={!!isTyping}
             unreadCount={unreadCount || 0}
             lastMessage={lastMessage}
diff --git a/ts/models/message.ts b/ts/models/message.ts
index b8126c5af..8164af8fb 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -526,15 +526,13 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     if (body) {
       props.text = this.createNonBreakingLastSeparator(body);
     }
-
-    if (this.get('messageHash')) {
-      props.messageHash = this.get('messageHash');
-    }
-
     if (this.get('isDeleted')) {
       props.isDeleted = this.get('isDeleted');
     }
 
+    if (this.get('messageHash')) {
+      props.messageHash = this.get('messageHash');
+    }
     if (this.get('received_at')) {
       props.receivedAt = this.get('received_at');
     }