Fixed a few more QA issues

• Added the updated light-mode warning colour
• Updated the group version warning banner to explicitly use the primary orange colour
• Fixed an incorrect colour for radio options in the modal
• Fixed an issue where non-admins would incorrectly try to remove obsolete group config hashes (which is not allowed)

LibSession-Util

@@ -1 +1 @@
-Subproject commit ce944869b77ba26eb82e657628fa2b6a1e4bbd44
+Subproject commit bf7c010b5e857e4ab35c4d8f819ccf90ac595fdb

Session/Closed Groups/EditGroupViewModel.swift

@@ -17,7 +17,7 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Editabl
         message: "groupInviteVersion".localizedFormatted(baseFont: .systemFont(ofSize: Values.verySmallFontSize)),
         icon: .none,
         tintColor: .black,
-        backgroundColor: .warning,
+        backgroundColor: .explicitPrimary(.orange),
         accessibility: Accessibility(identifier: "Version warning banner")
     )
     

Session/Closed Groups/NewClosedGroupVC.swift

@@ -70,7 +70,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
                 message: "groupInviteVersion".localizedFormatted(baseFont: .systemFont(ofSize: Values.verySmallFontSize)),
                 icon: .none,
                 tintColor: .black,
-                backgroundColor: .warning,
+                backgroundColor: .explicitPrimary(.orange),
                 accessibility: Accessibility(label: "Version warning banner")
             )
         )

SessionMessagingKit/LibSession/LibSession+SessionMessagingKit.swift

@@ -564,12 +564,17 @@ public extension LibSession {
             
             // Get a list of the different config variants for the provided publicKey
             let userSessionId: SessionId = dependencies[cache: .general].sessionId
+            let targetSessionId: SessionId = try SessionId(from: swarmPubkey)
             let targetVariants: [(sessionId: SessionId, variant: ConfigDump.Variant)] = {
-                switch (swarmPubkey, try? SessionId(from: swarmPubkey)) {
+                switch (swarmPubkey, targetSessionId) {
                     case (userSessionId.hexString, _):
                         return ConfigDump.Variant.userVariants.map { (userSessionId, $0) }
                         
-                    case (_, .some(let sessionId)) where sessionId.prefix == .group:
+                    case (_, let sessionId) where sessionId.prefix == .group:
+                        // Only admins can push changes or delete obsolete configs so do
+                        // nothing if the current user isn't an admin
+                        guard isAdmin(groupSessionId: targetSessionId) else { return [] }
+                        
                         return ConfigDump.Variant.groupVariants.map { (sessionId, $0) }
                         
                     default: return []

SessionMessagingKit/Messages/Message.swift

@@ -413,7 +413,7 @@ public extension Message {
             // succeed early
             guard rawMessage.namespace.shouldDedupeMessages else {
                 // If we want to track the last hash then upsert the raw message info (don't
-                // want to fail if it already exsits because we don't want to dedupe messages
+                // want to fail if it already exists because we don't want to dedupe messages
                 // in this namespace)
                 if rawMessage.namespace.shouldFetchSinceLastHash {
                     try rawMessage.info.upserted(db)

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Groups.swift

@@ -374,7 +374,6 @@ extension MessageReceiver {
             case .disappearingMessages:
                 /// **Note:** We only create this to insert the control message, it **should not** be saved as that would
                 /// override the correct settings applied by the group config messages
-                let userSessionId: SessionId = dependencies[cache: .general].sessionId
                 let config: DisappearingMessagesConfiguration = DisappearingMessagesConfiguration(
                     threadId: groupSessionId.hexString,
                     isEnabled: ((message.updatedExpiration ?? 0) > 0),

SessionUIKit/Components/ConfirmationModal.swift

@@ -355,7 +355,7 @@ public class ConfirmationModal: Modal, UITextFieldDelegate, UITextViewDelegate {
                 
                 // Add the options
                 options.enumerated().forEach { index, optionInfo in
-                    let radioButton: RadioButton = RadioButton(size: .medium) { [weak self] button in
+                    let radioButton: RadioButton = RadioButton(size: .medium, titleTextColor: .alert_text) { [weak self] button in
                         guard button.isEnabled && !button.isSelected else { return }
                         
                         // If an option is selected then update the modal to show that one as selected

SessionUIKit/Components/RadioButton.swift

@@ -38,6 +38,7 @@ public class RadioButton: UIView {
     
     public private(set) var isEnabled: Bool = true
     public private(set) var isSelected: Bool = false
+    private let titleTextColor: ThemeValue
     private let onSelected: ((RadioButton) -> ())?
     
     // MARK: - UI
@@ -50,12 +51,12 @@ public class RadioButton: UIView {
         return result
     }()
     
-    private let titleLabel: UILabel = {
+    private lazy var titleLabel: UILabel = {
         let result: UILabel = UILabel()
         result.translatesAutoresizingMaskIntoConstraints = false
         result.isUserInteractionEnabled = false
         result.font = .systemFont(ofSize: Values.smallFontSize)
-        result.themeTextColor = .textPrimary
+        result.themeTextColor = titleTextColor
         result.numberOfLines = 0
         
         return result
@@ -82,7 +83,12 @@ public class RadioButton: UIView {
     
     // MARK: - Initialization
     
-    public init(size: Size, onSelected: ((RadioButton) -> ())? = nil) {
+    public init(
+        size: Size,
+        titleTextColor: ThemeValue = .textPrimary,
+        onSelected: ((RadioButton) -> ())? = nil
+    ) {
+        self.titleTextColor = titleTextColor
         self.onSelected = onSelected
         
         super.init(frame: .zero)
@@ -146,12 +152,12 @@ public class RadioButton: UIView {
         
         switch (self.isEnabled, self.isSelected) {
             case (true, true):
-                titleLabel.themeTextColor = .textPrimary
+                titleLabel.themeTextColor = titleTextColor
                 selectionBorderView.themeBorderColor = .radioButton_selectedBorder
                 selectionView.themeBackgroundColor = .radioButton_selectedBackground
             
             case (true, false):
-                titleLabel.themeTextColor = .textPrimary
+                titleLabel.themeTextColor = titleTextColor
                 selectionBorderView.themeBorderColor = .radioButton_unselectedBorder
                 selectionView.themeBackgroundColor = .radioButton_unselectedBackground
             

SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift

@@ -11,7 +11,7 @@ internal enum Theme_ClassicDark: ThemeColors {
         .clear: .clear,
         .primary: .primary,
         .defaultPrimary: Theme.PrimaryColor.green.color,
-        .warning: .warning,
+        .warning: .warningDark,
         .danger: .dangerDark,
         .disabled: .disabledDark,
         .backgroundPrimary: .classicDark0,

SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift

@@ -11,7 +11,7 @@ internal enum Theme_ClassicLight: ThemeColors {
         .clear: .clear,
         .primary: .primary,
         .defaultPrimary: Theme.PrimaryColor.green.color,
-        .warning: .warning,
+        .warning: .warningLight,
         .danger: .dangerLight,
         .disabled: .disabledLight,
         .backgroundPrimary: .classicLight6,

SessionUIKit/Style Guide/Themes/Theme+Colors.swift

@@ -77,7 +77,8 @@ public extension Theme {
 // MARK: - Standard Theme Colors
 
 internal extension UIColor {
-    static let warning: UIColor = #colorLiteral(red: 0.9882352941, green: 0.6941176471, blue: 0.3490196078, alpha: 1)            // #FCB159
+    static let warningDark: UIColor = #colorLiteral(red: 0.9882352941, green: 0.6941176471, blue: 0.3490196078, alpha: 1)        // #FCB159
+    static let warningLight: UIColor = #colorLiteral(red: 0.6509803922, green: 0.2941176471, blue: 0, alpha: 1)       // #A64B00
     static let dangerDark: UIColor = #colorLiteral(red: 1, green: 0.2274509804, blue: 0.2274509804, alpha: 1)         // #FF3A3A
     static let dangerLight: UIColor = #colorLiteral(red: 0.8823529412, green: 0.1764705882, blue: 0.09803921569, alpha: 1)        // #E12D19
     static let disabledDark: UIColor = #colorLiteral(red: 0.4274509804, green: 0.4274509804, blue: 0.4274509804, alpha: 1 )       // #6D6D6D

SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift

@@ -11,7 +11,7 @@ internal enum Theme_OceanDark: ThemeColors {
         .clear: .clear,
         .primary: .primary,
         .defaultPrimary: Theme.PrimaryColor.blue.color,
-        .warning: .warning,
+        .warning: .warningDark,
         .danger: .dangerDark,
         .disabled: .disabledDark,
         .backgroundPrimary: .oceanDark2,

SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift

@@ -11,7 +11,7 @@ internal enum Theme_OceanLight: ThemeColors {
         .clear: .clear,
         .primary: .primary,
         .defaultPrimary: Theme.PrimaryColor.blue.color,
-        .warning: .warning,
+        .warning: .warningLight,
         .danger: .dangerLight,
         .disabled: .disabledLight,
         .backgroundPrimary: .oceanLight7,

SessionUIKit/Style Guide/Themes/Theme.swift

@@ -55,6 +55,7 @@ public enum Theme: String, CaseIterable, Codable {
     public func color(for value: ThemeValue) -> UIColor? {
         switch value {
             case .value(let value, let alpha): return color(for: value)?.withAlphaComponent(alpha)
+            case .explicitPrimary(let primaryColor): return primaryColor.color
             
             case .highlighted(let value, let alwaysDarken):
                 switch (self.interfaceStyle, alwaysDarken) {
@@ -78,6 +79,7 @@ public enum Theme: String, CaseIterable, Codable {
     public func colorSwiftUI(for themeValue: ThemeValue) -> Color? {
         switch themeValue {
             case .value(let value, let alpha): return colorSwiftUI(for: value)?.opacity(alpha)
+            case .explicitPrimary(let primaryColor): return primaryColor.colorSwiftUI
             
             case .highlighted(let value, let alwaysDarken):
                 switch (self.interfaceStyle, alwaysDarken) {
@@ -107,6 +109,7 @@ public protocol ThemedNavigation {
 
 public indirect enum ThemeValue: Hashable, Equatable {
     case value(ThemeValue, alpha: CGFloat)
+    case explicitPrimary(Theme.PrimaryColor)
     
     // The 'highlighted' state of a color will automatically lighten/darken a ThemeValue
     // by a fixed amount depending on wither the theme is dark/light mode