From 3f7e21e08dcccf814fd8f889678b3c9801f0c404 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 29 Jan 2024 12:38:37 +0000
Subject: [PATCH] Fix display of room notification debug info (#12183)

* Fix display of room notification debug info

 * Add 'one' string because apprently it just displays nothing at all
   if that's missing, rather than erroring or falling back to use the 'other'.
 * Simplify and always display the count: it's debug info so it's best to
   be very explicit anyway, plus simpler code & one less string.

* Update snapshot
---
 .../dialogs/devtools/RoomNotifications.tsx    | 30 +++++++------------
 src/i18n/strings/en_EN.json                   |  2 +-
 .../RoomNotifications-test.tsx.snap           |  4 +++
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/components/views/dialogs/devtools/RoomNotifications.tsx b/src/components/views/dialogs/devtools/RoomNotifications.tsx
index 5a43eeb935..234746b74a 100644
--- a/src/components/views/dialogs/devtools/RoomNotifications.tsx
+++ b/src/components/views/dialogs/devtools/RoomNotifications.tsx
@@ -77,26 +77,16 @@ export default function RoomNotifications({ onBack }: IDevtoolsProps): JSX.Eleme
                 <h2>{_t("devtools|room_status")}</h2>
                 <ul>
                     <li>
-                        {count > 0
-                            ? _t(
-                                  "devtools|room_unread_status_count",
-                                  {
-                                      status: humanReadableNotificationLevel(level),
-                                      count,
-                                  },
-                                  {
-                                      strong: (sub) => <strong>{sub}</strong>,
-                                  },
-                              )
-                            : _t(
-                                  "devtools|room_unread_status",
-                                  {
-                                      status: humanReadableNotificationLevel(level),
-                                  },
-                                  {
-                                      strong: (sub) => <strong>{sub}</strong>,
-                                  },
-                              )}
+                        {_t(
+                            "devtools|room_unread_status_count",
+                            {
+                                status: humanReadableNotificationLevel(level),
+                                count,
+                            },
+                            {
+                                strong: (sub) => <strong>{sub}</strong>,
+                            },
+                        )}
                     </li>
                     <li>
                         {_t(
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5521b74331..43f6d6bbce 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -765,8 +765,8 @@
         "room_notifications_total": "Total: ",
         "room_notifications_type": "Type: ",
         "room_status": "Room status",
-        "room_unread_status": "Room unread status: <strong>%(status)s</strong>",
         "room_unread_status_count": {
+            "one": "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
             "other": "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>"
         },
         "save_setting_values": "Save setting values",
diff --git a/test/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap b/test/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap
index 843ee88ca5..a3c3559df8 100644
--- a/test/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap
+++ b/test/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap
@@ -16,6 +16,10 @@ exports[`<RoomNotifications /> should render 1`] = `
             <strong>
               None
             </strong>
+            , count: 
+            <strong>
+              0
+            </strong>
           </span>
         </li>
         <li>