only display "complete" after the WC2 request has been successful

kukai-wallet · May 24, 2024 · 134ad81 · 134ad81
1 parent 07d9ad0
commit 134ad81
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/Kukai Mobile/Modules/Send/SendAbstractConfirmViewController.swift b/Kukai Mobile/Modules/Send/SendAbstractConfirmViewController.swift
@@ -108,7 +108,7 @@ class SendAbstractConfirmViewController: UIViewController {
 		})
 	}
 
-	func handleApproval(opHash: String) {
+	func handleApproval(opHash: String, slideButton: SlideButton?) {
 		AccountViewModel.reconnectAccountActivityListenerIfNeeded()
 
 		if !isWalletConnectOp {
@@ -118,7 +118,15 @@ class SendAbstractConfirmViewController: UIViewController {
 
 		WalletConnectService.approveCurrentRequest(signature: nil, opHash: opHash, completion: { [weak self] success, error in
 			if success {
-				self?.dismissAndReturn(collapseOnly: false)
+
+				DispatchQueue.main.async {
+					slideButton?.markComplete(withText: "Complete")
+				}
+
+				// Delay for UX purposes only, just a brief delay to see the words "complete"
+				DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+					self?.dismissAndReturn(collapseOnly: false)
+				}
 
 			} else {
 				var message = "error-wc2-unrecoverable".localized()

diff --git a/Kukai Mobile/Modules/Send/SendBatchConfirmViewController.swift b/Kukai Mobile/Modules/Send/SendBatchConfirmViewController.swift
@@ -193,15 +193,13 @@ class SendBatchConfirmViewController: SendAbstractConfirmViewController, SlideBu
 		}
 
 		DependencyManager.shared.tezosNodeClient.send(operations: selectedOperationsAndFees(), withWallet: wallet) { [weak self] sendResult in
-			self?.slideButton.markComplete(withText: "Complete")
-
 			switch sendResult {
 				case .success(let opHash):
 					Logger.app.info("Sent: \(opHash)")
 
 					self?.didSend = true
 					self?.addPendingTransaction(opHash: opHash)
-					self?.handleApproval(opHash: opHash)
+					self?.handleApproval(opHash: opHash, slideButton: self?.slideButton)
 
 				case .failure(let sendError):
 					self?.unblockInteraction()

diff --git a/Kukai Mobile/Modules/Send/SendCollectibleConfirmViewController.swift b/Kukai Mobile/Modules/Send/SendCollectibleConfirmViewController.swift
@@ -215,13 +215,12 @@ class SendCollectibleConfirmViewController: SendAbstractConfirmViewController, S
 		}
 
 		DependencyManager.shared.tezosNodeClient.send(operations: selectedOperationsAndFees(), withWallet: wallet) { [weak self] sendResult in
-			self?.slideButton.markComplete(withText: "Complete")
 			switch sendResult {
 				case .success(let opHash):
 					Logger.app.info("Sent: \(opHash)")
 					self?.didSend = true
 					self?.addPendingTransaction(opHash: opHash)
-					self?.handleApproval(opHash: opHash)
+					self?.handleApproval(opHash: opHash, slideButton: self?.slideButton)
 
 				case .failure(let sendError):
 					self?.unblockInteraction()

diff --git a/Kukai Mobile/Modules/Send/SendGenericConfirmViewController.swift b/Kukai Mobile/Modules/Send/SendGenericConfirmViewController.swift
@@ -177,14 +177,13 @@ class SendGenericConfirmViewController: SendAbstractConfirmViewController, Slide
 		}
 
 		DependencyManager.shared.tezosNodeClient.send(operations: selectedOperationsAndFees(), withWallet: wallet) { [weak self] sendResult in
-			self?.slideButton.markComplete(withText: "Complete")
 			switch sendResult {
 				case .success(let opHash):
 					Logger.app.info("Sent: \(opHash)")
 
 					self?.didSend = true
 					self?.addPendingTransaction(opHash: opHash)
-					self?.handleApproval(opHash: opHash)
+					self?.handleApproval(opHash: opHash, slideButton: self?.slideButton)
 
 				case .failure(let sendError):
 					self?.unblockInteraction()

diff --git a/Kukai Mobile/Modules/Send/SendTokenConfirmViewController.swift b/Kukai Mobile/Modules/Send/SendTokenConfirmViewController.swift
@@ -195,13 +195,12 @@ class SendTokenConfirmViewController: SendAbstractConfirmViewController, SlideBu
 		}
 
 		DependencyManager.shared.tezosNodeClient.send(operations: selectedOperationsAndFees(), withWallet: wallet) { [weak self] sendResult in
-			self?.slideButton.markComplete(withText: "Complete")
 			switch sendResult {
 				case .success(let opHash):
 					Logger.app.info("Sent: \(opHash)")
 					self?.didSend = true
 					self?.addPendingTransaction(opHash: opHash)
-					self?.handleApproval(opHash: opHash)
+					self?.handleApproval(opHash: opHash, slideButton: self?.slideButton)
 
 				case .failure(let sendError):
 					self?.unblockInteraction()

diff --git a/Kukai Mobile/Modules/Stake/ConfirmStakeViewController.swift b/Kukai Mobile/Modules/Stake/ConfirmStakeViewController.swift
@@ -181,14 +181,12 @@ class ConfirmStakeViewController: SendAbstractConfirmViewController, SlideButton
 		}
 
 		DependencyManager.shared.tezosNodeClient.send(operations: selectedOperationsAndFees(), withWallet: wallet) { [weak self] sendResult in
-			self?.slideButton.markComplete(withText: "Complete")
-
 			switch sendResult {
 				case .success(let opHash):
 					Logger.app.info("Sent: \(opHash)")
 					self?.didSend = true
 					self?.addPendingTransaction(opHash: opHash)
-					self?.handleApproval(opHash: opHash)
+					self?.handleApproval(opHash: opHash, slideButton: self?.slideButton)
 
 				case .failure(let sendError):
 					self?.unblockInteraction()