Merge pull request #759 from Adamant-im/trello.com/c/YsjIF3DY

[trello.com/c/YsjIF3DY] (Secret wallets) Handle logout/login case

Author: Lainaaa

Adamant/Modules/Account/AccountViewController/AccountViewController.swift

@@ -178,8 +178,8 @@ final class AccountViewController: FormViewController {
         accountHeaderView.delegate = self
 
         secretWalletsViewModel.$state
-            .map { $0.currentActiveIndex }
             .removeDuplicates()
+            .map { $0.currentActiveIndex }
             .receive(on: DispatchQueue.main)
             .sink { [weak self] index in
                 guard let self = self else { return }

Adamant/Modules/SecretWallets/SecretWalletsState.swift

@@ -17,7 +17,15 @@ struct SecretWalletsState: Equatable {
         return wallets[currentActiveIndex]
     }
 
-    static let `default` = Self(wallets: [], currentActiveIndex: -1)
+    static let `default` = Self(
+        wallets: [WalletItem(
+            name: String.localized(
+                "SecretWallets.Menu.Regular",
+                comment: "Secret wallet menu: regular wallet"
+            )
+        )],
+        currentActiveIndex: 0
+    )
 }
 
 struct WalletItem: Equatable, Identifiable {

Adamant/Modules/SecretWallets/SecretWalletsViewModel.swift

@@ -6,6 +6,7 @@
 //  Copyright © 2025 Adamant. All rights reserved.
 //
 
+import Foundation
 import CommonKit
 import Combine
 
@@ -22,11 +23,6 @@ final class SecretWalletsViewModel: ObservableObject {
         setup()
     }
 
-    private func setup() {
-        self.state.currentActiveIndex = 0
-        self.state.wallets.append(WalletItem(name: String.localized("SecretWallets.Menu.Regular", comment: "Secret wallet menu: regular wallet")))
-    }
-    
     func pickWallet(at index: Int) {
         if index == 0 {
             secretWalletsManager.activateDefaultWallet()
@@ -46,3 +42,18 @@ final class SecretWalletsViewModel: ObservableObject {
         self.state.currentActiveIndex = index
     }
 }
+
+private extension SecretWalletsViewModel {
+    func setup() {
+        NotificationCenter.default.notifications(named: .AdamantAccountService.userLoggedOut)
+            .sink { [weak self] _ in await self?.removeAllSecretWallets() }
+            .store(in: &subscriptions)        
+    }
+    
+    func removeAllSecretWallets() {
+        secretWalletsManager.removeAllSecretWallets()
+        secretWalletsManager.activateDefaultWallet()
+        state.currentActiveIndex = 0
+        state.wallets.removeLast(state.wallets.count - 1)
+    }
+}

Adamant/ServiceProtocols/SecretWalletsManagerProtocol.swift

@@ -17,6 +17,7 @@ protocol SecretWalletsManagerProtocol {
     func getSecretWallets() -> [WalletStoreServiceProtocol]
     func activateSecretWallet(at index: Int)
     func activateDefaultWallet()
+    func removeAllSecretWallets()
 }
 
 protocol SecretWalletsManagerStateProtocol {

Adamant/Services/AdamantAccountService.swift

@@ -313,6 +313,14 @@ extension AdamantAccountService {
 
         _ = await initWallets()
 
+        let userInfo = [AdamantUserInfoKey.AccountService.loggedAccountAddress: account.address]
+        
+        NotificationCenter.default.post(
+            name: Notification.Name.AdamantAccountService.userLoggedIn,
+            object: self,
+            userInfo: userInfo
+        )
+        
         return .success(account: account, alert: nil)
     }
 
@@ -384,14 +392,6 @@ extension AdamantAccountService {
             self.keypair = keypair
             markBalanceAsFresh()
 
-            let userInfo = [AdamantUserInfoKey.AccountService.loggedAccountAddress: account.address]
-            
-            NotificationCenter.default.post(
-                name: Notification.Name.AdamantAccountService.userLoggedIn,
-                object: self,
-                userInfo: userInfo
-            )
-            
             self.state = .loggedIn
             return account
         } catch let error as ApiServiceError {

Adamant/Services/SecretWalletsManager.swift

@@ -66,4 +66,8 @@ final class AdamantSecretWalletsManager: SecretWalletsManagerProtocol {
         state.currentWallet = state.regularWallet
         statePublisher.send(state)
     }
+    
+    func removeAllSecretWallets() {
+        state.secretWallets.removeAll()
+    }
 }