diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs b/app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs index 5c7c25ac939..f1e7848db94 100644 --- a/app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs +++ b/app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs @@ -25,10 +25,9 @@ {{/if}} - - {{#if this.endComponent}} - - {{/if}} - + {{#if this.endComponent}} + + {{/if}} + \ No newline at end of file diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu-item.js b/app/assets/javascripts/discourse/app/components/user-menu/menu-item.js index b8481864f7d..34c4b8d0845 100644 --- a/app/assets/javascripts/discourse/app/components/user-menu/menu-item.js +++ b/app/assets/javascripts/discourse/app/components/user-menu/menu-item.js @@ -61,6 +61,10 @@ export default class UserMenuItem extends Component { return this.#item.endComponent; } + get endOutletArgs() { + return this.#item.endOutletArgs; + } + get #item() { return this.args.item; } diff --git a/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js b/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js index 55b299778e4..99ca27d3bc9 100644 --- a/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js +++ b/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js @@ -70,6 +70,12 @@ export default class UserMenuNotificationItem extends UserMenuBaseItem { return this.notification.acting_user_avatar_template; } + get endOutletArgs() { + return { + notification: this.notification, + }; + } + get #notificationName() { return this.site.notificationLookup[this.notification.notification_type]; }