Fix

MixinNetwork · Sep 28, 2021 · 82b5a83 · 82b5a83
1 parent 634dde8
commit 82b5a83
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Mixin/UserInterface/Controllers/Common/KeyboardBasedLayoutViewController.swift b/Mixin/UserInterface/Controllers/Common/KeyboardBasedLayoutViewController.swift
@@ -61,6 +61,7 @@ class KeyboardBasedLayoutViewController: UIViewController {
             layout(for: frame)
         } else {
             UIView.performWithoutAnimation {
+                view.layoutIfNeeded()
                 layout(for: frame)
             }
         }

diff --git a/Mixin/UserInterface/Controllers/Wallet/TransferOutViewController.swift b/Mixin/UserInterface/Controllers/Wallet/TransferOutViewController.swift
@@ -241,10 +241,8 @@ class TransferOutViewController: KeyboardBasedLayoutViewController {
                     checkPay()
                 }
                 window.cancelHandler = {
-                    DispatchQueue.main.async {
-                        self.continueButton.isBusy = false
-                        self.amountTextField.becomeFirstResponder()
-                    }
+                    self.continueButton.isBusy = false
+                    self.amountTextField.becomeFirstResponder()
                 }
                 window.presentPopupControllerAnimated()
             } else {

diff --git a/Mixin/UserInterface/Windows/StrangerTransferHintWindow.swift b/Mixin/UserInterface/Windows/StrangerTransferHintWindow.swift
@@ -31,14 +31,14 @@ final class StrangerTransferHintWindow: BottomSheetView {
 
     @IBAction func continueAction(_ sender: Any) {
         canDismiss = true
-        dismissPopupControllerAnimated()
         continueHandler?()
+        dismissPopupControllerAnimated()
     }
 
     @IBAction func cancelAction(_ sender: Any) {
         canDismiss = true
-        dismissPopupControllerAnimated()
         cancelHandler?()
+        dismissPopupControllerAnimated()
     }
 
 }