Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify crazy DappInteractionFlow switch #447

Merged
merged 1 commit into from
Apr 20, 2023
Merged

Simplify crazy DappInteractionFlow switch #447

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 24 additions & 32 deletions Sources/Features/DappInteractionFeature/Coordinator/DappInteractionFlow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,56 +421,36 @@ struct DappInteractionFlow: Sendable, FeatureReducer {
return dismissEffect(for: state, errorKind: errorKind, message: message)
}

switch childAction {
case
let .root(.relay(item, .login(.delegate(.continueButtonTapped(persona, authorizedDapp, authorizedPersona))))),
let .path(.element(_, .relay(item, .login(.delegate(.continueButtonTapped(persona, authorizedDapp, authorizedPersona)))))):
guard let (item, action) = childAction.itemAndAction else { return .none }
switch action {
case let .login(.delegate(.continueButtonTapped(persona, authorizedDapp, authorizedPersona))):
return handleLogin(item, persona, authorizedDapp, authorizedPersona)

case
let .root(.relay(item, .accountPermission(.delegate(.continueButtonTapped)))),
let .path(.element(_, .relay(item, .accountPermission(.delegate(.continueButtonTapped))))):
case .accountPermission(.delegate(.continueButtonTapped)):
return handleAccountPermission(item)

case
let .root(.relay(item, .chooseAccounts(.delegate(.continueButtonTapped(accounts, accessKind))))),
let .path(.element(_, .relay(item, .chooseAccounts(.delegate(.continueButtonTapped(accounts, accessKind)))))):
case let .chooseAccounts(.delegate(.continueButtonTapped(accounts, accessKind))):
return handleAccounts(item, accounts, accessKind)

case
let .root(.relay(_, .personaDataPermission(.delegate(.personaUpdated(persona))))),
let .path(.element(_, .relay(_, .personaDataPermission(.delegate(.personaUpdated(persona)))))):
case let .personaDataPermission(.delegate(.personaUpdated(persona))):
return handlePersonaUpdated(&state, persona)

case
let .root(.relay(item, .personaDataPermission(.delegate(.continueButtonTapped(fields))))),
let .path(.element(_, .relay(item, .personaDataPermission(.delegate(.continueButtonTapped(fields)))))):
case let .personaDataPermission(.delegate(.continueButtonTapped(fields))):
return handleOngoingPersonaDataPermission(item, fields)

case
let .root(.relay(_, .oneTimePersonaData(.delegate(.personaUpdated(persona))))),
let .path(.element(_, .relay(_, .oneTimePersonaData(.delegate(.personaUpdated(persona)))))):
case let .oneTimePersonaData(.delegate(.personaUpdated(persona))):
return handlePersonaUpdated(&state, persona)

case
let .root(.relay(item, .oneTimePersonaData(.delegate(.continueButtonTapped(fields))))),
let .path(.element(_, .relay(item, .oneTimePersonaData(.delegate(.continueButtonTapped(fields)))))):
case let .oneTimePersonaData(.delegate(.continueButtonTapped(fields))):
return handleOneTimePersonaData(item, fields)

case
let .root(.relay(item, .reviewTransaction(.delegate(.signedTXAndSubmittedToGateway(txID))))),
let .path(.element(_, .relay(item, .reviewTransaction(.delegate(.signedTXAndSubmittedToGateway(txID)))))):
case let .reviewTransaction(.delegate(.signedTXAndSubmittedToGateway(txID))):
return handleSignAndSubmitTX(item, txID)

case
.root(.relay(_, .reviewTransaction(.delegate(.transactionCompleted)))),
.path(.element(_, .relay(_, .reviewTransaction(.delegate(.transactionCompleted))))):

case .reviewTransaction(.delegate(.transactionCompleted)):
return .send(.delegate(.dismissWithSuccess(state.dappMetadata)))

case
let .root(.relay(_, .reviewTransaction(.delegate(.failed(error))))),
let .path(.element(_, .relay(_, .reviewTransaction(.delegate(.failed(error)))))):
case let .reviewTransaction(.delegate(.failed(error))):
return handleSignAndSubmitTXFailed(error)

default:
Expand Down Expand Up @@ -716,6 +696,18 @@ extension OrderedSet<DappInteractionFlow.State.AnyInteractionItem> {
}
}

extension DappInteractionFlow.ChildAction {
var itemAndAction: (DappInteractionFlow.State.AnyInteractionItem, DappInteractionFlow.Destinations.MainAction)? {
switch self {
case let .root(.relay(item, action)), let .path(.element(_, .relay(item, action))):
return (item, action)

case .path(.popFrom):
return nil
}
}
}

extension DappInteractionFlow.Destinations.State {
init?(
for anyItem: DappInteractionFlow.State.AnyInteractionItem,
Expand Down