about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/components/status.js
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-03-23 11:57:12 -0500
committerGitHub <noreply@github.com>2018-03-23 11:57:12 -0500
commit1772034ef251aa13f20a7eadc0ca1e527a54d07c (patch)
treeb490e9c753bfafa3c0243edf152f9bc248782565 /app/javascript/flavours/glitch/components/status.js
parent03b2f701e755b2dcc013619d8e234fdec315c418 (diff)
parent58eeb92755c1dd81fb7481484084890cb4698f4d (diff)
Merge pull request #398 from ashkitten/compressed-notifs
make expanded notifications show like default
Diffstat (limited to 'app/javascript/flavours/glitch/components/status.js')
-rw-r--r--app/javascript/flavours/glitch/components/status.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index b8fb5383a..77477fe95 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -403,7 +403,7 @@ export default class Status extends ImmutablePureComponent {
                   notificationId={this.props.notificationId}
                 />
               ) : null}
-              {!muted ? (
+              {!muted || isExpanded !== false ? (
                 <StatusHeader
                   status={status}
                   friend={account}
@@ -429,7 +429,7 @@ export default class Status extends ImmutablePureComponent {
             parseClick={parseClick}
             disabled={!router}
           />
-          {isExpanded !== false && !muted ? (
+          {isExpanded !== false || !muted ? (
             <StatusActionBar
               {...other}
               status={status}