Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentsListController.swift

@@ -76,9 +76,7 @@ class AttachmentsListController: ViewController {
     }
     
     private func deleteAttachments(at indices: IndexSet) {
-        var array = draft.draftAttachments
-        array.remove(atOffsets: indices)
-        draft.attachments = NSMutableOrderedSet(array: array)
+        draft.attachments.removeObjects(at: indices)
     }
     
     private func insertAttachments(at offset: Int, itemProviders: [NSItemProvider]) {

Packages/ComposeUI/Sources/ComposeUI/Controllers/ComposeController.swift

@@ -154,7 +154,7 @@ public final class ComposeController: ViewController {
             if draft.hasContent {
                 isShowingSaveDraftSheet = true
             } else {
-                deleteDraftOnDisappear = true
+                DraftsPersistentContainer.shared.viewContext.delete(draft)
                 config.dismiss(.cancel)
             }
         }
@@ -162,7 +162,9 @@ public final class ComposeController: ViewController {
     
     @MainActor
     func cancel(deleteDraft: Bool) {
-        deleteDraftOnDisappear = true
+        if deleteDraft {
+            DraftsPersistentContainer.shared.viewContext.delete(draft)
+        }
         config.dismiss(.cancel)
     }
     

ShareExtension/ShareViewController.swift

@@ -33,16 +33,17 @@ class ShareViewController: UIViewController {
                 
                 let context = ShareMastodonContext(accountInfo: account)
                 let host = ShareHostingController(draft: draft, mastodonContext: context)
-                host.view.translatesAutoresizingMaskIntoConstraints = false
-                addChild(host)
-                self.view.addSubview(host.view)
+                let nav = UINavigationController(rootViewController: host)
+                self.addChild(nav)
+                nav.view.translatesAutoresizingMaskIntoConstraints = false
+                self.view.addSubview(nav.view)
                 NSLayoutConstraint.activate([
-                    host.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-                    host.view.trailingAnchor.constraint(equalTo: self.view.trailingAnchor),
-                    host.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-                    host.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
+                    nav.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
+                    nav.view.trailingAnchor.constraint(equalTo: self.view.trailingAnchor),
+                    nav.view.topAnchor.constraint(equalTo: self.view.topAnchor),
+                    nav.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
                 ])
-                host.didMove(toParent: self)
+                nav.didMove(toParent: self)
             }
         } else {
             state = .notLoggedIn

Tusker/Screens/Report/ReportView.swift

@@ -143,16 +143,14 @@ struct ReportView: View {
             .appGroupedListRowBackground()
 
             Button(action: self.sendReport) {
-                let label = Text(isReporting ? "Sending Report" : "Send Report")
-                HStack {
-                    label
+                if isReporting {
+                    Text("Sending Report")
                     Spacer()
-                    if isReporting {
-                        ProgressView()
-                            .progressViewStyle(.circular)
-                    }
+                    ProgressView()
+                        .progressViewStyle(.circular)
+                } else {
+                    Text("Send Report")
                 }
-                .accessibilityLabel(label)
             }
             .disabled(isReporting)
             .appGroupedListRowBackground()