diff --git a/Kukai Mobile/Modules/Collectibles/CollectionDetailsViewModel.swift b/Kukai Mobile/Modules/Collectibles/CollectionDetailsViewModel.swift index 872dca06..7f9d3531 100644 --- 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 index a4d994da..540b77fa 100644 --- 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