fix already exist case and ws predicate

novasamatech · Aug 1, 2024 · 4a356f2 · 4a356f2
1 parent bc16058
commit 4a356f2
Show file tree

Hide file tree

Showing 6 changed files with 178 additions and 91 deletions.
diff --git a/novawallet/Common/Extension/Foundation/Predicate/NSPredicate+Validation.swift b/novawallet/Common/Extension/Foundation/Predicate/NSPredicate+Validation.swift
@@ -110,7 +110,7 @@ extension NSPredicate {
             "[a-z0-9\\u00a1-\\uffff]" +
             "[a-z0-9\\u00a1-\\uffff_-]{0,62}" +
             ")?" +
-            "[a-z0-9\\u00a1-\\uffff]\\." +
+            "[a-z0-9\\u00a1-\\uffff_-]\\." +
             ")+" +
             // TLD identifier name, may end with dot
             "(?:[a-z\\u00a1-\\uffff]{2,}\\.?)" +

diff --git a/novawallet/Modules/NetworkManagement/CustomNetwork/CustomNetworkViewFactory.swift b/novawallet/Modules/NetworkManagement/CustomNetwork/CustomNetworkViewFactory.swift
@@ -33,13 +33,20 @@ struct CustomNetworkViewFactory {
             operationQueue: operationQueue
         )
 
+        let setupFinishStrategyFactory = CustomNetworkSetupFinishStrategyFactory(
+            chainRegistry: chainRegistry,
+            repository: repository,
+            operationQueue: operationQueue
+        )
+
         let interactor = CustomNetworkAddInteractor(
             networkToAdd: networkToAdd,
             chainRegistry: chainRegistry,
             customNetworkSetupFactory: customNetworkSetupFactory,
             connectionFactory: connectionFactory,
             repository: repository,
             priceIdParser: CoingeckoUrlParser(),
+            setupFinishStrategyFactory: setupFinishStrategyFactory,
             operationQueue: operationQueue
         )
 
@@ -99,6 +106,12 @@ struct CustomNetworkViewFactory {
             operationQueue: operationQueue
         )
 
+        let setupFinishStrategyFactory = CustomNetworkSetupFinishStrategyFactory(
+            chainRegistry: chainRegistry,
+            repository: repository,
+            operationQueue: operationQueue
+        )
+
         let interactor = CustomNetworkEditInteractor(
             networkToEdit: network,
             selectedNode: selectedNode,
@@ -107,6 +120,7 @@ struct CustomNetworkViewFactory {
             connectionFactory: connectionFactory,
             repository: repository,
             priceIdParser: CoingeckoUrlParser(),
+            setupFinishStrategyFactory: setupFinishStrategyFactory,
             operationQueue: operationQueue
         )
 

diff --git a/...allet/Modules/NetworkManagement/CustomNetwork/Interactor/CustomNetworkAddInteractor.swift b/...allet/Modules/NetworkManagement/CustomNetwork/Interactor/CustomNetworkAddInteractor.swift
@@ -11,6 +11,7 @@ final class CustomNetworkAddInteractor: CustomNetworkBaseInteractor {
         connectionFactory: ConnectionFactoryProtocol,
         repository: AnyDataProviderRepository<ChainModel>,
         priceIdParser: PriceUrlParserProtocol,
+        setupFinishStrategyFactory: CustomNetworkSetupFinishStrategyFactory,
         operationQueue: OperationQueue
     ) {
         self.networkToAdd = networkToAdd
@@ -21,6 +22,7 @@ final class CustomNetworkAddInteractor: CustomNetworkBaseInteractor {
             connectionFactory: connectionFactory,
             repository: repository,
             priceIdParser: priceIdParser,
+            setupFinishStrategyFactory: setupFinishStrategyFactory,
             operationQueue: operationQueue
         )
     }
@@ -41,10 +43,7 @@ final class CustomNetworkAddInteractor: CustomNetworkBaseInteractor {
 
 extension CustomNetworkAddInteractor: CustomNetworkAddInteractorInputProtocol {
     func addNetwork(with request: CustomNetwork.AddRequest) {
-        setupFinishStrategy = CustomNetworkAddNewStrategy(
-            repository: repository,
-            operationQueue: operationQueue
-        )
+        setupFinishStrategy = setupFinishStrategyFactory.createAddNewStrategy()
 
         let type: ChainType = if let networkToAdd {
             networkToAdd.isEthereumBased ? .evm : .substrate
@@ -63,7 +62,7 @@ extension CustomNetworkAddInteractor: CustomNetworkAddInteractorInputProtocol {
     }
 
     func fetchNetworkProperties(for url: String) {
-        setupFinishStrategy = CustomNetworkProvideStrategy()
+        setupFinishStrategy = setupFinishStrategyFactory.createProvideStrategy()
 
         let request = CustomNetwork.SetupRequest(
             networkType: .substrate,

diff --git a/...llet/Modules/NetworkManagement/CustomNetwork/Interactor/CustomNetworkBaseInteractor.swift b/...llet/Modules/NetworkManagement/CustomNetwork/Interactor/CustomNetworkBaseInteractor.swift
@@ -12,6 +12,8 @@ class CustomNetworkBaseInteractor: NetworkNodeCreatorTrait,
     let priceIdParser: PriceUrlParserProtocol
     let operationQueue: OperationQueue
 
+    let setupFinishStrategyFactory: CustomNetworkSetupFinishStrategyFactory
+
     var currentConnectingNode: ChainNodeModel?
     var currentConnection: ChainConnection?
 
@@ -26,13 +28,15 @@ class CustomNetworkBaseInteractor: NetworkNodeCreatorTrait,
         connectionFactory: ConnectionFactoryProtocol,
         repository: AnyDataProviderRepository<ChainModel>,
         priceIdParser: PriceUrlParserProtocol,
+        setupFinishStrategyFactory: CustomNetworkSetupFinishStrategyFactory,
         operationQueue: OperationQueue
     ) {
         self.chainRegistry = chainRegistry
         self.customNetworkSetupFactory = customNetworkSetupFactory
         self.connectionFactory = connectionFactory
         self.repository = repository
         self.priceIdParser = priceIdParser
+        self.setupFinishStrategyFactory = setupFinishStrategyFactory
         self.operationQueue = operationQueue
     }
 
@@ -247,7 +251,7 @@ private extension CustomNetworkBaseInteractor {
             case let .success(chain):
                 self?.setupFinishStrategy?.handleSetupFinished(
                     for: chain,
-                    presenter: self?.presenter
+                    output: self?.presenter
                 )
             case let .failure(error):
                 self?.presenter?.didReceive(.init(from: error))

diff --git a/...llet/Modules/NetworkManagement/CustomNetwork/Interactor/CustomNetworkEditInteractor.swift b/...llet/Modules/NetworkManagement/CustomNetwork/Interactor/CustomNetworkEditInteractor.swift
@@ -13,6 +13,7 @@ final class CustomNetworkEditInteractor: CustomNetworkBaseInteractor {
         connectionFactory: ConnectionFactoryProtocol,
         repository: AnyDataProviderRepository<ChainModel>,
         priceIdParser: PriceUrlParserProtocol,
+        setupFinishStrategyFactory: CustomNetworkSetupFinishStrategyFactory,
         operationQueue: OperationQueue
     ) {
         self.networkToEdit = networkToEdit
@@ -24,6 +25,7 @@ final class CustomNetworkEditInteractor: CustomNetworkBaseInteractor {
             connectionFactory: connectionFactory,
             repository: repository,
             priceIdParser: priceIdParser,
+            setupFinishStrategyFactory: setupFinishStrategyFactory,
             operationQueue: operationQueue
         )
     }
@@ -40,11 +42,9 @@ final class CustomNetworkEditInteractor: CustomNetworkBaseInteractor {
 
 extension CustomNetworkEditInteractor: CustomNetworkEditInteractorInputProtocol {
     func editNetwork(with request: CustomNetwork.EditRequest) {
-        setupFinishStrategy = CustomNetworkEditStrategy(
+        setupFinishStrategy = setupFinishStrategyFactory.createEditStrategy(
             networkToEdit: networkToEdit,
-            selectedNode: selectedNode,
-            repository: repository,
-            operationQueue: operationQueue
+            selectedNode: selectedNode
         )
 
         let setupRequest = CustomNetwork.SetupRequest(