From c921daed78a61316dc97fa52810f7d7ca421489b Mon Sep 17 00:00:00 2001
From: Phillip <philliplangmartinez@gmail.com>
Date: Wed, 25 Jan 2023 10:40:59 +0200
Subject: [PATCH] fix send name/address in replies

---
 .../plugins/utils/replace-messages-edited.js  | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/qortal-ui-plugins/plugins/utils/replace-messages-edited.js b/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
index 1d6a2941..7ee2cb06 100644
--- a/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
+++ b/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
@@ -52,33 +52,47 @@ export const replaceMessagesEdited = async ({
 				msgQuery = `&txGroupId=${msg.txGroupId}`
 			}
 			if (parsedMessageObj.repliedTo) {
+				const originalReply = await parentEpml.request("apiCall", {
+					type: "api",
+					url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
+				})
 				const response = await parentEpml.request("apiCall", {
 					type: "api",
 					url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
 				})
+				
 				if (
+					originalReply &&
+					Array.isArray(originalReply) &&
+					originalReply.length !== 0 &&
 					response &&
 					Array.isArray(response) &&
 					response.length !== 0
 				) {
+					const decodeOriginalReply = decodeMessageFunc(originalReply[0], isReceipient, _publicKey)
+
+					const decodeUpdatedReply = decodeMessageFunc(response[0], isReceipient, _publicKey)
+					const formattedRepliedToData = {
+						...decodeUpdatedReply,
+						senderName: decodeOriginalReply.senderName,
+						sender: decodeOriginalReply.sender,
+					}
 					msgItem = {
 						...msg,
-						repliedToData: decodeMessageFunc(response[0], isReceipient, _publicKey),
+						repliedToData: formattedRepliedToData,
 					}
 				} else {
-					const response2 = await parentEpml.request("apiCall", {
-						type: "api",
-						url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
-					})
+					
 
 					if (
-						response2 &&
-						Array.isArray(response2) &&
-						response2.length !== 0
+						originalReply &&
+						Array.isArray(originalReply) &&
+						originalReply.length !== 0
 					) {
+						
 						msgItem = {
 							...msg,
-							repliedToData: decodeMessageFunc(response2[0], isReceipient, _publicKey),
+							repliedToData: decodeMessageFunc(originalReply[0], isReceipient, _publicKey),
 						}
 					}
 				}