feat(wallet): iOS Wallet Network Settings

ios/brave-ios/Sources/BraveWallet/Crypto/CryptoTabsView.swift

@@ -175,8 +175,11 @@ struct CryptoTabsView<DismissContent: ToolbarContent>: View {
           AssetSearchView(
             keyringStore: keyringStore,
             cryptoStore: cryptoStore,
-            userAssetsStore: cryptoStore.portfolioStore.userAssetsStore
+            userAssetsStore: cryptoStore.openUserAssetsStore()
           )
+          .onDisappear {
+            cryptoStore.closeUserAssetsStore()
+          }
         }
     )
     .sheet(isPresented: $isShowingMainMenu) {

ios/brave-ios/Sources/BraveWallet/Crypto/FiltersDisplaySettingsView.swift

@@ -130,11 +130,10 @@ struct FiltersDisplaySettingsView: View {
   /// Returns true if all visible networks are selected
   var allNetworksSelected: Bool {
     networks
-      .filter {
-        if !Preferences.Wallet.showTestNetworks.value {
-          return !WalletConstants.supportedTestNetworkChainIds.contains($0.model.chainId)
+      .filter { network in
+        !networkStore.hiddenChains.contains { hiddenChain in
+          hiddenChain.chainId == network.model.chainId
         }
-        return true
       }
       .allSatisfy(\.isSelected)
   }

ios/brave-ios/Sources/BraveWallet/Crypto/NetworkFilterView.swift

@@ -41,11 +41,10 @@ struct NetworkFilterView: View {
 
   private var allSelected: Bool {
     networks
-      .filter {
-        if !Preferences.Wallet.showTestNetworks.value {
-          return !WalletConstants.supportedTestNetworkChainIds.contains($0.model.chainId)
+      .filter { network in
+        !networkStore.hiddenChains.contains { hiddenChain in
+          hiddenChain.chainId == network.model.chainId
         }
-        return true
       }
       .allSatisfy(\.isSelected)
   }
@@ -96,13 +95,7 @@ struct NetworkFilterView: View {
   private func selectAll() {
     DispatchQueue.main.async {
       networks = networks.map {
-        // don't select test networks if they are hidden
-        if !Preferences.Wallet.showTestNetworks.value {
-          let isTestnet = WalletConstants.supportedTestNetworkChainIds.contains($0.model.chainId)
-          return .init(isSelected: !isTestnet && !allSelected, model: $0.model)
-        } else {
-          return .init(isSelected: !allSelected, model: $0.model)
-        }
+        .init(isSelected: !allSelected, model: $0.model)
       }
     }
   }

ios/brave-ios/Sources/BraveWallet/Crypto/NetworkPicker.swift

@@ -41,27 +41,6 @@ struct NetworkPicker: View {
     self.networkStore = networkStore
   }
 
-  private var availableChains: [BraveWallet.NetworkInfo] {
-    networkStore.allChains.filter { chain in
-      if !Preferences.Wallet.showTestNetworks.value {
-        var testNetworkChainIdsToRemove = WalletConstants.supportedTestNetworkChainIds
-        // Don't remove selected network (possible if selected then disabled showing test networks)
-        testNetworkChainIdsToRemove.removeAll(where: {
-          $0 == networkStore.defaultSelectedChain.chainId
-        })
-        if testNetworkChainIdsToRemove.contains(chain.chainId) {
-          return false
-        }
-      }
-      if let destination = walletActionDestination {
-        if destination.kind.id != WalletActionDestination.Kind.send.id {
-          return !networkStore.isCustomChain(chain)
-        }
-      }
-      return true
-    }
-  }
-
   private var chainName: String {
     if isForOrigin {
       return networkStore.selectedChainForOrigin.chainName
@@ -97,7 +76,7 @@ struct NetworkPicker: View {
       Color.clear
         .sheet(isPresented: $isPresentingAddNetwork) {
           NavigationView {
-            CustomNetworkDetailsView(networkStore: networkStore, model: .init())
+            NetworkDetailsView(networkStore: networkStore, model: .init())
           }
         }
     )

ios/brave-ios/Sources/BraveWallet/Crypto/NetworkSelectionRootView.swift

@@ -77,7 +77,7 @@ struct NetworkSelectionRootView: View {
           .buttonStyle(FadeButtonStyle())
         }
 
-        if Preferences.Wallet.showTestNetworks.value && !allNetworks.testNetworks.isEmpty {
+        if !allNetworks.testNetworks.isEmpty {
           DividerLine()
             .padding(.top, 12)
 

ios/brave-ios/Sources/BraveWallet/Crypto/NetworkSelectionView.swift

@@ -48,7 +48,7 @@ struct NetworkSelectionView: View {
     NetworkSelectionRootView(
       navigationTitle: navigationTitle,
       selectedNetworks: [selectedNetwork],
-      allNetworks: networkStore.allChains,
+      allNetworks: networkStore.visibleChains,
       selectNetwork: { network in
         selectNetwork(network)
       }

ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/PortfolioView.swift

@@ -63,8 +63,11 @@ struct PortfolioView: View {
           EditUserAssetsView(
             networkStore: networkStore,
             keyringStore: keyringStore,
-            userAssetsStore: portfolioStore.userAssetsStore
+            userAssetsStore: cryptoStore.openUserAssetsStore()
           )
+          .onDisappear {
+            cryptoStore.closeUserAssetsStore()
+          }
         }
     )
     .background(
@@ -98,9 +101,12 @@ struct PortfolioView: View {
             networkStore: networkStore,
             networkSelectionStore: networkStore.openNetworkSelectionStore(mode: .formSelection),
             keyringStore: keyringStore,
-            userAssetStore: cryptoStore.nftStore.userAssetsStore,
+            userAssetStore: cryptoStore.openUserAssetsStore(),
             supportedTokenTypes: [.nft]
           )
+          .onDisappear {
+            cryptoStore.closeUserAssetsStore()
+          }
         }
     )
     .background(

ios/brave-ios/Sources/BraveWallet/Crypto/Search/AssetSearchView.swift

@@ -184,7 +184,7 @@ struct AssetSearchView: View {
         self.isLoadingMetadata = true
         self.allNFTMetadata = await userAssetsStore.allNFTMetadata()
         self.isLoadingMetadata = false
-        self.networkFilters = networkStore.allChains.map {
+        self.networkFilters = networkStore.visibleChains.map {
           .init(isSelected: true, model: $0)
         }
       }

ios/brave-ios/Sources/BraveWallet/Crypto/Stores/AccountsStore.swift

@@ -84,7 +84,6 @@ class AccountsStore: ObservableObject, WalletObserverStore {
         self?.update()
       }
     )
-    Preferences.Wallet.showTestNetworks.observe(from: self)
   }
 
   func tearDown() {
@@ -293,10 +292,3 @@ class AccountsStore: ObservableObject, WalletObserverStore {
     tokenBalancesCache[account.id]?[tokenId]
   }
 }
-
-extension AccountsStore: PreferencesObserver {
-  public func preferencesDidChange(for key: String) {
-    guard key == Preferences.Wallet.showTestNetworks.key else { return }
-    update()
-  }
-}

ios/brave-ios/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift

@@ -641,6 +641,30 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
     self.signMessageRequestStore = nil
   }
 
+  private var userAssetsStore: UserAssetsStore?
+  func openUserAssetsStore() -> UserAssetsStore {
+    if let store = userAssetsStore {
+      return store
+    }
+
+    let store = UserAssetsStore(
+      blockchainRegistry: blockchainRegistry,
+      rpcService: rpcService,
+      keyringService: keyringService,
+      assetRatioService: assetRatioService,
+      walletService: walletService,
+      ipfsApi: ipfsApi,
+      userAssetManager: userAssetManager
+    )
+    userAssetsStore = store
+    return store
+  }
+
+  func closeUserAssetsStore() {
+    userAssetsStore?.tearDown()
+    userAssetsStore = nil
+  }
+
   public private(set) lazy var settingsStore = SettingsStore(
     keyringService: keyringService,
     walletService: walletService,

ios/brave-ios/Sources/BraveWallet/Crypto/Stores/NFTStore.swift

@@ -85,16 +85,6 @@ public class NFTStore: ObservableObject, WalletObserverStore {
   private var isSavingFilters: Bool = false
   @Published var isLoadingDiscoverAssets: Bool = false
 
-  public private(set) lazy var userAssetsStore: UserAssetsStore = .init(
-    blockchainRegistry: self.blockchainRegistry,
-    rpcService: self.rpcService,
-    keyringService: self.keyringService,
-    assetRatioService: self.assetRatioService,
-    walletService: self.walletService,
-    ipfsApi: self.ipfsApi,
-    userAssetManager: self.assetManager
-  )
-
   enum NFTDisplayType: Int, CaseIterable, Identifiable {
     case visible
     case hidden
@@ -224,7 +214,6 @@ public class NFTStore: ObservableObject, WalletObserverStore {
         update()
       }
     }
-    Preferences.Wallet.showTestNetworks.observe(from: self)
     Preferences.Wallet.isHidingUnownedNFTsFilter.observe(from: self)
     Preferences.Wallet.isShowingNFTNetworkLogoFilter.observe(from: self)
     Preferences.Wallet.nonSelectedNetworksFilter.observe(from: self)
@@ -236,8 +225,6 @@ public class NFTStore: ObservableObject, WalletObserverStore {
     keyringServiceObserver = nil
     walletServiveObserver = nil
     txServiceObserver = nil
-
-    userAssetsStore.tearDown()
   }
 
   func setupObservers() {
@@ -282,8 +269,6 @@ public class NFTStore: ObservableObject, WalletObserverStore {
         }
       }
     )
-
-    userAssetsStore.setupObservers()
   }
 
   /// Cache of NFT balances for each account tokenBalances: [token.contractAddress]