From 85310f82f57bd3c4ea58efe765badeec7fc506e0 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 4 Feb 2021 11:41:01 -0500
Subject: [PATCH] FIX: Don't cancel filtering on second "n replies" tap
 (#11975)

Fixes an issue introduced in 0f31a221c9f9edbd8ed78502bd16fc6ead74b30d.
---
 .../javascripts/discourse/app/widgets/post.js    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index f33a560867d..b2dc65acd58 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -440,13 +440,17 @@ createWidget("post-contents", {
   },
 
   toggleFilteredRepliesView() {
-    const post = this.findAncestorModel();
-    const controller = this.register.lookup("controller:topic");
-    if (post.get("topic.postStream.filterRepliesToPostNumber")) {
-      controller.send(
-        "cancelFilter",
-        post.get("topic.postStream.filterRepliesToPostNumber")
+    const post = this.findAncestorModel(),
+      controller = this.register.lookup("controller:topic"),
+      currentFilterPostNumber = post.get(
+        "topic.postStream.filterRepliesToPostNumber"
       );
+
+    if (
+      currentFilterPostNumber &&
+      currentFilterPostNumber === post.post_number
+    ) {
+      controller.send("cancelFilter", currentFilterPostNumber);
       this.state.filteredRepliesShown = false;
     } else {
       this.state.filteredRepliesShown = true;