Fix profile access on ProfileStore (#1384)

radixdlt · Nov 14, 2024 · 865721a · 865721a
1 parent ef319ad
commit 865721a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/RadixWallet/Clients/OnboardingClient/OnboardingClient+Interface.swift b/RadixWallet/Clients/OnboardingClient/OnboardingClient+Interface.swift
@@ -18,7 +18,7 @@ struct OnboardingClient: Sendable {
 }
 
 extension OnboardingClient {
-	typealias LoadProfileState = @Sendable () async -> ProfileState
+	typealias LoadProfileState = @Sendable () async throws -> ProfileState
 	typealias CreateNewProfile = @Sendable () async throws -> Void
 
 	typealias FinishOnboardingWithRecoveredAccountsAndBDFS = @Sendable (AccountsRecoveredFromScanningUsingMnemonic) async throws -> Void

diff --git a/RadixWallet/Clients/OnboardingClient/OnboardingClient+Live.swift b/RadixWallet/Clients/OnboardingClient/OnboardingClient+Live.swift
@@ -7,7 +7,7 @@ extension OnboardingClient: DependencyKey {
 	static func live(profileStore: ProfileStore = .shared) -> Self {
 		Self(
 			loadProfileState: {
-				await profileStore.profileState()
+				try await profileStore.profileStateSequence().first()
 			},
 			createNewProfile: {
 				try await profileStore.createNewProfile()

diff --git a/RadixWallet/Clients/ProfileStore/ProfileStore.swift b/RadixWallet/Clients/ProfileStore/ProfileStore.swift
@@ -6,7 +6,7 @@ import Sargon
 final actor ProfileStore {
 	static let shared = ProfileStore()
 
-	private let profileSubject: AsyncReplaySubject<Profile> = .init(bufferSize: 1)
+	private let profileSubject: AsyncCurrentValueSubject<Profile?> = .init(nil)
 	private let profileStateSubject: AsyncReplaySubject<ProfileState> = .init(bufferSize: 1)
 
 	private init() {
@@ -23,16 +23,11 @@ final actor ProfileStore {
 }
 
 extension ProfileStore {
-	func profile() async -> Profile {
-		try! await profileSubject.first()
-	}
-
-	func profileState() async -> ProfileState {
-		try! await profileStateSubject.first()
-	}
-
-	func profileSequence() async -> AnyAsyncSequence<Profile> {
-		profileSubject.eraseToAnyAsyncSequence()
+	func profile() -> Profile {
+		guard let profile = profileSubject.value else {
+			fatalError("Programmer error - tried to access profile when it was not loaded yet.")
+		}
+		return profile
 	}
 
 	func profileStateSequence() async -> AnyAsyncSequence<ProfileState> {
@@ -84,7 +79,7 @@ extension ProfileStore {
 	func updating<T: Sendable>(
 		_ transform: @Sendable (inout Profile) async throws -> T
 	) async throws -> T {
-		var updated = await profile()
+		var updated = profile()
 		let result = try await transform(&updated)
 		try await SargonOS.shared.setProfile(profile: updated)
 		return result
@@ -106,7 +101,8 @@ extension ProfileStore {
 	func _lens<Property>(
 		_ transform: @escaping @Sendable (Profile) -> Property?
 	) -> AnyAsyncSequence<Property> where Property: Sendable & Equatable {
-		profileSubject.compactMap(transform)
+		profileSubject
+			.compactMap { $0.flatMap(transform) }
 			.share() // Multicast
 			.removeDuplicates()
 			.eraseToAnyAsyncSequence()

diff --git a/RadixWallet/Features/SplashFeature/Splash.swift b/RadixWallet/Features/SplashFeature/Splash.swift
@@ -97,7 +97,7 @@ struct Splash: Sendable, FeatureReducer {
 
 	func loadAdvancedLockState() -> Effect<Action> {
 		.run { send in
-			let profileState = await onboardingClient.loadProfileState()
+			let profileState = try await onboardingClient.loadProfileState()
 
 			if case let .loaded(profile) = profileState {
 				let isAdvancedLockEnabled = profile.appPreferences.security.isAdvancedLockEnabled
@@ -252,7 +252,7 @@ struct Splash: Sendable, FeatureReducer {
 		.run { send in
 			switch context {
 			case .appStarted:
-				await send(.delegate(.completed(onboardingClient.loadProfileState())))
+				try await send(.delegate(.completed(onboardingClient.loadProfileState())))
 			case .appForegrounded:
 				localAuthenticationClient.setAuthenticatedSuccessfully()
 			}