diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift index 29c3d4d3d..74cc4b82b 100644 --- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift +++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift @@ -77,7 +77,8 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga var footer: String? { switch self { - case .group: return "disappearingMessagesOnlyAdmins".localized() + case .group: + return "\("disappearingMessagesDescription".localized())\n\("disappearingMessagesOnlyAdmins".localized())" default: return nil } } diff --git a/SessionUtilitiesKit/General/String+Utilities.swift b/SessionUtilitiesKit/General/String+Utilities.swift index ead0db949..70145d71a 100644 --- a/SessionUtilitiesKit/General/String+Utilities.swift +++ b/SessionUtilitiesKit/General/String+Utilities.swift @@ -124,7 +124,11 @@ public extension String { } dateComponentsFormatter.unitsStyle = .positional // This is a workaroud for 00:00 to be shown as 0:00 - return (dateComponentsFormatter.string(from: duration) ?? "").replacingOccurrences(of: "00:", with: "0:") + var str: String = dateComponentsFormatter.string(from: duration) ?? "" + if str.hasPrefix("0") { + str.remove(at: str.startIndex) + } + return str case .short: // Single unit, no localization, short version e.g. 1w dateComponentsFormatter.maximumUnitCount = 1