- wire up real code for delegation/staking onboarding

- bug fix some loading - remove unnecessary extra loading - remove all hacks to speed up testing
kukai-wallet · Dec 2, 2024 · d34b976 · d34b976
1 parent 2b62c42
commit d34b976
Show file tree

Hide file tree

Showing 11 changed files with 347 additions and 90 deletions.
diff --git a/Kukai Mobile/Controls/EnterAddressComponent/EnterAddressComponent.swift b/Kukai Mobile/Controls/EnterAddressComponent/EnterAddressComponent.swift
@@ -42,6 +42,13 @@ public class EnterAddressComponent: UIView {
 	private var currentSelectedType: AddressType = .tezosAddress
 
 	public weak var delegate: EnterAddressComponentDelegate? = nil
+	public var allowEmpty: Bool = false {
+		didSet {
+			if (self.textField.text == nil || self.textField.text == "") && allowEmpty {
+				self.sendButton.isEnabled = true
+			}
+		}
+	}
 
 
 	required init?(coder aDecoder: NSCoder) {
@@ -71,7 +78,7 @@ public class EnterAddressComponent: UIView {
 		textField.validatorTextFieldDelegate = self
 
 		self.hideError(animate: false)
-		self.sendButton.isEnabled = false
+		self.sendButton.isEnabled = allowEmpty
 	}
 
 	public func updateAvilableAddressTypes(_ types: [AddressType]) {
@@ -275,7 +282,7 @@ extension EnterAddressComponent: ValidatorTextFieldDelegate {
 			self.sendButton.isEnabled = true
 
 		} else if text == "" {
-			self.sendButton.isEnabled = false
+			self.sendButton.isEnabled = allowEmpty
 
 		} else {
 			self.sendButton.isEnabled = false

diff --git a/Kukai Mobile/Extensions/UIViewController+extensions.swift b/Kukai Mobile/Extensions/UIViewController+extensions.swift
@@ -42,7 +42,7 @@ extension UIViewController {
 		activityViewStatusLabel.font = UIFont.custom(ofType: .medium, andSize: 16)
 		activityViewStatusLabel.textColor = UIColor.white
 		activityViewStatusLabel.textAlignment = .center
-		activityViewStatusLabel.frame = CGRect(x: view.center.x, y: view.center.y, width: view.frame.width - 64, height: 50)
+		activityViewStatusLabel.frame = CGRect(x: view.center.x, y: view.center.y, width: view.frame.width - 64, height: 200)
 
 		UIViewController.activityViewActivityIndicator.color = UIColor.white
 

diff --git a/Kukai Mobile/Modules/Account/TokenDetailsViewModel.swift b/Kukai Mobile/Modules/Account/TokenDetailsViewModel.swift
@@ -7,6 +7,7 @@
 
 import UIKit
 import KukaiCoreSwift
+import Combine
 import OSLog
 
 struct AllChartData: Hashable {
@@ -122,6 +123,7 @@ public class TokenDetailsViewModel: ViewModel, TokenDetailsChartCellDelegate {
 	private let chartDateFormatter = DateFormatter(withFormat: "MMM dd HH:mm a")
 	private var initialChartLoad = true
 	private var onlineXTZFetchGroup = DispatchGroup()
+	private var bag = [AnyCancellable]()
 
 	// Set by VC
 	weak var delegate: (TokenDetailsViewModelDelegate & TokenDetailsBakerDelegate & TokenDetailsStakeBalanceDelegate)? = nil
@@ -155,6 +157,22 @@ public class TokenDetailsViewModel: ViewModel, TokenDetailsChartCellDelegate {
 	var finaliseableAmount: TokenAmount = .zero()
 
 
+	override init() {
+		super.init()
+
+		DependencyManager.shared.$addressRefreshed
+			.dropFirst()
+			.sink { [weak self] address in
+				let selectedAddress = DependencyManager.shared.selectedWalletAddress ?? ""
+				if self?.dataSource != nil && selectedAddress == address {
+					self?.refresh(animate: true)
+				}
+			}.store(in: &bag)
+	}
+
+	deinit {
+		bag.forEach({ $0.cancel() })
+	}
 
 
 

diff --git a/Kukai Mobile/Modules/Login/LoginViewController.swift b/Kukai Mobile/Modules/Login/LoginViewController.swift
@@ -63,7 +63,7 @@ class LoginViewController: UIViewController {
 
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
-		/* // TODO: uncomment
+
 		// Hide biometric button if its not enabled, or we are in the middle of the edit passcode flow
 		if isEditPasscodeMode() || CurrentDevice.biometricTypeAuthorized() == .none || StorageService.isBiometricEnabled() == false {
 			useBiometricsButton.isHidden = true
@@ -83,9 +83,6 @@ class LoginViewController: UIViewController {
 			// Edit passcode popup
 			self.hiddenTextfield.becomeFirstResponder()
 		}
-		*/
-
-		self.next()
 	}
 
 	override func viewDidDisappear(_ animated: Bool) {

diff --git a/Kukai Mobile/Modules/Send/SendAbstractConfirmViewController.swift b/Kukai Mobile/Modules/Send/SendAbstractConfirmViewController.swift
@@ -114,6 +114,7 @@ class SendAbstractConfirmViewController: UIViewController {
 			if collapseOnly == false {
 				if isDuringStakeOnboardingFlow {
 					topMostNavigationController?.dismiss(animated: true)
+
 				} else {
 					(self?.presentingViewController as? UINavigationController)?.popToHome()
 				}

diff --git a/Kukai Mobile/Modules/Stake/ChooseBakerConfirmViewController.swift b/Kukai Mobile/Modules/Stake/ChooseBakerConfirmViewController.swift
@@ -181,10 +181,7 @@ class ChooseBakerConfirmViewController: SendAbstractConfirmViewController, Slide
 
 	func didCompleteSlide() {
 		self.blockInteraction(exceptFor: [closeButton])
-
-		// TODO: swap back
-		//self.performAuth()
-		self.handleApproval(opHash: "", slideButton: self.slideButton)
+		self.performAuth()
 	}
 
 	override func authSuccessful() {

diff --git a/Kukai Mobile/Modules/Stake/ChooseBakerViewController.swift b/Kukai Mobile/Modules/Stake/ChooseBakerViewController.swift
@@ -13,7 +13,7 @@ class ChooseBakerViewController: UIViewController {
 
 	@IBOutlet weak var tableView: UITableView!
 
-	private let viewModel = ChooseBakerViewModel()
+	private var viewModel = ChooseBakerViewModel()
 	private var cancellable: AnyCancellable?
 	private let footerView = UIView(frame: CGRect(x: 0, y: 0, width: 1, height: 2))
 	private let blankView = UIView(frame: CGRect(x: 0, y: 0, width: 0, height: 0.1))
@@ -49,7 +49,10 @@ class ChooseBakerViewController: UIViewController {
 
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
-		viewModel.refresh(animate: false)
+
+		if viewModel.bakers.count == 0 {
+			viewModel.refresh(animate: false)
+		}
 	}
 
 	public func enteredCustomBaker(address: String) {
@@ -58,21 +61,24 @@ class ChooseBakerViewController: UIViewController {
 		if address == "" {
 			let currentDelegate = DependencyManager.shared.balanceService.account.delegate
 			let name = currentDelegate?.alias ?? currentDelegate?.address.truncateTezosAddress() ?? ""
-			let baker = TzKTBaker(address: "", name: name)
+			let baker = TzKTBaker(address: currentDelegate?.address ?? "", name: name)
 
 			TransactionService.shared.delegateData.chosenBaker = baker
+			TransactionService.shared.stakeData.chosenBaker = baker
 			TransactionService.shared.delegateData.isAdd = false
 
 		} else {
 			self.showLoadingView()
 
 			if let foundBaker = viewModel.bakerFor(address: address) {
 				TransactionService.shared.delegateData.chosenBaker = foundBaker
+				TransactionService.shared.stakeData.chosenBaker = foundBaker
 				TransactionService.shared.delegateData.isAdd = true
 
 			} else {
 				let baker = TzKTBaker(address: address, name: address.truncateTezosAddress())
 				TransactionService.shared.delegateData.chosenBaker = baker
+				TransactionService.shared.stakeData.chosenBaker = baker
 				TransactionService.shared.delegateData.isAdd = true
 			}
 		}
@@ -97,7 +103,13 @@ class ChooseBakerViewController: UIViewController {
 			return
 		}
 
-		let operations = OperationFactory.delegateOperation(to: toAddress, from: selectedWallet.address)
+		var operations: [KukaiCoreSwift.Operation] = []
+		if TransactionService.shared.delegateData.isAdd == true {
+			operations = OperationFactory.delegateOperation(to: toAddress, from: selectedWallet.address)
+		} else {
+			operations = OperationFactory.undelegateOperation(address: selectedWallet.address)
+		}
+
 		DependencyManager.shared.tezosNodeClient.estimate(operations: operations, walletAddress: selectedWallet.address, base58EncodedPublicKey: selectedWallet.publicKeyBase58encoded()) { [weak self] estimationResult in
 			self?.hideLoadingView()
 
@@ -132,6 +144,7 @@ extension ChooseBakerViewController: UITableViewDelegate {
 		if let baker = viewModel.bakerFor(indexPath: indexPath) {
 
 			TransactionService.shared.delegateData.chosenBaker = baker
+			TransactionService.shared.stakeData.chosenBaker = baker
 			TransactionService.shared.delegateData.isAdd = true
 			self.performSegue(withIdentifier: "details", sender: nil)
 

diff --git a/Kukai Mobile/Modules/Stake/ChooseBakerViewModel.swift b/Kukai Mobile/Modules/Stake/ChooseBakerViewModel.swift
@@ -32,15 +32,6 @@ class ChooseBakerViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 
 	override init() {
 		super.init()
-
-		DependencyManager.shared.$addressRefreshed
-			.dropFirst()
-			.sink { [weak self] address in
-				let selectedAddress = DependencyManager.shared.selectedWalletAddress ?? ""
-				if self?.dataSource != nil && selectedAddress == address {
-					self?.refresh(animate: true)
-				}
-			}.store(in: &bag)
 	}
 
 	deinit {

diff --git a/Kukai Mobile/Modules/Stake/EnterCustomBakerViewController.swift b/Kukai Mobile/Modules/Stake/EnterCustomBakerViewController.swift
@@ -18,6 +18,7 @@ class EnterCustomBakerViewController: UIViewController, EnterAddressComponentDel
 		enterAddressComponent.headerLabel.text = "Baker:"
 		enterAddressComponent.updateAvilableAddressTypes([.tezosAddress, .tezosDomain])
 		enterAddressComponent.delegate = self
+		enterAddressComponent.allowEmpty = true // undelegate by entering blank into field
     }
 
 	func validatedInput(entered: String, validAddress: Bool, ofType: AddressType) {