[trello.com/c/AvS5QpYb] Make balances ... only after pull to refresh update

Lainaaa · Lainaaa · commit 5d3d455db976 · 2025-04-09T18:39:12.000+02:00
diff --git a/Adamant/Modules/Account/AccountViewController/AccountViewController.swift b/Adamant/Modules/Account/AccountViewController/AccountViewController.swift
@@ -995,9 +995,9 @@ final class AccountViewController: FormViewController {
         }
 
         Task { @MainActor in
-            accountService.update()
-            refreshControl.endRefreshing()
+            accountService.updateWithRefreshUI()
         }
+        refreshControl.endRefreshing()
     }
 
     private func selectCurrentWallet() {
diff --git a/Adamant/Modules/Wallets/Adamant/AdmWalletService.swift b/Adamant/Modules/Wallets/Adamant/AdmWalletService.swift
@@ -158,14 +158,20 @@ final class AdmWalletService: NSObject, WalletCoreProtocol, WalletStaticCoreProt
             .store(in: &subscriptions)
     }
 
+    func updateWithRefreshUIBalance(){
+        Task {        
+            admWallet?.isBalanceInitialized = false
+            await walletUpdateSender.send()
+            update()
+        }
+    }
+    
     func update() {
         guard let accountService = accountService, let account = accountService.account else {
             admWallet = nil
             return
         }
         
-        admWallet?.isBalanceInitialized = false
-        
         let isRaised: Bool
 
         if let wallet = admWallet {
diff --git a/Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift b/Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift
@@ -278,8 +278,14 @@ final class BtcWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc
         }
     }
 
+    func updateWithRefreshUIBalance(){
+        Task {
+            await update(updateWithRefreshUIBalance: true)
+        }
+    }
+    
     @MainActor
-    func update() async {
+    func update(updateWithRefreshUIBalance: Bool = false) async {
         guard let wallet = btcWallet else {
             return
         }
@@ -292,8 +298,10 @@ final class BtcWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc
             break
         }
         
-        wallet.isBalanceInitialized = false
-        walletUpdateSender.send()
+        if updateWithRefreshUIBalance {
+            wallet.isBalanceInitialized = false
+            walletUpdateSender.send()
+        }
         
         setState(.updating)
 
diff --git a/Adamant/Modules/Wallets/Dash/DashWalletService.swift b/Adamant/Modules/Wallets/Dash/DashWalletService.swift
@@ -225,9 +225,15 @@ final class DashWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un
             await update()
         }
     }
+    
+    func updateWithRefreshUIBalance(){
+        Task {
+            await update(updateWithRefreshUIBalance: true)
+        }
+    }
 
     @MainActor
-    func update() async {
+    func update(updateWithRefreshUIBalance: Bool = false) async {
         guard let wallet = dashWallet else {
             return
         }
@@ -240,8 +246,10 @@ final class DashWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un
             break
         }
         
-        wallet.isBalanceInitialized = false
-        walletUpdateSender.send()
+        if updateWithRefreshUIBalance{
+            wallet.isBalanceInitialized = false
+            walletUpdateSender.send()
+        }
         
         setState(.updating)
 
diff --git a/Adamant/Modules/Wallets/Doge/DogeWalletService.swift b/Adamant/Modules/Wallets/Doge/DogeWalletService.swift
@@ -246,8 +246,14 @@ final class DogeWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un
         }
     }
 
+    func updateWithRefreshUIBalance(){
+        Task {
+            await update(updateWithRefreshUIBalance: true)
+        }
+    }
+    
     @MainActor
-    func update() async {
+    func update(updateWithRefreshUIBalance: Bool = false) async {
         guard let wallet = dogeWallet else {
             return
         }
@@ -260,8 +266,10 @@ final class DogeWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un
             break
         }
         
-        wallet.isBalanceInitialized = false
-        walletUpdateSender.send()
+        if updateWithRefreshUIBalance {
+            wallet.isBalanceInitialized = false
+            walletUpdateSender.send()
+        }
         
         setState(.updating)
 
diff --git a/Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift b/Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift
@@ -255,8 +255,14 @@ final class ERC20WalletService: WalletCoreProtocol, ERC20GasAlgorithmComputable,
         }
     }
 
+    func updateWithRefreshUIBalance() {
+        Task {
+            await update(updateWithRefreshUIBalance: true)
+        }
+    }
+    
     @MainActor
-    func update() async {
+    func update(updateWithRefreshUIBalance: Bool = false) async {
         guard let wallet = ethWallet else {
             return
         }
@@ -269,8 +275,10 @@ final class ERC20WalletService: WalletCoreProtocol, ERC20GasAlgorithmComputable,
             break
         }
         
-        wallet.isBalanceInitialized = false
-        walletUpdateSender.send()
+        if updateWithRefreshUIBalance {
+            wallet.isBalanceInitialized = false
+            walletUpdateSender.send()
+        }
         
         setState(.updating)
 
diff --git a/Adamant/Modules/Wallets/Ethereum/EthWalletService.swift b/Adamant/Modules/Wallets/Ethereum/EthWalletService.swift
@@ -292,8 +292,14 @@ final class EthWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, ERC2
         }
     }
 
+    func updateWithRefreshUIBalance(){
+        Task {
+            await update(updateWithRefreshUIBalance: true)
+        }
+    }
+    
     @MainActor
-    func update() async {
+    func update(updateWithRefreshUIBalance: Bool = false) async {
         guard let wallet = await getWallet() else {
             return
         }
@@ -306,8 +312,10 @@ final class EthWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, ERC2
             break
         }
         
-        wallet.isBalanceInitialized = false
-        walletUpdateSender.send()
+        if updateWithRefreshUIBalance {
+            wallet.isBalanceInitialized = false
+            walletUpdateSender.send()
+        }
         
         setState(.updating)
 
diff --git a/Adamant/Modules/Wallets/Klayr/WalletService/KlyWalletService.swift b/Adamant/Modules/Wallets/Klayr/WalletService/KlyWalletService.swift
@@ -249,8 +249,14 @@ extension KlyWalletService {
             .store(in: &subscriptions)
     }
 
+    func updateWithRefreshUIBalance(){
+        Task {
+            await update(updateWithRefreshUIBalance: true)
+        }
+    }
+    
     @MainActor
-    fileprivate func update() async {
+    fileprivate func update(updateWithRefreshUIBalance: Bool = false) async {
         guard let wallet = klyWallet else {
             return
         }
@@ -263,8 +269,10 @@ extension KlyWalletService {
             break
         }
         
-        wallet.isBalanceInitialized = false
-        walletUpdateSender.send()
+        if updateWithRefreshUIBalance {
+            wallet.isBalanceInitialized = false
+            walletUpdateSender.send()
+        }
         
         setState(.updating)
 
diff --git a/Adamant/Modules/Wallets/WalletsService/WalletCoreProtocol.swift b/Adamant/Modules/Wallets/WalletsService/WalletCoreProtocol.swift
@@ -301,6 +301,7 @@ protocol WalletCoreProtocol: AnyObject, Sendable {
     var walletUpdatePublisher: AnyObservable<Void> { get }
 
     func update()
+    func updateWithRefreshUIBalance()
 
     // MARK: Tools
     func validate(address: String) -> AddressValidationResult
diff --git a/Adamant/ServiceProtocols/AccountService.swift b/Adamant/ServiceProtocols/AccountService.swift
@@ -162,6 +162,7 @@ protocol AccountService: AnyObject, Sendable {
 
     /// Update logged account info
     func update()
+    func updateWithRefreshUI()
     func update(_ completion: (@Sendable (AccountServiceResult) -> Void)?)
 
     /// Login into Adamant using passphrase.
diff --git a/Adamant/Services/AdamantAccountService.swift b/Adamant/Services/AdamantAccountService.swift
@@ -233,8 +233,12 @@ extension AdamantAccountService {
     func update(_ completion: (@Sendable (AccountServiceResult) -> Void)?) {
         update(completion, updateOnlyVisible: true)
     }
+    
+    func updateWithRefreshUI() {
+        update(nil, updateOnlyVisible: true, shouldUpdateUIBalance: true)
+    }
 
-    func update(_ completion: (@Sendable (AccountServiceResult) -> Void)?, updateOnlyVisible: Bool) {
+    func update(_ completion: (@Sendable (AccountServiceResult) -> Void)?, updateOnlyVisible: Bool, shouldUpdateUIBalance: Bool = false) {
         switch state {
         case .notLogged, .isLoggingIn, .updating:
             return
@@ -283,7 +287,11 @@ extension AdamantAccountService {
 
         for wallet in wallets {
             if !updateOnlyVisible || !(walletsStoreService?.isInvisible(wallet) ?? false) {
-                wallet.core.update()
+                if shouldUpdateUIBalance {
+                    wallet.core.updateWithRefreshUIBalance()
+                } else {
+                    wallet.core.update()
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -995,9 +995,9 @@ final class AccountViewController: FormViewController {`
`995`	`995`	`}`
`996`	`996`
`997`	`997`	`Task { @MainActor in`
`998`		`- accountService.update()`
`999`		`- refreshControl.endRefreshing()`
	`998`	`+ accountService.updateWithRefreshUI()`
`1000`	`999`	`}`
	`1000`	`+ refreshControl.endRefreshing()`
`1001`	`1001`	`}`
`1002`	`1002`
`1003`	`1003`	`private func selectCurrentWallet() {`
Original file line number	Diff line number	Diff line change
`@@ -278,8 +278,14 @@ final class BtcWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`
	`281`	`+ func updateWithRefreshUIBalance(){`
	`282`	`+ Task {`
	`283`	`+ await update(updateWithRefreshUIBalance: true)`
	`284`	`+ }`
	`285`	`+ }`
	`286`	`+`
`281`	`287`	`@MainActor`
`282`		`- func update() async {`
	`288`	`+ func update(updateWithRefreshUIBalance: Bool = false) async {`
`283`	`289`	`guard let wallet = btcWallet else {`
`284`	`290`	`return`
`285`	`291`	`}`
`@@ -292,8 +298,10 @@ final class BtcWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc`
`292`	`298`	`break`
`293`	`299`	`}`
`294`	`300`
`295`		`- wallet.isBalanceInitialized = false`
`296`		`- walletUpdateSender.send()`
	`301`	`+ if updateWithRefreshUIBalance {`
	`302`	`+ wallet.isBalanceInitialized = false`
	`303`	`+ walletUpdateSender.send()`
	`304`	`+ }`
`297`	`305`
`298`	`306`	`setState(.updating)`
`299`	`307`
Original file line number	Diff line number	Diff line change
`@@ -246,8 +246,14 @@ final class DogeWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`
	`249`	`+ func updateWithRefreshUIBalance(){`
	`250`	`+ Task {`
	`251`	`+ await update(updateWithRefreshUIBalance: true)`
	`252`	`+ }`
	`253`	`+ }`
	`254`	`+`
`249`	`255`	`@MainActor`
`250`		`- func update() async {`
	`256`	`+ func update(updateWithRefreshUIBalance: Bool = false) async {`
`251`	`257`	`guard let wallet = dogeWallet else {`
`252`	`258`	`return`
`253`	`259`	`}`
`@@ -260,8 +266,10 @@ final class DogeWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un`
`260`	`266`	`break`
`261`	`267`	`}`
`262`	`268`
`263`		`- wallet.isBalanceInitialized = false`
`264`		`- walletUpdateSender.send()`
	`269`	`+ if updateWithRefreshUIBalance {`
	`270`	`+ wallet.isBalanceInitialized = false`
	`271`	`+ walletUpdateSender.send()`
	`272`	`+ }`
`265`	`273`
`266`	`274`	`setState(.updating)`
`267`	`275`
Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,14 @@ final class ERC20WalletService: WalletCoreProtocol, ERC20GasAlgorithmComputable,`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
	`258`	`+ func updateWithRefreshUIBalance() {`
	`259`	`+ Task {`
	`260`	`+ await update(updateWithRefreshUIBalance: true)`
	`261`	`+ }`
	`262`	`+ }`
	`263`	`+`
`258`	`264`	`@MainActor`
`259`		`- func update() async {`
	`265`	`+ func update(updateWithRefreshUIBalance: Bool = false) async {`
`260`	`266`	`guard let wallet = ethWallet else {`
`261`	`267`	`return`
`262`	`268`	`}`
`@@ -269,8 +275,10 @@ final class ERC20WalletService: WalletCoreProtocol, ERC20GasAlgorithmComputable,`
`269`	`275`	`break`
`270`	`276`	`}`
`271`	`277`
`272`		`- wallet.isBalanceInitialized = false`
`273`		`- walletUpdateSender.send()`
	`278`	`+ if updateWithRefreshUIBalance {`
	`279`	`+ wallet.isBalanceInitialized = false`
	`280`	`+ walletUpdateSender.send()`
	`281`	`+ }`
`274`	`282`
`275`	`283`	`setState(.updating)`
`276`	`284`
Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,14 @@ final class EthWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, ERC2`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`
	`295`	`+ func updateWithRefreshUIBalance(){`
	`296`	`+ Task {`
	`297`	`+ await update(updateWithRefreshUIBalance: true)`
	`298`	`+ }`
	`299`	`+ }`
	`300`	`+`
`295`	`301`	`@MainActor`
`296`		`- func update() async {`
	`302`	`+ func update(updateWithRefreshUIBalance: Bool = false) async {`
`297`	`303`	`guard let wallet = await getWallet() else {`
`298`	`304`	`return`
`299`	`305`	`}`
`@@ -306,8 +312,10 @@ final class EthWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, ERC2`
`306`	`312`	`break`
`307`	`313`	`}`
`308`	`314`
`309`		`- wallet.isBalanceInitialized = false`
`310`		`- walletUpdateSender.send()`
	`315`	`+ if updateWithRefreshUIBalance {`
	`316`	`+ wallet.isBalanceInitialized = false`
	`317`	`+ walletUpdateSender.send()`
	`318`	`+ }`
`311`	`319`
`312`	`320`	`setState(.updating)`
`313`	`321`