Latest TCA

radixdlt · Jun 14, 2023 · d080594 · d080594
1 parent 293d79a
commit d080594
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 28 deletions.
diff --git a/App/BabylonWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/App/BabylonWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/combine-schedulers",
       "state" : {
-        "revision" : "882ac01eb7ef9e36d4467eb4b1151e74fcef85ab",
-        "version" : "0.9.1"
+        "revision" : "0625932976b3ae23949f6b816d13bd97f3b40b7c",
+        "version" : "0.10.0"
       }
     },
     {
@@ -149,17 +149,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-case-paths",
       "state" : {
-        "revision" : "870133b7b2387df136ad301ec67b2e864b51dda1",
-        "version" : "0.14.0"
+        "revision" : "fc45e7b2cfece9dd80b5a45e6469ffe67fe67984",
+        "version" : "0.14.1"
       }
     },
     {
       "identity" : "swift-clocks",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-clocks",
       "state" : {
-        "revision" : "20b25ca0dd88ebfb9111ec937814ddc5a8880172",
-        "version" : "0.2.0"
+        "revision" : "f9acfa1a45f4483fe0f2c434a74e6f68f865d12d",
+        "version" : "0.3.0"
       }
     },
     {
@@ -176,26 +176,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/radixdlt/swift-composable-architecture",
       "state" : {
-        "branch" : "navigation-stack-and-full-scope",
-        "revision" : "a823c7d3237769feb9f19e4f609de03ba80fca76"
+        "branch" : "full-scope",
+        "revision" : "dee09ad89415689b213c4ff755d3fd7ac9ddd98f"
       }
     },
     {
       "identity" : "swift-custom-dump",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-custom-dump",
       "state" : {
-        "revision" : "de8ba65649e7ee317b9daf27dd5eebf34bd4be57",
-        "version" : "0.9.1"
+        "revision" : "505aa98716275fbd045d8f934fee3337c82ffbd3",
+        "version" : "0.10.3"
       }
     },
     {
       "identity" : "swift-dependencies",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-dependencies",
       "state" : {
-        "revision" : "6bb1034e8a1bfbf46dfb766b6c09b7b17e1cba10",
-        "version" : "0.2.0"
+        "revision" : "de1a984a71e51f6e488e98ce3652035563eb8acb",
+        "version" : "0.5.1"
       }
     },
     {
@@ -320,8 +320,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swiftui-navigation",
       "state" : {
-        "revision" : "47dd574b900ba5ba679f56ea00d4d282fc7305a6",
-        "version" : "0.7.1"
+        "revision" : "db81007362f998654239021ca9308a264e59d3e2",
+        "version" : "0.7.2"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -823,7 +823,7 @@ package.addModules([
 		name: "FeaturePrelude",
 		dependencies: [
 			.product(name: "ComposableArchitecture", package: "swift-composable-architecture") {
-				.package(url: "https://github.com/radixdlt/swift-composable-architecture", branch: "navigation-stack-and-full-scope")
+				.package(url: "https://github.com/radixdlt/swift-composable-architecture", branch: "full-scope")
 			},
 			"DesignSystem",
 			"Resources",
@@ -856,7 +856,7 @@ package.addModules([
 			},
 			"Resources",
 			.product(name: "SwiftUINavigation", package: "swiftui-navigation") {
-				.package(url: "https://github.com/pointfreeco/swiftui-navigation", exact: "0.7.1")
+				.package(url: "https://github.com/pointfreeco/swiftui-navigation", from: "0.7.1")
 			},
 			.product(name: "TextBuilder", package: "TextBuilder") {
 				.package(url: "https://github.com/davdroman/TextBuilder", from: "2.2.0")
@@ -1054,13 +1054,13 @@ package.addModules([
 				.package(url: "https://github.com/JohnSundell/CollectionConcurrencyKit.git", from: "0.1.0")
 			},
 			.product(name: "CustomDump", package: "swift-custom-dump") {
-				.package(url: "https://github.com/pointfreeco/swift-custom-dump", exact: "0.9.1")
+				.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.9.1")
 			},
 			.product(name: "Dependencies", package: "swift-dependencies") {
-				.package(url: "https://github.com/pointfreeco/swift-dependencies", exact: "0.2.0")
+				.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "0.2.0")
 			},
 			.product(name: "DependenciesAdditions", package: "swift-dependencies-additions") {
-				.package(url: "https://github.com/tgrapperon/swift-dependencies-additions", exact: "0.3.0")
+				.package(url: "https://github.com/tgrapperon/swift-dependencies-additions", from: "0.3.0")
 			},
 			.product(name: "Either", package: "swift-either") {
 				.package(url: "https://github.com/pointfreeco/swift-either", branch: "main")

diff --git a/Sources/Core/FeaturePrelude/FeatureReducer.swift b/Sources/Core/FeaturePrelude/FeatureReducer.swift
@@ -69,3 +69,5 @@ public typealias AlertPresentationStore<AlertAction> = Store<PresentationState<A
 public typealias PresentationStoreOf<R: ReducerProtocol> = Store<PresentationState<R.State>, PresentationAction<R.Action>>
 
 public typealias ViewStoreOf<Feature: FeatureReducer> = ViewStore<Feature.ViewState, Feature.ViewAction>
+
+public typealias StackActionOf<R: ReducerProtocol> = StackAction<R.State, R.Action>
diff --git a/Sources/Features/CreateAccount/Coordinator/CreateAccountCoordinator+Reducer.swift b/Sources/Features/CreateAccount/Coordinator/CreateAccountCoordinator+Reducer.swift
@@ -7,7 +7,7 @@ import FeaturePrelude
 public struct CreateAccountCoordinator: Sendable, FeatureReducer {
 	public struct State: Sendable, Hashable {
 		var root: Destinations.State?
-		var path: StackState<Destinations.State> = []
+		var path: StackState<Destinations.State> = .init()
 
 		public let config: CreateAccountConfig
 
@@ -75,7 +75,7 @@ public struct CreateAccountCoordinator: Sendable, FeatureReducer {
 
 	public enum ChildAction: Sendable, Equatable {
 		case root(Destinations.Action)
-		case path(StackAction<Destinations.Action>)
+		case path(StackActionOf<Destinations>)
 	}
 
 	public enum DelegateAction: Sendable, Equatable {

diff --git a/Sources/Features/CreatePersona/Coordinator/CreatePersonaCoordinator+Reducer.swift b/Sources/Features/CreatePersona/Coordinator/CreatePersonaCoordinator+Reducer.swift
@@ -7,7 +7,7 @@ import FeaturePrelude
 public struct CreatePersonaCoordinator: Sendable, FeatureReducer {
 	public struct State: Sendable, Hashable {
 		var root: Destinations.State?
-		var path: StackState<Destinations.State> = []
+		var path: StackState<Destinations.State> = .init()
 
 		public let config: CreatePersonaConfig
 
@@ -78,7 +78,7 @@ public struct CreatePersonaCoordinator: Sendable, FeatureReducer {
 
 	public enum ChildAction: Sendable, Equatable {
 		case root(Destinations.Action)
-		case path(StackAction<Destinations.Action>)
+		case path(StackActionOf<Destinations>)
 	}
 
 	public enum DelegateAction: Sendable, Equatable {

diff --git a/Sources/Features/DappInteractionFeature/Coordinator/DappInteractionFlow.swift b/Sources/Features/DappInteractionFeature/Coordinator/DappInteractionFlow.swift
@@ -47,7 +47,7 @@ struct DappInteractionFlow: Sendable, FeatureReducer {
 		var personaNotFoundErrorAlert: AlertState<ViewAction.PersonaNotFoundErrorAlertAction>? = nil
 
 		var root: Destinations.State?
-		var path: StackState<Destinations.State> = []
+		var path: StackState<Destinations.State> = .init()
 
 		init?(
 			dappMetadata: DappMetadata,
@@ -111,7 +111,7 @@ struct DappInteractionFlow: Sendable, FeatureReducer {
 
 	enum ChildAction: Sendable, Equatable {
 		case root(Destinations.Action)
-		case path(StackAction<Destinations.Action>)
+		case path(StackActionOf<Destinations>)
 	}
 
 	enum DelegateAction: Sendable, Equatable {
@@ -712,7 +712,7 @@ extension DappInteractionFlow.ChildAction {
 		case let .root(.relay(item, action)), let .path(.element(_, .relay(item, action))):
 			return (item, action)
 
-		case .path(.popFrom):
+		case .path(.popFrom), .path(.push):
 			return nil
 		}
 	}

diff --git a/...ngsFeature/ImportFromOlympiaLegacyWallet/Coordinator/ImportOlympiaWalletCoordinator.swift b/...ngsFeature/ImportFromOlympiaLegacyWallet/Coordinator/ImportOlympiaWalletCoordinator.swift
@@ -15,7 +15,7 @@ public struct ImportOlympiaWalletCoordinator: Sendable, FeatureReducer {
 		public var migratedAccounts: IdentifiedArrayOf<Profile.Network.Account> = .init()
 
 		var root: Destinations.State?
-		var path: StackState<Destinations.State> = []
+		var path: StackState<Destinations.State> = .init()
 
 		public init() {
 			self.root = .scanMultipleOlympiaQRCodes(.init())
@@ -64,7 +64,7 @@ public struct ImportOlympiaWalletCoordinator: Sendable, FeatureReducer {
 
 	public enum ChildAction: Sendable, Equatable {
 		case root(Destinations.Action)
-		case path(StackAction<Destinations.Action>)
+		case path(StackActionOf<Destinations>)
 	}
 
 	public enum InternalAction: Sendable, Equatable {