Fix #7785: User assets are not migrated if user restore wallet from l…

…ock screen (#7793)

Sources/BraveWallet/Crypto/Stores/CryptoStore.swift

@@ -103,6 +103,7 @@ public class CryptoStore: ObservableObject {
   private let solTxManagerProxy: BraveWalletSolanaTxManagerProxy
   private let ipfsApi: IpfsAPI
   private let userAssetManager: WalletUserAssetManager
+  private var isUpdatingUserAssets: Bool = false
 
   public init(
     keyringService: BraveWalletKeyringService,
@@ -561,11 +562,19 @@ extension CryptoStore: BraveWalletKeyringServiceObserver {
     }
   }
   public func keyringRestored(_ keyringId: BraveWallet.KeyringId) {
-    // if a keyring is restored, we want to reset user assets local storage
-    // and migrate with for new keyring
+    // This observer method will only get called when user restore a wallet
+    // from the lock screen
+    // We will need to
+    // 1. reset wallet user asset migration flag
+    // 2. wipe user assets local storage
+    // 3. migrate user assets with new keyring
+    guard !isUpdatingUserAssets else { return }
+    isUpdatingUserAssets = true
+    Preferences.Wallet.migrateCoreToWalletUserAssetCompleted.reset()
     WalletUserAssetGroup.removeAllGroup() { [weak self] in
       self?.userAssetManager.migrateUserAssets(completion: {
         self?.updateAssets()
+        self?.isUpdatingUserAssets = false
       })
     }
   }

Sources/BraveWallet/WalletUserAssetManager.swift

@@ -85,6 +85,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType {
 
   public func migrateUserAssets(for coin: BraveWallet.CoinType? = nil, completion: (() -> Void)? = nil) {
     guard !Preferences.Wallet.migrateCoreToWalletUserAssetCompleted.value else {
+      completion?()
       return
     }
     Task { @MainActor in