Skip to content

Commit

Permalink
Various small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kugel3 committed Apr 20, 2023
1 parent 0ac9c02 commit 7d3c56b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,10 @@ public struct DappDetails: Sendable, FeatureReducer {
state.$metadata = metadata
return .none
case let .dAppUpdated(dApp):
guard dApp.dAppDefinitionAddress == state.dApp.dAppDefinitionAddress else {
fatalError("Wrong dApp!") // FIXME: Throw error
}
assert(dApp.dAppDefinitionAddress == state.dApp.dAppDefinitionAddress, "dAppUpdated called with wrong dApp")
guard !dApp.detailedAuthorizedPersonas.isEmpty else {
return disconnectDappEffect(state: state)
}
// let previousPersonaDetails = state.personaDetails
// state = .init(dApp: dApp, personaDetails: previousPersonaDetails)

state.dApp = dApp

return .none
Expand Down
4 changes: 2 additions & 2 deletions Sources/Features/PersonaDetailsFeature/PersonaDetails.swift
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ public struct PersonaDetails: Sendable, FeatureReducer {
return .run { send in
let persona = try await personasClient.getPersona(id: persona.id)
await send(.internal(.editablePersonaFetched(persona)))
} catch: { _, _ in
// FIXME: Log/show error?
} catch: { error, _ in
errorQueue.schedule(error)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import PersonasClient
public struct PersonaList: Sendable, FeatureReducer {
@Dependency(\.authorizedDappsClient) var authorizedDappsClient
@Dependency(\.personasClient) var personasClient
@Dependency(\.errorQueue) var errorQueue

public struct State: Sendable, Hashable {
public var personas: IdentifiedArrayOf<Persona.State>
Expand Down Expand Up @@ -67,14 +68,12 @@ public struct PersonaList: Sendable, FeatureReducer {
case .task:
return .run { [strategy = state.strategy] send in
for try await personas in await personasClient.personas() {
print("•• Personas \(Task.isCancelled):", personas.map(\.displayName.rawValue))

let ids = try await personaIDs(strategy) ?? personas.ids
let result = ids.compactMap { personas[id: $0] }.map(Persona.State.init)
await send(.internal(.personasLoaded(.init(uniqueElements: result))))
}
print("•• Personas \(Task.isCancelled): DONE")
} catch: { _, _ in
} catch: { error, _ in
errorQueue.schedule(error)
}

case .createNewPersonaButtonTapped:
Expand Down

0 comments on commit 7d3c56b

Please sign in to comment.