Merge branch 'status-menu' into 'develop'

Don't show 'Bookmark' item menu if not authenticated

See merge request soapbox-pub/soapbox-fe!1033
improve-ci
Alex Gleason 2022-02-09 22:26:37 +00:00
commit 06214272a8
2 zmienionych plików z 12 dodań i 12 usunięć

Wyświetl plik

@ -342,6 +342,10 @@ class StatusActionBar extends ImmutablePureComponent {
// });
}
if (!me) {
return menu;
}
if (features.bookmarks) {
menu.push({
text: intl.formatMessage(status.get('bookmarked') ? messages.unbookmark : messages.bookmark),
@ -350,10 +354,6 @@ class StatusActionBar extends ImmutablePureComponent {
});
}
if (!me) {
return menu;
}
menu.push(null);
if (ownAccount || withDismiss) {

Wyświetl plik

@ -345,15 +345,15 @@ class ActionBar extends React.PureComponent {
// });
}
if (features.bookmarks) {
menu.push({
text: intl.formatMessage(status.get('bookmarked') ? messages.unbookmark : messages.bookmark),
action: this.handleBookmarkClick,
icon: require(status.get('bookmarked') ? '@tabler/icons/icons/bookmark-off.svg' : '@tabler/icons/icons/bookmark.svg'),
});
}
if (me) {
if (features.bookmarks) {
menu.push({
text: intl.formatMessage(status.get('bookmarked') ? messages.unbookmark : messages.bookmark),
action: this.handleBookmarkClick,
icon: require(status.get('bookmarked') ? '@tabler/icons/icons/bookmark-off.svg' : '@tabler/icons/icons/bookmark.svg'),
});
}
menu.push(null);
if (ownAccount) {