Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Fix #8721: Approve transaction does not show confirmation after editing allowance #8725

Merged
merged 2 commits into from
Feb 1, 2024
Merged

Fix #8721: Approve transaction does not show confirmation after editing allowance #8725

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a722540
Fix case where `TransactionConfirmationStore` is torn down from obser…
StephenHeaps Feb 1, 2024
34053da
Close stores on dismiss of modal to cover case where user manually di…
StephenHeaps Feb 1, 2024
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
13 changes: 5 additions & 8 deletions Sources/BraveWallet/Panels/RequestContainerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ struct RequestContainerView<DismissContent: ToolbarContent>: View {
keyringStore: keyringStore,
onDismiss: onDismiss
)
.onDisappear {
cryptoStore.closeConfirmationStore()
}
case .addSuggestedToken(let request):
AddSuggestedTokenView(
token: request.token,
Expand Down Expand Up @@ -62,9 +59,6 @@ struct RequestContainerView<DismissContent: ToolbarContent>: View {
networkStore: cryptoStore.networkStore,
onDismiss: onDismiss
)
.onDisappear {
cryptoStore.closeSignMessageRequestStore()
}
case let .signMessageError(signMessageErrors):
SignMessageErrorView(
signMessageErrors: signMessageErrors,
Expand Down Expand Up @@ -108,8 +102,11 @@ struct RequestContainerView<DismissContent: ToolbarContent>: View {
}
}
.navigationViewStyle(.stack)
.onAppear {
// TODO: Fetch pending requests
.onDisappear {
// `onDisappear` on individual views will trigger for navigation pushes.
// Close stores when navigation covers manual dismiss & onDismiss() cases.
cryptoStore.closeConfirmationStore()
cryptoStore.closeSignMessageRequestStore()
}
}
}
Loading