Merge branch 'hotfix/26.09.4' into develop

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt

@@ -345,7 +345,7 @@ private fun MessagePreviewAndIndicatorRow(
         // Call and unread
         Row(
             modifier = Modifier
-                .heightIn(min = 16.dp)
+                .height(16.dp)
                 // Used to force this line to be read aloud earlier than the latest event when using Talkback
                 .zIndex(-1f),
             horizontalArrangement = Arrangement.spacedBy(8.dp),
@@ -358,18 +358,21 @@ private fun MessagePreviewAndIndicatorRow(
                     isAudio = room.activeCallIntent == CallIntent.AUDIO
                 )
             }
-            val isMuted = room.userDefinedNotificationMode == RoomNotificationMode.MUTE
-            if (isMuted) {
+            if (room.userDefinedNotificationMode == RoomNotificationMode.MUTE) {
                 NotificationOffIndicatorAtom()
             } else if (room.numberOfUnreadMentions > 0) {
                 MentionIndicatorAtom()
             }
             if (room.hasNewContent) {
                 val contentDescription = stringResource(CommonStrings.a11y_notifications_new_messages)
-                val count = when {
-                    showUnreadCount && !isMuted && room.numberOfUnreadNotifications > 0 -> room.numberOfUnreadNotifications
-                    !showUnreadCount -> 0
-                    else -> null
+                val count = if (showUnreadCount) {
+                    if (room.userDefinedNotificationMode == RoomNotificationMode.MUTE) {
+                        room.numberOfUnreadMessages
+                    } else {
+                        room.numberOfUnreadNotifications
+                    }
+                } else {
+                    null
                 }
                 UnreadIndicatorAtom(
                     color = tint,
@@ -454,6 +457,5 @@ internal fun RoomSummaryRowPreview(@PreviewParameter(RoomListRoomSummaryPreviewP
         isInviteSeen = data.name == "Bob",
         onClick = {},
         eventSink = {},
-        showUnreadCount = data.numberOfUnreadNotifications > 0,
     )
 }

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryPreviewParam.kt

@@ -82,24 +82,6 @@ open class RoomListRoomSummaryPreviewParam : PreviewParameterProvider<RoomListRo
                             numberOfUnreadMentions = 1,
                             hasRoomCall = hasCall,
                         ),
-                        aRoomListRoomSummary(
-                            name = roomNotificationMode.name,
-                            latestEvent = LatestEvent.Synced("New notifications" + if (hasCall) ", call" else ""),
-                            notificationMode = roomNotificationMode,
-                            numberOfUnreadMessages = 0,
-                            numberOfUnreadMentions = 0,
-                            numberOfUnreadNotifications = 1,
-                            hasRoomCall = hasCall,
-                        ),
-                        aRoomListRoomSummary(
-                            name = roomNotificationMode.name,
-                            latestEvent = LatestEvent.Synced("New notifications" + if (hasCall) ", call" else ""),
-                            notificationMode = roomNotificationMode,
-                            numberOfUnreadMessages = 0,
-                            numberOfUnreadMentions = 0,
-                            numberOfUnreadNotifications = 100,
-                            hasRoomCall = hasCall,
-                        ),
                     )
                 }.flatten()
             }.flatten(),