Fixed a few minor issues

• Fixed a possible incorrect crash report after importing data via the dev settings
• Fixed an issue where modals displayed after clearing the database data would have broken theming
• Fixed an issue where admin display name and pictures may not appear correctly in the message list when interleaved with control messages

Session/Settings/DeveloperSettingsViewModel.swift

@@ -1254,7 +1254,10 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
                         (UIApplication.shared.delegate as? AppDelegate)?.stopPollers()
                     }
                     
+                    /// Need to shut everything down before the swap out the data to prevent crashes
+                    LibSession.clearLoggers()
                     dependencies[singleton: .jobRunner].stopAndClearPendingJobs()
+                    dependencies.remove(cache: .libSession)
                     dependencies.mutate(cache: .libSessionNetwork) { $0.suspendNetworkAccess() }
                     dependencies[singleton: .storage].suspendDatabaseAccess()
                     try dependencies[singleton: .storage].closeDatabase()

SessionMessagingKit/Shared Models/MessageViewModel.swift

@@ -403,6 +403,7 @@ public struct MessageViewModel: FetchableRecordWithRowId, Decodable, Equatable,
         }()
         let (positionInCluster, isOnlyMessageInCluster): (Position, Bool) = {
             let isFirstInCluster: Bool = (
+                self.variant.isInfoMessage ||
                 prevModel == nil ||
                 shouldShowDateBeforeThisModel || (
                     self.variant.isOutgoing &&
@@ -414,6 +415,7 @@ public struct MessageViewModel: FetchableRecordWithRowId, Decodable, Equatable,
                 self.authorId != prevModel?.authorId
             )
             let isLastInCluster: Bool = (
+                self.variant.isInfoMessage ||
                 nextModel == nil ||
                 shouldShowDateBeforeNextModel || (
                     self.variant.isOutgoing &&
@@ -510,9 +512,11 @@ public struct MessageViewModel: FetchableRecordWithRowId, Decodable, Equatable,
                 guard self.variant.isIncoming else { return nil }
                     
                 // Only if there is a date header or the senders are different
-                guard shouldShowDateBeforeThisModel || self.authorId != prevModel?.authorId else {
-                    return nil
-                }
+                guard
+                    shouldShowDateBeforeThisModel ||
+                    self.authorId != prevModel?.authorId ||
+                    prevModel?.variant.isInfoMessage == true
+                else { return nil }
                     
                 return authorDisplayName
             }(),

SessionUIKit/Style Guide/ThemeManager.swift

@@ -15,10 +15,12 @@ public enum ThemeManager {
     /// Unfortunately if we don't do this the `ThemeApplier` is immediately deallocated and we can't use it to update the theme
     private static var uiRegistry: NSMapTable<AnyObject, ThemeApplier> = NSMapTable.weakToStrongObjects()
     
+    private static var _hasLoadedTheme: Bool = false
     private static var _theme: Theme = .classicDark                 // Default to `classicDark`
     private static var _primaryColor: Theme.PrimaryColor = .green   // Default to `green`
     private static var _matchSystemNightModeSetting: Bool = false   // Default to `false`
     
+    public static var hasLoadedTheme: Bool { _hasLoadedTheme }
     public static var currentTheme: Theme { _theme }
     public static var primaryColor: Theme.PrimaryColor { _primaryColor }
     public static var matchSystemNightModeSetting: Bool { _matchSystemNightModeSetting }
@@ -42,6 +44,7 @@ public enum ThemeManager {
         let themeChanged: Bool = (_theme != targetTheme || _primaryColor != targetPrimaryColor)
         _theme = targetTheme
         _primaryColor = targetPrimaryColor
+        _hasLoadedTheme = true
         
         if !hasSetInitialSystemTrait || themeChanged {
             updateAllUI()
@@ -364,7 +367,7 @@ internal class ThemeApplier {
             .filter { $0.info != info }
         
         // Automatically apply the theme immediately (if the database has been setup)
-        if SNUIKit.config?.isStorageValid == true {
+        if SNUIKit.config?.isStorageValid == true || ThemeManager.hasLoadedTheme {
             self.apply(theme: ThemeManager.currentTheme, isInitialApplication: true)
         }
     }