From c0620a95ef2eaa6aa889d8663611e6525f8f58f1 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 28 Apr 2026 20:37:46 +0200
Subject: [PATCH] no-bug: Sync upstream Firefox to version 150.0.1 (gh-13472)

---
 README.md                                 | 4 ++--
 build/firefox-cache/l10n-last-commit-hash | 2 +-
 src/zen/drag-and-drop/ZenDragAndDrop.js   | 6 +++++-
 src/zen/tabs/ZenPinnedTabManager.mjs      | 5 +++--
 surfer.json                               | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 26e5634e7..7cce689f0 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0.1`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0.1`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index fc5481288..11b9258f4 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-fb55808f9cdd2172649e551705008af4f98038fe
\ No newline at end of file
+e097b3c5ca4139a5b88052379a776782e078356b
\ No newline at end of file
diff --git a/src/zen/drag-and-drop/ZenDragAndDrop.js b/src/zen/drag-and-drop/ZenDragAndDrop.js
index f2f0d6881..360e8f75f 100644
--- a/src/zen/drag-and-drop/ZenDragAndDrop.js
+++ b/src/zen/drag-and-drop/ZenDragAndDrop.js
@@ -952,6 +952,7 @@
         // Sometimes, dragend doesn't always get called when dragging
         // to different windows, see gh-8643.
         delete ownerGlobal.gZenCompactModeManager._isTabBeingDragged;
+        ownerGlobal.gZenCompactModeManager._clearAllHoverStates();
       }
       this.clearSpaceSwitchTimer();
       gZenFolders.highlightGroupOnDragOver(null);
@@ -1107,7 +1108,10 @@
         );
         for (let i = startIndex; i <= endIndex; i++) {
           let item = items[i];
-          if (!movingTabs.includes(item)) {
+          if (
+            !movingTabs.includes(item) &&
+            !(isTabGroupLabel(item) && i == startIndex)
+          ) {
             tabsInBetween.push(item);
           }
         }
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 38dfa9e68..893c89bb3 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -664,7 +664,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
   ) {
     let newIndex = dropIndex;
     let fromDifferentWindow = false;
-    movingTabs = Array.from(movingTabs || draggedTab)
+    let ownedTabs = Array.from(movingTabs || draggedTab)
       .reverse()
       .map(tab => {
         if (!gBrowser.isTab(tab)) {
@@ -700,6 +700,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
         }
         return tab;
       });
+    movingTabs = [...ownedTabs];
     if (fromDifferentWindow) {
       gBrowser.addRangeToMultiSelectedTabs(
         gBrowser.tabContainer.dragAndDropElements[dropIndex],
@@ -822,7 +823,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
     } catch (ex) {
       console.error("Error moving tabs:", ex);
     }
-    return [draggedTab, movingTabs];
+    return [draggedTab, ownedTabs];
   }
 
   onLocationChange(aBrowser, aWebProgress, aRequest, aLocationURI) {
diff --git a/surfer.json b/surfer.json
index d5b3dfcdd..a17ecb94d 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "150.0",
-    "candidate": "150.0",
+    "version": "150.0.1",
+    "candidate": "150.0.1",
     "candidateBuild": 1
   },
   "buildOptions": {