Fixed comments on MR

Sources/App/AppDelegate.swift

@@ -143,8 +143,8 @@ public class AppDelegate: UIResponder, UIApplicationDelegate {
         open url: URL,
         options: [UIApplication.OpenURLOptionsKey : Any] = [:]
     ) -> Bool {
-        if let username = getUsernameFromInvitationDeepLink(url),
-           let router = try? DependencyInjection.Container.shared.resolve() as PushRouter {
+        if let username = getUsernameFromInvitationDeepLink(url) {
+            let router = try! DependencyInjection.Container.shared.resolve() as PushRouter
             invitation = username
             router.navigateTo(.search, {})
 

Sources/App/DependencyRegistrator.swift

@@ -251,46 +251,3 @@ struct DependencyRegistrator {
             ) as ChatListCoordinating)
     }
 }
-
-extension PushRouter {
-    static func live(navigationController: UINavigationController) -> PushRouter {
-        PushRouter { route, completion in
-            if let launchController = navigationController.viewControllers.last as? LaunchController {
-                launchController.pendingPushRoute = route
-            } else {
-                switch route {
-                case .search:
-                    if (navigationController.viewControllers.last as? SearchContainerController) == nil {
-                        navigationController.setViewControllers([
-                            ChatListController(),
-                            SearchContainerController()
-                        ], animated: true)
-                    }
-
-                case .requests:
-                    if (navigationController.viewControllers.last as? RequestsContainerController) == nil {
-                        navigationController.setViewControllers([RequestsContainerController()], animated: true)
-                    }
-                case .contactChat(id: let id):
-                    if let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
-                       let contact = try? session.dbManager.fetchContacts(.init(id: [id])).first {
-                        navigationController.setViewControllers([
-                            ChatListController(),
-                            SingleChatController(contact)
-                        ], animated: true)
-                    }
-                case .groupChat(id: let id):
-                    if let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
-                       let info = try? session.dbManager.fetchGroupInfos(.init(groupId: id)).first {
-                        navigationController.setViewControllers([
-                            ChatListController(),
-                            GroupChatController(info)
-                        ], animated: true)
-                    }
-                }
-            }
-
-            completion()
-        }
-    }
-}

Sources/App/PushRouter.swift

+import UIKit
+import PushFeature
+import Integration
+import ChatFeature
+import SearchFeature
+import LaunchFeature
+import ChatListFeature
+import RequestsFeature
+import DependencyInjection
+
+extension PushRouter {
+    static func live(navigationController: UINavigationController) -> PushRouter {
+        PushRouter { route, completion in
+            if let launchController = navigationController.viewControllers.last as? LaunchController {
+                launchController.pendingPushRoute = route
+            } else {
+                switch route {
+                case .search:
+                    if !(navigationController.viewControllers.last is SearchContainerController) {
+                        navigationController.setViewControllers([
+                            ChatListController(),
+                            SearchContainerController()
+                        ], animated: true)
+                    }
+                case .requests:
+                    if !(navigationController.viewControllers.last is RequestsContainerController) {
+                        navigationController.setViewControllers([RequestsContainerController()], animated: true)
+                    }
+                case .contactChat(id: let id):
+                    if let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
+                       let contact = try? session.dbManager.fetchContacts(.init(id: [id])).first {
+                        navigationController.setViewControllers([
+                            ChatListController(),
+                            SingleChatController(contact)
+                        ], animated: true)
+                    }
+                case .groupChat(id: let id):
+                    if let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
+                       let info = try? session.dbManager.fetchGroupInfos(.init(groupId: id)).first {
+                        navigationController.setViewControllers([
+                            ChatListController(),
+                            GroupChatController(info)
+                        ], animated: true)
+                    }
+                }
+            }
+
+            completion()
+        }
+    }
+}

Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift

@@ -48,6 +48,8 @@ final class SearchLeftViewModel {
             stateSubject.value.input = pendingInvitation
             hudSubject.send(.onAction(Localized.Ud.Search.cancel))
 
+            networkCancellable.removeAll()
+
             networkMonitor.statusPublisher
                 .first { $0 == .available }
                 .eraseToAnyPublisher()

Tests/AppTests/General/InvitationTests.swift

@@ -4,18 +4,18 @@ import XCTest
 
 final class AppDelegateTests: XCTestCase {
     func test_invitationDeeplink() {
-        let host = "messenger"
-        let query = "invitation"
-        let scheme = "xxnetwork"
-        let username = "john_doe"
+        XCTAssertNil(
+            getUsernameFromInvitationDeepLink(URL(string: "http://messenger?invitation=john_doe")!)
+        )
 
-        let url = URL(string: "\(scheme)://\(host)?\(query)=\(username)")!
-        XCTAssertEqual(getUsernameFromInvitationDeepLink(url), username)
+        XCTAssertNotEqual(
+            getUsernameFromInvitationDeepLink(URL(string: "xxnetwork://messenger?invitation=the_rock")!),
+            "john_doe"
+        )
 
-        let malformedURL = URL(string: "\(scheme)\(host)\(query)\(username)")!
-        XCTAssertNil(getUsernameFromInvitationDeepLink(malformedURL))
-
-        let urlAnotherUsername = URL(string: "\(scheme)://\(host)?\(query)=asdfg")!
-        XCTAssertNotEqual(getUsernameFromInvitationDeepLink(urlAnotherUsername), username)
+        XCTAssertEqual(
+            getUsernameFromInvitationDeepLink(URL(string: "xxnetwork://messenger?invitation=john_doe")!),
+            "john_doe"
+        )
     }
 }