From 0abf17cb6b187c8680e50606fcdc5408ce8dd7f3 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 13 May 2025 20:00:31 +0200
Subject: [PATCH 1/2] fix: Fixed an issue with opening bookmarks with different
 containers, b=(no-bug), c=common

---
 .../components/places/PlacesUIUtils-sys-mjs.patch    | 12 ++----------
 src/zen/common/styles/zen-popup.css                  | 10 +++++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
index 78266e8ce..d5415712f 100644
--- a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
+++ b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
-index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..16034842b4ca5295aa3c9237db55035ecc4016d2 100644
+index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..028b899b7a5da7ba398965861ff044e596c27666 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
 @@ -59,6 +59,7 @@ class BookmarkState {
@@ -157,20 +157,12 @@ index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..16034842b4ca5295aa3c9237db55035e
    /**
     * Append transactions to update tags by given information.
     *
-@@ -903,8 +1012,15 @@ export var PlacesUIUtils = {
+@@ -903,7 +1012,7 @@ export var PlacesUIUtils = {
      aNode,
      aWhere,
      aWindow,
 -    { aPrivate = false, userContextId = 0 } = {}
 +    { aPrivate = false, userContextId = undefined } = {}
    ) {
-+    if (typeof userContextId == "undefined") {
-+      try {
-+        let browserWindow = getBrowserWindow(aWindow);
-+        userContextId = browserWindow.ZenWorkspaces.getDefaultContainer();
-+      } catch {}
-+    }
-+
      if (
        aNode &&
-       lazy.PlacesUtils.nodeIsURI(aNode) &&
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index e6c59279c..0cb3a57f3 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -363,11 +363,11 @@ menuitem {
       translate: 100%;
     }
 
-    --zen-toast-padding: 10px;
-    --zen-toast-max-height: 52px;
-    @media (-moz-platform: windows) {
-      --zen-toast-padding: 6px;
-      --zen-toast-max-height: 46px;
+    --zen-toast-padding: 6px;
+    --zen-toast-max-height: 46px;
+    @media (-moz-platform: macos) {
+      --zen-toast-padding: 10px;
+      --zen-toast-max-height: 52px;
     }
 
     gap: 10px;

From 0021c3522f5f43afb223c2510a6b19462ed17b5e Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Wed, 14 May 2025 10:03:06 +0200
Subject: [PATCH 2/2] Added security instructions for new reports

Signed-off-by: mr. m  <91018726+mauro-balades@users.noreply.github.com>
---
 SECURITY.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..fd204c87d
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security vulnerabilities [here](https://github.com/zen-browser/desktop/security/advisories/new)