diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 index e39d9a67c57..b61c7d45f6f 100644 --- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 @@ -5,8 +5,6 @@ export default Ember.ArrayController.extend({ this.set("controllers.application.showFooter", !this.get("model.canLoadMore")); }.observes("model.canLoadMore"), - showDismissButton: Ember.computed.gt('user.total_unread_notifications', 0), - currentPath: Em.computed.alias('controllers.application.currentPath'), actions: { diff --git a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs index 5d2e184b819..0ea5830ad6e 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs @@ -8,20 +8,16 @@ {{/if}} -{{#if showDismissButton}} -
- -
-{{/if}} +
+ +
{{user-notifications-large notifications=model}} {{#conditional-loading-spinner condition=loading}} {{#unless model.canLoadMore}} - {{#if showDismissButton}} -
- -
- {{/if}} +
+ +
{{/unless}} {{/conditional-loading-spinner}}