Merge branch 'feature/stability_improvements' into develop

kukai-wallet · Jun 28, 2024 · a6acb23 · a6acb23
2 parents 3082e70 + 30cc4ee
commit a6acb23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Kukai Mobile/Modules/Collectibles/CollectionDetailsViewModel.swift b/Kukai Mobile/Modules/Collectibles/CollectionDetailsViewModel.swift
@@ -101,7 +101,7 @@ class CollectionDetailsViewModel: ViewModel, UICollectionViewDiffableDataSourceH
 		}
 
 		var tokenToView = selectedToken
-		if let updatedSelectedToken = DependencyManager.shared.balanceService.account.nfts.first(where: { $0.tokenContractAddress == selectedToken?.tokenContractAddress && $0.tokenId == selectedToken?.tokenId }) {
+		if let updatedSelectedToken = DependencyManager.shared.balanceService.account.nfts.first(where: { $0.tokenContractAddress == selectedToken?.tokenContractAddress && $0.tokenId == selectedToken?.tokenId && $0.name == selectedToken?.name}) {
 			tokenToView = updatedSelectedToken
 		}
 

diff --git a/Kukai Mobile/Modules/Home/HomeTabBarController.swift b/Kukai Mobile/Modules/Home/HomeTabBarController.swift
@@ -163,10 +163,13 @@ public class HomeTabBarController: UITabBarController, UITabBarControllerDelegat
 
 		NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification).sink { [weak self] _ in
 			AccountViewModel.reconnectAccountActivityListenerIfNeeded()
-			self?.recheckWalletConnectAnimation()
 			self?.supressAutoRefreshError = true
 			self?.refreshType = .refreshEverything
 			self?.refresh(addresses: nil)
+
+			DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+				self?.recheckWalletConnectAnimation()
+			}
 		}.store(in: &bag)
 
 		ThemeManager.shared.$themeDidChange