Merge pull request #720 from Adamant-im/trello.com/c/AvS5QpYb

[trello.com/c/AvS5QpYb] Updating again the popup logic

Author: PingPongEzZ

Adamant/Modules/Account/AccountViewController/AccountViewController.swift

@@ -204,10 +204,12 @@ final class AccountViewController: FormViewController {
 
         viewModel.$state
             .removeDuplicates()
+            .debounce(for: .nanoseconds(500_000_000), scheduler: DispatchQueue.main)
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
                 guard let self = self else { return }
                 self.pagingViewController.reloadMenu()
+                self.pagingViewController.select(index: currentWalletIndex, animated: false)
             }
             .store(in: &notificationsSet)
 
@@ -900,11 +902,8 @@ final class AccountViewController: FormViewController {
     }
 
     private func updatePagingItemHeight() {
-        if walletViewControllers.count > 0 {
-            pagingViewController.menuItemSize = .fixed(width: 110, height: 114)
-        } else {
-            pagingViewController.menuItemSize = .fixed(width: 110, height: 0)
-        }
+        let itemHeight: CGFloat = walletViewControllers.count > .zero ? 114 : .zero
+        pagingViewController.menuItemSize = .fixed(width: 110, height: itemHeight)
 
         updateHeaderSize(with: pagingViewController.menuItemSize.height, animated: true)
     }
@@ -978,9 +977,9 @@ final class AccountViewController: FormViewController {
             )
         }
 
-        refreshControl.endRefreshing()
-        DispatchQueue.background.async { [accountService] in
-            accountService.reloadWallets()
+        Task { @MainActor in
+            await accountService.reloadWallets()
+            refreshControl.endRefreshing()
         }
     }
 }

Adamant/Modules/Account/AccountViewController/AccountWallets/AccountWalletsViewModel.swift

@@ -48,9 +48,8 @@ private extension AccountWalletsViewModel {
             state.wallets[index].isBalanceInitialized = coreService.wallet?.isBalanceInitialized ?? false
             state.wallets[index].notificationBadgeCount = coreService.wallet?.notifications ?? 0
         } else {
-            let network = ERC20Token.supportedTokens.contains(where: { $0.symbol == coreService.tokenSymbol })
-                ? type(of: coreService).tokenNetworkSymbol
-                : ""
+            let network = type(of: coreService).tokenNetworkSymbol
+            
             let model = WalletCollectionViewCell.Model(
                 index: state.wallets.count,
                 coinID: coreService.tokenUniqueID,

Adamant/Modules/Account/WalletCollectionViewCell.swift

@@ -33,7 +33,7 @@ class WalletCollectionViewCell: PagingCell {
 private extension WalletCollectionViewCell {
     func update(item: WalletCollectionViewCell.Model) {
         currencyImageView.image = item.currencyImage
-        if item.currencyNetwork.isEmpty {
+        if item.currencyNetwork == item.currencySymbol {
             currencySymbolLabel.text = item.currencySymbol
         } else {
             let currencyFont = currencySymbolLabel.font ?? .systemFont(ofSize: 12)

Adamant/ServiceProtocols/AccountService.swift

@@ -171,7 +171,7 @@ protocol AccountService: AnyObject, Sendable {
     func logout()
 
     /// Reload current wallets state
-    func reloadWallets()
+    func reloadWallets() async
 
     // MARK: Stay in functions
 

Adamant/Services/AdamantAccountService.swift

@@ -408,10 +408,8 @@ extension AdamantAccountService {
         }
     }
 
-    func reloadWallets() {
-        Task {
-            _ = await initWallets()
-        }
+    func reloadWallets() async {
+        _ = await initWallets()
     }
 
     func initWallets() async -> [WalletAccount?] {