Skip to content

Commit 6cf9fc5

Browse files
committed
fix: Unselect after report
1 parent 5b42527 commit 6cf9fc5

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ struct ActionsPanelViewModifier: ViewModifier {
9696
.sheetViewStyle()
9797
}
9898
.floatingPanel(item: $reportForJunkMessages) { reportForJunkMessages in
99-
ReportJunkView(reportedMessages: reportForJunkMessages, origin: origin)
99+
ReportJunkView(reportedMessages: reportForJunkMessages, origin: origin, completionHandler: completionHandler)
100100
}
101101
.floatingPanel(item: $blockSendersList,
102102
title: MailResourcesStrings.Localizable.blockAnExpeditorTitle) { blockSenderState in

Mail/Views/Bottom sheets/Actions/ReportJunkView.swift

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ struct ReportJunkView: View {
3232

3333
let reportedMessages: [Message]
3434
let origin: ActionOrigin
35+
var completionHandler: ((Action) -> Void)?
3536

3637
private var filteredActions: [Action] {
3738
let currentUserEmail = mailboxManager.mailbox.email
@@ -57,14 +58,23 @@ struct ReportJunkView: View {
5758
if action != filteredActions.first {
5859
IKDivider()
5960
}
60-
MessageActionView(targetMessages: reportedMessages, action: action, origin: origin)
61+
MessageActionView(
62+
targetMessages: reportedMessages,
63+
action: action,
64+
origin: origin,
65+
completionHandler: completionHandler
66+
)
6167
}
6268
}
6369
.matomoView(view: [MatomoUtils.View.bottomSheet.displayName, "ReportJunkView"])
6470
}
6571
}
6672

6773
#Preview {
68-
ReportJunkView(reportedMessages: PreviewHelper.sampleMessages, origin: .floatingPanel(source: .threadList))
69-
.accentColor(AccentColor.pink.primary.swiftUIColor)
74+
ReportJunkView(
75+
reportedMessages: PreviewHelper.sampleMessages,
76+
origin: .floatingPanel(source: .threadList),
77+
completionHandler: { _ in }
78+
)
79+
.accentColor(AccentColor.pink.primary.swiftUIColor)
7080
}

0 commit comments

Comments
 (0)