- move pending transaction removal code to a later function call so t…

…hat its not removed too early - increase right padding for sign expression textview
kukai-wallet · Apr 29, 2024 · 32df696 · 32df696
1 parent 876d33b
commit 32df696
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 96 deletions.
diff --git a/Kukai Mobile/Modules/Activity/ActivityViewModel.swift b/Kukai Mobile/Modules/Activity/ActivityViewModel.swift
@@ -135,10 +135,10 @@ class ActivityViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 			self.expandedIndex = nil
 		}
 
-		let currentAddress = DependencyManager.shared.selectedWalletAddress
+		let currentAddress = DependencyManager.shared.selectedWalletAddress ?? ""
+		let confirmed = DependencyManager.shared.activityService.transactionGroups
 
 		var pending = DependencyManager.shared.activityService.pendingTransactionGroups.filter({ $0.transactions.first?.sender.address == currentAddress })
-		let confirmed = DependencyManager.shared.activityService.transactionGroups
 
 		pending.append(contentsOf: confirmed)
 		pending = pending.sorted { groupLeft, groupRight in

diff --git a/Kukai Mobile/Modules/ConnectedApps/WalletConnectSignViewController.swift b/Kukai Mobile/Modules/ConnectedApps/WalletConnectSignViewController.swift
@@ -50,7 +50,7 @@ class WalletConnectSignViewController: UIViewController, BottomSheetCustomFixedP
 		stringToSign = expression
 		accountToSign = account
 		payloadTextView.text = expression.humanReadableStringFromMichelson()
-		payloadTextView.contentInset = UIEdgeInsets(top: 4, left: 6, bottom: 4, right: 6)
+		payloadTextView.contentInset = UIEdgeInsets(top: 4, left: 6, bottom: 4, right: 12)
 
 		slideButton.delegate = self
 		presentationController?.delegate = self