cleanup

deltachat-ios/Controller/WelcomeViewController.swift

@@ -249,6 +249,13 @@ class WelcomeContentView: UIView {
         return label
     }()
 
+    private lazy var buttonStack: UIStackView = {
+        let stack = UIStackView(arrangedSubviews: [loginButton, qrCodeButton /*, importBackupButton */])
+        stack.axis = .vertical
+        stack.spacing = 15
+        return stack
+    }()
+
     private lazy var loginButton: UIButton = {
         let button = UIButton(type: .roundedRect)
         let title = String.localized("login_header").uppercased()
@@ -264,13 +271,6 @@ class WelcomeContentView: UIView {
         return button
     }()
 
-    private lazy var buttonStack: UIStackView = {
-        let stack = UIStackView(arrangedSubviews: [loginButton, qrCodeButton /*, importBackupButton */])
-        stack.axis = .vertical
-        stack.spacing = 15
-        return stack
-    }()
-
     private lazy var qrCodeButton: UIButton = {
         let button = UIButton()
         let title = String.localized("qrscan_title")

deltachat-ios/Coordinator/AppCoordinator.swift

@@ -99,12 +99,7 @@ class AppCoordinator: NSObject, Coordinator {
 
     func showChat(chatId: Int, animated: Bool = true) {
         showTab(index: chatsTab)
-        guard let navController = self.chatListController as? UINavigationController else {
-            assertionFailure("huh? why no nav controller?")
-            return
-        }
-
-        if let rootController = navController.viewControllers.first as? ChatListController {
+        if let rootController = self.chatListController.viewControllers.first as? ChatListController {
             rootController.showChat(chatId: chatId)
         }
     }