Change adjacent notifications about the same status to display as onefeature-collapsed-notifications

Fix #7698

1 files changed, 3 insertions, 2 deletions

diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index c87654547..fc837f771 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -144,8 +144,9 @@ export const makeGetNotification = () => {
   return createSelector([
     (_, base)             => base,
     (state, _, accountId) => state.getIn(['accounts', accountId]),
-  ], (base, account) => {
-    return base.set('account', account);
+    (state, base)         => base.get('collapsed_account_ids') && base.get('collapsed_account_ids').map(id => state.getIn(['accounts', id])),
+  ], (base, account, collapsedAccounts) => {
+    return base.set('account', account).set('collapsed_accounts', collapsedAccounts);
   });
 };