IOS-8044 Refactor

tangem · Sep 27, 2024 · 60cfbe2 · 60cfbe2
1 parent dc332d3
commit 60cfbe2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Tangem/App/Services/UserWalletRepository/CommonUserWalletRepository.swift b/Tangem/App/Services/UserWalletRepository/CommonUserWalletRepository.swift
@@ -105,7 +105,7 @@ class CommonUserWalletRepository: UserWalletRepository {
                     config.cardName,
                     names: models.map(\.name)
                 )
-                
+
                 let userWalletModel = CommonUserWalletModelFactory().makeModel(cardInfo: cardInfo)
                 if let userWalletModel {
                     initializeServices(for: userWalletModel)

diff --git a/Tangem/Modules/Main/MultiWalletMainContent/MultiWalletMainContentViewModel.swift b/Tangem/Modules/Main/MultiWalletMainContent/MultiWalletMainContentViewModel.swift
@@ -81,7 +81,6 @@ final class MultiWalletMainContentViewModel: ObservableObject {
     private var isUpdating = false
 
     private var bag = Set<AnyCancellable>()
-    private var tokenListSyncSubscription: AnyCancellable?
 
     init(
         userWalletModel: UserWalletModel,
@@ -274,12 +273,14 @@ final class MultiWalletMainContentViewModel: ObservableObject {
         let sectionsPublisher = sectionsPublisher
             .replaceEmpty(with: [])
 
+        var tokenListSyncSubscription: AnyCancellable?
         tokenListSyncSubscription = Publishers.Zip(tokenListSyncPublisher, sectionsPublisher)
+            .prefix(1)
             .receive(on: DispatchQueue.main)
             .withWeakCaptureOf(self)
             .sink { viewModel, _ in
                 viewModel.isLoadingTokenList = false
-                viewModel.tokenListSyncSubscription = nil
+                withExtendedLifetime(tokenListSyncSubscription) {}
             }
     }