From 0d5e50eb4bdafad492e5c0f136ce12c93c2625ac Mon Sep 17 00:00:00 2001
From: yash-rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Thu, 18 Feb 2021 10:53:46 -0800
Subject: [PATCH] [FIX] Real name setting ignored on reply preview (#2908)

Co-authored-by: Diego Mello <diegolmello@gmail.com>
---
 app/containers/MessageBox/ReplyPreview.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/containers/MessageBox/ReplyPreview.js b/app/containers/MessageBox/ReplyPreview.js
index e1fcbcca..1a77a254 100644
--- a/app/containers/MessageBox/ReplyPreview.js
+++ b/app/containers/MessageBox/ReplyPreview.js
@@ -43,7 +43,7 @@ const styles = StyleSheet.create({
 });
 
 const ReplyPreview = React.memo(({
-	message, Message_TimeFormat, baseUrl, username, replying, getCustomEmoji, close, theme
+	message, Message_TimeFormat, baseUrl, username, replying, getCustomEmoji, close, theme, useRealName
 }) => {
 	if (!replying) {
 		return null;
@@ -59,7 +59,7 @@ const ReplyPreview = React.memo(({
 		>
 			<View style={[styles.messageContainer, { backgroundColor: themes[theme].chatComponentBackground }]}>
 				<View style={styles.header}>
-					<Text style={[styles.username, { color: themes[theme].tintColor }]}>{message.u?.username}</Text>
+					<Text style={[styles.username, { color: themes[theme].tintColor }]}>{useRealName ? message.u?.name : message.u?.username}</Text>
 					<Text style={[styles.time, { color: themes[theme].auxiliaryText }]}>{time}</Text>
 				</View>
 				<Markdown
@@ -85,12 +85,14 @@ ReplyPreview.propTypes = {
 	baseUrl: PropTypes.string.isRequired,
 	username: PropTypes.string.isRequired,
 	getCustomEmoji: PropTypes.func,
-	theme: PropTypes.string
+	theme: PropTypes.string,
+	useRealName: PropTypes.bool
 };
 
 const mapStateToProps = state => ({
 	Message_TimeFormat: state.settings.Message_TimeFormat,
-	baseUrl: state.server.server
+	baseUrl: state.server.server,
+	useRealName: state.settings.UI_Use_Real_Name
 });
 
 export default connect(mapStateToProps)(ReplyPreview);