From 5600c94f5a6233abe3b47432d66c664ce2e53bee Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Mon, 25 Jan 2021 16:01:55 -0500
Subject: [PATCH] Fixed issue with active icons in action bar for like, repost
 if no active user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Fixed:
- issue with active icons in action bar for like, repost if no active user
---
 app/javascript/gabsocial/components/comment.js           | 4 ++--
 app/javascript/gabsocial/components/status_action_bar.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/gabsocial/components/comment.js b/app/javascript/gabsocial/components/comment.js
index 5f9c00b1..d9b0a05d 100644
--- a/app/javascript/gabsocial/components/comment.js
+++ b/app/javascript/gabsocial/components/comment.js
@@ -208,7 +208,7 @@ class Comment extends ImmutablePureComponent {
 
               <div className={[_s.d, _s.flexRow, _s.mt5].join(' ')}>
                 <CommentButton
-                  title={intl.formatMessage(status.get('favourited') ? messages.unlike : messages.like)}
+                  title={intl.formatMessage(status.get('favourited') && !!me ? messages.unlike : messages.like)}
                   onClick={this.handleOnFavorite}
                 />
                 <CommentButton
@@ -216,7 +216,7 @@ class Comment extends ImmutablePureComponent {
                   onClick={this.handleOnReply}
                 />
                 <CommentButton
-                  title={intl.formatMessage(status.get('reblogged') ? messages.unrepost : messages.repost)}
+                  title={intl.formatMessage(status.get('reblogged') && !!me ? messages.unrepost : messages.repost)}
                   onClick={this.handleOnRepost}
                 />
                 <div ref={this.setMoreNode}>
diff --git a/app/javascript/gabsocial/components/status_action_bar.js b/app/javascript/gabsocial/components/status_action_bar.js
index 0fb72f99..cccad92e 100644
--- a/app/javascript/gabsocial/components/status_action_bar.js
+++ b/app/javascript/gabsocial/components/status_action_bar.js
@@ -173,8 +173,8 @@ class StatusActionBar extends ImmutablePureComponent {
           <div className={[_s.d, _s.flexRow, _s.py2, _s.w100PC].join(' ')}>
             <StatusActionBarItem
               title={intl.formatMessage(messages.like)}
-              icon={!!status.get('favourited') ? 'liked' : 'like'}
-              active={!!status.get('favourited')}
+              icon={!!status.get('favourited') && !!me ? 'liked' : 'like'}
+              active={!!status.get('favourited') && !!me}
               onClick={this.handleFavoriteClick}
               isCompact={isCompact}
             />
@@ -189,7 +189,7 @@ class StatusActionBar extends ImmutablePureComponent {
               altTitle={!publicStatus ? intl.formatMessage(messages.cannot_repost) : ''}
               icon={!publicStatus ? 'lock' : 'repost'}
               disabled={!publicStatus}
-              active={!!status.get('reblogged')}
+              active={!!status.get('reblogged') && !!me}
               onClick={this.handleRepostClick}
               isCompact={isCompact}
             />