mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'notifications-empty-messages' into 'develop' 

Show different 'empty notifications' message if category is selected

See merge request soapbox-pub/soapbox-fe!1627
environments/review-develop-3zknud/deployments/534
marcin mikołajczak 2022-07-11 20:20:44 +00:00
rodzic 30bf4a04b3 c9edf20ab7
commit ffe14d9aa7
1 zmienionych plików z 7 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
app/soapbox/features/notifications/index.js
Wyświetl plik

@ -47,6 +47,7 @@ const mapStateToProps = state => {
return { return {
showFilterBar: settings.getIn(['notifications', 'quickFilter', 'show']), showFilterBar: settings.getIn(['notifications', 'quickFilter', 'show']),
activeFilter: settings.getIn(['notifications', 'quickFilter', 'active']),
notifications: getNotifications(state), notifications: getNotifications(state),
isLoading: state.getIn(['notifications', 'isLoading'], true), isLoading: state.getIn(['notifications', 'isLoading'], true),
isUnread: state.getIn(['notifications', 'unread']) > 0, isUnread: state.getIn(['notifications', 'unread']) > 0,
@ -62,6 +63,7 @@ class Notifications extends React.PureComponent {
static propTypes = { static propTypes = {
notifications: ImmutablePropTypes.list.isRequired, notifications: ImmutablePropTypes.list.isRequired,
showFilterBar: PropTypes.bool.isRequired, showFilterBar: PropTypes.bool.isRequired,
activeFilter: PropTypes.string,
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
isLoading: PropTypes.bool, isLoading: PropTypes.bool,
@ -143,8 +145,11 @@ class Notifications extends React.PureComponent {
} }
render() { render() {
const { intl, notifications, isLoading, hasMore, showFilterBar, totalQueuedNotificationsCount } = this.props; const { intl, notifications, isLoading, hasMore, showFilterBar, totalQueuedNotificationsCount, activeFilter } = this.props;
const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. Interact with others to start the conversation." />;
const emptyMessage = activeFilter === 'all'
? <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. Interact with others to start the conversation." />
: <FormattedMessage id='empty_column.notifications_filtered' defaultMessage="You don't have any notifications of this type yet." />;
let scrollableContent = null; let scrollableContent = null;