From ced4225007e87891134674f833a28965628a7988 Mon Sep 17 00:00:00 2001 From: Ghenadie <118184705+GhenadieVP@users.noreply.github.com> Date: Tue, 12 Mar 2024 20:06:12 +0200 Subject: [PATCH] Fix ROLA completion slide up (#1040) --- .../Children/Completion/Completion.swift | 8 ++++---- .../Interactor/DappInteractor.swift | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/RadixWallet/Features/DappInteractionFeature/Children/Completion/Completion.swift b/RadixWallet/Features/DappInteractionFeature/Children/Completion/Completion.swift index ad9efc41b0..3a61dc4d0d 100644 --- a/RadixWallet/Features/DappInteractionFeature/Children/Completion/Completion.swift +++ b/RadixWallet/Features/DappInteractionFeature/Children/Completion/Completion.swift @@ -20,14 +20,14 @@ struct Completion: Sendable, FeatureReducer { case dismissTapped } - @Dependency(\.dismiss) var dismiss + enum DelegateAction: Sendable, Equatable { + case dismiss + } func reduce(into state: inout State, viewAction: ViewAction) -> Effect { switch viewAction { case .dismissTapped: - .run { _ in - await dismiss() - } + .send(.delegate(.dismiss)) } } } diff --git a/RadixWallet/Features/DappInteractionFeature/Interactor/DappInteractor.swift b/RadixWallet/Features/DappInteractionFeature/Interactor/DappInteractor.swift index a46570be2c..604553d4d9 100644 --- a/RadixWallet/Features/DappInteractionFeature/Interactor/DappInteractor.swift +++ b/RadixWallet/Features/DappInteractionFeature/Interactor/DappInteractor.swift @@ -274,12 +274,9 @@ struct DappInteractor: Sendable, FeatureReducer { return delayedMediumEffect(internal: .presentQueuedRequestIfNeeded) } - case .modal(.dismiss): - if case .dappInteractionCompletion = state.currentModal { - return delayedMediumEffect(internal: .presentQueuedRequestIfNeeded) - } - - return .none + case .modal(.presented(.dappInteractionCompletion(.delegate(.dismiss)))): + state.currentModal = nil + return delayedMediumEffect(internal: .presentQueuedRequestIfNeeded) default: return .none