Merge pull request #1957 from MixinNetwork/bugfix/wallet

Fix view wallet in delete account confirmation

Author: over140

Mixin/UserInterface/Controllers/Setting/DeleteAccountSettingViewController.swift

@@ -129,15 +129,24 @@ extension DeleteAccountSettingViewController {
 
     private func presentDeleteAccountHintWindow(assets: [MixinTokenItem]) {
         let window = DeleteAccountHintWindow.instance()
-        window.onViewWallet = presentWallet
-        window.onContinue = presentVerificationConfirmation
+        window.onViewWallet = { [weak self] in
+            self?.presentWallet()
+        }
+        window.onContinue = { [weak self] in
+            self?.presentVerificationConfirmation()
+        }
         window.render(assets: assets)
         window.presentPopupControllerAnimated()
     }
 
     private func presentWallet() {
-        let wallet = WalletViewController()
-        navigationController?.pushViewController(wallet, animated: true)
+        UIApplication.homeNavigationController?.popToRootViewController(animated: false)
+        if let tabBarController = UIApplication.homeContainerViewController?.homeTabBarController {
+            tabBarController.switchTo(child: .wallet)
+            if let container = tabBarController.selectedViewController as? WalletContainerViewController {
+                container.switchToWalletSummary(animated: false)
+            }
+        }
     }
 
     private func requestVerificationCode(for phone: String, captchaToken token: CaptchaToken?) {

Mixin/UserInterface/Controllers/Wallet/WalletContainerViewController.swift

@@ -23,7 +23,7 @@ final class WalletContainerViewController: UIViewController {
         ConcurrentJobQueue.shared.addJob(job: job)
     }
 
-    func switchToWalletSummary() {
+    func switchToWalletSummary(animated: Bool) {
         guard let wallet = viewController as? WalletViewController else {
             return
         }
@@ -41,12 +41,25 @@ final class WalletContainerViewController: UIViewController {
         view.addSubview(summary.view)
         summary.didMove(toParent: self)
 
-        UIView.animate(withDuration: 0.5, delay: 0, options: .overdampedCurve) {
+        let animation = {
             summary.view.frame = self.view.bounds
-        } completion: { _ in
+        }
+        let completion = { (finished: Bool) in
             self.remove(child: wallet)
             self.viewController = summary
         }
+        if animated {
+            UIView.animate(
+                withDuration: 0.5,
+                delay: 0,
+                options: .overdampedCurve,
+                animations: animation,
+                completion: completion
+            )
+        } else {
+            animation()
+            completion(true)
+        }
     }
 
     func switchToWallet(_ wallet: Wallet) {

Mixin/UserInterface/Controllers/Wallet/WalletViewController.swift

@@ -54,7 +54,7 @@ class WalletViewController: UIViewController, MnemonicsBackupChecking {
 
     @IBAction func switchFromWallets(_ sender: Any) {
         if let parent = parent as? WalletContainerViewController {
-            parent.switchToWalletSummary()
+            parent.switchToWalletSummary(animated: true)
         }
     }