From 8ea3fa73e5c343d4c486b6b87df3db14d69a9139 Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Tue, 9 Jan 2024 19:06:54 +0100
Subject: [PATCH] Fix #1851 (both)

---
 IceCubesApp/App/SafariRouter.swift               | 16 +++++++++-------
 .../MediaUI/Sources/MediaUI/MediaUIView.swift    |  6 +++---
 .../Sources/StatusKit/Editor/ViewModel.swift     |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/IceCubesApp/App/SafariRouter.swift b/IceCubesApp/App/SafariRouter.swift
index 7d41aafc..2882b676 100644
--- a/IceCubesApp/App/SafariRouter.swift
+++ b/IceCubesApp/App/SafariRouter.swift
@@ -47,15 +47,17 @@ private struct SafariRouter: ViewModifier {
           }
           #if !targetEnvironment(macCatalyst)
             guard preferences.preferredBrowser == .inAppSafari else { return .systemAction }
-          #endif
-          // SFSafariViewController only supports initial URLs with http:// or https:// schemes.
-          guard let scheme = url.scheme, ["https", "http"].contains(scheme.lowercased()) else {
+            // SFSafariViewController only supports initial URLs with http:// or https:// schemes.
+            guard let scheme = url.scheme, ["https", "http"].contains(scheme.lowercased()) else {
+              return .systemAction
+            }
+            #if os(visionOS)
             return .systemAction
-          }
-          #if os(visionOS)
-          return .systemAction
+            #else
+            return safariManager.open(url)
+            #endif
           #else
-          return safariManager.open(url)
+            return .systemAction
           #endif
         }
       }
diff --git a/Packages/MediaUI/Sources/MediaUI/MediaUIView.swift b/Packages/MediaUI/Sources/MediaUI/MediaUIView.swift
index 8f239d6d..e6607e75 100644
--- a/Packages/MediaUI/Sources/MediaUI/MediaUIView.swift
+++ b/Packages/MediaUI/Sources/MediaUI/MediaUIView.swift
@@ -75,9 +75,7 @@ private struct MediaToolBar: ToolbarContent {
   let data: DisplayData
 
   var body: some ToolbarContent {
-    #if !targetEnvironment(macCatalyst)
-      DismissToolbarItem()
-    #endif
+    DismissToolbarItem()
     QuickLookToolbarItem(itemUrl: data.url)
     AltTextToolbarItem(alt: data.description)
     SavePhotoToolbarItem(url: data.url, type: data.type)
@@ -95,6 +93,8 @@ private struct DismissToolbarItem: ToolbarContent {
       } label: {
         Image(systemName: "xmark.circle")
       }
+      .opacity(0)
+      .keyboardShortcut(.cancelAction)
     }
   }
 }
diff --git a/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift b/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
index 3203c1d1..b369a917 100644
--- a/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
@@ -228,12 +228,12 @@ extension StatusEditor {
         postingTimer = nil
         
         if let postStatus {
-          StreamWatcher.shared.emmitEditEvent(for: postStatus)
-          HapticManager.shared.fireHaptic(.notification(.success))
           withAnimation {
             postingProgress = 99.0
           }
           try await Task.sleep(for: .seconds(0.5))
+          StreamWatcher.shared.emmitEditEvent(for: postStatus)
+          HapticManager.shared.fireHaptic(.notification(.success))
         }
         
         if hasExplicitlySelectedLanguage, let selectedLanguage {