From 49225cf685d683a48cb80996a292e14d6783f9e7 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 1 Mar 2026 18:09:35 +0100
Subject: [PATCH] chore: Import external patches with replacements, b=no-bug,
 c=no-component

---
 src/external-patches/firefox/native_macos_popovers.patch | 2 +-
 src/external-patches/manifest.json                       | 3 ++-
 src/zen/sessionstore/ZenSessionManager.sys.mjs           | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/external-patches/firefox/native_macos_popovers.patch b/src/external-patches/firefox/native_macos_popovers.patch
index cf70eb89b..687cf9106 100644
--- a/src/external-patches/firefox/native_macos_popovers.patch
+++ b/src/external-patches/firefox/native_macos_popovers.patch
@@ -131,7 +131,7 @@ diff --git a/toolkit/themes/shared/global-shared.css b/toolkit/themes/shared/glo
  /* Lightweight theme roots */
  
  :root[lwtheme] {
-   body,
+   .browser-toolbox-background,
    toolbar,
 diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
 --- a/widget/cocoa/nsCocoaWindow.h
diff --git a/src/external-patches/manifest.json b/src/external-patches/manifest.json
index 50b0a829e..523cc8bf9 100644
--- a/src/external-patches/manifest.json
+++ b/src/external-patches/manifest.json
@@ -18,7 +18,8 @@
       // Specifically trying to target FeatureCallout.sys.mjs's change.
       // IMPORTANT: Make sure Feature callouts STILL use native popopvers when
       //    syncing from upstream, as this is a critical part of the patch.
-      "+            nonnativepopover=\"true\"": "+ "
+      "+            nonnativepopover=\"true\"": "+ ",
+      "body,": ".browser-toolbox-background,"
     }
   },
   {
diff --git a/src/zen/sessionstore/ZenSessionManager.sys.mjs b/src/zen/sessionstore/ZenSessionManager.sys.mjs
index f8be181e6..835a8360a 100644
--- a/src/zen/sessionstore/ZenSessionManager.sys.mjs
+++ b/src/zen/sessionstore/ZenSessionManager.sys.mjs
@@ -450,7 +450,8 @@ export class nsZenSessionManager {
       ];
     }
     for (const winData of initialState?.windows || []) {
-      winData.spaces = winData.spaces || this._migrationData?.spaces || [];
+      winData.spaces =
+        (winData.spaces?.length ? winData.spaces : this._migrationData?.spaces) || [];
       if (winData.tabs) {
         for (const tabData of winData.tabs) {
           let storeId = tabData.zenSyncId || tabData.zenPinnedId;