From b8d24912a06253ba76b201649e9bd8ecb49e1237 Mon Sep 17 00:00:00 2001 From: Elena Nazarova Date: Fri, 16 Dec 2022 11:06:52 +0300 Subject: [PATCH] MALINKA-868: When no accounts show welcome screen --- .../Sources/Account/Controller/AccountControllerManual.swift | 2 +- .../Controller/AccountOnboardingControllerStartWay.swift | 3 +-- iOS/Wallet/Sources/Main/Controller/MainController.swift | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/iOS/Wallet/Sources/Account/Controller/AccountControllerManual.swift b/iOS/Wallet/Sources/Account/Controller/AccountControllerManual.swift index 170d0fde..caeb4306 100644 --- a/iOS/Wallet/Sources/Account/Controller/AccountControllerManual.swift +++ b/iOS/Wallet/Sources/Account/Controller/AccountControllerManual.swift @@ -36,7 +36,7 @@ final class AccountControllerManual: UIViewController { if let navigationController = self.navigationController { - self.navigationItem.leftBarButtonItem = .pop(self, { vc in vc.dismiss(animated: true) }) + self.navigationItem.leftBarButtonItem = .pop(self) navigationController.navigationBar.setBackgroundImage(UIImage(), for: .default) navigationController.navigationBar.shadowImage = UIImage() diff --git a/iOS/Wallet/Sources/AccountOnboarding/Controller/AccountOnboardingControllerStartWay.swift b/iOS/Wallet/Sources/AccountOnboarding/Controller/AccountOnboardingControllerStartWay.swift index 8fb29238..582c5fe0 100644 --- a/iOS/Wallet/Sources/AccountOnboarding/Controller/AccountOnboardingControllerStartWay.swift +++ b/iOS/Wallet/Sources/AccountOnboarding/Controller/AccountOnboardingControllerStartWay.swift @@ -37,8 +37,7 @@ class AccountOnboardingControllerStartWay: UIViewController { @IBAction func privateKeyPressed(_ sender: Any) { AccountViewAuthorize.showGetPassword(in: self) { _ in let manualController = StoryboardScene.Account.manual.instantiate() - manualController.privateKeyHasBeenProcessed = { [weak self] in self?.navigationController?.popViewController(animated: true) - } + manualController.privateKeyHasBeenProcessed = { [weak self] in self?.navigationController?.popViewController(animated: true) } self.navigationController?.pushViewController(manualController, animated: true) } } diff --git a/iOS/Wallet/Sources/Main/Controller/MainController.swift b/iOS/Wallet/Sources/Main/Controller/MainController.swift index b3a73fbe..c9fe647d 100644 --- a/iOS/Wallet/Sources/Main/Controller/MainController.swift +++ b/iOS/Wallet/Sources/Main/Controller/MainController.swift @@ -362,6 +362,8 @@ final class MainController: UIViewController { self.inviteView.changeVisibility(Accounts().hasActiveAccounts) self.updateMsgCount() + + if Accounts().collection.isEmpty { self.showWalletBoarding() } } func setupSubscriptions() {