Address PR comments

brave · Jan 19, 2024 · 6824b33 · 6824b33
1 parent d05c094
commit 6824b33
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/Sources/BraveWallet/Crypto/Accounts/AccountsView.swift b/Sources/BraveWallet/Crypto/Accounts/AccountsView.swift
@@ -346,21 +346,3 @@ private struct AccountCardView: View {
       .clipShape(RoundedRectangle(cornerRadius: 8))
   }
 }
-
-private extension BraveWallet.AccountInfo {
-  /// String to display what this account supports, ex. `"Ethereum + EVM Chains"`.
-  var accountSupportDisplayString: String {
-    switch coin {
-    case .eth:
-      return Strings.Wallet.ethAccountDescription
-    case .sol:
-      return Strings.Wallet.solAccountDescription
-    case .fil:
-      return Strings.Wallet.filAccountDescription
-    case .btc, .zec:
-      return ""
-    @unknown default:
-      return ""
-    }
-  }
-}
diff --git a/Sources/BraveWallet/Crypto/Stores/AccountsStore.swift b/Sources/BraveWallet/Crypto/Stores/AccountsStore.swift
@@ -48,7 +48,7 @@ class AccountsStore: ObservableObject, WalletObserverStore {
   private var walletServiceObserver: WalletServiceObserver?
 
   var isObserving: Bool {
-    keyringServiceObserver != nil
+    keyringServiceObserver != nil && walletServiceObserver != nil
   }
 
   init(
@@ -85,6 +85,7 @@ class AccountsStore: ObservableObject, WalletObserverStore {
 
   func tearDown() {
     keyringServiceObserver = nil
+    walletServiceObserver = nil
   }
 
   func update() {

diff --git a/Sources/BraveWallet/Extensions/BraveWalletExtensions.swift b/Sources/BraveWallet/Extensions/BraveWalletExtensions.swift
@@ -141,6 +141,24 @@ extension BraveWallet.AccountId {
   }
 }
 
+extension BraveWallet.AccountInfo {
+  /// String to display what this account supports, ex. `"Ethereum + EVM Chains"`.
+  var accountSupportDisplayString: String {
+    switch coin {
+    case .eth:
+      return Strings.Wallet.ethAccountDescription
+    case .sol:
+      return Strings.Wallet.solAccountDescription
+    case .fil:
+      return Strings.Wallet.filAccountDescription
+    case .btc, .zec:
+      return ""
+    @unknown default:
+      return ""
+    }
+  }
+}
+
 extension BraveWallet.CoinType {
   public var keyringIds: [BraveWallet.KeyringId] {
     switch self {