From fc8bb223590fc5b0ff8167c690a49c24d820561b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Fri, 10 Sep 2021 00:23:49 +0200
Subject: [PATCH] Reactions page improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/components/column_back_button.js | 6 ++----
 app/soapbox/features/reactions/index.js      | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/components/column_back_button.js b/app/soapbox/components/column_back_button.js
index bbc2fc701..54b700b63 100644
--- a/app/soapbox/components/column_back_button.js
+++ b/app/soapbox/components/column_back_button.js
@@ -16,10 +16,8 @@ export default class ColumnBackButton extends React.PureComponent {
   handleClick = () => {
     const { to } = this.props;
 
-    if (to) {
-      this.context.router.history.push(to);
-    } else if (window.history && window.history.length === 1) {
-      this.context.router.history.push('/');
+    if (window.history && window.history.length === 1) {
+      this.context.router.history.push(to ? to : '/');
     } else {
       this.context.router.history.goBack();
     }
diff --git a/app/soapbox/features/reactions/index.js b/app/soapbox/features/reactions/index.js
index 260c8726b..4eca0880b 100644
--- a/app/soapbox/features/reactions/index.js
+++ b/app/soapbox/features/reactions/index.js
@@ -91,7 +91,7 @@ class Reactions extends ImmutablePureComponent {
           reactions.size > 0 && (
             <div className='reaction__filter-bar'>
               <NavLink to={`/@${username}/posts/${statusId}/reactions`} exact>All</NavLink>
-              {reactions?.map(reaction => <NavLink to={`/@${username}/posts/${statusId}/reactions/${reaction.name}`}>{reaction.name} {reaction.count}</NavLink>)}
+              {reactions?.filter(reaction => reaction.count).map(reaction => <NavLink to={`/@${username}/posts/${statusId}/reactions/${reaction.name}`}>{reaction.name} {reaction.count}</NavLink>)}
             </div>
           )
         }