diff --git a/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings b/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings index 6240a9e55..6fc85a727 100644 --- a/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings @@ -99,6 +99,7 @@ "action_report" = "Report"; "action_report_bug" = "Report bug"; "action_report_content" = "Report content"; +"action_report_dm" = "Report conversation"; "action_report_room" = "Report room"; "action_reset" = "Reset"; "action_reset_identity" = "Reset identity"; diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index 50fcd376e..6f48f8b5f 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -99,6 +99,7 @@ "action_report" = "Report"; "action_report_bug" = "Report bug"; "action_report_content" = "Report content"; +"action_report_dm" = "Report conversation"; "action_report_room" = "Report room"; "action_reset" = "Reset"; "action_reset_identity" = "Reset identity"; diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index 61a6ffd5d..136ee6da0 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -236,6 +236,8 @@ internal enum L10n { internal static var actionReportBug: String { return L10n.tr("Localizable", "action_report_bug") } /// Report content internal static var actionReportContent: String { return L10n.tr("Localizable", "action_report_content") } + /// Report conversation + internal static var actionReportDm: String { return L10n.tr("Localizable", "action_report_dm") } /// Report room internal static var actionReportRoom: String { return L10n.tr("Localizable", "action_report_room") } /// Reset diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift index 23b64d746..114f7fb71 100644 --- a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift +++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift @@ -215,7 +215,7 @@ extension HomeScreenRoom { let hasUnreadMessages = hideUnreadMessagesBadge ? false : summary.hasUnreadMessages let isUnseenInvite = summary.joinRequestType?.isInvite == true && !seenInvites.contains(roomID) - + let isDotShown = hasUnreadMessages || summary.hasUnreadMentions || summary.hasUnreadNotifications || summary.isMarkedUnread || isUnseenInvite let isMentionShown = summary.hasUnreadMentions && !summary.isMuted let isMuteShown = summary.isMuted diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift index 525fea3ef..906be8621 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift @@ -73,7 +73,7 @@ struct HomeScreenRoomList: View { Button(role: .destructive) { context.send(viewAction: .reportRoom(roomIdentifier: room.id)) } label: { - Label(L10n.actionReportRoom, icon: \.chatProblem) + Label(room.isDirect ? L10n.actionReportDm : L10n.actionReportRoom, icon: \.chatProblem) } } diff --git a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift index 557f7639e..b9fd05f43 100644 --- a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift +++ b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift @@ -277,7 +277,7 @@ struct RoomDetailsScreen: View { } private var reportRoomTitle: String { - context.viewState.dmRecipientInfo == nil ? L10n.actionReportRoom : L10n.actionReport + context.viewState.dmRecipientInfo == nil ? L10n.actionReportRoom : L10n.actionReportDm } private var leaveRoomSection: some View {