No phone Auth flow

Package.swift

@@ -91,9 +91,6 @@ package.addModules([
 			"MainFeature",
 			"OnboardingFeature",
 			"OverlayWindowClient",
-			"CreateAccountFeature",
-			"NetworkSwitchingClient",
-			"GatewaysClient",
 			"SplashFeature",
 		],
 		tests: .yes()

Sources/Features/AppFeature/App+Reducer.swift

@@ -1,13 +1,8 @@
 import AppPreferencesClient
-import CreateAccountFeature
-import EngineKit
 import FeaturePrelude
-import GatewaysClient
 import MainFeature
-import NetworkSwitchingClient
 import OnboardingClient
 import OnboardingFeature
-import SecureStorageClient
 import SplashFeature
 
 // MARK: - App
@@ -21,8 +16,6 @@ public struct App: Sendable, FeatureReducer {
 
 		public var root: Root
 
-		public var isOnMainnet = true
-
 		@PresentationState
 		public var alert: Alerts.State?
 
@@ -43,7 +36,6 @@ public struct App: Sendable, FeatureReducer {
 		case incompatibleProfileDeleted
 		case toMain(isAccountRecoveryNeeded: Bool)
 		case toOnboarding
-		case currentGatewayChanged(to: Radix.Gateway)
 	}
 
 	public enum ChildAction: Sendable, Equatable {
@@ -71,8 +63,6 @@ public struct App: Sendable, FeatureReducer {
 	}
 
 	@Dependency(\.continuousClock) var clock
-	@Dependency(\.networkSwitchingClient) var networkSwitchingClient
-	@Dependency(\.gatewaysClient) var gatewaysClient
 	@Dependency(\.errorQueue) var errorQueue
 	@Dependency(\.appPreferencesClient) var appPreferencesClient
 
@@ -103,28 +93,19 @@ public struct App: Sendable, FeatureReducer {
 		case .task:
 			let retBuildInfo = buildInformation()
 			loggerGlobal.info("EngineToolkit commit hash: \(retBuildInfo.version)")
-			return .merge(
-				.run { send in
-					for try await gateways in await gatewaysClient.gatewaysValues() {
-						guard !Task.isCancelled else { return }
-						loggerGlobal.notice("Changed network to: \(gateways.current)")
-						await send(.internal(.currentGatewayChanged(to: gateways.current)))
-					}
-				},
-				.run { send in
-					for try await error in errorQueue.errors() {
-						guard !Task.isCancelled else { return }
-						// Maybe instead we should listen here for the Profile.State change,
-						// and when it switches to `.ephemeral` we navigate to onboarding.
-						// For now, we react to the specific error, since the Profile.State is meant to be private.
-						if error is Profile.ProfileIsUsedOnAnotherDeviceError {
-							await send(.internal(.toOnboarding))
-							// A slight delay to allow any modal that may be shown to be dismissed.
-							try? await clock.sleep(for: .seconds(0.5))
-						}
+			return .run { send in
+				for try await error in errorQueue.errors() {
+					guard !Task.isCancelled else { return }
+					// Maybe instead we should listen here for the Profile.State change,
+					// and when it switches to `.ephemeral` we navigate to onboarding.
+					// For now, we react to the specific error, since the Profile.State is meant to be private.
+					if error is Profile.ProfileIsUsedOnAnotherDeviceError {
+						await send(.internal(.toOnboarding))
+						// A slight delay to allow any modal that may be shown to be dismissed.
+						try? await clock.sleep(for: .seconds(0.5))
 					}
 				}
-			)
+			}
 
 		case .alert(.presented(.incompatibleProfileErrorAlert(.deleteWalletDataButtonTapped))):
 			return .run { send in
@@ -150,10 +131,6 @@ public struct App: Sendable, FeatureReducer {
 
 		case .toOnboarding:
 			return goToOnboarding(state: &state)
-
-		case let .currentGatewayChanged(currentGateway):
-			state.isOnMainnet = currentGateway.network == .mainnet
-			return .none
 		}
 	}
 

Sources/Features/AppFeature/App+View.swift

@@ -1,16 +1,9 @@
 import AssetTransferFeature
-import CreateAccountFeature
 import FeaturePrelude
 import MainFeature
 import OnboardingFeature
 import SplashFeature
 
-extension App.State {
-	public var showIsUsingTestnetBanner: Bool {
-		!isOnMainnet
-	}
-}
-
 // MARK: - App.View
 extension App {
 	@MainActor
@@ -22,7 +15,6 @@ extension App {
 		}
 
 		public var body: some SwiftUI.View {
-			let bannerStore = store.scope(state: \.showIsUsingTestnetBanner, action: actionless)
 			SwitchStore(store.scope(state: \.root, action: Action.child)) { state in
 				switch state {
 				case .main:
@@ -53,10 +45,6 @@ extension App {
 				state: /App.Alerts.State.incompatibleProfileErrorAlert,
 				action: App.Alerts.Action.incompatibleProfileErrorAlert
 			)
-			.task { @MainActor in
-				await store.send(.view(.task)).finish()
-			}
-			.showDeveloperDisclaimerBanner(bannerStore)
 			.presentsLoadingViewOverlay()
 		}
 	}

Sources/Features/MainFeature/Main+Reducer.swift

@@ -1,5 +1,6 @@
 import AppPreferencesClient
 import FeaturePrelude
+import GatewaysClient
 import HomeFeature
 import SettingsFeature
 
@@ -8,6 +9,8 @@ public struct Main: Sendable, FeatureReducer {
 		// MARK: - Components
 		public var home: Home.State
 
+		public var isOnMainnet = true
+
 		// MARK: - Destinations
 		@PresentationState
 		public var destination: Destinations.State?
@@ -17,6 +20,10 @@ public struct Main: Sendable, FeatureReducer {
 		}
 	}
 
+	public enum ViewAction: Sendable, Equatable {
+		case task
+	}
+
 	public enum ChildAction: Sendable, Equatable {
 		case home(Home.Action)
 		case destination(PresentationAction<Destinations.Action>)
@@ -26,6 +33,10 @@ public struct Main: Sendable, FeatureReducer {
 		case removedWallet
 	}
 
+	public enum InternalAction: Sendable, Equatable {
+		case currentGatewayChanged(to: Radix.Gateway)
+	}
+
 	public struct Destinations: Sendable, Reducer {
 		public enum State: Sendable, Hashable {
 			case settings(Settings.State)
@@ -42,8 +53,8 @@ public struct Main: Sendable, FeatureReducer {
 		}
 	}
 
-	@Dependency(\.keychainClient) var keychainClient
 	@Dependency(\.appPreferencesClient) var appPreferencesClient
+	@Dependency(\.gatewaysClient) var gatewaysClient
 
 	public init() {}
 
@@ -57,6 +68,19 @@ public struct Main: Sendable, FeatureReducer {
 			}
 	}
 
+	public func reduce(into state: inout State, viewAction: ViewAction) -> Effect<Action> {
+		switch viewAction {
+		case .task:
+			return .run { send in
+				for try await gateways in await gatewaysClient.gatewaysValues() {
+					guard !Task.isCancelled else { return }
+					loggerGlobal.notice("Changed network to: \(gateways.current)")
+					await send(.internal(.currentGatewayChanged(to: gateways.current)))
+				}
+			}
+		}
+	}
+
 	public func reduce(into state: inout State, childAction: ChildAction) -> Effect<Action> {
 		switch childAction {
 		case .home(.delegate(.displaySettings)):
@@ -75,4 +99,12 @@ public struct Main: Sendable, FeatureReducer {
 			return .none
 		}
 	}
+
+	public func reduce(into state: inout State, internalAction: InternalAction) -> Effect<Action> {
+		switch internalAction {
+		case let .currentGatewayChanged(currentGateway):
+			state.isOnMainnet = currentGateway.network == .mainnet
+			return .none
+		}
+	}
 }

Sources/Features/MainFeature/Main+View.swift

@@ -3,6 +3,12 @@ import FeaturePrelude
 import HomeFeature
 import SettingsFeature
 
+extension Main.State {
+	public var showIsUsingTestnetBanner: Bool {
+		!isOnMainnet
+	}
+}
+
 // MARK: - Main.View
 extension Main {
 	@MainActor
@@ -14,6 +20,7 @@ extension Main {
 		}
 
 		public var body: some SwiftUI.View {
+			let bannerStore = store.scope(state: \.showIsUsingTestnetBanner, action: actionless)
 			NavigationStack {
 				Home.View(
 					store: store.scope(
@@ -33,6 +40,10 @@ extension Main {
 				)
 				#endif
 			}
+			.task { @MainActor in
+				await store.send(.view(.task)).finish()
+			}
+			.showDeveloperDisclaimerBanner(bannerStore)
 			.presentsDappInteractions()
 		}
 	}

Sources/Features/SplashFeature/Splash.swift

@@ -63,9 +63,7 @@ public struct Splash: Sendable, FeatureReducer {
 
 		case .didTapToUnlock:
 			state.biometricsCheckFailed = false
-			return .run { send in
-				await send(.internal(.loadProfileOutcome(loadProfile())))
-			}
+			return verifyPasscode()
 
 		case let .passcodeCheckFailedAlert(.presented(action)):
 			switch action {
@@ -91,6 +89,7 @@ public struct Splash: Sendable, FeatureReducer {
 			let config = try? result.value
 
 			guard config?.isPasscodeSetUp == true else {
+				state.biometricsCheckFailed = true
 				state.passcodeCheckFailedAlert = .init(
 					title: { .init(L10n.Splash.PasscodeCheckFailedAlert.title) },
 					actions: {
@@ -121,8 +120,9 @@ public struct Splash: Sendable, FeatureReducer {
 			}
 			return delegateCompleted(loadProfileOutcome: outcome, accountRecoveryNeeded: false)
 
-		case .accountRecoveryNeeded(_, .failure):
+		case let .accountRecoveryNeeded(_, .failure(error)):
 			state.biometricsCheckFailed = true
+			errorQueue.schedule(error)
 			return .none
 
 		case let .accountRecoveryNeeded(outcome, .success(recoveryNeeded)):

Tests/Features/AppFeatureTests/AppFeatureTests.swift

@@ -29,7 +29,6 @@ final class AppFeatureTests: TestCase {
 		await store.send(.child(.main(.delegate(.removedWallet)))) {
 			$0.root = .onboardingCoordinator(.init())
 		}
-		XCTAssertFalse(store.state.showIsUsingTestnetBanner)
 	}
 
 	func test_splash__GIVEN__an_existing_profile__WHEN__existing_profile_loaded__THEN__we_navigate_to_main() async throws {
@@ -65,14 +64,11 @@ final class AppFeatureTests: TestCase {
 		) {
 			$0.errorQueue = .liveValue
 			$0.continuousClock = clock
-			$0.gatewaysClient.gatewaysValues = { AsyncLazySequence([.init(current: .default)]).eraseToAnyAsyncSequence() }
 		}
 
 		let viewTask = await store.send(.view(.task))
 
 		// then
-		await store.receive(.internal(.currentGatewayChanged(to: .default)))
-		XCTAssertFalse(store.state.showIsUsingTestnetBanner)
 		await store.send(.child(.splash(.delegate(.completed(.newUser, accountRecoveryNeeded: false))))) {
 			$0.root = .onboardingCoordinator(.init())
 		}
@@ -90,7 +86,6 @@ final class AppFeatureTests: TestCase {
 		) {
 			$0.errorQueue = .liveValue
 			$0.continuousClock = clock
-			$0.gatewaysClient.gatewaysValues = { AsyncLazySequence([.init(current: .default)]).eraseToAnyAsyncSequence() }
 		}
 
 		let viewTask = await store.send(.view(.task))
@@ -104,8 +99,6 @@ final class AppFeatureTests: TestCase {
 		let outcome = LoadProfileOutcome.usersExistingProfileCouldNotBeLoaded(failure: failure)
 
 		// then
-		await store.receive(.internal(.currentGatewayChanged(to: .default)))
-		XCTAssertFalse(store.state.showIsUsingTestnetBanner)
 		await store.send(.child(.splash(.delegate(.completed(outcome, accountRecoveryNeeded: false))))) {
 			$0.root = .onboardingCoordinator(.init())
 		}
@@ -125,7 +118,6 @@ final class AppFeatureTests: TestCase {
 		) {
 			$0.errorQueue = .liveValue
 			$0.continuousClock = clock
-			$0.gatewaysClient.gatewaysValues = { AsyncLazySequence([.init(current: .default)]).eraseToAnyAsyncSequence() }
 		}
 		store.exhaustivity = .off
 		let viewTask = await store.send(.view(.task))
@@ -166,7 +158,6 @@ final class AppFeatureTests: TestCase {
 		) {
 			$0.errorQueue = .liveValue
 			$0.continuousClock = clock
-			$0.gatewaysClient.gatewaysValues = { AsyncLazySequence([.init(current: .default)]).eraseToAnyAsyncSequence() }
 			$0.appPreferencesClient.deleteProfileAndFactorSources = { _ in
 				profileDeletedExpectation.fulfill()
 			}
@@ -180,8 +171,6 @@ final class AppFeatureTests: TestCase {
 
 		let outcome = LoadProfileOutcome.usersExistingProfileCouldNotBeLoaded(failure: .profileVersionOutdated(json: Data([0xDE, 0xAD]), version: badVersion))
 
-		await store.receive(.internal(.currentGatewayChanged(to: .default)))
-		XCTAssertFalse(store.state.showIsUsingTestnetBanner)
 		await store.send(.child(.splash(.delegate(.completed(outcome, accountRecoveryNeeded: false))))) {
 			$0.alert = .incompatibleProfileErrorAlert(
 				.init(

Tests/Features/MainFeatureTests/MainFeatureTests.swift

@@ -22,4 +22,22 @@ final class MainFeatureTests: TestCase {
 			$0.destination = nil
 		}
 	}
+
+	func test_displayTestBanner() async {
+		// given
+		let store = TestStore(initialState: Main.State(home: .previewValue)) {
+			Main()
+				.dependency(\.userDefaultsClient, .noop)
+				.dependency(\.gatewaysClient.gatewaysValues) { AsyncLazySequence([.init(current: .stokenet)]).eraseToAnyAsyncSequence() }
+		}
+
+		XCTAssertFalse(store.state.showIsUsingTestnetBanner)
+
+		await store.send(.view(.task))
+
+		await store.receive(.internal(.currentGatewayChanged(to: .stokenet))) {
+			$0.isOnMainnet = false
+		}
+		XCTAssertTrue(store.state.showIsUsingTestnetBanner)
+	}
 }

Tests/Features/SplashFeatureTests/SplashFeatureTests.swift

@@ -30,6 +30,7 @@ final class SplashFeatureTests: TestCase {
 
 		await clock.advance(by: .seconds(0.4))
 		await store.receive(.internal(.passcodeConfigResult(.success(authBiometricsConfig)))) {
+			$0.biometricsCheckFailed = true
 			$0.passcodeCheckFailedAlert = .init(
 				title: { .init(L10n.Splash.PasscodeCheckFailedAlert.title) },
 				actions: {