From 32df6963f28f54768646f939cf53f351e55d9f7c Mon Sep 17 00:00:00 2001 From: Simon McLoughlin Date: Mon, 29 Apr 2024 16:11:01 +0100 Subject: [PATCH] - move pending transaction removal code to a later function call so that its not removed too early - increase right padding for sign expression textview --- .../Modules/Activity/ActivityViewModel.swift | 4 +- .../WalletConnectSignViewController.swift | 2 +- .../RecoveryPhrase/RecoveryPhrase.storyboard | 180 +++++++++--------- Kukai Mobile/Services/ActivityService.swift | 4 +- Kukai Mobile/Services/BalanceService.swift | 4 + 5 files changed, 98 insertions(+), 96 deletions(-) diff --git a/Kukai Mobile/Modules/Activity/ActivityViewModel.swift b/Kukai Mobile/Modules/Activity/ActivityViewModel.swift index d49a7e34..91b70a7f 100644 --- 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 index 7a822d68..8df6247e 100644 --- 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 diff --git a/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhrase.storyboard b/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhrase.storyboard index 5eb9fd08..5f3266f2 100644 --- a/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhrase.storyboard +++ b/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhrase.storyboard @@ -47,13 +47,13 @@ - + @@ -682,7 +682,7 @@