From 28a534ee490fe7086b22b968ed58d1ca758e1409 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Mon, 10 Jan 2022 18:32:03 +0530
Subject: [PATCH] Fix reply nesting

---
 .../web/ui/session/room/timeline/TextMessageView.js      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/platform/web/ui/session/room/timeline/TextMessageView.js b/src/platform/web/ui/session/room/timeline/TextMessageView.js
index fe34f850..c8651224 100644
--- a/src/platform/web/ui/session/room/timeline/TextMessageView.js
+++ b/src/platform/web/ui/session/room/timeline/TextMessageView.js
@@ -27,11 +27,14 @@ export class TextMessageView extends BaseMessageView {
                 statusMessage: vm => vm.shape === "message-status",
             }
         }, t.mapView(vm => vm.replyTile, replyTile => {
-            if (vm.isReply && !replyTile) {
+            if (this._isReplyPreview) {
+                // if this._isReplyPreview = true, this is already a reply preview, don't nest replies for now.
+                return null;
+            }
+            else if (vm.isReply && !replyTile) {
                 return new ReplyPreviewError();
             }
-            else if (replyTile && !this._isReplyPreview) {
-                // if this._isReplyPreview = true, this is already a reply preview, don't nest replies for now.
+            else if (replyTile) {
                 return new ReplyPreviewView(replyTile);
             }
             else {