From c8e8d851f9027af03933ef206575575e2a8c32ff Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 17 Nov 2020 10:21:24 +1100
Subject: [PATCH] fix verified change saving of messages, and ctx menu for
 header

---
 js/models/conversations.js                    | 10 ++++++--
 .../conversation/ConversationHeader.tsx       | 25 ++++++-------------
 ts/components/conversation/Message.tsx        |  2 +-
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 81c3588ea..e6b400393 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -864,7 +864,10 @@
         unread: 1,
       };
 
-      const id = await message.commit();
+      // no commit() here as this is not a message model object
+      const id = await window.Signal.Data.saveMessage(message, {
+        Message: Whisper.Message,
+      });
 
       this.trigger(
         'newmessage',
@@ -915,7 +918,10 @@
         unread: 1,
       };
 
-      const id = await message.commit();
+      // no commit() here as this is not a message model object
+      const id = await window.Signal.Data.saveMessage(message, {
+        Message: Whisper.Message,
+      });
 
       this.trigger(
         'newmessage',
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 7655380e3..a26aaa31b 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -231,22 +231,6 @@ class ConversationHeader extends React.Component<Props> {
     );
   }
 
-  public renderOptions(triggerId: string) {
-    const { showBackButton } = this.props;
-
-    if (showBackButton) {
-      return null;
-    }
-    return (
-      <MenuProvider id={triggerId} event="onClick">
-        <SessionIconButton
-          iconType={SessionIconType.Ellipses}
-          iconSize={SessionIconSize.Medium}
-        />
-      </MenuProvider>
-    );
-  }
-
   public renderSelectionOverlay() {
     const {
       onDeleteSelectedMessages,
@@ -283,7 +267,7 @@ class ConversationHeader extends React.Component<Props> {
 
   public render() {
     const { id, isKickedFromGroup, selectionMode } = this.props;
-    const triggerId = `conversation-header-${id}`;
+    const triggerId = 'conversation-header';
 
     return (
       <div className="module-conversation-header">
@@ -291,7 +275,12 @@ class ConversationHeader extends React.Component<Props> {
           {this.renderBackButton()}
           <div className="module-conversation-header__title-container">
             <div className="module-conversation-header__title-flex">
-              {!selectionMode && this.renderOptions(triggerId)}
+              <MenuProvider id={triggerId} event="onClick">
+                <SessionIconButton
+                  iconType={SessionIconType.Ellipses}
+                  iconSize={SessionIconSize.Medium}
+                />
+              </MenuProvider>
               {this.renderTitle()}
             </div>
           </div>
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 41d53d804..66a45f254 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -140,7 +140,7 @@ export class Message extends React.PureComponent<Props, State> {
       expired: false,
       imageBroken: false,
     };
-    this.ctxMenuID = uuid();
+    this.ctxMenuID = `ctx-menu-message-${uuid()}`;
   }
 
   public componentDidMount() {