From 17e5aa20c74cf2af80330bc6d85fab96fb1029e2 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Mon, 24 Apr 2023 14:35:57 -0400
Subject: [PATCH] fix(message_model): mentions not being removed when deleted
 or edited

Fixes #10335
---
 .../modules/main/chat_section/chat_content/messages/module.nim | 1 +
 src/app/modules/shared_models/message_model.nim                | 3 +++
 vendor/status-go                                               | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/modules/main/chat_section/chat_content/messages/module.nim b/src/app/modules/main/chat_section/chat_content/messages/module.nim
index 8f10b851cd..08e703d7b0 100644
--- a/src/app/modules/main/chat_section/chat_content/messages/module.nim
+++ b/src/app/modules/main/chat_section/chat_content/messages/module.nim
@@ -616,6 +616,7 @@ method onMessageEdited*(self: Module, message: MessageDto) =
     self.controller.replacePubKeysWithDisplayNames(message.text),
     message.parsedText,
     message.contentType,
+    message.mentioned,
     message.containsContactMentions(),
     message.links,
     message.mentionedUsersPks
diff --git a/src/app/modules/shared_models/message_model.nim b/src/app/modules/shared_models/message_model.nim
index 8bb5f0be75..08f28c4d0d 100644
--- a/src/app/modules/shared_models/message_model.nim
+++ b/src/app/modules/shared_models/message_model.nim
@@ -604,6 +604,7 @@ QtObject:
       updatedRawMsg: string,
       updatedParsedText: seq[ParsedText],
       contentType: int,
+      mentioned: bool,
       messageContainsMentions: bool,
       links: seq[string],
       mentionedUsersPks: seq[string]
@@ -613,6 +614,7 @@ QtObject:
       return
 
     self.items[ind].messageText = updatedMsg
+    self.items[ind].mentioned = mentioned
     self.items[ind].messageContainsMentions = messageContainsMentions
     self.items[ind].isEdited = true
     self.items[ind].links = links
@@ -623,6 +625,7 @@ QtObject:
     self.dataChanged(index, index, @[
       ModelRole.MessageText.int,
       ModelRole.UnparsedText.int,
+      ModelRole.Mentioned.int,
       ModelRole.MessageContainsMentions.int,
       ModelRole.IsEdited.int,
       ModelRole.Links.int,
diff --git a/vendor/status-go b/vendor/status-go
index 2950d37e43..4212dde288 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 2950d37e430844d83d9897084b51a028d56e8052
+Subproject commit 4212dde28870479b23e84249937456917532db5a