chore: ios: Remove App State

ios/PolkadotVault.xcodeproj/project.pbxproj

@@ -213,7 +213,6 @@
 		6DA317C3299F6FF1005DD060 /* AirgapMediatorAssembler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA317C2299F6FF1005DD060 /* AirgapMediatorAssembler.swift */; };
 		6DA501CC290A48190096DA4E /* KeyDetails+ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA501CB290A48190096DA4E /* KeyDetails+ViewModel.swift */; };
 		6DA501D4290BC55A0096DA4E /* KeyDetailsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA501D3290BC55A0096DA4E /* KeyDetailsService.swift */; };
-		6DA501D7290BECBE0096DA4E /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA501D6290BECBE0096DA4E /* AppState.swift */; };
 		6DA501D9290C1C3E0096DA4E /* MKeyAndNetworkCard+PathAndNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA501D8290C1C3E0096DA4E /* MKeyAndNetworkCard+PathAndNetwork.swift */; };
 		6DA9DAE929E5831C009CC12C /* ManageNetworkDetailsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA9DAE829E5831C009CC12C /* ManageNetworkDetailsService.swift */; };
 		6DAA6CB129BF482E002329A8 /* AuthenticatedStateMediator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DAA6CB029BF482E002329A8 /* AuthenticatedStateMediator.swift */; };
@@ -552,7 +551,6 @@
 		6DA317C2299F6FF1005DD060 /* AirgapMediatorAssembler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AirgapMediatorAssembler.swift; sourceTree = "<group>"; };
 		6DA501CB290A48190096DA4E /* KeyDetails+ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyDetails+ViewModel.swift"; sourceTree = "<group>"; };
 		6DA501D3290BC55A0096DA4E /* KeyDetailsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDetailsService.swift; sourceTree = "<group>"; };
-		6DA501D6290BECBE0096DA4E /* AppState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = "<group>"; };
 		6DA501D8290C1C3E0096DA4E /* MKeyAndNetworkCard+PathAndNetwork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MKeyAndNetworkCard+PathAndNetwork.swift"; sourceTree = "<group>"; };
 		6DA9DAE829E5831C009CC12C /* ManageNetworkDetailsService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManageNetworkDetailsService.swift; sourceTree = "<group>"; };
 		6DAA6CB029BF482E002329A8 /* AuthenticatedStateMediator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticatedStateMediator.swift; sourceTree = "<group>"; };
@@ -1560,7 +1558,6 @@
 		6DA501D5290BECB60096DA4E /* Data */ = {
 			isa = PBXGroup;
 			children = (
-				6DA501D6290BECBE0096DA4E /* AppState.swift */,
 			);
 			path = Data;
 			sourceTree = "<group>";
@@ -2349,7 +2346,6 @@
 				6D42793728DB147800C141DC /* PrivateKeyQRCodeService.swift in Sources */,
 				6D77F323296D4D8900044C7C /* CreateDerivedKeyService.swift in Sources */,
 				6D5801D928991F48006C41D8 /* ProcessInfoProtocol.swift in Sources */,
-				6DA501D7290BECBE0096DA4E /* AppState.swift in Sources */,
 				6D019972289D183200F4C317 /* Navigation.swift in Sources */,
 				6DC33723295ACF2D0067284B /* CornerRadiusModifier.swift in Sources */,
 			);

ios/PolkadotVault/Core/Keychain/KeychainAccessAdapter.swift

@@ -112,7 +112,7 @@ final class KeychainAccessAdapter: KeychainAccessAdapting {
         var item: CFTypeRef?
         let query = queryProvider.query(for: .search(seedName: seedName))
         let osStatus = SecItemCopyMatching(query, &item)
-        if osStatus == errSecSuccess,
+        if osStatus == errSecSuccess || osStatus == errSecItemNotFound,
            let itemAsData = item as? Data,
            let result = String(data: itemAsData, encoding: .utf8) {
             return .success(result)

ios/PolkadotVault/Core/ServiceLocator.swift

@@ -17,5 +17,4 @@ enum ServiceLocator {
     static var onboardingMediator: OnboardingMediator = OnboardingMediator()
 
     static var networkColorsGenerator = UnknownNetworkColorsGenerator()
-    static var appState = AppState()
 }

ios/PolkadotVault/Modals/NetworkSelection/NetworkSelectionModal.swift

@@ -13,7 +13,6 @@ struct NetworkSelectionModal: View {
     }
 
     @StateObject var viewModel: ViewModel
-    @EnvironmentObject private var appState: AppState
 
     var body: some View {
         FullScreenRoundedModal(
@@ -55,10 +54,6 @@ struct NetworkSelectionModal: View {
                 }
             }
         )
-        .onAppear {
-            viewModel.use(appState: appState)
-            viewModel.loadCurrentSelection()
-        }
     }
 
     @ViewBuilder
@@ -114,50 +109,46 @@ struct NetworkSelectionModal: View {
 
 extension NetworkSelectionModal {
     final class ViewModel: ObservableObject {
-        private weak var appState: AppState!
         @Published var animateBackground: Bool = false
-        @Published var networks: [MmNetwork] = []
-        @Published var selectedNetworks: [MmNetwork] = []
+        @Published var networksSelection: [MmNetwork]
+        @Binding var networks: [MmNetwork]
+        @Binding var selectedNetworks: [MmNetwork]
         @Binding var isPresented: Bool
 
         init(
-            isPresented: Binding<Bool>
+            isPresented: Binding<Bool>,
+            networks: Binding<[MmNetwork]>,
+            selectedNetworks: Binding<[MmNetwork]>
         ) {
             _isPresented = isPresented
-        }
-
-        func use(appState: AppState) {
-            self.appState = appState
-            networks = appState.userData.allNetworks
-        }
-
-        func loadCurrentSelection() {
-            selectedNetworks = appState.userData.selectedNetworks
+            _networks = networks
+            _selectedNetworks = selectedNetworks
+            _networksSelection = .init(initialValue: selectedNetworks.wrappedValue)
         }
 
         func cancelAction() {
             animateDismissal()
         }
 
         func resetAction() {
-            appState.userData.selectedNetworks = []
+            selectedNetworks = []
             animateDismissal()
         }
 
         func doneAction() {
-            appState.userData.selectedNetworks = selectedNetworks
+            selectedNetworks = networksSelection
             animateDismissal()
         }
 
         func isSelected(_ network: MmNetwork) -> Bool {
-            selectedNetworks.contains(network)
+            networksSelection.contains(network)
         }
 
         func toggleSelection(_ network: MmNetwork) {
-            if selectedNetworks.contains(network) {
-                selectedNetworks.removeAll { $0 == network }
+            if networksSelection.contains(network) {
+                networksSelection.removeAll { $0 == network }
             } else {
-                selectedNetworks.append(network)
+                networksSelection.append(network)
             }
         }
 
@@ -179,9 +170,12 @@ extension NetworkSelectionModal {
 struct NetworkSelectionModal_Previews: PreviewProvider {
     static var previews: some View {
         NetworkSelectionModal(
-            viewModel: .init(isPresented: Binding<Bool>.constant(true))
+            viewModel: .init(
+                isPresented: Binding<Bool>.constant(true),
+                networks: .constant(MmNetwork.stubList),
+                selectedNetworks: .constant([.stub])
+            )
         )
-        .environmentObject(AppState.preview)
     }
 }
 #endif

ios/PolkadotVault/PolkadotVaultApp.swift

@@ -27,7 +27,6 @@ struct PolkadotVaultApp: App {
                 .background(.backgroundPrimary)
                 .environmentObject(navigation)
                 .environmentObject(connectivityMediator)
-                .environmentObject(ServiceLocator.appState)
                 .environmentObject(jailbreakDetectionPublisher)
                 .environmentObject(applicationStatePublisher)
             }

ios/PolkadotVault/Screens/Containers/AuthenticatedScreenContainer.swift

@@ -10,7 +10,6 @@ import SwiftUI
 
 struct AuthenticatedScreenContainer: View {
     @EnvironmentObject private var navigation: NavigationCoordinator
-    @EnvironmentObject private var appState: AppState
     @StateObject var viewModel: ViewModel
 
     var body: some View {

ios/PolkadotVault/Screens/DerivedKey/DerivationPathNameView.swift

@@ -12,7 +12,6 @@ struct DerivationPathNameView: View {
     @FocusState var focusedPath: Bool
     @FocusState var focusedField: SecurePrimaryTextField.Field?
     @StateObject var viewModel: ViewModel
-    @EnvironmentObject private var appState: AppState
     @State var isUpdatingText = false
     @Environment(\.presentationMode) var presentationMode
 

ios/PolkadotVault/Screens/DerivedKey/Subviews/DerivationMethodsInfoView.swift

@@ -9,7 +9,6 @@ import SwiftUI
 
 struct DerivationMethodsInfoView: View {
     @StateObject var viewModel: ViewModel
-    @EnvironmentObject private var appState: AppState
 
     var body: some View {
         FullScreenRoundedModal(

ios/PolkadotVault/Screens/KeyDetails/ExportKeys/ExportKeysSelectionModal.swift

@@ -13,7 +13,6 @@ struct ExportKeysSelectionModal: View {
     }
 
     @StateObject var viewModel: ViewModel
-    @EnvironmentObject private var appState: AppState
 
     var body: some View {
         FullScreenRoundedModal(
@@ -236,7 +235,6 @@ extension ExportKeysSelectionModal {
                     onCompletion: { _ in }
                 )
             )
-            .environmentObject(AppState.preview)
         }
     }
 #endif

ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetails+ViewModel.swift

@@ -27,7 +27,6 @@ extension KeyDetailsView {
         private let exportPrivateKeyService: PrivateKeyQRCodeService
         private let keyDetailsActionsService: KeyDetailsActionService
         private let seedsMediator: SeedsMediating
-        private var appState: AppState
 
         @Published var keyName: String
         @Published var keysData: MKeysNew?
@@ -53,6 +52,8 @@ extension KeyDetailsView {
 
         @Published var derivedKeys: [DerivedKeyRowModel] = []
         @Published var isFilteringActive: Bool = false
+        @Published var networks: [MmNetwork] = []
+        @Published var selectedNetworks: [MmNetwork] = []
         // Error handling
         @Published var isPresentingError: Bool = false
         @Published var presentableError: ErrorBottomModalViewModel = .noNetworksAvailable()
@@ -75,36 +76,26 @@ extension KeyDetailsView {
             keyDetailsService: KeyDetailsService = KeyDetailsService(),
             networksService: GetManagedNetworksService = GetManagedNetworksService(),
             keyDetailsActionsService: KeyDetailsActionService = KeyDetailsActionService(),
-            appState: AppState = ServiceLocator.appState,
             seedsMediator: SeedsMediating = ServiceLocator.seedsMediator
         ) {
             self.onDeleteCompletion = onDeleteCompletion
             self.exportPrivateKeyService = exportPrivateKeyService
             self.keyDetailsService = keyDetailsService
             self.networksService = networksService
             self.keyDetailsActionsService = keyDetailsActionsService
-            self.appState = appState
             self.seedsMediator = seedsMediator
             _keyName = .init(initialValue: initialKeyName)
-            use(appState: appState)
             subscribeToNetworkChanges()
         }
 
-        func use(appState _: AppState) {
-            $isPresentingNetworkSelection.sink { newValue in
-                guard !newValue else { return }
-                self.isFilteringActive = !self.appState.userData.selectedNetworks.isEmpty
-            }
-            .store(in: cancelBag)
-        }
-
         func onAppear() {
             refreshData()
         }
 
         func subscribeToNetworkChanges() {
             $isPresentingNetworkSelection.sink { newValue in
                 guard !newValue else { return }
+                self.isFilteringActive = !self.selectedNetworks.isEmpty
                 self.refreshDerivedKeys()
             }
             .store(in: cancelBag)
@@ -132,7 +123,7 @@ extension KeyDetailsView {
             networksService.getNetworks { result in
                 switch result {
                 case let .success(networks):
-                    self.appState.userData.allNetworks = networks
+                    self.networks = networks
                 case let .failure(error):
                     self.presentableError = .alertError(message: error.description)
                     self.isPresentingError = true
@@ -238,7 +229,7 @@ extension KeyDetailsView {
                 }
             case let .viewKeySet(selectedKeySet):
                 isFilteringActive = false
-                appState.userData.selectedNetworks = []
+                selectedNetworks = []
                 keyName = selectedKeySet.seedName
                 refreshData()
             }
@@ -268,7 +259,7 @@ extension KeyDetailsView {
 
 extension KeyDetailsView.ViewModel {
     func onCreateDerivedKeyTap() {
-        if appState.userData.allNetworks.isEmpty {
+        if networks.isEmpty {
             presentableError = .noNetworksAvailable()
             isPresentingError = true
         } else {
@@ -299,7 +290,7 @@ extension KeyDetailsView.ViewModel {
     func onNetworkSelectionTap() {
         networksService.getNetworks { result in
             if case let .success(networks) = result {
-                self.appState.userData.allNetworks = networks
+                self.networks = networks
                 self.isPresentingNetworkSelection = true
             }
         }
@@ -388,11 +379,11 @@ private extension KeyDetailsView.ViewModel {
         guard let keysData else { return }
         let sortedDerivedKeys = keysData.set
             .sorted(by: { $0.key.address.path < $1.key.address.path })
-        let filteredKeys: [MKeyAndNetworkCard] = if appState.userData.selectedNetworks.isEmpty {
+        let filteredKeys: [MKeyAndNetworkCard] = if selectedNetworks.isEmpty {
             sortedDerivedKeys
         } else {
             sortedDerivedKeys.filter {
-                appState.userData.selectedNetworks
+                selectedNetworks
                     .map(\.key)
                     .contains($0.network.networkSpecsKey)
             }

ios/PolkadotVault/Screens/KeyDetails/Views/KeyDetailsView.swift

@@ -143,7 +143,11 @@ struct KeyDetailsView: View {
             isPresented: $viewModel.isPresentingNetworkSelection
         ) {
             NetworkSelectionModal(
-                viewModel: .init(isPresented: $viewModel.isPresentingNetworkSelection)
+                viewModel: .init(
+                    isPresented: $viewModel.isPresentingNetworkSelection,
+                    networks: $viewModel.networks,
+                    selectedNetworks: $viewModel.selectedNetworks
+                )
             )
             .clearModalBackground()
         }

ios/PolkadotVault/Screens/KeyDetails/Views/ManageKeySetsView.swift

@@ -210,7 +210,6 @@ extension ManageKeySetsView {
                     onCompletion: { _ in }
                 )
             )
-            .environmentObject(AppState.preview)
         }
     }
 #endif

ios/PolkadotVault/Screens/Settings/Subviews/VerifierCertificate/VerifierCertificateView.swift

@@ -10,7 +10,6 @@ import SwiftUI
 
 struct VerifierCertificateView: View {
     @StateObject var viewModel: ViewModel
-    @EnvironmentObject private var appState: AppState
     @Environment(\.presentationMode) var presentationMode
 
     var body: some View {