From fbd09b2a4fd01e52299f6f17328feca7681d5024 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:39:25 -0400
Subject: [PATCH 1/2] fix(deps): update dependency ace-builds to v1.36.0
 (#12750)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 install/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/package.json b/install/package.json
index 46e2e4ebcf..fb19e7bba2 100644
--- a/install/package.json
+++ b/install/package.json
@@ -35,7 +35,7 @@
         "@isaacs/ttlcache": "1.4.1",
         "@nodebb/spider-detector": "2.0.3",
         "@popperjs/core": "2.11.8",
-        "ace-builds": "1.35.5",
+        "ace-builds": "1.36.0",
         "archiver": "7.0.1",
         "async": "3.2.6",
         "autoprefixer": "10.4.20",

From ad68809bb40b6e0e2e997f06c51255c8cad373be Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 22 Aug 2024 14:55:27 -0400
Subject: [PATCH 2/2] fix: #12736, merged notifications use username instead of
 displayname

---
 src/notifications.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/notifications.js b/src/notifications.js
index fdb9998248..20a6cd5f73 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -475,7 +475,7 @@ Notifications.merge = async function (notifications) {
 				case 'notifications:user-posted-to':
 				case 'notifications:user-flagged-post-in':
 				case 'notifications:user-flagged-user': {
-					const usernames = _.uniq(set.map(notifObj => notifObj && notifObj.user && notifObj.user.username));
+					const usernames = _.uniq(set.map(notifObj => notifObj && notifObj.user && notifObj.user.displayname));
 					const numUsers = usernames.length;
 
 					const title = utils.decodeHTMLEntities(notifications[modifyIndex].topicTitle || '');