[ABW-2214] Shared persona data not persisted in profile

Sources/Clients/AuthorizedDappsClient/AuthorizedDappsClient+Interface.swift

@@ -36,7 +36,7 @@ extension AuthorizedDappsClient {
 	public typealias DetailsForAuthorizedDapp = @Sendable (Profile.Network.AuthorizedDapp) async throws -> Profile.Network.AuthorizedDappDetailed
 	public typealias AddAuthorizedDapp = @Sendable (Profile.Network.AuthorizedDapp) async throws -> Void
 	public typealias UpdateOrAddAuthorizedDapp = @Sendable (Profile.Network.AuthorizedDapp) async throws -> Void
-	public typealias ForgetAuthorizedDapp = @Sendable (Profile.Network.AuthorizedDapp.ID, NetworkID) async throws -> Void
+	public typealias ForgetAuthorizedDapp = @Sendable (Profile.Network.AuthorizedDapp.ID, NetworkID?) async throws -> Void
 	public typealias UpdateAuthorizedDapp = @Sendable (Profile.Network.AuthorizedDapp) async throws -> Void
 	public typealias DeauthorizePersonaFromDapp = @Sendable (Profile.Network.Persona.ID, Profile.Network.AuthorizedDapp.ID, NetworkID) async throws -> Void
 }

Sources/Clients/AuthorizedDappsClientLive/AuthorizedDappsClient+Live.swift

@@ -20,8 +20,10 @@ extension AuthorizedDappsClient: DependencyKey {
 					_ = try $0.addAuthorizedDapp(newDapp)
 				}
 			},
-			forgetAuthorizedDapp: { toForget, networkID in
-				try await getProfileStore().updating {
+			forgetAuthorizedDapp: { toForget, maybeNetworkID in
+				let currentNetworkID = await getProfileStore().profile.networkID
+				let networkID = maybeNetworkID ?? currentNetworkID
+				return try await getProfileStore().updating {
 					_ = try $0.forgetAuthorizedDapp(toForget, on: networkID)
 				}
 			},

Sources/Core/SharedModels/P2P/Dapp/Models/Interaction/Requests/ResetRequestItem.swift

@@ -1,6 +1,6 @@
 import Prelude
 
-// MARK: - P2P.Dapp.Request.OneTimeAccountsRequestItem
+// MARK: - P2P.Dapp.Request.ResetRequestItem
 extension P2P.Dapp.Request {
 	public struct ResetRequestItem: Sendable, Hashable, Decodable {
 		public let accounts: Bool

Sources/Features/AuthorizedDAppsFeature/AuthorizedDApps/AuthorizedDApps.swift

@@ -36,6 +36,7 @@ public struct AuthorizedDapps: Sendable, FeatureReducer {
 		case loadedDapps(TaskResult<Profile.Network.AuthorizedDapps>)
 		case loadedThumbnail(URL, dApp: Profile.Network.AuthorizedDapp.ID)
 		case presentDappDetails(DappDetails.State)
+		case failedToGetDetailsOfDapp(id: Profile.Network.AuthorizedDapp.ID)
 	}
 
 	public enum ChildAction: Sendable, Equatable {
@@ -56,17 +57,16 @@ public struct AuthorizedDapps: Sendable, FeatureReducer {
 	public func reduce(into state: inout State, viewAction: ViewAction) -> EffectTask<Action> {
 		switch viewAction {
 		case .appeared:
-			return .task {
-				await loadAuthorizedDapps()
-			}
+			return loadAuthorizedDapps()
 
 		case let .didSelectDapp(dAppID):
 			return .run { send in
 				let details = try await authorizedDappsClient.getDetailedDapp(dAppID)
 				let presentedDappState = DappDetails.State(dApp: details)
 				await send(.internal(.presentDappDetails(presentedDappState)))
-			} catch: { error, _ in
+			} catch: { error, send in
 				errorQueue.schedule(error)
+				await send(.internal(.failedToGetDetailsOfDapp(id: dAppID)))
 			}
 		}
 	}
@@ -86,6 +86,19 @@ public struct AuthorizedDapps: Sendable, FeatureReducer {
 					}
 				}
 			}
+
+		case let .failedToGetDetailsOfDapp(dappId):
+			#if DEBUG
+			return .run { _ in
+				loggerGlobal.notice("DEBUG ONLY deleting authorized dapp since we failed to load detailed info about it")
+				try? await authorizedDappsClient.forgetAuthorizedDapp(dappId, nil)
+
+			}.concatenate(with: loadAuthorizedDapps())
+			#else
+			// FIXME: Should we have to handle this, this is a discrepancy bug..
+			return .none
+			#endif
+
 		case let .loadedDapps(.failure(error)):
 			errorQueue.schedule(error)
 			return .none
@@ -103,18 +116,19 @@ public struct AuthorizedDapps: Sendable, FeatureReducer {
 		case .presentedDapp(.presented(.delegate(.dAppForgotten))):
 			return .run { send in
 				await send(.child(.presentedDapp(.dismiss)))
-				await send(loadAuthorizedDapps())
-			}
+			}.concatenate(with: loadAuthorizedDapps())
 
 		case .presentedDapp:
 			return .none
 		}
 	}
 
-	private func loadAuthorizedDapps() async -> Action {
-		let result = await TaskResult {
-			try await authorizedDappsClient.getAuthorizedDapps()
+	private func loadAuthorizedDapps() -> EffectTask<Action> {
+		.run { send in
+			let result = await TaskResult {
+				try await authorizedDappsClient.getAuthorizedDapps()
+			}
+			await send(.internal(.loadedDapps(result)))
 		}
-		return .internal(.loadedDapps(result))
 	}
 }

Sources/Features/DappInteractionFeature/Children/OneTimePersonaData/OneTimePersonaData.swift

@@ -157,6 +157,7 @@ struct OneTimePersonaData: Sendable, FeatureReducer {
 			return .none
 
 		case let .destination(.presented(.editPersona(.delegate(.personaSaved(persona))))):
+			loggerGlobal.critical("editPersona delegate personaSaved")
 			return .send(.delegate(.personaUpdated(persona)))
 
 		case .destination(.presented(.createPersona(.delegate(.completed)))):