Skip to content

fix: Crash report junk macos #2047

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

Merged
PhilippeWeidmann merged 2 commits into from
Dec 19, 2025
Merged

fix: Crash report junk macos #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97c9a79
fix: Prevent crash by force passing env
PhilippeWeidmann Dec 19, 2025
9387125
fix: Remove duplicated close button view
PhilippeWeidmann Dec 19, 2025
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
1 change: 1 addition & 0 deletions Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ struct ActionsPanelViewModifier: ViewModifier {
}
.mailFloatingPanel(item: $reportForJunkMessages) { reportForJunkMessages in
ReportJunkView(reportedMessages: reportForJunkMessages, origin: origin, completionHandler: completionHandler)
.environmentObject(mailboxManager) // Force environment object to prevent crash on macOS
}
.mailFloatingPanel(item: $blockSendersList,
title: MailResourcesStrings.Localizable.blockAnExpeditorTitle) { blockSenderState in
Expand Down
10 changes: 0 additions & 10 deletions Mail/Views/Bottom sheets/Actions/ReportJunkView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ import MailResources
import SwiftUI

struct ReportJunkView: View {
@InjectService private var platformDetector: PlatformDetectable

@EnvironmentObject private var mailboxManager: MailboxManager
@Environment(\.dismiss) private var dismiss

let reportedMessages: [Message]
let origin: ActionOrigin
Expand All @@ -47,13 +44,6 @@ struct ReportJunkView: View {

var body: some View {
VStack(alignment: .leading, spacing: 0) {
if platformDetector.isMac {
HeaderCloseButtonView(title: MailResourcesStrings.Localizable.actionReportJunk) {
dismiss()
}
.padding(.horizontal, value: .medium)
}

ForEach(filteredActions) { action in
if action != filteredActions.first {
IKDivider()
Expand Down
Loading