From 27c2afad70b7c575b11d91dabcbca662c58e658b Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Tue, 25 Nov 2025 12:52:32 +0100
Subject: [PATCH 01/40] Feature flag

---
 .../Sources/FeatureFlags/FeatureFlag.swift             | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift b/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
index b5756f22fc9..1db283e78ed 100644
--- a/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
+++ b/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
@@ -298,6 +298,10 @@ public enum FeatureFlag: String, CaseIterable {
     /// Show popup permission button in inactive state when temporary allowance is active
     /// https://app.asana.com/1/137249556945/project/1211834678943996/task/1212017701300919?focus=true
     case popupPermissionButtonPersistence
+
+    /// New permission management view
+    /// https://app.asana.com/1/137249556945/project/1148564399326804/task/1211985993948718?focus=true
+    case newPermissionView
 }
 
 extension FeatureFlag: FeatureFlagDescribing {
@@ -421,7 +425,8 @@ extension FeatureFlag: FeatureFlagDescribing {
                 .extendedUserInitiatedPopupTimeout,
                 .suppressEmptyPopUpsOnApproval,
                 .allowPopupsForCurrentPage,
-                .popupPermissionButtonPersistence:
+                .popupPermissionButtonPersistence,
+                .newPermissionView:
             return true
         case .sslCertificatesBypass,
                 .appendAtbToSerpQueries,
@@ -616,7 +621,10 @@ extension FeatureFlag: FeatureFlagDescribing {
             return .remoteReleasable(.subfeature(PopupBlockingSubfeature.allowPopupsForCurrentPage))
         case .popupPermissionButtonPersistence:
             return .remoteReleasable(.subfeature(PopupBlockingSubfeature.popupPermissionButtonPersistence))
+        case .newPermissionView:
+            return .internalOnly()
         }
+
     }
 }
 

From bb08041290fe97ef4f7d35ed55588135383acfa4 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Tue, 25 Nov 2025 13:48:53 +0100
Subject: [PATCH 02/40] Legacy permission flow disabled when feature flag is on

---
 .../Features/PrivacyFeature.swift             |  3 +++
 .../AddressBarButtonsViewController.swift     | 19 ++++++++++++-------
 .../View/NavigationBar.storyboard             |  6 +++---
 .../Sources/FeatureFlags/FeatureFlag.swift    |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift b/SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
index fb1d3dedd24..eafc1ff9a8b 100644
--- a/SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
+++ b/SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
@@ -145,6 +145,9 @@ public enum MacOSBrowserConfigSubfeature: String, PrivacySubfeature {
     /// Pinned Tabs AppKit Rewrite Feature Flag
     /// https://app.asana.com/1/137249556945/project/1201048563534612/task/1209949983074592?focus=true
     case pinnedTabsViewRewrite
+
+    /// Hang reporting feature flag
+    case newPermissionView
 }
 
 public enum iOSBrowserConfigSubfeature: String, PrivacySubfeature {
diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 1f43518e50c..cd84c0243f2 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -523,13 +523,13 @@ final class AddressBarButtonsViewController: NSViewController {
         permissionsCancellables.removeAll(keepingCapacity: true)
 
         tabViewModel?.$usedPermissions.dropFirst().sink { [weak self] _ in
-            self?.updatePermissionButtons()
+            self?.updateLegacyPermissionButtons()
         }.store(in: &permissionsCancellables)
         tabViewModel?.tab.popupHandling?.popupOpenedPublisher.sink { [weak self] _ in
-            self?.updatePermissionButtons()
+            self?.updateLegacyPermissionButtons()
         }.store(in: &permissionsCancellables)
         tabViewModel?.$permissionAuthorizationQuery.dropFirst().sink { [weak self] _ in
-            self?.updatePermissionButtons()
+            self?.updateLegacyPermissionButtons()
         }.store(in: &permissionsCancellables)
     }
 
@@ -590,11 +590,16 @@ final class AddressBarButtonsViewController: NSViewController {
             .store(in: &cancellables)
     }
 
-    private func updatePermissionButtons() {
+    private func updateLegacyPermissionButtons() {
         // Prevent crash if Combine subscriptions outlive view lifecycle
         guard isViewLoaded else { return }
         guard let tabViewModel else { return }
 
+        guard !featureFlagger.isFeatureOn(.newPermissionView) else {
+            permissionButtons.isShown = false
+            return
+        }
+
         // Show permission buttons when there's a requested permission on NTP even if address bar is focused,
         // since NTP has the address bar focused by default
         let hasRequestedPermission = tabViewModel.usedPermissions.values.contains(where: { $0.isRequested })
@@ -1492,7 +1497,7 @@ final class AddressBarButtonsViewController: NSViewController {
 
         updateImageButton()
         updatePrivacyDashboardButton()
-        updatePermissionButtons()
+        updateLegacyPermissionButtons()
         updateBookmarkButtonVisibility()
         updateZoomButtonVisibility()
         if !isToggleFeatureEnabled {
@@ -1816,7 +1821,7 @@ final class AddressBarButtonsViewController: NSViewController {
                 trackerAnimationView?.isHidden = true
                 guard let self else { return }
                 updatePrivacyEntryPointIcon()
-                updatePermissionButtons()
+                updateLegacyPermissionButtons()
                 // If badge animation is not queueued check if we should animate the privacy shield
                 if buttonsBadgeAnimator.queuedAnimation == nil {
                     playPrivacyInfoHighlightAnimationIfNecessary()
@@ -1827,7 +1832,7 @@ final class AddressBarButtonsViewController: NSViewController {
         }
 
         updatePrivacyEntryPointIcon()
-        updatePermissionButtons()
+        updateLegacyPermissionButtons()
     }
 
     private func stopAnimations(trackerAnimations: Bool = true,
diff --git a/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard b/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
index 385cdf86f40..ea49c6f94d0 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
+++ b/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
@@ -909,7 +909,7 @@
                                 </customSpacing>
                             </stackView>
                             <stackView distribution="equalSpacing" orientation="horizontal" alignment="centerY" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HEu-ro-RSA">
-                                <rect key="frame" x="0.0" y="1" width="189" height="32"/>
+                                <rect key="frame" x="0.0" y="1" width="61" height="32"/>
                                 <subviews>
                                     <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nOW-iY-XmO" customClass="MouseOverAnimationButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
@@ -1006,8 +1006,8 @@
                                             <action selector="zoomButtonAction:" target="mcr-nj-GmC" id="xCK-4c-baX"/>
                                         </connections>
                                     </button>
-                                    <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8UU-A8-1nD">
-                                        <rect key="frame" x="61" y="0.0" width="128" height="32"/>
+                                    <stackView hidden="YES" distribution="fill" orientation="horizontal" alignment="centerY" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8UU-A8-1nD">
+                                        <rect key="frame" x="0.0" y="0.0" width="128" height="32"/>
                                         <subviews>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CN6-fJ-o2J" userLabel="Geolocation Button" customClass="PermissionButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="24" height="32"/>
diff --git a/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift b/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
index 1db283e78ed..125b56038b1 100644
--- a/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
+++ b/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
@@ -622,7 +622,7 @@ extension FeatureFlag: FeatureFlagDescribing {
         case .popupPermissionButtonPersistence:
             return .remoteReleasable(.subfeature(PopupBlockingSubfeature.popupPermissionButtonPersistence))
         case .newPermissionView:
-            return .internalOnly()
+            return .remoteReleasable(.subfeature(MacOSBrowserConfigSubfeature.hangReporting))
         }
 
     }

From 2fe76f4da9ff9af3c0f03189aabe388e7c6b60fc Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Wed, 26 Nov 2025 13:28:24 +0100
Subject: [PATCH 03/40] New permission center button

---
 .../Contents.json                             |  12 ++
 .../PermissionCenterBell.imageset/Union.pdf   | Bin 0 -> 4633 bytes
 .../Contents.json                             |  12 ++
 .../PermissionCenterIcon.imageset/Union.pdf   | Bin 0 -> 4274 bytes
 .../AddressBarButtonsViewController.swift     | 153 ++++++++++++++----
 .../View/NavigationBar.storyboard             |  29 ++++
 .../Permissions/Model/PermissionState.swift   |   5 +
 7 files changed, 182 insertions(+), 29 deletions(-)
 create mode 100644 macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Contents.json
 create mode 100644 macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Union.pdf
 create mode 100644 macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Contents.json
 create mode 100644 macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Union.pdf

diff --git a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Contents.json b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Contents.json
new file mode 100644
index 00000000000..4171612590a
--- /dev/null
+++ b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Union.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Union.pdf b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Union.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..ad8e11a7f5d1ea3bb40561a69ea4a343f91e630f
GIT binary patch
literal 4633
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

literal 0
HcmV?d00001

diff --git a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Contents.json b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Contents.json
new file mode 100644
index 00000000000..4171612590a
--- /dev/null
+++ b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Union.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Union.pdf b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Union.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..a61d7232df372b0fc1ab07f5e544908b35b26535
GIT binary patch
literal 4274
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

literal 0
HcmV?d00001

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index cd84c0243f2..61876f772db 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -63,6 +63,7 @@ final class AddressBarButtonsViewController: NSViewController {
         return permissionAuthorizationPopover ?? {
             let popover = PermissionAuthorizationPopover()
             NotificationCenter.default.addObserver(self, selector: #selector(popoverDidClose), name: NSPopover.didCloseNotification, object: popover)
+            NotificationCenter.default.addObserver(self, selector: #selector(popoverWillShow), name: NSPopover.willShowNotification, object: popover)
             self.permissionAuthorizationPopover = popover
             popover.setAccessibilityIdentifier("AddressBarButtonsViewController.permissionAuthorizationPopover")
             return popover
@@ -87,6 +88,7 @@ final class AddressBarButtonsViewController: NSViewController {
     @IBOutlet weak var imageButton: NSButton!
     @IBOutlet weak var cancelButton: AddressBarButton!
     @IBOutlet private weak var buttonsContainer: NSStackView!
+    @IBOutlet weak var permissionCenterButton: AddressBarButton!
     @IBOutlet private weak var trailingButtonsContainer: NSStackView!
     @IBOutlet weak var aiChatButton: AddressBarMenuButton!
     @IBOutlet weak var askAIChatButton: AddressBarMenuButton!
@@ -114,6 +116,7 @@ final class AddressBarButtonsViewController: NSViewController {
     @IBOutlet weak var aiChatButtonWidthConstraint: NSLayoutConstraint!
     @IBOutlet weak var aiChatButtonHeightConstraint: NSLayoutConstraint!
     @IBOutlet weak var askAIChatButtonWidthConstraint: NSLayoutConstraint!
+    @IBOutlet weak var permissionCenterButtonWidthConstraint: NSLayoutConstraint!
     @IBOutlet weak var askAIChatButtonHeightConstraint: NSLayoutConstraint!
     @IBOutlet weak var privacyShieldButtonWidthConstraint: NSLayoutConstraint!
     @IBOutlet weak var privacyShieldButtonHeightConstraint: NSLayoutConstraint!
@@ -124,6 +127,7 @@ final class AddressBarButtonsViewController: NSViewController {
     @IBOutlet weak var cameraButtonHeightConstraint: NSLayoutConstraint!
     @IBOutlet weak var popupsButtonHeightConstraint: NSLayoutConstraint!
     @IBOutlet weak var externalSchemeButtonHeightConstraint: NSLayoutConstraint!
+    @IBOutlet weak var permissionButtonHeightConstraint: NSLayoutConstraint!
     @IBOutlet private weak var permissionButtons: NSView!
     @IBOutlet weak var cameraButton: PermissionButton! {
         didSet {
@@ -523,13 +527,13 @@ final class AddressBarButtonsViewController: NSViewController {
         permissionsCancellables.removeAll(keepingCapacity: true)
 
         tabViewModel?.$usedPermissions.dropFirst().sink { [weak self] _ in
-            self?.updateLegacyPermissionButtons()
+            self?.updateAllPermissionButtons()
         }.store(in: &permissionsCancellables)
         tabViewModel?.tab.popupHandling?.popupOpenedPublisher.sink { [weak self] _ in
-            self?.updateLegacyPermissionButtons()
+            self?.updateAllPermissionButtons()
         }.store(in: &permissionsCancellables)
         tabViewModel?.$permissionAuthorizationQuery.dropFirst().sink { [weak self] _ in
-            self?.updateLegacyPermissionButtons()
+            self?.updateAllPermissionButtons()
         }.store(in: &permissionsCancellables)
     }
 
@@ -655,6 +659,73 @@ final class AddressBarButtonsViewController: NSViewController {
 
     }
 
+    private func updateAllPermissionButtons() {
+        // Old version
+        updateLegacyPermissionButtons()
+
+        // New version
+        updatePermissionCenterButton()
+    }
+
+    //MARK: - Permission Center
+
+    private func updatePermissionCenterButton() {
+        // Prevent crash if Combine subscriptions outlive view lifecycle
+        guard isViewLoaded else { return }
+        guard let tabViewModel else { return }
+
+        guard featureFlagger.isFeatureOn(.newPermissionView) else {
+            permissionCenterButton.isShown = false
+            return
+        }
+
+        // Show permission buttons when there's a requested permission on NTP even if address bar is focused,
+        // since NTP has the address bar focused by default
+        let hasRequestedPermission = tabViewModel.usedPermissions.values.contains(where: { $0.isRequested})
+        let shouldShowWhileFocused = (tabViewModel.tab.content == .newtab) && hasRequestedPermission
+        let isAnyPermissionPresent = tabViewModel.usedPermissions.values.contains(where: { !$0.isReloading})
+
+        permissionCenterButton.isShown = (shouldShowWhileFocused ||
+                                          (!isTextFieldEditorFirstResponder && hasRequestedPermission) ||
+                                          isAnyPermissionPresent)
+        && !isAnyTrackerAnimationPlaying
+        && !tabViewModel.isShowingErrorPage
+
+        showOrHidePermissionCenterPopoverIfNeeded()
+    }
+
+    private func updatePermissionCenterButtonIcon(showBell: Bool) {
+        guard featureFlagger.isFeatureOn(.newPermissionView) else {
+            return
+        }
+
+        if showBell {
+            permissionCenterButton.image = .permissionCenterBell
+        } else {
+            permissionCenterButton.image = .permissionCenterIcon
+        }
+    }
+
+    private func showOrHidePermissionCenterPopoverIfNeeded() {
+        guard let tabViewModel else { return }
+
+        for permission in tabViewModel.usedPermissions.keys {
+            guard case .requested(let query) = tabViewModel.usedPermissions[permission] else { continue }
+
+            let permissionAuthorizationPopover = permissionAuthorizationPopoverCreatingIfNeeded()
+            guard !permissionAuthorizationPopover.isShown else {
+                if permissionAuthorizationPopover.viewController.query === query { return }
+                permissionAuthorizationPopover.close()
+                return
+            }
+            openPermissionAuthorizationPopover(for: query)
+            return
+        }
+        if let permissionAuthorizationPopover, permissionAuthorizationPopover.isShown {
+            permissionAuthorizationPopover.close()
+        }
+    }
+
     private func updateBookmarkButtonImage(isUrlBookmarked: Bool = false) {
         let bookmarksIconsProvider = theme.iconsProvider.bookmarksIconsProvider
         let colorsProvider = theme.colorsProvider
@@ -891,6 +962,7 @@ final class AddressBarButtonsViewController: NSViewController {
         permissionButtons.setCornerRadius(cornerRadius)
         zoomButton.setCornerRadius(cornerRadius)
         privacyDashboardButton.setCornerRadius(cornerRadius)
+        permissionCenterButton.setCornerRadius(cornerRadius)
     }
 
     private func setupButtonsSize() {
@@ -912,6 +984,8 @@ final class AddressBarButtonsViewController: NSViewController {
         cameraButtonHeightConstraint.constant = addressBarButtonSize
         popupsButtonHeightConstraint.constant = addressBarButtonSize
         externalSchemeButtonHeightConstraint.constant = addressBarButtonSize
+        permissionButtonHeightConstraint.constant = addressBarButtonSize
+        permissionCenterButtonWidthConstraint.constant = addressBarButtonSize
     }
 
     private func setupButtonIcons() {
@@ -1402,7 +1476,7 @@ final class AddressBarButtonsViewController: NSViewController {
     }
 
     func openPermissionAuthorizationPopover(for query: PermissionAuthorizationQuery) {
-        let button: PermissionButton
+        let button: AddressBarButton
 
         lazy var popover: NSPopover = {
             let popover = self.permissionAuthorizationPopoverCreatingIfNeeded()
@@ -1410,28 +1484,32 @@ final class AddressBarButtonsViewController: NSViewController {
             return popover
         }()
 
-        if query.permissions.contains(.camera)
-            || (query.permissions.contains(.microphone) && microphoneButton.isHidden && cameraButton.isShown) {
-            button = cameraButton
+        if featureFlagger.isFeatureOn(.newPermissionView) {
+            button = permissionCenterButton
         } else {
-            assert(query.permissions.count == 1)
-            switch query.permissions.first {
-            case .microphone:
-                button = microphoneButton
-            case .geolocation:
-                button = geolocationButton
-            case .popups:
-                guard !query.wasShownOnce else { return }
-                button = popupsButton
-                popover = popupBlockedPopoverCreatingIfNeeded()
-            case .externalScheme:
-                button = externalSchemeButton
-                query.shouldShowAlwaysAllowCheckbox = true
-                query.shouldShowCancelInsteadOfDeny = true
-            default:
-                assertionFailure("Unexpected permissions")
-                query.handleDecision(grant: false)
-                return
+            if query.permissions.contains(.camera)
+                || (query.permissions.contains(.microphone) && microphoneButton.isHidden && cameraButton.isShown) {
+                button = cameraButton
+            } else {
+                assert(query.permissions.count == 1)
+                switch query.permissions.first {
+                case .microphone:
+                    button = microphoneButton
+                case .geolocation:
+                    button = geolocationButton
+                case .popups:
+                    guard !query.wasShownOnce else { return }
+                    button = popupsButton
+                    popover = popupBlockedPopoverCreatingIfNeeded()
+                case .externalScheme:
+                    button = externalSchemeButton
+                    query.shouldShowAlwaysAllowCheckbox = true
+                    query.shouldShowCancelInsteadOfDeny = true
+                default:
+                    assertionFailure("Unexpected permissions")
+                    query.handleDecision(grant: false)
+                    return
+                }
             }
         }
         guard button.isVisible else { return }
@@ -1497,7 +1575,7 @@ final class AddressBarButtonsViewController: NSViewController {
 
         updateImageButton()
         updatePrivacyDashboardButton()
-        updateLegacyPermissionButtons()
+        updateAllPermissionButtons()
         updateBookmarkButtonVisibility()
         updateZoomButtonVisibility()
         if !isToggleFeatureEnabled {
@@ -1516,6 +1594,10 @@ final class AddressBarButtonsViewController: NSViewController {
         }
     }
 
+    @IBAction func permissionCenterButtonAction(_ sender: Any) {
+
+    }
+
     @IBAction func cameraButtonAction(_ sender: NSButton) {
         guard let tabViewModel else {
             assertionFailure("No selectedTabViewModel")
@@ -1821,7 +1903,7 @@ final class AddressBarButtonsViewController: NSViewController {
                 trackerAnimationView?.isHidden = true
                 guard let self else { return }
                 updatePrivacyEntryPointIcon()
-                updateLegacyPermissionButtons()
+                updateAllPermissionButtons()
                 // If badge animation is not queueued check if we should animate the privacy shield
                 if buttonsBadgeAnimator.queuedAnimation == nil {
                     playPrivacyInfoHighlightAnimationIfNecessary()
@@ -1832,7 +1914,8 @@ final class AddressBarButtonsViewController: NSViewController {
         }
 
         updatePrivacyEntryPointIcon()
-        updateLegacyPermissionButtons()
+        updateAllPermissionButtons()
+        updatePermissionCenterButton()
     }
 
     private func stopAnimations(trackerAnimations: Bool = true,
@@ -2081,6 +2164,17 @@ extension AddressBarButtonsViewController: PermissionContextMenuDelegate {
 
 extension AddressBarButtonsViewController: NSPopoverDelegate {
 
+    func popoverWillShow(_ notification: Notification) {
+        guard let popover = notification.object as? NSPopover else { return }
+
+        switch popover {
+        case is PermissionAuthorizationPopover, is PopupBlockedPopover:
+            updatePermissionCenterButtonIcon(showBell: true)
+        default:
+            break
+        }
+    }
+
     func popoverDidClose(_ notification: Notification) {
         guard let popovers, let popover = notification.object as? NSPopover else { return }
 
@@ -2094,12 +2188,13 @@ extension AddressBarButtonsViewController: NSPopoverDelegate {
             updateZoomButtonVisibility()
         case is PermissionAuthorizationPopover,
             is PopupBlockedPopover:
-            if let button = popover.positioningView as? PermissionButton {
+            if let button = popover.positioningView as? AddressBarButton {
                 button.backgroundColor = .clear
                 button.mouseOverColor = .buttonMouseOver
             } else {
                 assertionFailure("Unexpected popover positioningView: \(popover.positioningView?.description ?? "<nil>"), expected PermissionButton")
             }
+            updatePermissionCenterButtonIcon(showBell: false)
         default:
             break
         }
diff --git a/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard b/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
index ea49c6f94d0..f26d527efd6 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
+++ b/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
@@ -1006,6 +1006,29 @@
                                             <action selector="zoomButtonAction:" target="mcr-nj-GmC" id="xCK-4c-baX"/>
                                         </connections>
                                     </button>
+                                    <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7f7-ob-zog" customClass="AddressBarButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="0.0" width="24" height="32"/>
+                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="PermissionCenterIcon" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="AK6-34-TQm">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <color key="contentTintColor" name="ButtonColor"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="32" id="I0h-6q-AY4"/>
+                                            <constraint firstAttribute="width" constant="24" id="vbX-0P-lVk"/>
+                                        </constraints>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
+                                                <color key="value" name="ButtonMouseOverColor"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
+                                                <color key="value" name="ButtonMouseDownColor"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                        <connections>
+                                            <action selector="permissionCenterButtonAction:" target="mcr-nj-GmC" id="9iB-Op-Gco"/>
+                                        </connections>
+                                    </button>
                                     <stackView hidden="YES" distribution="fill" orientation="horizontal" alignment="centerY" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8UU-A8-1nD">
                                         <rect key="frame" x="0.0" y="0.0" width="128" height="32"/>
                                         <subviews>
@@ -1147,6 +1170,7 @@
                                     <integer value="1000"/>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
+                                    <integer value="1000"/>
                                 </visibilityPriorities>
                                 <customSpacing>
                                     <real value="3.4028234663852886e+38"/>
@@ -1154,6 +1178,7 @@
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
                                 </customSpacing>
                             </stackView>
                         </subviews>
@@ -1201,7 +1226,10 @@
                         <outlet property="microphoneButton" destination="uao-nC-0co" id="UHu-oA-rTl"/>
                         <outlet property="microphoneButtonHeightConstraint" destination="0aM-UZ-dCe" id="Kgq-0q-iNz"/>
                         <outlet property="notificationAnimationView" destination="1qw-sL-vFK" id="b5X-px-pwG"/>
+                        <outlet property="permissionButtonHeightConstraint" destination="I0h-6q-AY4" id="BbX-2y-p3L"/>
                         <outlet property="permissionButtons" destination="8UU-A8-1nD" id="gYJ-VW-MEG"/>
+                        <outlet property="permissionCenterButton" destination="7f7-ob-zog" id="gbs-S4-xCe"/>
+                        <outlet property="permissionCenterButtonWidthConstraint" destination="vbX-0P-lVk" id="dzi-E4-ax7"/>
                         <outlet property="popupsButton" destination="qqY-h9-UQ7" id="1QY-I6-oNC"/>
                         <outlet property="popupsButtonHeightConstraint" destination="Lys-Hh-cYc" id="aif-wm-FWV"/>
                         <outlet property="privacyDashboardButton" destination="nOW-iY-XmO" id="r0A-EO-srN"/>
@@ -1245,6 +1273,7 @@
         <image name="Microphone-Active" width="12" height="16"/>
         <image name="Microphone-Icon" width="12" height="16"/>
         <image name="PasswordManagement" width="16" height="16"/>
+        <image name="PermissionCenterIcon" width="12" height="12"/>
         <image name="PopupBlocked" width="16" height="16"/>
         <image name="Refresh" width="16" height="16"/>
         <image name="Search" width="14" height="14"/>
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionState.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionState.swift
index 1d36164a319..0674ca8bbf5 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionState.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionState.swift
@@ -53,6 +53,11 @@ enum PermissionState: Equatable {
         return false
     }
 
+    var isReloading: Bool {
+        if case .reloading = self { return true }
+        return false
+    }
+
 }
 
 extension Optional where Wrapped == PermissionState {

From fabef1e7d62582aaf7ced5fe47fe6fbfd861713b Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Wed, 26 Nov 2025 13:42:26 +0100
Subject: [PATCH 04/40] Feature flag fix

---
 .../PrivacyConfig/Features/PrivacyFeature.swift                 | 2 +-
 .../FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift b/SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
index eafc1ff9a8b..161b1744a0f 100644
--- a/SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
+++ b/SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
@@ -146,7 +146,7 @@ public enum MacOSBrowserConfigSubfeature: String, PrivacySubfeature {
     /// https://app.asana.com/1/137249556945/project/1201048563534612/task/1209949983074592?focus=true
     case pinnedTabsViewRewrite
 
-    /// Hang reporting feature flag
+    /// New permission center
     case newPermissionView
 }
 
diff --git a/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift b/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
index 125b56038b1..f64826bda8a 100644
--- a/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
+++ b/macOS/LocalPackages/FeatureFlags/Sources/FeatureFlags/FeatureFlag.swift
@@ -622,7 +622,7 @@ extension FeatureFlag: FeatureFlagDescribing {
         case .popupPermissionButtonPersistence:
             return .remoteReleasable(.subfeature(PopupBlockingSubfeature.popupPermissionButtonPersistence))
         case .newPermissionView:
-            return .remoteReleasable(.subfeature(MacOSBrowserConfigSubfeature.hangReporting))
+            return .remoteReleasable(.subfeature(MacOSBrowserConfigSubfeature.newPermissionView))
         }
 
     }

From cf774e588ea1d41222429a6061451acc3b7ac671 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Wed, 26 Nov 2025 13:45:31 +0100
Subject: [PATCH 05/40] Comment corrected

---
 .../NavigationBar/View/AddressBarButtonsViewController.swift  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 61876f772db..4950df4bee5 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -660,10 +660,10 @@ final class AddressBarButtonsViewController: NSViewController {
     }
 
     private func updateAllPermissionButtons() {
-        // Old version
+        // Legacy permission buttons
         updateLegacyPermissionButtons()
 
-        // New version
+        // New permission button
         updatePermissionCenterButton()
     }
 

From 0f89263d5e7c95effabbeeee8c84b60c7cb43299 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Wed, 26 Nov 2025 13:52:39 +0100
Subject: [PATCH 06/40] SwiftLint

---
 .../View/AddressBarButtonsViewController.swift           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 4950df4bee5..1f873b5716e 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -667,7 +667,7 @@ final class AddressBarButtonsViewController: NSViewController {
         updatePermissionCenterButton()
     }
 
-    //MARK: - Permission Center
+    // MARK: - Permission Center
 
     private func updatePermissionCenterButton() {
         // Prevent crash if Combine subscriptions outlive view lifecycle
@@ -681,9 +681,12 @@ final class AddressBarButtonsViewController: NSViewController {
 
         // Show permission buttons when there's a requested permission on NTP even if address bar is focused,
         // since NTP has the address bar focused by default
-        let hasRequestedPermission = tabViewModel.usedPermissions.values.contains(where: { $0.isRequested})
+        let hasRequestedPermission = tabViewModel.usedPermissions.values.contains(where: { $0.isRequested
+        })
         let shouldShowWhileFocused = (tabViewModel.tab.content == .newtab) && hasRequestedPermission
-        let isAnyPermissionPresent = tabViewModel.usedPermissions.values.contains(where: { !$0.isReloading})
+        let isAnyPermissionPresent = tabViewModel.usedPermissions.values.contains(where: {
+            !$0.isReloading
+        })
 
         permissionCenterButton.isShown = (shouldShowWhileFocused ||
                                           (!isTextFieldEditorFirstResponder && hasRequestedPermission) ||

From 4bfa91ee62ae5ccd3ceb17e215c7b2f4c8702517 Mon Sep 17 00:00:00 2001
From: Tom Strba <57389842+tomasstrba@users.noreply.github.com>
Date: Thu, 27 Nov 2025 15:31:23 +0100
Subject: [PATCH 07/40] Update
 macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../NavigationBar/View/AddressBarButtonsViewController.swift     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 1f873b5716e..c099f742fec 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -1918,7 +1918,6 @@ final class AddressBarButtonsViewController: NSViewController {
 
         updatePrivacyEntryPointIcon()
         updateAllPermissionButtons()
-        updatePermissionCenterButton()
     }
 
     private func stopAnimations(trackerAnimations: Bool = true,

From 6cfc29a1ad4afd2a25a5c3fd6dce00cf05f3d498 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Thu, 27 Nov 2025 18:38:36 +0100
Subject: [PATCH 08/40] Basic authorization prompt

---
 .../project.pbxproj                           |  6 ++
 .../Common/Localizables/UserText.swift        |  3 +
 .../Localization/Localizable.xcstrings        | 30 ++++++-
 .../AddressBarButtonsViewController.swift     |  2 +-
 .../View/PermissionAuthorizationPopover.swift |  7 +-
 .../PermissionAuthorizationSwiftUIView.swift  | 87 +++++++++++++++++++
 ...ermissionAuthorizationViewController.swift | 82 ++++++++++++++++-
 7 files changed, 213 insertions(+), 4 deletions(-)
 create mode 100644 macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift

diff --git a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
index 72ca9a83af9..0586597af90 100644
--- a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
+++ b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
@@ -94,6 +94,8 @@
 		1D4B03D72CA4432000224E99 /* BookmarkUrlExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D4B03D52CA4431C00224E99 /* BookmarkUrlExtension.swift */; };
 		1D4B03D92CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */; };
 		1D4B03DA2CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */; };
+		1D532BB12ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB02ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
+		1D532BB22ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB02ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
 		1D5C1AF12CFF58220073ED65 /* Logger+WebExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D5C1AF02CFF58170073ED65 /* Logger+WebExtensions.swift */; };
 		1D6216B229069BBF00386B2C /* BWKeyStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6216B129069BBF00386B2C /* BWKeyStorage.swift */; };
 		1D638D612C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D638D602C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift */; };
@@ -4238,6 +4240,7 @@
 		1D43EB3B292B664A0065E5D6 /* BWMessageIdGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BWMessageIdGenerator.swift; sourceTree = "<group>"; };
 		1D4B03D52CA4431C00224E99 /* BookmarkUrlExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkUrlExtension.swift; sourceTree = "<group>"; };
 		1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkUrlExtensionTests.swift; sourceTree = "<group>"; };
+		1D532BB02ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionAuthorizationSwiftUIView.swift; sourceTree = "<group>"; };
 		1D5C1AF02CFF58170073ED65 /* Logger+WebExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+WebExtensions.swift"; sourceTree = "<group>"; };
 		1D6216B129069BBF00386B2C /* BWKeyStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BWKeyStorage.swift; sourceTree = "<group>"; };
 		1D638D602C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationUpdateDetectorTests.swift; sourceTree = "<group>"; };
@@ -10832,6 +10835,7 @@
 			children = (
 				B64C84DD2692D7400048FEBE /* PermissionAuthorization.storyboard */,
 				B64C84E22692DC9F0048FEBE /* PermissionAuthorizationViewController.swift */,
+				1D532BB02ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift */,
 				B64C84EA2692DD650048FEBE /* PermissionAuthorizationPopover.swift */,
 				B6BBF17327475B15004F850E /* PopupBlockedPopover.swift */,
 				B64C852926942AC90048FEBE /* PermissionContextMenu.swift */,
@@ -13388,6 +13392,7 @@
 				37EE56122D5F197300D53C7C /* BadgeAnimationView.swift in Sources */,
 				37EE56132D5F197300D53C7C /* BadgeNotificationAnimationModel.swift in Sources */,
 				37EE56142D5F197300D53C7C /* CookieManagedNotificationContainerView.swift in Sources */,
+				1D532BB12ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */,
 				37EE56152D5F197300D53C7C /* CookieManagedNotificationView.swift in Sources */,
 				37EE56162D5F197300D53C7C /* CookieNotificationAnimationModel.swift in Sources */,
 				37EE56172D5F197300D53C7C /* NavigationBarBadgeAnimationView.swift in Sources */,
@@ -16378,6 +16383,7 @@
 				C126B35A2C820924005DC2A3 /* FreemiumDebugMenu.swift in Sources */,
 				B6A9E46B2614618A0067D1B9 /* OperatingSystemVersionExtension.swift in Sources */,
 				4BDFA4AE27BF19E500648192 /* ToggleableScrollView.swift in Sources */,
+				1D532BB22ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */,
 				7B0A6DFC2D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift in Sources */,
 				1D36F4242A3B85C50052B527 /* TabCleanupPreparer.swift in Sources */,
 				4B4D60DF2A0C875F00BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
diff --git a/macOS/DuckDuckGo/Common/Localizables/UserText.swift b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
index 9a39a0e2b76..deb2f57edf4 100644
--- a/macOS/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
@@ -975,6 +975,9 @@ struct UserText {
     static let permissionPopupLearnMoreLink = NSLocalizedString("permission.popup.learn-more.link", value: "Learn more about location services", comment: "Text of link that leads to web page with more informations about location services.")
     static let permissionPopupAllowButton = NSLocalizedString("permission.popup.allow.button", value: "Allow", comment: "Button that the user can use to authorise a web site to for, for example access location or camera and microphone etc.")
 
+    static let permissionPopupNeverAllowButton = NSLocalizedString("permission.popup.never.allow.button", value: "Never Allow", comment: "Button that denies permission and remembers the decision")
+    static let permissionPopupAlwaysAllowButton = NSLocalizedString("permission.popup.always.allow.button", value: "Always Allow", comment: "Button that grants permission and remembers the decision for future requests")
+
     static let privacyDashboardPermissionAsk = NSLocalizedString("dashboard.permission.ask", value: "Ask every time", comment: "Privacy Dashboard: Website should always Ask for permission for input media device access")
     static let privacyDashboardPermissionAlwaysAllow = NSLocalizedString("dashboard.permission.allow", value: "Always allow", comment: "Privacy Dashboard: Website can always access input media device")
     static let privacyDashboardPermissionAlwaysDeny = NSLocalizedString("dashboard.permission.deny", value: "Always deny", comment: "Privacy Dashboard: Website can never access input media device")
diff --git a/macOS/DuckDuckGo/Localization/Localizable.xcstrings b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
index d7efb4de7be..c979e51a2b8 100644
--- a/macOS/DuckDuckGo/Localization/Localizable.xcstrings
+++ b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
@@ -3774,6 +3774,10 @@
         }
       }
     },
+    "Allow \"%@\" to use your current location?" : {
+      "comment" : "A centered label in the checkout view asking the user if they want to allow a specific app to use their location. The text inside the quotes should be replaced with the name of the app.",
+      "isCommentAutoGenerated" : true
+    },
     "allow.integration" : {
       "comment" : "Setup of the integration with Bitwarden app",
       "extractionState" : "extracted_with_value",
@@ -60799,6 +60803,18 @@
         }
       }
     },
+    "permission.popup.always.allow.button" : {
+      "comment" : "Button that grants permission and remembers the decision for future requests",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Always Allow"
+          }
+        }
+      }
+    },
     "permission.popup.blocked.popover" : {
       "comment" : "Text of popover warning the user that a pop-up has been blocked",
       "extractionState" : "extracted_with_value",
@@ -60919,6 +60935,18 @@
         }
       }
     },
+    "permission.popup.never.allow.button" : {
+      "comment" : "Button that denies permission and remembers the decision",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Never Allow"
+          }
+        }
+      }
+    },
     "permission.popup.open.format" : {
       "comment" : "Menu action to open the blocked pop-up at the specified URL",
       "extractionState" : "extracted_with_value",
@@ -96582,5 +96610,5 @@
       }
     }
   },
-  "version" : "1.0"
+  "version" : "1.1"
 }
\ No newline at end of file
diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 1f873b5716e..8c255b5f6f9 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -61,7 +61,7 @@ final class AddressBarButtonsViewController: NSViewController {
     private var permissionAuthorizationPopover: PermissionAuthorizationPopover?
     private func permissionAuthorizationPopoverCreatingIfNeeded() -> PermissionAuthorizationPopover {
         return permissionAuthorizationPopover ?? {
-            let popover = PermissionAuthorizationPopover()
+            let popover = PermissionAuthorizationPopover(featureFlagger: featureFlagger)
             NotificationCenter.default.addObserver(self, selector: #selector(popoverDidClose), name: NSPopover.didCloseNotification, object: popover)
             NotificationCenter.default.addObserver(self, selector: #selector(popoverWillShow), name: NSPopover.willShowNotification, object: popover)
             self.permissionAuthorizationPopover = popover
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
index 172b1681d52..5a53b022a11 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
@@ -17,12 +17,16 @@
 //
 
 import Cocoa
+import BrowserServicesKit
+import FeatureFlags
 
 final class PermissionAuthorizationPopover: NSPopover {
 
     @nonobjc private var didShow: Bool = false
+    private let featureFlagger: FeatureFlagger
 
-    override init() {
+    init(featureFlagger: FeatureFlagger) {
+        self.featureFlagger = featureFlagger
         super.init()
 
         behavior = .applicationDefined
@@ -50,6 +54,7 @@ final class PermissionAuthorizationPopover: NSPopover {
         let storyboard = NSStoryboard(name: "PermissionAuthorization", bundle: nil)
         let controller = storyboard
             .instantiateController(withIdentifier: "PermissionAuthorizationViewController") as! PermissionAuthorizationViewController
+        controller.featureFlagger = featureFlagger
         contentViewController = controller
     }
     // swiftlint:enable force_cast
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
new file mode 100644
index 00000000000..8068dd1b45b
--- /dev/null
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -0,0 +1,87 @@
+//
+//  PermissionAuthorizationSwiftUIView.swift
+//
+//  Copyright © 2025 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import SwiftUI
+import Common
+
+struct PermissionAuthorizationSwiftUIView: View {
+    let domain: String
+    let onNeverAllow: () -> Void
+    let onAlwaysAllow: () -> Void
+
+    var body: some View {
+        VStack(spacing: 20) {
+            Text("Allow \"\(domain)\" to use your current location?")
+                .font(.system(size: 15))
+                .foregroundColor(Color(designSystemColor: .textPrimary))
+                .multilineTextAlignment(.center)
+                .fixedSize(horizontal: false, vertical: true)
+                .padding(.horizontal, 20)
+                .padding(.top, 20)
+
+            HStack(spacing: 12) {
+                Button(action: onNeverAllow) {
+                    Text(UserText.permissionPopupNeverAllowButton)
+                        .font(.system(size: 13))
+                        .foregroundColor(Color(designSystemColor: .textPrimary))
+                        .frame(maxWidth: .infinity)
+                        .padding(.vertical, 8)
+                        .background(Color(designSystemColor: .controlsFillSecondary))
+                        .cornerRadius(8)
+                }
+                .buttonStyle(PlainButtonStyle())
+                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.neverAllowButton")
+
+                Button(action: onAlwaysAllow) {
+                    Text(UserText.permissionPopupAlwaysAllowButton)
+                        .font(.system(size: 13))
+                        .foregroundColor(Color(designSystemColor: .textPrimary))
+                        .frame(maxWidth: .infinity)
+                        .padding(.vertical, 8)
+                        .background(Color(designSystemColor: .controlsFillSecondary))
+                        .cornerRadius(8)
+                }
+                .buttonStyle(PlainButtonStyle())
+                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.alwaysAllowButton")
+            }
+            .padding(.horizontal, 20)
+            .padding(.bottom, 20)
+        }
+    }
+}
+
+#if DEBUG
+struct PermissionAuthorizationSwiftUIView_Previews: PreviewProvider {
+    static var previews: some View {
+        PermissionAuthorizationSwiftUIView(
+            domain: "apple.com",
+            onNeverAllow: {},
+            onAlwaysAllow: {}
+        )
+        .previewDisplayName("Light Mode")
+
+        PermissionAuthorizationSwiftUIView(
+            domain: "apple.com",
+            onNeverAllow: {},
+            onAlwaysAllow: {}
+        )
+        .preferredColorScheme(.dark)
+        .previewDisplayName("Dark Mode")
+    }
+}
+#endif
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index 19a736e3c29..4391683522d 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -17,6 +17,9 @@
 //
 
 import Cocoa
+import SwiftUI
+import BrowserServicesKit
+import FeatureFlags
 
 extension PermissionType {
     var localizedDescription: String {
@@ -66,14 +69,23 @@ final class PermissionAuthorizationViewController: NSViewController {
     @IBOutlet weak var linkButton: LinkButton!
     @IBOutlet weak var allowButton: NSButton!
 
+    var featureFlagger: FeatureFlagger?
+
     weak var query: PermissionAuthorizationQuery? {
         didSet {
             updateText()
+            setupSwiftUIViewIfNeeded()
         }
     }
 
     override func viewDidLoad() {
-        updateText()
+        super.viewDidLoad()
+
+        if featureFlagger?.isFeatureOn(.newPermissionView) == true {
+            setupSwiftUIViewIfNeeded()
+        } else {
+            updateText()
+        }
     }
 
     override func viewWillAppear() {
@@ -143,4 +155,72 @@ final class PermissionAuthorizationViewController: NSViewController {
     @IBAction func learnMoreAction(_ sender: NSButton) {
         Application.appDelegate.windowControllersManager.show(url: "https://help.duckduckgo.com/privacy/device-location-services".url, source: .ui, newTab: true)
     }
+
+    // Mark: - New Authorization View
+
+    private var swiftUIHostingView: NSHostingView<PermissionAuthorizationSwiftUIView>?
+
+    private func setupSwiftUIViewIfNeeded() {
+        guard isViewLoaded,
+              let query = query,
+              !query.permissions.isEmpty,
+              query.permissions.contains(.geolocation),
+              let featureFlagger = featureFlagger,
+              featureFlagger.isFeatureOn(.newPermissionView)
+        else {
+            // Hide SwiftUI view if it exists but shouldn't be shown
+            swiftUIHostingView?.isHidden = true
+            return
+        }
+
+        // Hide storyboard-based UI elements
+        descriptionLabel?.isHidden = true
+        domainNameLabel?.isHidden = true
+        alwaysAllowCheckbox?.isHidden = true
+        alwaysAllowStackView?.isHidden = true
+        learnMoreStackView?.isHidden = true
+        denyButton?.isHidden = true
+        allowButton?.isHidden = true
+        linkButton?.isHidden = true
+
+        // Create SwiftUI view if it doesn't exist
+        if swiftUIHostingView == nil {
+            let swiftUIView = PermissionAuthorizationSwiftUIView(
+                domain: query.domain,
+                onNeverAllow: { [weak self] in
+                    self?.handleNeverAllow()
+                },
+                onAlwaysAllow: { [weak self] in
+                    self?.handleAlwaysAllow()
+                }
+            )
+            let hostingView = NSHostingView(rootView: swiftUIView)
+            hostingView.translatesAutoresizingMaskIntoConstraints = false
+            view.addSubview(hostingView)
+
+            NSLayoutConstraint.activate([
+                hostingView.topAnchor.constraint(equalTo: view.topAnchor),
+                hostingView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+                hostingView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+                hostingView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+            ])
+
+            swiftUIHostingView = hostingView
+            
+            // Update preferred content size for the popover
+            preferredContentSize = NSSize(width: 400, height: 160)
+        } else {
+            swiftUIHostingView?.isHidden = false
+        }
+    }
+
+    private func handleNeverAllow() {
+        dismiss()
+        query?.handleDecision(grant: false)
+    }
+
+    private func handleAlwaysAllow() {
+        dismiss()
+        query?.handleDecision(grant: true, remember: true)
+    }
 }

From c0a1f56e67b2d704f756f45b5f5471a1dc90acd9 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Thu, 27 Nov 2025 20:40:14 +0100
Subject: [PATCH 09/40] Popover reorganized

---
 .../project.pbxproj                           |  12 +-
 .../View/PermissionAuthorizationPopover.swift |  34 ++++-
 .../PermissionAuthorizationSwiftUIView.swift  |   5 +-
 ...ermissionAuthorizationViewController.swift | 129 +++++++++---------
 4 files changed, 105 insertions(+), 75 deletions(-)

diff --git a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
index 0586597af90..ff7066d95c9 100644
--- a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
+++ b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
@@ -94,8 +94,8 @@
 		1D4B03D72CA4432000224E99 /* BookmarkUrlExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D4B03D52CA4431C00224E99 /* BookmarkUrlExtension.swift */; };
 		1D4B03D92CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */; };
 		1D4B03DA2CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */; };
-		1D532BB12ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB02ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
-		1D532BB22ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB02ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
+		1D532BB42ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
+		1D532BB52ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
 		1D5C1AF12CFF58220073ED65 /* Logger+WebExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D5C1AF02CFF58170073ED65 /* Logger+WebExtensions.swift */; };
 		1D6216B229069BBF00386B2C /* BWKeyStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6216B129069BBF00386B2C /* BWKeyStorage.swift */; };
 		1D638D612C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D638D602C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift */; };
@@ -4240,7 +4240,7 @@
 		1D43EB3B292B664A0065E5D6 /* BWMessageIdGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BWMessageIdGenerator.swift; sourceTree = "<group>"; };
 		1D4B03D52CA4431C00224E99 /* BookmarkUrlExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkUrlExtension.swift; sourceTree = "<group>"; };
 		1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkUrlExtensionTests.swift; sourceTree = "<group>"; };
-		1D532BB02ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionAuthorizationSwiftUIView.swift; sourceTree = "<group>"; };
+		1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionAuthorizationSwiftUIView.swift; sourceTree = "<group>"; };
 		1D5C1AF02CFF58170073ED65 /* Logger+WebExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+WebExtensions.swift"; sourceTree = "<group>"; };
 		1D6216B129069BBF00386B2C /* BWKeyStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BWKeyStorage.swift; sourceTree = "<group>"; };
 		1D638D602C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationUpdateDetectorTests.swift; sourceTree = "<group>"; };
@@ -10835,7 +10835,7 @@
 			children = (
 				B64C84DD2692D7400048FEBE /* PermissionAuthorization.storyboard */,
 				B64C84E22692DC9F0048FEBE /* PermissionAuthorizationViewController.swift */,
-				1D532BB02ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift */,
+				1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */,
 				B64C84EA2692DD650048FEBE /* PermissionAuthorizationPopover.swift */,
 				B6BBF17327475B15004F850E /* PopupBlockedPopover.swift */,
 				B64C852926942AC90048FEBE /* PermissionContextMenu.swift */,
@@ -13392,7 +13392,7 @@
 				37EE56122D5F197300D53C7C /* BadgeAnimationView.swift in Sources */,
 				37EE56132D5F197300D53C7C /* BadgeNotificationAnimationModel.swift in Sources */,
 				37EE56142D5F197300D53C7C /* CookieManagedNotificationContainerView.swift in Sources */,
-				1D532BB12ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */,
+				1D532BB52ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */,
 				37EE56152D5F197300D53C7C /* CookieManagedNotificationView.swift in Sources */,
 				37EE56162D5F197300D53C7C /* CookieNotificationAnimationModel.swift in Sources */,
 				37EE56172D5F197300D53C7C /* NavigationBarBadgeAnimationView.swift in Sources */,
@@ -16383,7 +16383,7 @@
 				C126B35A2C820924005DC2A3 /* FreemiumDebugMenu.swift in Sources */,
 				B6A9E46B2614618A0067D1B9 /* OperatingSystemVersionExtension.swift in Sources */,
 				4BDFA4AE27BF19E500648192 /* ToggleableScrollView.swift in Sources */,
-				1D532BB22ED89E1000D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */,
+				1D532BB42ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */,
 				7B0A6DFC2D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift in Sources */,
 				1D36F4242A3B85C50052B527 /* TabCleanupPreparer.swift in Sources */,
 				4B4D60DF2A0C875F00BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
index 5a53b022a11..bf00ae7fd2c 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
@@ -17,6 +17,7 @@
 //
 
 import Cocoa
+import SwiftUI
 import BrowserServicesKit
 import FeatureFlags
 
@@ -46,16 +47,39 @@ final class PermissionAuthorizationPopover: NSPopover {
     }
 
     // swiftlint:disable force_cast
-    var viewController: PermissionAuthorizationViewController { contentViewController as! PermissionAuthorizationViewController }
+    var viewController: PermissionAuthorizationViewController {
+        get {
+            // Ensure content controller is set up
+            if contentViewController == nil {
+                setupContentController()
+            }
+            return contentViewController as! PermissionAuthorizationViewController
+        }
+    }
     // swiftlint:enable force_cast
 
-    // swiftlint:disable force_cast
     private func setupContentController() {
+        // Check if we should use SwiftUI for this query
+        let controller: PermissionAuthorizationViewController
+
+        if featureFlagger.isFeatureOn(.newPermissionView) {
+
+            // Create programmatically with SwiftUI
+            controller = PermissionAuthorizationViewController(useSwiftUI: true)
+
+        } else {
+            // Load from storyboard
+            controller = setupStoryboardController()
+        }
+
+        contentViewController = controller
+    }
+
+    // swiftlint:disable force_cast
+    private func setupStoryboardController() -> PermissionAuthorizationViewController {
         let storyboard = NSStoryboard(name: "PermissionAuthorization", bundle: nil)
-        let controller = storyboard
+        return storyboard
             .instantiateController(withIdentifier: "PermissionAuthorizationViewController") as! PermissionAuthorizationViewController
-        controller.featureFlagger = featureFlagger
-        contentViewController = controller
     }
     // swiftlint:enable force_cast
 
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index 8068dd1b45b..2613954264b 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -40,7 +40,7 @@ struct PermissionAuthorizationSwiftUIView: View {
                         .font(.system(size: 13))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
-                        .padding(.vertical, 8)
+                        .frame(height: 32)
                         .background(Color(designSystemColor: .controlsFillSecondary))
                         .cornerRadius(8)
                 }
@@ -52,7 +52,7 @@ struct PermissionAuthorizationSwiftUIView: View {
                         .font(.system(size: 13))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
-                        .padding(.vertical, 8)
+                        .frame(height: 32)
                         .background(Color(designSystemColor: .controlsFillSecondary))
                         .cornerRadius(8)
                 }
@@ -62,6 +62,7 @@ struct PermissionAuthorizationSwiftUIView: View {
             .padding(.horizontal, 20)
             .padding(.bottom, 20)
         }
+        .frame(width: 400)
     }
 }
 
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index 4391683522d..32cc44623d2 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -18,8 +18,6 @@
 
 import Cocoa
 import SwiftUI
-import BrowserServicesKit
-import FeatureFlags
 
 extension PermissionType {
     var localizedDescription: String {
@@ -69,26 +67,54 @@ final class PermissionAuthorizationViewController: NSViewController {
     @IBOutlet weak var linkButton: LinkButton!
     @IBOutlet weak var allowButton: NSButton!
 
-    var featureFlagger: FeatureFlagger?
+    private var swiftUIHostingView: NSHostingView<PermissionAuthorizationSwiftUIView>?
+    private let useSwiftUI: Bool
 
     weak var query: PermissionAuthorizationQuery? {
         didSet {
-            updateText()
-            setupSwiftUIViewIfNeeded()
+            if useSwiftUI {
+                setupSwiftUIView()
+            } else {
+                updateText()
+            }
+        }
+    }
+
+    // Programmatic initializer for SwiftUI mode
+    init(useSwiftUI: Bool) {
+        self.useSwiftUI = useSwiftUI
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    // Storyboard initializer
+    required init?(coder: NSCoder) {
+        self.useSwiftUI = false
+        super.init(coder: coder)
+    }
+
+    override func loadView() {
+        if useSwiftUI {
+            // Create a simple container view for SwiftUI
+            view = NSView()
+        } else {
+            // Load from nib/storyboard
+            super.loadView()
         }
     }
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        if featureFlagger?.isFeatureOn(.newPermissionView) == true {
-            setupSwiftUIViewIfNeeded()
+        
+        if useSwiftUI {
+            setupSwiftUIView()
         } else {
             updateText()
         }
     }
 
     override func viewWillAppear() {
+        guard !useSwiftUI else { return }
+        
         alwaysAllowCheckbox.state = .off
         if query?.shouldShowCancelInsteadOfDeny == true {
             denyButton.title = UserText.cancel
@@ -99,7 +125,8 @@ final class PermissionAuthorizationViewController: NSViewController {
     }
 
     private func updateText() {
-        guard isViewLoaded,
+        guard !useSwiftUI,
+              isViewLoaded,
               let query = query,
               !query.permissions.isEmpty
         else { return }
@@ -135,15 +162,18 @@ final class PermissionAuthorizationViewController: NSViewController {
     }
 
     @IBAction func alwaysAllowLabelClick(_ sender: Any) {
+        guard !useSwiftUI else { return }
         alwaysAllowCheckbox.setNextState()
     }
 
     @IBAction func grantAction(_ sender: NSButton) {
+        guard !useSwiftUI else { return }
         self.dismiss()
         query?.handleDecision(grant: true, remember: query!.shouldShowAlwaysAllowCheckbox && alwaysAllowCheckbox.state == .on)
     }
 
     @IBAction func denyAction(_ sender: NSButton) {
+        guard !useSwiftUI else { return }
         self.dismiss()
         guard let query = query,
               !query.shouldShowCancelInsteadOfDeny
@@ -153,65 +183,40 @@ final class PermissionAuthorizationViewController: NSViewController {
     }
 
     @IBAction func learnMoreAction(_ sender: NSButton) {
+        guard !useSwiftUI else { return }
         Application.appDelegate.windowControllersManager.show(url: "https://help.duckduckgo.com/privacy/device-location-services".url, source: .ui, newTab: true)
     }
 
-    // Mark: - New Authorization View
+    // MARK: - SwiftUI View Setup
 
-    private var swiftUIHostingView: NSHostingView<PermissionAuthorizationSwiftUIView>?
+    private func setupSwiftUIView() {
+        guard useSwiftUI, let query = query else { return }
 
-    private func setupSwiftUIViewIfNeeded() {
-        guard isViewLoaded,
-              let query = query,
-              !query.permissions.isEmpty,
-              query.permissions.contains(.geolocation),
-              let featureFlagger = featureFlagger,
-              featureFlagger.isFeatureOn(.newPermissionView)
-        else {
-            // Hide SwiftUI view if it exists but shouldn't be shown
-            swiftUIHostingView?.isHidden = true
-            return
-        }
+        // Remove existing hosting view if any
+        swiftUIHostingView?.removeFromSuperview()
 
-        // Hide storyboard-based UI elements
-        descriptionLabel?.isHidden = true
-        domainNameLabel?.isHidden = true
-        alwaysAllowCheckbox?.isHidden = true
-        alwaysAllowStackView?.isHidden = true
-        learnMoreStackView?.isHidden = true
-        denyButton?.isHidden = true
-        allowButton?.isHidden = true
-        linkButton?.isHidden = true
-
-        // Create SwiftUI view if it doesn't exist
-        if swiftUIHostingView == nil {
-            let swiftUIView = PermissionAuthorizationSwiftUIView(
-                domain: query.domain,
-                onNeverAllow: { [weak self] in
-                    self?.handleNeverAllow()
-                },
-                onAlwaysAllow: { [weak self] in
-                    self?.handleAlwaysAllow()
-                }
-            )
-            let hostingView = NSHostingView(rootView: swiftUIView)
-            hostingView.translatesAutoresizingMaskIntoConstraints = false
-            view.addSubview(hostingView)
-
-            NSLayoutConstraint.activate([
-                hostingView.topAnchor.constraint(equalTo: view.topAnchor),
-                hostingView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-                hostingView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-                hostingView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
-            ])
-
-            swiftUIHostingView = hostingView
-            
-            // Update preferred content size for the popover
-            preferredContentSize = NSSize(width: 400, height: 160)
-        } else {
-            swiftUIHostingView?.isHidden = false
-        }
+        let swiftUIView = PermissionAuthorizationSwiftUIView(
+            domain: query.domain,
+            onNeverAllow: { [weak self] in
+                self?.handleNeverAllow()
+            },
+            onAlwaysAllow: { [weak self] in
+                self?.handleAlwaysAllow()
+            }
+        )
+
+        let hostingView = NSHostingView(rootView: swiftUIView)
+        hostingView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(hostingView)
+
+        NSLayoutConstraint.activate([
+            hostingView.topAnchor.constraint(equalTo: view.topAnchor),
+            hostingView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            hostingView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            hostingView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
+
+        swiftUIHostingView = hostingView
     }
 
     private func handleNeverAllow() {

From 55c017eab27f0bdf266a6ece7ec91bc0ad59d0a3 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Thu, 27 Nov 2025 21:33:57 +0100
Subject: [PATCH 10/40] Code improvements

---
 .../View/PermissionAuthorizationPopover.swift |  6 ++--
 .../PermissionAuthorizationSwiftUIView.swift  | 10 +++----
 ...ermissionAuthorizationViewController.swift | 28 +++++++++----------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
index bf00ae7fd2c..9910a25fa23 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationPopover.swift
@@ -59,13 +59,11 @@ final class PermissionAuthorizationPopover: NSPopover {
     // swiftlint:enable force_cast
 
     private func setupContentController() {
-        // Check if we should use SwiftUI for this query
         let controller: PermissionAuthorizationViewController
 
         if featureFlagger.isFeatureOn(.newPermissionView) {
-
-            // Create programmatically with SwiftUI
-            controller = PermissionAuthorizationViewController(useSwiftUI: true)
+            // Create programmatically
+            controller = PermissionAuthorizationViewController(newPermissionView: true)
 
         } else {
             // Load from storyboard
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index 2613954264b..7671fe9b0b2 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -27,7 +27,7 @@ struct PermissionAuthorizationSwiftUIView: View {
     var body: some View {
         VStack(spacing: 20) {
             Text("Allow \"\(domain)\" to use your current location?")
-                .font(.system(size: 15))
+                .font(.system(size: 13))
                 .foregroundColor(Color(designSystemColor: .textPrimary))
                 .multilineTextAlignment(.center)
                 .fixedSize(horizontal: false, vertical: true)
@@ -37,11 +37,11 @@ struct PermissionAuthorizationSwiftUIView: View {
             HStack(spacing: 12) {
                 Button(action: onNeverAllow) {
                     Text(UserText.permissionPopupNeverAllowButton)
-                        .font(.system(size: 13))
+                        .font(.system(size: 13, weight: .light))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
                         .frame(height: 32)
-                        .background(Color(designSystemColor: .controlsFillSecondary))
+                        .background(Color(designSystemColor: .controlsFillPrimary))
                         .cornerRadius(8)
                 }
                 .buttonStyle(PlainButtonStyle())
@@ -49,11 +49,11 @@ struct PermissionAuthorizationSwiftUIView: View {
 
                 Button(action: onAlwaysAllow) {
                     Text(UserText.permissionPopupAlwaysAllowButton)
-                        .font(.system(size: 13))
+                        .font(.system(size: 13, weight: .light))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
                         .frame(height: 32)
-                        .background(Color(designSystemColor: .controlsFillSecondary))
+                        .background(Color(designSystemColor: .controlsFillPrimary))
                         .cornerRadius(8)
                 }
                 .buttonStyle(PlainButtonStyle())
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index 32cc44623d2..ad8fb5b4cd5 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -68,11 +68,11 @@ final class PermissionAuthorizationViewController: NSViewController {
     @IBOutlet weak var allowButton: NSButton!
 
     private var swiftUIHostingView: NSHostingView<PermissionAuthorizationSwiftUIView>?
-    private let useSwiftUI: Bool
+    private let newPermissionView: Bool
 
     weak var query: PermissionAuthorizationQuery? {
         didSet {
-            if useSwiftUI {
+            if newPermissionView {
                 setupSwiftUIView()
             } else {
                 updateText()
@@ -81,19 +81,19 @@ final class PermissionAuthorizationViewController: NSViewController {
     }
 
     // Programmatic initializer for SwiftUI mode
-    init(useSwiftUI: Bool) {
-        self.useSwiftUI = useSwiftUI
+    init(newPermissionView: Bool) {
+        self.newPermissionView = newPermissionView
         super.init(nibName: nil, bundle: nil)
     }
 
     // Storyboard initializer
     required init?(coder: NSCoder) {
-        self.useSwiftUI = false
+        self.newPermissionView = false
         super.init(coder: coder)
     }
 
     override func loadView() {
-        if useSwiftUI {
+        if newPermissionView {
             // Create a simple container view for SwiftUI
             view = NSView()
         } else {
@@ -105,7 +105,7 @@ final class PermissionAuthorizationViewController: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        if useSwiftUI {
+        if newPermissionView {
             setupSwiftUIView()
         } else {
             updateText()
@@ -113,7 +113,7 @@ final class PermissionAuthorizationViewController: NSViewController {
     }
 
     override func viewWillAppear() {
-        guard !useSwiftUI else { return }
+        guard !newPermissionView else { return }
         
         alwaysAllowCheckbox.state = .off
         if query?.shouldShowCancelInsteadOfDeny == true {
@@ -125,7 +125,7 @@ final class PermissionAuthorizationViewController: NSViewController {
     }
 
     private func updateText() {
-        guard !useSwiftUI,
+        guard !newPermissionView,
               isViewLoaded,
               let query = query,
               !query.permissions.isEmpty
@@ -162,18 +162,18 @@ final class PermissionAuthorizationViewController: NSViewController {
     }
 
     @IBAction func alwaysAllowLabelClick(_ sender: Any) {
-        guard !useSwiftUI else { return }
+        guard !newPermissionView else { return }
         alwaysAllowCheckbox.setNextState()
     }
 
     @IBAction func grantAction(_ sender: NSButton) {
-        guard !useSwiftUI else { return }
+        guard !newPermissionView else { return }
         self.dismiss()
         query?.handleDecision(grant: true, remember: query!.shouldShowAlwaysAllowCheckbox && alwaysAllowCheckbox.state == .on)
     }
 
     @IBAction func denyAction(_ sender: NSButton) {
-        guard !useSwiftUI else { return }
+        guard !newPermissionView else { return }
         self.dismiss()
         guard let query = query,
               !query.shouldShowCancelInsteadOfDeny
@@ -183,14 +183,14 @@ final class PermissionAuthorizationViewController: NSViewController {
     }
 
     @IBAction func learnMoreAction(_ sender: NSButton) {
-        guard !useSwiftUI else { return }
+        guard !newPermissionView else { return }
         Application.appDelegate.windowControllersManager.show(url: "https://help.duckduckgo.com/privacy/device-location-services".url, source: .ui, newTab: true)
     }
 
     // MARK: - SwiftUI View Setup
 
     private func setupSwiftUIView() {
-        guard useSwiftUI, let query = query else { return }
+        guard newPermissionView, let query = query else { return }
 
         // Remove existing hosting view if any
         swiftUIHostingView?.removeFromSuperview()

From 6cb966a6046aa6876afb00386db4c6cd42d4842e Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Thu, 27 Nov 2025 21:48:52 +0100
Subject: [PATCH 11/40] Using correct popover for blocked popup

---
 .../View/AddressBarButtonsViewController.swift            | 8 ++++++++
 macOS/DuckDuckGo/Permissions/Model/PermissionType.swift   | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 1f873b5716e..66a3f00d667 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -1489,6 +1489,14 @@ final class AddressBarButtonsViewController: NSViewController {
 
         if featureFlagger.isFeatureOn(.newPermissionView) {
             button = permissionCenterButton
+            if query.permissions.first?.isPopups == true {
+                guard !query.wasShownOnce else { return }
+                popover = popupBlockedPopoverCreatingIfNeeded()
+            }
+            if query.permissions.first?.isExternalScheme == true {
+                query.shouldShowAlwaysAllowCheckbox = true
+                query.shouldShowCancelInsteadOfDeny = true
+            }
         } else {
             if query.permissions.contains(.camera)
                 || (query.permissions.contains(.microphone) && microphoneButton.isHidden && cameraButton.isShown) {
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
index ee879b148de..af4a41a9c20 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
@@ -95,6 +95,13 @@ extension PermissionType {
         return false
     }
 
+    var isPopups: Bool {
+        if case .popups = self {
+            return true
+        }
+        return false
+    }
+
 }
 
 extension Array where Element == PermissionType {

From c083a9cfa4d745800e90ab7ce7561d7db4793a11 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Fri, 28 Nov 2025 09:42:42 +0100
Subject: [PATCH 12/40] Improvements after code review

---
 .../PermissionCenterBell.imageset/Contents.json  |  12 ------------
 .../PermissionCenterBell.imageset/Union.pdf      | Bin 4633 -> 0 bytes
 .../PermissionCenterIcon.imageset/Contents.json  |  12 ------------
 .../PermissionCenterIcon.imageset/Union.pdf      | Bin 4274 -> 0 bytes
 .../View/AddressBarButtonsViewController.swift   |   7 +++----
 .../NavigationBar/View/NavigationBar.storyboard  |   4 ++--
 6 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Contents.json
 delete mode 100644 macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Union.pdf
 delete mode 100644 macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Contents.json
 delete mode 100644 macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Union.pdf

diff --git a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Contents.json b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Contents.json
deleted file mode 100644
index 4171612590a..00000000000
--- a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Union.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Union.pdf b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterBell.imageset/Union.pdf
deleted file mode 100644
index ad8e11a7f5d1ea3bb40561a69ea4a343f91e630f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4633
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

diff --git a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Contents.json b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Contents.json
deleted file mode 100644
index 4171612590a..00000000000
--- a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Union.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Union.pdf b/macOS/DuckDuckGo/Assets.xcassets/Images/PermissionCenterIcon.imageset/Union.pdf
deleted file mode 100644
index a61d7232df372b0fc1ab07f5e544908b35b26535..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4274
zcmai2c|4R~7q><ekwn%8*_SbxVN$YZH<n~)Fc`}WV<wX&iY$rj`x25p5wd3~OO!3y
zMQM@9zRNqK<@c-i{e0f%pXWZ`bM86!o^#Lre9yxVS5+4WOUMHF1Bnj+43q?7>|6jq
z;Q8}Fkdhk?iA5uDNFYcRc@<@kG`yrt6cHbgI*KGCzTJpoRir(}0r^v+gG4*woPkmh
zsO(Qf4=7C>DJTHEa9AY59Y9F0N<_g=j<R%Myf-4n$;r)Hn?iIG$tps`@7)Y^%VCNo
zLmXvfYPLFIaN~rUDwU<;5j9Q^oT&rj34@6v)YQh7H|YQ`<m7I1h?G&D!F|ykD!x)S
z^|Yuy!2e77_@~U>>;tlBG^MH}Hjnmsj;)QpkE#PR*Cy4`t{|9a4I66uEwz7}chD-v
z`*cNp#6(I5{qAv`@iUGM7ACXC1Nd$uGhvTTq9UEOb;5M^J#Cg^G7ATLk8%wc*?HJ^
zc^3bU24-#svewII1Dy6O#ladTX=0iufIV@ZfULM19?;gEa!r(7uqe{A-|st$En<6u
zD!BfHfRomi2A2UeiObB+OhH&Vu}$}6mmC{{22DZJ#WMtSQ+RujPRrIw=3Y|be$bYA
z;M(=dA#?361u*NF;;Q&V)p*z$m2UKDMOD2!M_vcA^ij44lDh>`dK_77=GY2SWCZZG
zxHMBA1yYA8vW$>b-#iZ|+X&ph$H_?!xp!P9Q2HKqWl+R4poSbBL@r5p-<Ga{%4nJ^
z`38`d#sDaC{|HLuNHm)RC79<*Cx<x&wMq<}j+x;o&(TWqu_LDxpTl9s)I&-aRX*K|
z=z|n6)G<UVp6s*f6Ff~FhhQ%`%F&uAd2%C=avDxJ#mSK0Ha~4ikhMH=r7eHjaf{cF
zk~=VONt?h<4L=(X(4u*+2sRKi28sYqg)(JBvsVoA3S5jSi|B`f>Vjf(1Pspfo64Nh
zy(HcD%K73NK!!CVYARSlH7QsBURwX;XZg=3)|huhLvHprCnM4&-E^n~xZ`ehwZ+@H
zfOV6*lgWEdf8=6`xZJ{y;Cgg@M8l2u>V;}XU)u4og=ZUxOXY)doO<+5Azm%i@8smb
z5)9sq-T-g%;kz7d{>^bqV+4){1_c1<*{5mkWx-{xt?PSUdvr=SY!y9tsh9}CRl&T<
z^x2Uf5t8c3JR(eyVG_^acD$aV<#$FD8+80M{8V^jaGFu~Kb$2;9V@(pOT{I~DDP;P
z@TSF@%{o^EH>CNcPiQvjUsuV7(+Mxe3*AnxNHe@tt9ngm8+a+<akPE+@+`FbawnvF
zy}L11u#=<Hx3etKM$kqiz~p=4-hB$C7Wj?4W`mLY@N5q~ga*PqrpUSUbU|{CX#v4-
zIrUu)lU^6R%OX5Kz8I%77ds$yN^K~&qQLSC)P;Us3V$agkF9^CQq`P%LC_rJu4Se<
zY68=NS=1_TH&hr?=h+psnrNB`8^Us>3RX}zK2qGJ-lMK(krDfBvt*6WE~*!?f!I_T
z;1$>7*sWe#h-<o+nMaKA;VbJ3cd+YX>uq0>h6Gs$Sk8fFC3<WKjx&_>rftT2ruL2P
z;K(%g!Bq3qrc_ia4FrVJb18JLb>(+SaK=09IvZ74RZ)-ekFi$T^d-!3uQ~XzHKr-#
z<z~On=j$&Vm>WvzhYVO{r{#_p>}uRC=y)A5DB3?ikTx*<#-`}0(o^e$8{{p4sAyY{
z=6fB}joC4XnwjHmENz~Am-(vu&*l2$hPE@?%f83GcX?kgV0!X_W^5Nv-1vh>g&C-u
zs9SU5(jz@nI<{9kOL{r&7o8<!%AjZLqS?6b=%`<?f2RE0E?g~2E#kSTwtu%!cVps(
zM4QsDC9$P0B_X8=CHtjbCF3Or72v9wG2@X5D^;`E$Ih!cZ`8`%U%G8qhq`|oHCRX-
zTX-~Iv1|9u7F2<Gl;zRq9p+hpJ8d_Rtkk3Y@$#iRx%uxMJFa%z)!Wds%a_&*I47MR
zm#%;AE(mJgV`KT4@LFy7)_cPby!gEO_8M+{Lfu@A=S0zDX5D=4>V)fLmTxlQtWWw1
z;REV}@QT}tUoY0q-2v~D-Qd@_(&*Ee&~Sy2<a=?We?5G&a5H74YSrr7_+04nv8C~O
z*=KJYyhia~g#%~~BEL_P&jv;Zt_0?5>m-FGR*K(B+5t^IS(}jxLbf8sZvdmYYCuZ{
z(FSmzzOwG}?x4ggVgW2}Tn#)mg2C(+0<#XC_3+-loW7Y;?V@Kz>sn{qa@xMMPKEm3
zVhz>i6XS!bPlOrYWmc_LpUG*>amjsf#iwlIDOPMu;vC4wBcZ?O>*ZmS;xavJ|Lc)^
z?5|QEgOih&lH<Txup8+vuW(}W)lye)cfaGFZknxK)gqkqW4#VOxR$PM={Z4Y(B5m>
z3a5G!JP@o&t__zUWPDB{oL%-ev>jN!KRUZK+s^E#rSk%o9V@9hl2Me9nlYB-n3$L(
zpzE#mHcNpYz&PZn$W|<6{#<7E64uC0Y*d1+3-_|5b1(W-A|7f1wn+B(DxDj%a?L7R
zHQRjev*xq7^N{`=M>YEN=;!ismy?ykSB-`p8(-F@byRPmVdV)m5Y#*dW&(Q-!#uf#
zaqS-JnT(aMoAmbe&$P@G!Z?SnM)Aq_%TvqydW(<YJ%)$<tiP{Q6yF@U*?ViEb^fC1
z0eqwF>tfAhquPdA=%(!^?IztKe%v?5w47kI{JAM_H&y#H|298nvure=^mX-GC;2<_
zE^^dpY{i?P9hyzfJ<CkE0({1--?Y%6ws>WqXDa)9+hQn3lry)m+{#?R^yfyAw?!Xa
z+P)0fkJzVlWDW%nt?hO0l|M9TtiHF=?K$H)7e0M*5`P?z7li1s47IJt?t~ll=c5m1
z*Nt2$bF+&K^2(=W<iuh7?>;4G(ezTK&z<W&KfV;v0!q+*{b0|r;F|lYv9@wVC8VP2
zTlzumL+GdK2R7o@FHAigwDz>#_A{U<=X+wm(OP$GFawnl$NC-=b+vSky@}a#4!yau
zIMq#_RA#+gi!JQP{nUCnsd!;H{b5G^tA;6T+jsR<-TE}$r=$CCUc0^>_v@Z9nRo9P
zclVFjJ-0Kt1DaZ{^ZFpMyBK)`N$DRXdgL3u8iVGy<;BRi`b`HrN*{w#X2co546A2^
z&x`n%EZ6LWcg3j}Hm>c34R^lG=g|+nRGSM5=-t|1HC>c`@p$0VSnqthd;7Scp8)!)
z>9*Zh<XCq~SHnf-g91O~-j}3{lLrm3Q((x3`I^s0S*xrIChBRG|2Tw8W`E1-MSaTV
z_L<iT>06z9BdfxDgR3bey*0f^8=a;~fBLN*4=D2LhCG8^%Z6kBLMhk60vnXhwT|^-
z6rU!`Ao5jILTb9miGGy<IZK5MrKFUEgEal{3$%*eSILae_(kvlQUiK?D_}~~S=0en
zyieCUSi5#SF?E5E^`OY$zEV`nUSJasq5XQ8<jrkQzY{iLZV;X3UMAZ2G5g1^QIrEO
zYp~MJ1#k==G_5|Jx5#?iP@bG6o;fcKaWB<i%mO}me9Nv$qcaBoOfyrSE2gC5j&Y1B
zP!pWbr#Ems@J@{y)Jt2*;TfNOX3wi8FcsMqisq!8(b1Hm(NR#R7`%-Pr}dpWlD3}@
zfJ8g|WQ4>KiFE>`e$&rG`uGc${ta6IL7FNm$_Ou{1CYd34S`l9Gl!F9eru7qs~Q1!
z$p}Z{u7_XX!<Rh*C@CQ)BT0OSe3V2<f3R5<j2i}P<bkmNp{)W2l3W`8P#|jkasm0n
z#sB5NP?C{9sV_M)UMY%`hfZxXJx79(-Tq#WPdue6jKVNhZBxVGt<8%k**a=QY3g^2
zzF~HI&ntZ1+G6A0V*9ovd%kIKd6!E_z&8rV)wDe~pK+#LbZdKl=7NICU5HT(_I0w>
zV(FPOMd7O=g)c(l7vi^U>qWPfYkHE}X*mq<i(y-*jOYDXH*)mUqdW6DM_G#3<@km(
zZz-LvGC!%oG$49=APqpbHhh~a<3fwv30Z>i0~=+WNl(nH_74qlNcF1bwRO(Cs<GE}
z@wcmVg;d6#70Dhw&Q}9+(wD6HWD><BEvvWv=y<(;0-+bdq~jiZ(U+gI_qM^=64e~$
zcEyB*sai#GZ#_4NZ<4aQ&g`2QX`LL8b3?bdXQ|96to6ei?_3bLydcIwAueweF&Bd7
zKcyEjm|{!+KwzKB{0zZBaICKTD`z7`#~c13d9m`NSCklS83tdTDv(v~D;cq*Xn@bM
z-PX<0>QxrEpo}PjYT36~dA~KRXOx%}W5&Sa;w3wULu(M##i_%1nVa&s4JsABF!r2M
zwkOoN7Qw7kMlFw>=Bc1-WyPQ7#kEDQFDqJ=bxL6v(j~~X<+vN7ULp8-5{-(o87f1T
zdB0kF^62axEZ9ExLTx!^BLZ)>)Ovq)5ICl>8RaG-m668kluWY{?3SA7Xk_mSur>^D
zJReOH<|31EE#v`H?A)vggWGmmHKR`4fF(sKL&H1uvE8yIw(G$G<?$>D|D!TUN9jjn
z27yTaK991$(ZhBPjmF@-fEHFiPqpzi4`SyAM>zdz&2*6tD1<VG0JI>M0jUUxW$=3d
zmXeT^k%B>Cz<)-+EEyubFnFvz(hEo`GSZPI^?)iEG!BU-dL)&_FA$Ev5;36MPv~F8
zLxTS4Ewxb&#H9jBJ0KPDFN=8MT=0Lb-;0R+%M$DlOC~6!HxdiSA{~)L*Q7;~f}x7?
z@^C|3Q^nXDqi}9WAP$R1{!{RpXh+PU8XSvpz}pi$Ss`_llRHBAhwH=D9PaVQWTDGw
z6bAi=@b}%JgFrh0g^<6bhw=9My?;`ie&j&~fkU`qoc`Pifw*dbBoHhK_>qpolt3X6
zX$a7f{x=3D2KZ2d{)I`&N)qqNzcH!*p$8@2WPj<&LH}#6v<!@R!v55ghJcAF`wN4@
zh}Z64m@M>PesNd?$_<GHkaD1@O3bhjL`uq1QdUYz1|lc?*Vkd*L53I%4oJ%B;TZxM
dp?r{}h!7*}g+pL*hcS|d5q~G}^Q-Br{|Do1FqQxS

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index a642300a8d9..21c0808e030 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -689,8 +689,7 @@ final class AddressBarButtonsViewController: NSViewController {
         })
 
         permissionCenterButton.isShown = (shouldShowWhileFocused ||
-                                          (!isTextFieldEditorFirstResponder && hasRequestedPermission) ||
-                                          isAnyPermissionPresent)
+                                          (!isTextFieldEditorFirstResponder && isAnyPermissionPresent))
         && !isAnyTrackerAnimationPlaying
         && !tabViewModel.isShowingErrorPage
 
@@ -703,9 +702,9 @@ final class AddressBarButtonsViewController: NSViewController {
         }
 
         if showBell {
-            permissionCenterButton.image = .permissionCenterBell
+            permissionCenterButton.image = DesignSystemImages.Color.Size16.heart
         } else {
-            permissionCenterButton.image = .permissionCenterIcon
+            permissionCenterButton.image = DesignSystemImages.Color.Size16.globe
         }
     }
 
diff --git a/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard b/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
index 21aa09b9eda..7c8135395cf 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
+++ b/macOS/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
@@ -1008,7 +1008,7 @@
                                     </button>
                                     <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7f7-ob-zog" customClass="AddressBarButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="24" height="32"/>
-                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="PermissionCenterIcon" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="AK6-34-TQm">
+                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Globe-Color-16" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="AK6-34-TQm">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
@@ -1268,12 +1268,12 @@
         <image name="Forward" width="16" height="16"/>
         <image name="Geolocation-Active" width="16" height="16"/>
         <image name="Geolocation-Icon" width="16" height="16"/>
+        <image name="Globe-Color-16" width="16" height="16"/>
         <image name="Home-16" width="16" height="16"/>
         <image name="HomePageLogo" width="56" height="56"/>
         <image name="Microphone-Active" width="12" height="16"/>
         <image name="Microphone-Icon" width="12" height="16"/>
         <image name="PasswordManagement" width="16" height="16"/>
-        <image name="PermissionCenterIcon" width="12" height="12"/>
         <image name="PopupBlocked" width="16" height="16"/>
         <image name="Refresh" width="16" height="16"/>
         <image name="Search" width="14" height="14"/>

From 22509d0834c41b6cdd8de65002ae0ed5bb520150 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Fri, 28 Nov 2025 09:56:43 +0100
Subject: [PATCH 13/40] Refactoring

---
 .../AddressBarButtonsViewController.swift     | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 21c0808e030..aaa3f50c193 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -679,24 +679,13 @@ final class AddressBarButtonsViewController: NSViewController {
             return
         }
 
-        // Show permission buttons when there's a requested permission on NTP even if address bar is focused,
-        // since NTP has the address bar focused by default
-        let hasRequestedPermission = tabViewModel.usedPermissions.values.contains(where: { $0.isRequested
-        })
-        let shouldShowWhileFocused = (tabViewModel.tab.content == .newtab) && hasRequestedPermission
-        let isAnyPermissionPresent = tabViewModel.usedPermissions.values.contains(where: {
-            !$0.isReloading
-        })
-
-        permissionCenterButton.isShown = (shouldShowWhileFocused ||
-                                          (!isTextFieldEditorFirstResponder && isAnyPermissionPresent))
-        && !isAnyTrackerAnimationPlaying
-        && !tabViewModel.isShowingErrorPage
+        permissionCenterButton.isShown = tabViewModel.shouldShowPermissionCenterButton(isTextFieldEditorFirstResponder: isTextFieldEditorFirstResponder,
+                                                                                       isAnyTrackerAnimationPlaying: isAnyTrackerAnimationPlaying)
 
         showOrHidePermissionCenterPopoverIfNeeded()
     }
 
-    private func updatePermissionCenterButtonIcon(showBell: Bool) {
+    private func updatePermissionCenterButtonIcon(showBell: Bool = false) {
         guard featureFlagger.isFeatureOn(.newPermissionView) else {
             return
         }
@@ -998,6 +987,7 @@ final class AddressBarButtonsViewController: NSViewController {
         geolocationButton.defaultImage = addressBarButtonsIconsProvider.locationIcon
         externalSchemeButton.defaultImage = addressBarButtonsIconsProvider.externalSchemeIcon
         popupsButton.defaultImage = addressBarButtonsIconsProvider.popupsIcon
+        updatePermissionCenterButtonIcon()
     }
 
     private func updateBookmarkButtonVisibility() {
@@ -2291,3 +2281,22 @@ extension URL {
         return false
     }
 }
+
+extension TabViewModel {
+
+    func shouldShowPermissionCenterButton(isTextFieldEditorFirstResponder: Bool, isAnyTrackerAnimationPlaying: Bool) -> Bool {
+        // Show permission buttons when there's a requested permission on NTP even if address bar is focused,
+        // since NTP has the address bar focused by default
+        let hasRequestedPermission = usedPermissions.values.contains(where: { $0.isRequested
+        })
+        let shouldShowWhileFocused = (tab.content == .newtab) && hasRequestedPermission
+        let isAnyPermissionPresent = usedPermissions.values.contains(where: {
+            !$0.isReloading
+        })
+
+        return (shouldShowWhileFocused || (!isTextFieldEditorFirstResponder && isAnyPermissionPresent))
+        && !isAnyTrackerAnimationPlaying
+        && !isShowingErrorPage
+    }
+
+}

From f480f2bbdcf899331f3afc3787d7a9dd667fe772 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Fri, 28 Nov 2025 11:45:05 +0100
Subject: [PATCH 14/40] Various kinds of permissions in new authorization
 dialog

---
 .../Common/Localizables/UserText.swift        |  3 +-
 .../Localization/Localizable.xcstrings        | 40 ++++++-----
 .../PermissionAuthorizationSwiftUIView.swift  | 68 +++++++++++++++----
 ...ermissionAuthorizationViewController.swift | 32 +++++++--
 4 files changed, 106 insertions(+), 37 deletions(-)

diff --git a/macOS/DuckDuckGo/Common/Localizables/UserText.swift b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
index 9e41748d7f2..9beb0938cce 100644
--- a/macOS/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
@@ -975,7 +975,8 @@ struct UserText {
     static let permissionPopupLearnMoreLink = NSLocalizedString("permission.popup.learn-more.link", value: "Learn more about location services", comment: "Text of link that leads to web page with more informations about location services.")
     static let permissionPopupAllowButton = NSLocalizedString("permission.popup.allow.button", value: "Allow", comment: "Button that the user can use to authorise a web site to for, for example access location or camera and microphone etc.")
 
-    static let permissionPopupNeverAllowButton = NSLocalizedString("permission.popup.never.allow.button", value: "Never Allow", comment: "Button that denies permission and remembers the decision")
+    static let permissionPopupDenyButton = NSLocalizedString("permission.popup.deny.button", value: "Deny", comment: "Button that denies permission for this request only")
+    static let permissionPopupAlwaysDenyButton = NSLocalizedString("permission.popup.always.deny.button", value: "Always Deny", comment: "Button that denies permission and remembers the decision for future requests")
     static let permissionPopupAlwaysAllowButton = NSLocalizedString("permission.popup.always.allow.button", value: "Always Allow", comment: "Button that grants permission and remembers the decision for future requests")
 
     static let privacyDashboardPermissionAsk = NSLocalizedString("dashboard.permission.ask", value: "Ask every time", comment: "Privacy Dashboard: Website should always Ask for permission for input media device access")
diff --git a/macOS/DuckDuckGo/Localization/Localizable.xcstrings b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
index 61c88b2ed6c..6c63adafc30 100644
--- a/macOS/DuckDuckGo/Localization/Localizable.xcstrings
+++ b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
@@ -3774,10 +3774,6 @@
         }
       }
     },
-    "Allow \"%@\" to use your current location?" : {
-      "comment" : "A centered label in the checkout view asking the user if they want to allow a specific app to use their location. The text inside the quotes should be replaced with the name of the app.",
-      "isCommentAutoGenerated" : true
-    },
     "allow.integration" : {
       "comment" : "Setup of the integration with Bitwarden app",
       "extractionState" : "extracted_with_value",
@@ -60922,6 +60918,18 @@
         }
       }
     },
+    "permission.popup.always.deny.button" : {
+      "comment" : "Button that denies permission and remembers the decision for future requests",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Always Deny"
+          }
+        }
+      }
+    },
     "permission.popup.blocked.popover" : {
       "comment" : "Text of popover warning the user that a pop-up has been blocked",
       "extractionState" : "extracted_with_value",
@@ -60982,6 +60990,18 @@
         }
       }
     },
+    "permission.popup.deny.button" : {
+      "comment" : "Button that denies permission for this request only",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Deny"
+          }
+        }
+      }
+    },
     "permission.popup.learn-more.link" : {
       "comment" : "Text of link that leads to web page with more informations about location services.",
       "extractionState" : "extracted_with_value",
@@ -61042,18 +61062,6 @@
         }
       }
     },
-    "permission.popup.never.allow.button" : {
-      "comment" : "Button that denies permission and remembers the decision",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Never Allow"
-          }
-        }
-      }
-    },
     "permission.popup.open.format" : {
       "comment" : "Menu action to open the blocked pop-up at the specified URL",
       "extractionState" : "extracted_with_value",
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index 7671fe9b0b2..a823c022708 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -21,12 +21,48 @@ import Common
 
 struct PermissionAuthorizationSwiftUIView: View {
     let domain: String
-    let onNeverAllow: () -> Void
+    let permissionType: PermissionType
+    let onDeny: () -> Void
+    let onAlwaysDeny: () -> Void
+    let onAllow: () -> Void
     let onAlwaysAllow: () -> Void
 
+    private var promptText: String {
+        switch permissionType {
+        case .geolocation:
+            return String(format: UserText.locationPermissionAuthorizationFormat, domain)
+        case .camera, .microphone:
+            return String(format: UserText.devicePermissionAuthorizationFormat, domain, permissionType.localizedDescription.lowercased())
+        case .popups:
+            return String(format: UserText.popupWindowsPermissionAuthorizationFormat, domain, permissionType.localizedDescription.lowercased())
+        case .externalScheme:
+            if domain.isEmpty {
+                return String(format: UserText.externalSchemePermissionAuthorizationNoDomainFormat, permissionType.localizedDescription)
+            } else {
+                return String(format: UserText.externalSchemePermissionAuthorizationFormat, domain, permissionType.localizedDescription)
+            }
+        }
+    }
+
+    private var denyButtonTitle: String {
+        permissionType == .geolocation ? UserText.permissionPopupDenyButton : UserText.permissionPopupAlwaysDenyButton
+    }
+
+    private var allowButtonTitle: String {
+        permissionType == .geolocation ? UserText.permissionPopupAllowButton : UserText.permissionPopupAlwaysAllowButton
+    }
+
+    private var denyAction: () -> Void {
+        permissionType == .geolocation ? onDeny : onAlwaysDeny
+    }
+
+    private var allowAction: () -> Void {
+        permissionType == .geolocation ? onAllow : onAlwaysAllow
+    }
+
     var body: some View {
         VStack(spacing: 20) {
-            Text("Allow \"\(domain)\" to use your current location?")
+            Text(promptText)
                 .font(.system(size: 13))
                 .foregroundColor(Color(designSystemColor: .textPrimary))
                 .multilineTextAlignment(.center)
@@ -35,8 +71,8 @@ struct PermissionAuthorizationSwiftUIView: View {
                 .padding(.top, 20)
 
             HStack(spacing: 12) {
-                Button(action: onNeverAllow) {
-                    Text(UserText.permissionPopupNeverAllowButton)
+                Button(action: denyAction) {
+                    Text(denyButtonTitle)
                         .font(.system(size: 13, weight: .light))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
@@ -45,10 +81,10 @@ struct PermissionAuthorizationSwiftUIView: View {
                         .cornerRadius(8)
                 }
                 .buttonStyle(PlainButtonStyle())
-                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.neverAllowButton")
+                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.denyButton")
 
-                Button(action: onAlwaysAllow) {
-                    Text(UserText.permissionPopupAlwaysAllowButton)
+                Button(action: allowAction) {
+                    Text(allowButtonTitle)
                         .font(.system(size: 13, weight: .light))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
@@ -57,12 +93,13 @@ struct PermissionAuthorizationSwiftUIView: View {
                         .cornerRadius(8)
                 }
                 .buttonStyle(PlainButtonStyle())
-                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.alwaysAllowButton")
+                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.allowButton")
             }
             .padding(.horizontal, 20)
             .padding(.bottom, 20)
         }
         .frame(width: 400)
+        .background(Color(designSystemColor: .containerFillPrimary))
     }
 }
 
@@ -71,18 +108,23 @@ struct PermissionAuthorizationSwiftUIView_Previews: PreviewProvider {
     static var previews: some View {
         PermissionAuthorizationSwiftUIView(
             domain: "apple.com",
-            onNeverAllow: {},
+            permissionType: .geolocation,
+            onDeny: {},
+            onAlwaysDeny: {},
+            onAllow: {},
             onAlwaysAllow: {}
         )
-        .previewDisplayName("Light Mode")
+        .previewDisplayName("Geolocation (Deny / Allow)")
 
         PermissionAuthorizationSwiftUIView(
             domain: "apple.com",
-            onNeverAllow: {},
+            permissionType: .camera,
+            onDeny: {},
+            onAlwaysDeny: {},
+            onAllow: {},
             onAlwaysAllow: {}
         )
-        .preferredColorScheme(.dark)
-        .previewDisplayName("Dark Mode")
+        .previewDisplayName("Camera (Always Deny / Always Allow)")
     }
 }
 #endif
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index ad8fb5b4cd5..f271a154a4f 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -190,15 +190,23 @@ final class PermissionAuthorizationViewController: NSViewController {
     // MARK: - SwiftUI View Setup
 
     private func setupSwiftUIView() {
-        guard newPermissionView, let query = query else { return }
+        guard newPermissionView, let query = query, let permissionType = query.permissions.first else { return }
 
-        // Remove existing hosting view if any
-        swiftUIHostingView?.removeFromSuperview()
+        // Remove all existing subviews to ensure clean state
+        view.subviews.forEach { $0.removeFromSuperview() }
+        swiftUIHostingView = nil
 
         let swiftUIView = PermissionAuthorizationSwiftUIView(
             domain: query.domain,
-            onNeverAllow: { [weak self] in
-                self?.handleNeverAllow()
+            permissionType: permissionType,
+            onDeny: { [weak self] in
+                self?.handleDeny()
+            },
+            onAlwaysDeny: { [weak self] in
+                self?.handleAlwaysDeny()
+            },
+            onAllow: { [weak self] in
+                self?.handleAllow()
             },
             onAlwaysAllow: { [weak self] in
                 self?.handleAlwaysAllow()
@@ -219,9 +227,19 @@ final class PermissionAuthorizationViewController: NSViewController {
         swiftUIHostingView = hostingView
     }
 
-    private func handleNeverAllow() {
+    private func handleDeny() {
+        dismiss()
+        query?.handleDecision(grant: false, remember: nil)
+    }
+
+    private func handleAlwaysDeny() {
+        dismiss()
+        query?.handleDecision(grant: false, remember: true)
+    }
+
+    private func handleAllow() {
         dismiss()
-        query?.handleDecision(grant: false)
+        query?.handleDecision(grant: true, remember: nil)
     }
 
     private func handleAlwaysAllow() {

From 25cdbfe4f0e659e59f347775dd249493f7a41471 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Fri, 28 Nov 2025 12:06:51 +0100
Subject: [PATCH 15/40] Padding adjusted

---
 .../PermissionAuthorizationSwiftUIView.swift     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index a823c022708..c4ddb57279c 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -63,17 +63,17 @@ struct PermissionAuthorizationSwiftUIView: View {
     var body: some View {
         VStack(spacing: 20) {
             Text(promptText)
-                .font(.system(size: 13))
+                .font(.system(size: 13, weight: .medium))
                 .foregroundColor(Color(designSystemColor: .textPrimary))
                 .multilineTextAlignment(.center)
                 .fixedSize(horizontal: false, vertical: true)
-                .padding(.horizontal, 20)
-                .padding(.top, 20)
+                .padding(.horizontal, 16)
+                .padding(.top, 16)
 
             HStack(spacing: 12) {
                 Button(action: denyAction) {
                     Text(denyButtonTitle)
-                        .font(.system(size: 13, weight: .light))
+                        .font(.system(size: 13))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
                         .frame(height: 32)
@@ -85,7 +85,7 @@ struct PermissionAuthorizationSwiftUIView: View {
 
                 Button(action: allowAction) {
                     Text(allowButtonTitle)
-                        .font(.system(size: 13, weight: .light))
+                        .font(.system(size: 13))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
                         .frame(height: 32)
@@ -95,10 +95,10 @@ struct PermissionAuthorizationSwiftUIView: View {
                 .buttonStyle(PlainButtonStyle())
                 .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.allowButton")
             }
-            .padding(.horizontal, 20)
-            .padding(.bottom, 20)
+            .padding(.horizontal, 16)
+            .padding(.bottom, 16)
         }
-        .frame(width: 400)
+        .frame(width: 360)
         .background(Color(designSystemColor: .containerFillPrimary))
     }
 }

From 7b12a02244dc71f1d3e66dc8d261c9566cfdeb4b Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Fri, 28 Nov 2025 20:07:16 +0100
Subject: [PATCH 16/40] SystemPermissionManager

---
 .../project.pbxproj                           |  12 +-
 .../Model/SystemPermissionManager.swift       | 171 ++++++++++++++++++
 ...ermissionAuthorizationViewController.swift |   2 +
 3 files changed, 182 insertions(+), 3 deletions(-)
 create mode 100644 macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift

diff --git a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
index 0556f6ff72b..1f2ae295a29 100644
--- a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
+++ b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
@@ -96,6 +96,8 @@
 		1D4B03DA2CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */; };
 		1D532BB42ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
 		1D532BB52ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
+		1D532BC92EDA1DF800D219FA /* SystemPermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BC82EDA1DF200D219FA /* SystemPermissionManager.swift */; };
+		1D532BCA2EDA1DF800D219FA /* SystemPermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BC82EDA1DF200D219FA /* SystemPermissionManager.swift */; };
 		1D5C1AF12CFF58220073ED65 /* Logger+WebExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D5C1AF02CFF58170073ED65 /* Logger+WebExtensions.swift */; };
 		1D6216B229069BBF00386B2C /* BWKeyStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6216B129069BBF00386B2C /* BWKeyStorage.swift */; };
 		1D638D612C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D638D602C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift */; };
@@ -2934,8 +2936,6 @@
 		B643BF1427ABF772000BACEC /* NSWorkspaceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B643BF1327ABF772000BACEC /* NSWorkspaceExtension.swift */; };
 		B644B43D29D56829003FA9AB /* SearchNonexistentDomainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B644B43929D565DB003FA9AB /* SearchNonexistentDomainTests.swift */; };
 		B644B43E29D5682B003FA9AB /* SearchNonexistentDomainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B644B43929D565DB003FA9AB /* SearchNonexistentDomainTests.swift */; };
-		B6F6B0022F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F6B0012F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift */; };
-		B6F6B0032F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F6B0012F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift */; };
 		B645D8F629FA95440024461F /* WKProcessPoolExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B645D8F529FA95440024461F /* WKProcessPoolExtension.swift */; };
 		B645D8F729FA95440024461F /* WKProcessPoolExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B645D8F529FA95440024461F /* WKProcessPoolExtension.swift */; };
 		B647EFBB2922584B00BA628D /* AdClickAttributionTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B647EFBA2922584B00BA628D /* AdClickAttributionTabExtension.swift */; };
@@ -3203,6 +3203,8 @@
 		B6F1B02F2BCE6B47005E863C /* TunnelControllerProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B02D2BCE6B47005E863C /* TunnelControllerProvider.swift */; };
 		B6F1C80B2761C45400334924 /* LocalUnprotectedDomains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336B39E22726B4B700C417D3 /* LocalUnprotectedDomains.swift */; };
 		B6F41031264D2B23003DA42C /* ProgressExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F41030264D2B23003DA42C /* ProgressExtension.swift */; };
+		B6F6B0022F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F6B0012F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift */; };
+		B6F6B0032F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F6B0012F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift */; };
 		B6F7127E29F6779000594A45 /* QRSharingService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F7127D29F6779000594A45 /* QRSharingService.swift */; };
 		B6F7127F29F6779000594A45 /* QRSharingService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F7127D29F6779000594A45 /* QRSharingService.swift */; };
 		B6F7128129F681EB00594A45 /* QuickLookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6F7128029F681EB00594A45 /* QuickLookUI.framework */; };
@@ -4259,6 +4261,7 @@
 		1D4B03D52CA4431C00224E99 /* BookmarkUrlExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkUrlExtension.swift; sourceTree = "<group>"; };
 		1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkUrlExtensionTests.swift; sourceTree = "<group>"; };
 		1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionAuthorizationSwiftUIView.swift; sourceTree = "<group>"; };
+		1D532BC82EDA1DF200D219FA /* SystemPermissionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemPermissionManager.swift; sourceTree = "<group>"; };
 		1D5C1AF02CFF58170073ED65 /* Logger+WebExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+WebExtensions.swift"; sourceTree = "<group>"; };
 		1D6216B129069BBF00386B2C /* BWKeyStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BWKeyStorage.swift; sourceTree = "<group>"; };
 		1D638D602C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationUpdateDetectorTests.swift; sourceTree = "<group>"; };
@@ -5609,7 +5612,6 @@
 		B642738127B65BAC0005DFD1 /* SecureVaultReporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureVaultReporter.swift; sourceTree = "<group>"; };
 		B643BF1327ABF772000BACEC /* NSWorkspaceExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSWorkspaceExtension.swift; sourceTree = "<group>"; };
 		B644B43929D565DB003FA9AB /* SearchNonexistentDomainTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchNonexistentDomainTests.swift; sourceTree = "<group>"; };
-		B6F6B0012F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowOpenSecurityTests.swift; sourceTree = "<group>"; };
 		B645D8F529FA95440024461F /* WKProcessPoolExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKProcessPoolExtension.swift; sourceTree = "<group>"; };
 		B647EFBA2922584B00BA628D /* AdClickAttributionTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdClickAttributionTabExtension.swift; sourceTree = "<group>"; };
 		B64C84DD2692D7400048FEBE /* PermissionAuthorization.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = PermissionAuthorization.storyboard; sourceTree = "<group>"; };
@@ -5805,6 +5807,7 @@
 		B6F1B0292BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionControllerTabExtension.swift; sourceTree = "<group>"; };
 		B6F1B02D2BCE6B47005E863C /* TunnelControllerProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelControllerProvider.swift; sourceTree = "<group>"; };
 		B6F41030264D2B23003DA42C /* ProgressExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressExtension.swift; sourceTree = "<group>"; };
+		B6F6B0012F1E1C2C00A1B2C3 /* WindowOpenSecurityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowOpenSecurityTests.swift; sourceTree = "<group>"; };
 		B6F7127D29F6779000594A45 /* QRSharingService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRSharingService.swift; sourceTree = "<group>"; };
 		B6F7128029F681EB00594A45 /* QuickLookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLookUI.framework; path = System/Library/Frameworks/QuickLookUI.framework; sourceTree = SDKROOT; };
 		B6F9BDDB2B45B7EE00677B33 /* WebsiteInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteInfo.swift; sourceTree = "<group>"; };
@@ -10900,6 +10903,7 @@
 				845F57282E97FCC900C7F78A /* PermissionManagerMock.swift */,
 				B64C853726944B880048FEBE /* StoredPermission.swift */,
 				B64C853C26944B940048FEBE /* PermissionStore.swift */,
+				1D532BC82EDA1DF200D219FA /* SystemPermissionManager.swift */,
 				B64C852E26943BC10048FEBE /* Permissions.xcdatamodeld */,
 			);
 			path = Model;
@@ -14014,6 +14018,7 @@
 				3706FB95293F65D500E42796 /* PermissionType.swift in Sources */,
 				3706FB96293F65D500E42796 /* RecentlyClosedWindow.swift in Sources */,
 				4B9DB0242A983B24000927DB /* WaitlistRequest.swift in Sources */,
+				1D532BCA2EDA1DF800D219FA /* SystemPermissionManager.swift in Sources */,
 				B690152D2ACBF4DA00AD0BAB /* MenuPreview.swift in Sources */,
 				1D36F4252A3B85C50052B527 /* TabCleanupPreparer.swift in Sources */,
 				BD7090D72C540D5D009EED82 /* EmptyMetadataCollector.swift in Sources */,
@@ -15968,6 +15973,7 @@
 				B6DB3CFB26A17CB800D459B7 /* PermissionModel.swift in Sources */,
 				4B92929C26670D2A00AD2C21 /* PasteboardFolder.swift in Sources */,
 				B5AE99542E84A5D900F45912 /* ThemeName.swift in Sources */,
+				1D532BC92EDA1DF800D219FA /* SystemPermissionManager.swift in Sources */,
 				EEA3EEB32B24EC0600E8333A /* VPNLocationViewModel.swift in Sources */,
 				B6106BAB26A7BF1D0013B453 /* PermissionType.swift in Sources */,
 				9F08B3112DE5A55400C68C0E /* DefaultBrowserAndDockPromptDebugMenu.swift in Sources */,
diff --git a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
new file mode 100644
index 00000000000..f90639be74b
--- /dev/null
+++ b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
@@ -0,0 +1,171 @@
+//
+//  SystemPermissionManager.swift
+//
+//  Copyright © 2025 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Combine
+import CoreLocation
+
+/// Represents the authorization state for a system permission
+enum SystemPermissionAuthorizationState {
+    /// Permission has not been requested yet
+    case notDetermined
+    /// Permission has been granted
+    case authorized
+    /// Permission has been denied by the user
+    case denied
+    /// Permission is restricted (parental controls, MDM, etc.)
+    case restricted
+    /// Services are disabled system-wide (e.g., Location Services off in System Settings)
+    case systemDisabled
+}
+
+/// Protocol for managing system-level permissions required before website permissions can be granted
+protocol SystemPermissionManagerProtocol: AnyObject {
+
+    // MARK: - Geolocation
+
+    /// Returns the current geolocation authorization state
+    var geolocationAuthorizationState: SystemPermissionAuthorizationState { get }
+
+    /// Publisher that emits the current geolocation authorization state whenever it changes
+    var geolocationAuthorizationStatePublisher: AnyPublisher<SystemPermissionAuthorizationState, Never> { get }
+
+    /// Returns true if geolocation authorization has been granted
+    var isGeolocationAuthorized: Bool { get }
+
+    /// Returns true if geolocation authorization needs to be requested
+    var isGeolocationAuthorizationRequired: Bool { get }
+
+    /// Requests geolocation authorization from the system
+    /// - Parameter completion: Called with the resulting authorization state after the user responds
+    /// - Returns: A cancellable that can be used to cancel the observation
+    @discardableResult
+    func requestGeolocationAuthorization(completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable
+
+    /// Requests geolocation authorization from the system using async/await
+    /// - Returns: The authorization state after the user responds
+    func requestGeolocationAuthorization() async -> SystemPermissionAuthorizationState
+}
+
+/// Manages system-level permissions required before website permissions can be granted
+final class SystemPermissionManager: SystemPermissionManagerProtocol {
+
+    private let geolocationService: GeolocationServiceProtocol
+
+    init(geolocationService: GeolocationServiceProtocol = GeolocationService.shared) {
+        self.geolocationService = geolocationService
+    }
+
+    // MARK: - Geolocation Authorization
+
+    /// Returns the current geolocation authorization state
+    var geolocationAuthorizationState: SystemPermissionAuthorizationState {
+        guard geolocationService.locationServicesEnabled() else {
+            return .systemDisabled
+        }
+
+        switch geolocationService.authorizationStatus {
+        case .notDetermined:
+            return .notDetermined
+        case .authorized, .authorizedAlways:
+            return .authorized
+        case .denied:
+            return .denied
+        case .restricted:
+            return .restricted
+        @unknown default:
+            return .notDetermined
+        }
+    }
+
+    /// Publisher that emits the current geolocation authorization state whenever it changes
+    var geolocationAuthorizationStatePublisher: AnyPublisher<SystemPermissionAuthorizationState, Never> {
+        geolocationService.authorizationStatusPublisher
+            .map { [weak self] _ in
+                self?.geolocationAuthorizationState ?? .notDetermined
+            }
+            .eraseToAnyPublisher()
+    }
+
+    /// Returns true if geolocation authorization has been granted
+    var isGeolocationAuthorized: Bool {
+        geolocationAuthorizationState == .authorized
+    }
+
+    /// Returns true if geolocation authorization needs to be requested
+    var isGeolocationAuthorizationRequired: Bool {
+        switch geolocationAuthorizationState {
+        case .notDetermined, .systemDisabled:
+            return true
+        case .authorized, .denied, .restricted:
+            return false
+        }
+    }
+
+    /// Requests geolocation authorization from the system
+    /// - Parameter completion: Called with the resulting authorization state after the user responds
+    /// - Returns: A cancellable that can be used to cancel the observation
+    @discardableResult
+    func requestGeolocationAuthorization(completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable {
+        // If already determined, return current state immediately
+        guard geolocationAuthorizationState == .notDetermined else {
+            completion(geolocationAuthorizationState)
+            return AnyCancellable {}
+        }
+
+        var locationCancellable: AnyCancellable?
+
+        // Subscribe to authorization status publisher to observe changes
+        let authorizationCancellable = geolocationService.authorizationStatusPublisher
+            .dropFirst() // Skip initial value, we want to observe changes
+            .first() // Only need the first change
+            .sink { [weak self] _ in
+                let state = self?.geolocationAuthorizationState ?? .notDetermined
+                // Cancel location subscription once we have the authorization result
+                locationCancellable?.cancel()
+                completion(state)
+            }
+
+        // Subscribe to location publisher to trigger authorization request
+        // The GeolocationService calls requestWhenInUseAuthorization() when first subscribed
+        // We keep this subscription alive until authorization is determined
+        locationCancellable = geolocationService.locationPublisher
+            .sink { _ in }
+
+        return AnyCancellable {
+            authorizationCancellable.cancel()
+            locationCancellable?.cancel()
+        }
+    }
+
+    /// Requests geolocation authorization from the system using async/await
+    /// - Returns: The authorization state after the user responds
+    func requestGeolocationAuthorization() async -> SystemPermissionAuthorizationState {
+        // If already determined, return current state immediately
+        guard geolocationAuthorizationState == .notDetermined else {
+            return geolocationAuthorizationState
+        }
+
+        return await withCheckedContinuation { continuation in
+            var cancellable: AnyCancellable?
+            cancellable = requestGeolocationAuthorization { state in
+                continuation.resume(returning: state)
+                cancellable?.cancel()
+            }
+        }
+    }
+}
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index f271a154a4f..9e848185643 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -56,6 +56,8 @@ extension Array where Element == PermissionType {
 
 final class PermissionAuthorizationViewController: NSViewController {
 
+    let systemPermissionManager = SystemPermissionManager()
+
     @IBOutlet var descriptionLabel: NSTextField!
     @IBOutlet var domainNameLabel: NSTextField!
     @IBOutlet var alwaysAllowCheckbox: NSButton!

From 09bf2062e10fc9205f908d5ede3481264a00ebf8 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Fri, 28 Nov 2025 22:03:53 +0100
Subject: [PATCH 17/40] System authorization UI

---
 .../project.pbxproj                           |   6 +-
 .../Common/Localizables/UserText.swift        |   8 +
 .../Localization/Localizable.xcstrings        |  72 ++++++
 .../PermissionAuthorizationSwiftUIView.swift  | 236 ++++++++++++++++--
 ...ermissionAuthorizationViewController.swift |   3 +-
 5 files changed, 305 insertions(+), 20 deletions(-)

diff --git a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
index 1f2ae295a29..4f575129491 100644
--- a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
+++ b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
@@ -4745,7 +4745,7 @@
 		4B1E6EEC27AB5E5100F51793 /* PasswordManagementListSection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordManagementListSection.swift; sourceTree = "<group>"; };
 		4B1E6EEF27AB5E5D00F51793 /* NSPopUpButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSPopUpButtonView.swift; sourceTree = "<group>"; };
 		4B1E6EF027AB5E5D00F51793 /* PasswordManagementItemList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordManagementItemList.swift; sourceTree = "<group>"; };
-		4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debug.systemextension */ = {isa = PBXFileReference; explicitFileType = "wrapper.system-extension"; includeInIndex = 0; path = "com.duckduckgo.macos.vpn.network-extension.debug.systemextension"; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debugg.systemextension */ = {isa = PBXFileReference; explicitFileType = "wrapper.system-extension"; includeInIndex = 0; path = "com.duckduckgo.macos.vpn.network-extension.debugg.systemextension"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B25376C2A11BF6D00610219 /* NetworkProtectionSystemExtension_SparkleDistribution.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = NetworkProtectionSystemExtension_SparkleDistribution.entitlements; sourceTree = "<group>"; };
 		4B25376D2A11BF6D00610219 /* NetworkProtectionSystemExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = NetworkProtectionSystemExtension.entitlements; sourceTree = "<group>"; };
 		4B25376E2A11BF8B00610219 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -9661,7 +9661,7 @@
 				3706FEB2293F662100E42796 /* Integration Tests App Store.xctest */,
 				B6EC37E829B5DA2A001ACE79 /* tests-server */,
 				4B4D603D2A0B290200BCD287 /* NetworkProtectionAppExtension.appex */,
-				4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debug.systemextension */,
+				4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debugg.systemextension */,
 				4B2D06392A11CFBB00DE1F49 /* DuckDuckGo VPN.app */,
 				4B2D06692A13318400DE1F49 /* DuckDuckGo VPN App Store.app */,
 				9D9AE8D12AAA39A70026E7DC /* DuckDuckGo Personal Information Removal.app */,
@@ -12113,7 +12113,7 @@
 				7BC15A1B2E1917D6000062C8 /* VPNNotifications */,
 			);
 			productName = NetworkProtectionSystemExtension;
-			productReference = 4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debug.systemextension */;
+			productReference = 4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debugg.systemextension */;
 			productType = "com.apple.product-type.system-extension";
 		};
 		4B2D06382A11CFBA00DE1F49 /* DuckDuckGoVPN */ = {
diff --git a/macOS/DuckDuckGo/Common/Localizables/UserText.swift b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
index 9beb0938cce..c69232c8e30 100644
--- a/macOS/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
@@ -984,6 +984,14 @@ struct UserText {
     static let privacyDashboardPermissionAlwaysDeny = NSLocalizedString("dashboard.permission.deny", value: "Always deny", comment: "Privacy Dashboard: Website can never access input media device")
     static let permissionPopoverDenyButton = NSLocalizedString("permission.popover.deny", value: "Deny", comment: "Permission Popover: Deny Website input media device access")
 
+    // Two-step permission authorization (geolocation)
+    static let permissionSystemLocationEnable = NSLocalizedString("permission.system.location.enable", value: "Enable System Location", comment: "Button to enable system location services")
+    static let permissionSystemLocationWaiting = NSLocalizedString("permission.system.location.waiting", value: "Waiting for system permission…", comment: "Text shown while waiting for user to respond to system location permission dialog")
+    static let permissionSystemLocationEnabled = NSLocalizedString("permission.system.location.enabled", value: "System location enabled!", comment: "Text shown after system location permission has been granted")
+    static let permissionSystemLocationDenied = NSLocalizedString("permission.system.location.denied", value: "System location denied", comment: "Text shown after system location permission has been denied")
+    static let permissionGeolocationPromptFormat = NSLocalizedString("permission.geolocation.prompt.format", value: "Allow %@ to use your current location?", comment: "Prompt asking if domain %@ can use location")
+    static let permissionPopupNeverAllowButton = NSLocalizedString("permission.popup.never.allow.button", value: "Never Allow", comment: "Button that denies permission and remembers the decision for future requests")
+
     static let privacyDashboardPopupsAlwaysAsk = NSLocalizedString("dashboard.popups.ask", value: "Notify", comment: "Make pop-up windows always request permission for the current domain")
 
     static let settings = NSLocalizedString("settings", value: "Settings", comment: "Menu item for opening settings")
diff --git a/macOS/DuckDuckGo/Localization/Localizable.xcstrings b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
index 6c63adafc30..42db058a3b9 100644
--- a/macOS/DuckDuckGo/Localization/Localizable.xcstrings
+++ b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
@@ -60546,6 +60546,18 @@
         }
       }
     },
+    "permission.geolocation.prompt.format" : {
+      "comment" : "Prompt asking if domain %@ can use location",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Allow %@ to use your current location?"
+          }
+        }
+      }
+    },
     "permission.microphone" : {
       "comment" : "Microphone input media device name",
       "extractionState" : "extracted_with_value",
@@ -61062,6 +61074,18 @@
         }
       }
     },
+    "permission.popup.never.allow.button" : {
+      "comment" : "Button that denies permission and remembers the decision for future requests",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Never Allow"
+          }
+        }
+      }
+    },
     "permission.popup.open.format" : {
       "comment" : "Menu action to open the blocked pop-up at the specified URL",
       "extractionState" : "extracted_with_value",
@@ -61523,6 +61547,54 @@
         }
       }
     },
+    "permission.system.location.denied" : {
+      "comment" : "Text shown after system location permission has been denied",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "System location denied"
+          }
+        }
+      }
+    },
+    "permission.system.location.enable" : {
+      "comment" : "Button to enable system location services",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Enable System Location"
+          }
+        }
+      }
+    },
+    "permission.system.location.enabled" : {
+      "comment" : "Text shown after system location permission has been granted",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "System location enabled!"
+          }
+        }
+      }
+    },
+    "permission.system.location.waiting" : {
+      "comment" : "Text shown while waiting for user to respond to system location permission dialog",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Waiting for system permission…"
+          }
+        }
+      }
+    },
     "permission.unmute" : {
       "comment" : "Resume input media device %@ access for %@ website",
       "extractionState" : "extracted_with_value",
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index c4ddb57279c..dfc2caa2e74 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -17,7 +17,7 @@
 //
 
 import SwiftUI
-import Common
+import Combine
 
 struct PermissionAuthorizationSwiftUIView: View {
     let domain: String
@@ -26,11 +26,29 @@ struct PermissionAuthorizationSwiftUIView: View {
     let onAlwaysDeny: () -> Void
     let onAllow: () -> Void
     let onAlwaysAllow: () -> Void
+    let systemPermissionManager: SystemPermissionManagerProtocol
+
+    /// State for the system permission step in two-step geolocation flow
+    enum SystemPermissionState {
+        case initial
+        case waiting
+        case authorized
+        case denied
+    }
+
+    @State private var systemPermissionState: SystemPermissionState = .initial
+    @State private var authorizationCancellable: AnyCancellable?
+
+    /// Whether to show the two-step UI (only for geolocation when system permission not granted)
+    private var showsTwoStepUI: Bool {
+        guard case .geolocation = permissionType else { return false }
+        return systemPermissionManager.isGeolocationAuthorizationRequired || systemPermissionState != .initial
+    }
 
     private var promptText: String {
         switch permissionType {
         case .geolocation:
-            return String(format: UserText.locationPermissionAuthorizationFormat, domain)
+            return String(format: UserText.permissionGeolocationPromptFormat, domain)
         case .camera, .microphone:
             return String(format: UserText.devicePermissionAuthorizationFormat, domain, permissionType.localizedDescription.lowercased())
         case .popups:
@@ -44,23 +62,172 @@ struct PermissionAuthorizationSwiftUIView: View {
         }
     }
 
-    private var denyButtonTitle: String {
-        permissionType == .geolocation ? UserText.permissionPopupDenyButton : UserText.permissionPopupAlwaysDenyButton
+    var body: some View {
+        if showsTwoStepUI {
+            twoStepGeolocationView
+        } else {
+            standardPermissionView
+        }
     }
 
-    private var allowButtonTitle: String {
-        permissionType == .geolocation ? UserText.permissionPopupAllowButton : UserText.permissionPopupAlwaysAllowButton
+    // MARK: - Two-Step Geolocation View
+
+    private var twoStepGeolocationView: some View {
+        VStack(spacing: 16) {
+            // Prompt text
+            Text(promptText)
+                .font(.system(size: 13, weight: .medium))
+                .foregroundColor(Color(designSystemColor: .textPrimary))
+                .multilineTextAlignment(.center)
+                .fixedSize(horizontal: false, vertical: true)
+                .padding(.horizontal, 16)
+                .padding(.top, 16)
+
+            // Step 1: System permission
+            stepOneView
+                .padding(.horizontal, 16)
+
+            // Step 2: Website permission
+            stepTwoView
+                .padding(.horizontal, 16)
+                .padding(.bottom, 16)
+        }
+        .frame(width: 360)
+        .background(Color(designSystemColor: .containerFillPrimary))
     }
 
-    private var denyAction: () -> Void {
-        permissionType == .geolocation ? onDeny : onAlwaysDeny
+    @ViewBuilder
+    private var stepOneView: some View {
+        HStack(spacing: 12) {
+            stepIndicator(step: 1, isActive: systemPermissionState != .authorized)
+
+            switch systemPermissionState {
+            case .initial:
+                Button(action: requestSystemPermission) {
+                    Text(UserText.permissionSystemLocationEnable)
+                        .font(.system(size: 13))
+                        .foregroundColor(.white)
+                        .frame(maxWidth: .infinity)
+                        .frame(height: 36)
+                        .background(Color.accentColor)
+                        .cornerRadius(8)
+                }
+                .buttonStyle(PlainButtonStyle())
+                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.enableSystemLocationButton")
+
+            case .waiting:
+                Text(UserText.permissionSystemLocationWaiting)
+                    .font(.system(size: 13))
+                    .foregroundColor(Color(designSystemColor: .textSecondary))
+                    .frame(maxWidth: .infinity)
+                    .frame(height: 36)
+                    .background(Color(designSystemColor: .controlsFillSecondary))
+                    .cornerRadius(8)
+
+            case .authorized:
+                HStack(spacing: 8) {
+                    Image(systemName: "checkmark.circle.fill")
+                        .foregroundColor(Color(NSColor.systemGreen))
+                        .font(.system(size: 20))
+
+                    Text(UserText.permissionSystemLocationEnabled)
+                        .font(.system(size: 13, weight: .medium))
+                        .foregroundColor(Color(NSColor.systemGreen))
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .frame(height: 36)
+
+            case .denied:
+                HStack(spacing: 8) {
+                    Image(systemName: "xmark.circle.fill")
+                        .foregroundColor(Color(NSColor.systemRed))
+                        .font(.system(size: 20))
+
+                    Text(UserText.permissionSystemLocationDenied)
+                        .font(.system(size: 13, weight: .medium))
+                        .foregroundColor(Color(NSColor.systemRed))
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .frame(height: 36)
+            }
+        }
     }
 
-    private var allowAction: () -> Void {
-        permissionType == .geolocation ? onAllow : onAlwaysAllow
+    @ViewBuilder
+    private var stepTwoView: some View {
+        let isEnabled = systemPermissionState == .authorized
+
+        HStack(spacing: 12) {
+            stepIndicator(step: 2, isActive: isEnabled)
+
+            HStack(spacing: 8) {
+                Button(action: onAlwaysDeny) {
+                    Text(UserText.permissionPopupNeverAllowButton)
+                        .font(.system(size: 13))
+                        .foregroundColor(isEnabled ? Color(designSystemColor: .textPrimary) : Color(designSystemColor: .textSecondary))
+                        .frame(maxWidth: .infinity)
+                        .frame(height: 36)
+                        .background(isEnabled ? Color(designSystemColor: .controlsFillPrimary) : Color(designSystemColor: .controlsFillSecondary))
+                        .cornerRadius(8)
+                }
+                .buttonStyle(PlainButtonStyle())
+                .disabled(!isEnabled)
+                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.neverAllowButton")
+
+                Button(action: onAlwaysAllow) {
+                    Text(UserText.permissionPopupAlwaysAllowButton)
+                        .font(.system(size: 13))
+                        .foregroundColor(isEnabled ? Color(designSystemColor: .textPrimary) : Color(designSystemColor: .textSecondary))
+                        .frame(maxWidth: .infinity)
+                        .frame(height: 36)
+                        .background(isEnabled ? Color(designSystemColor: .controlsFillPrimary) : Color(designSystemColor: .controlsFillSecondary))
+                        .cornerRadius(8)
+                }
+                .buttonStyle(PlainButtonStyle())
+                .disabled(!isEnabled)
+                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.alwaysAllowButton")
+            }
+        }
     }
 
-    var body: some View {
+    private func stepIndicator(step: Int, isActive: Bool) -> some View {
+        ZStack {
+            if isActive {
+                Circle()
+                    .fill(Color.primary)
+                    .frame(width: 28, height: 28)
+            } else {
+                Circle()
+                    .stroke(Color.secondary.opacity(0.4), lineWidth: 1)
+                    .frame(width: 28, height: 28)
+            }
+
+            Text("\(step)")
+                .font(.system(size: 13, weight: .semibold))
+                .foregroundColor(isActive ? Color(NSColor.windowBackgroundColor) : Color.secondary.opacity(0.6))
+        }
+    }
+
+    private func requestSystemPermission() {
+        systemPermissionState = .waiting
+
+        authorizationCancellable = systemPermissionManager.requestGeolocationAuthorization { state in
+            DispatchQueue.main.async {
+                switch state {
+                case .authorized:
+                    systemPermissionState = .authorized
+                case .denied, .restricted, .systemDisabled:
+                    systemPermissionState = .denied
+                case .notDetermined:
+                    systemPermissionState = .initial
+                }
+            }
+        }
+    }
+
+    // MARK: - Standard Permission View
+
+    private var standardPermissionView: some View {
         VStack(spacing: 20) {
             Text(promptText)
                 .font(.system(size: 13, weight: .medium))
@@ -71,8 +238,8 @@ struct PermissionAuthorizationSwiftUIView: View {
                 .padding(.top, 16)
 
             HStack(spacing: 12) {
-                Button(action: denyAction) {
-                    Text(denyButtonTitle)
+                Button(action: standardDenyAction) {
+                    Text(standardDenyButtonTitle)
                         .font(.system(size: 13))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
@@ -83,8 +250,8 @@ struct PermissionAuthorizationSwiftUIView: View {
                 .buttonStyle(PlainButtonStyle())
                 .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.denyButton")
 
-                Button(action: allowAction) {
-                    Text(allowButtonTitle)
+                Button(action: standardAllowAction) {
+                    Text(standardAllowButtonTitle)
                         .font(.system(size: 13))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
@@ -101,6 +268,43 @@ struct PermissionAuthorizationSwiftUIView: View {
         .frame(width: 360)
         .background(Color(designSystemColor: .containerFillPrimary))
     }
+
+    private var standardDenyButtonTitle: String {
+        permissionType == .geolocation ? UserText.permissionPopupDenyButton : UserText.permissionPopupAlwaysDenyButton
+    }
+
+    private var standardAllowButtonTitle: String {
+        permissionType == .geolocation ? UserText.permissionPopupAllowButton : UserText.permissionPopupAlwaysAllowButton
+    }
+
+    private var standardDenyAction: () -> Void {
+        permissionType == .geolocation ? onDeny : onAlwaysDeny
+    }
+
+    private var standardAllowAction: () -> Void {
+        permissionType == .geolocation ? onAllow : onAlwaysAllow
+    }
+}
+
+// MARK: - Convenience Initializer
+
+extension PermissionAuthorizationSwiftUIView {
+    init(
+        domain: String,
+        permissionType: PermissionType,
+        onDeny: @escaping () -> Void,
+        onAlwaysDeny: @escaping () -> Void,
+        onAllow: @escaping () -> Void,
+        onAlwaysAllow: @escaping () -> Void
+    ) {
+        self.domain = domain
+        self.permissionType = permissionType
+        self.onDeny = onDeny
+        self.onAlwaysDeny = onAlwaysDeny
+        self.onAllow = onAllow
+        self.onAlwaysAllow = onAlwaysAllow
+        self.systemPermissionManager = SystemPermissionManager()
+    }
 }
 
 #if DEBUG
@@ -114,7 +318,7 @@ struct PermissionAuthorizationSwiftUIView_Previews: PreviewProvider {
             onAllow: {},
             onAlwaysAllow: {}
         )
-        .previewDisplayName("Geolocation (Deny / Allow)")
+        .previewDisplayName("Geolocation - Two Step")
 
         PermissionAuthorizationSwiftUIView(
             domain: "apple.com",
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index 9e848185643..640b311ffeb 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -212,7 +212,8 @@ final class PermissionAuthorizationViewController: NSViewController {
             },
             onAlwaysAllow: { [weak self] in
                 self?.handleAlwaysAllow()
-            }
+            },
+            systemPermissionManager: systemPermissionManager
         )
 
         let hostingView = NSHostingView(rootView: swiftUIView)

From fbab23a1013bcadf7b225ccb0d133fdb85554d4d Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sat, 29 Nov 2025 09:55:10 +0100
Subject: [PATCH 18/40] Permission assertions handled

---
 .../Permissions/Model/PermissionManager.swift      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
index 6d9a4de854d..3e0f64e4598 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
@@ -17,9 +17,12 @@
 //
 
 import Foundation
+import BrowserServicesKit
 import Combine
 import Common
+import FeatureFlags
 import os.log
+import AppKit
 
 protocol PermissionManagerProtocol: AnyObject {
 
@@ -39,13 +42,15 @@ protocol PermissionManagerProtocol: AnyObject {
 final class PermissionManager: PermissionManagerProtocol {
 
     private let store: PermissionStore
+    private let featureFlagger: FeatureFlagger
     private var permissions = [String: [PermissionType: StoredPermission]]()
 
     private let permissionSubject = PassthroughSubject<PublishedPermission, Never>()
     var permissionPublisher: AnyPublisher<PublishedPermission, Never> { permissionSubject.eraseToAnyPublisher() }
 
-    init(store: PermissionStore) {
+    init(store: PermissionStore, featureFlagger: FeatureFlagger = NSApp.delegateTyped.featureFlagger) {
         self.store = store
+        self.featureFlagger = featureFlagger
         loadPermissions()
     }
 
@@ -76,8 +81,11 @@ final class PermissionManager: PermissionManagerProtocol {
     }
 
     func setPermission(_ decision: PersistedPermissionDecision, forDomain domain: String, permissionType: PermissionType) {
-        assert(permissionType.canPersistGrantedDecision || decision != .allow)
-        assert(permissionType.canPersistDeniedDecision || decision != .deny)
+
+        if !featureFlagger.isFeatureOn(.newPermissionView) {
+            assert(permissionType.canPersistGrantedDecision || decision != .allow)
+            assert(permissionType.canPersistDeniedDecision || decision != .deny)
+        }
 
         let storedPermission: StoredPermission
         let domain = domain.droppingWwwPrefix()

From 841b807d678ad8bfbc76e61c8a813f1155fb54ad Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sat, 29 Nov 2025 10:35:11 +0100
Subject: [PATCH 19/40] External schemes authorization flow finalized

---
 .../DuckDuckGo/Application/AppDelegate.swift  |  6 +--
 .../Common/Localizables/UserText.swift        |  2 +-
 .../Localization/Localizable.xcstrings        |  2 +-
 .../Permissions/Model/PermissionManager.swift |  9 ++--
 .../Permissions/Model/PermissionModel.swift   | 11 +++--
 .../Permissions/Model/PermissionType.swift    | 47 +++++++++++++------
 .../View/PermissionContextMenu.swift          |  6 +--
 .../PrivacyDashboardPermissionHandler.swift   |  4 +-
 macOS/DuckDuckGo/Tab/Model/Tab.swift          |  3 +-
 .../Permissions/PermissionModelTests.swift    |  6 ++-
 .../PopupHandlingTabExtensionTests.swift      |  2 +-
 11 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/macOS/DuckDuckGo/Application/AppDelegate.swift b/macOS/DuckDuckGo/Application/AppDelegate.swift
index 1e3bb3952c8..6fe588084ab 100644
--- a/macOS/DuckDuckGo/Application/AppDelegate.swift
+++ b/macOS/DuckDuckGo/Application/AppDelegate.swift
@@ -705,16 +705,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         if AppVersion.runType.requiresEnvironment {
             fireproofDomains = FireproofDomains(store: FireproofDomainsStore(database: database.db, tableName: "FireproofDomains"), tld: tld)
             faviconManager = FaviconManager(cacheType: .standard(database.db), bookmarkManager: bookmarkManager, fireproofDomains: fireproofDomains)
-            permissionManager = PermissionManager(store: LocalPermissionStore(database: database.db))
+            permissionManager = PermissionManager(store: LocalPermissionStore(database: database.db), featureFlagger: featureFlagger)
         } else {
             fireproofDomains = FireproofDomains(store: FireproofDomainsStore(context: nil), tld: tld)
             faviconManager = FaviconManager(cacheType: .inMemory, bookmarkManager: bookmarkManager, fireproofDomains: fireproofDomains)
-            permissionManager = PermissionManager(store: LocalPermissionStore(database: nil))
+            permissionManager = PermissionManager(store: LocalPermissionStore(database: nil), featureFlagger: featureFlagger)
         }
 #else
         fireproofDomains = FireproofDomains(store: FireproofDomainsStore(database: database.db, tableName: "FireproofDomains"), tld: tld)
         faviconManager = FaviconManager(cacheType: .standard(database.db), bookmarkManager: bookmarkManager, fireproofDomains: fireproofDomains)
-        permissionManager = PermissionManager(store: LocalPermissionStore(database: database.db))
+        permissionManager = PermissionManager(store: LocalPermissionStore(database: database.db), featureFlagger: featureFlagger)
 #endif
 
         webCacheManager = WebCacheManager(fireproofDomains: fireproofDomains)
diff --git a/macOS/DuckDuckGo/Common/Localizables/UserText.swift b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
index c69232c8e30..2c0d3fd6d36 100644
--- a/macOS/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
@@ -976,7 +976,7 @@ struct UserText {
     static let permissionPopupAllowButton = NSLocalizedString("permission.popup.allow.button", value: "Allow", comment: "Button that the user can use to authorise a web site to for, for example access location or camera and microphone etc.")
 
     static let permissionPopupDenyButton = NSLocalizedString("permission.popup.deny.button", value: "Deny", comment: "Button that denies permission for this request only")
-    static let permissionPopupAlwaysDenyButton = NSLocalizedString("permission.popup.always.deny.button", value: "Always Deny", comment: "Button that denies permission and remembers the decision for future requests")
+    static let permissionPopupAlwaysDenyButton = NSLocalizedString("permission.popup.always.deny.button", value: "Never Allow", comment: "Button that denies permission and remembers the decision for future requests")
     static let permissionPopupAlwaysAllowButton = NSLocalizedString("permission.popup.always.allow.button", value: "Always Allow", comment: "Button that grants permission and remembers the decision for future requests")
 
     static let privacyDashboardPermissionAsk = NSLocalizedString("dashboard.permission.ask", value: "Ask every time", comment: "Privacy Dashboard: Website should always Ask for permission for input media device access")
diff --git a/macOS/DuckDuckGo/Localization/Localizable.xcstrings b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
index 42db058a3b9..ca3bd705a21 100644
--- a/macOS/DuckDuckGo/Localization/Localizable.xcstrings
+++ b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
@@ -60937,7 +60937,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Always Deny"
+            "value" : "Never Allow"
           }
         }
       }
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
index 3e0f64e4598..a1e7432cfcb 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
@@ -22,7 +22,6 @@ import Combine
 import Common
 import FeatureFlags
 import os.log
-import AppKit
 
 protocol PermissionManagerProtocol: AnyObject {
 
@@ -48,7 +47,7 @@ final class PermissionManager: PermissionManagerProtocol {
     private let permissionSubject = PassthroughSubject<PublishedPermission, Never>()
     var permissionPublisher: AnyPublisher<PublishedPermission, Never> { permissionSubject.eraseToAnyPublisher() }
 
-    init(store: PermissionStore, featureFlagger: FeatureFlagger = NSApp.delegateTyped.featureFlagger) {
+    init(store: PermissionStore, featureFlagger: FeatureFlagger) {
         self.store = store
         self.featureFlagger = featureFlagger
         loadPermissions()
@@ -82,10 +81,8 @@ final class PermissionManager: PermissionManagerProtocol {
 
     func setPermission(_ decision: PersistedPermissionDecision, forDomain domain: String, permissionType: PermissionType) {
 
-        if !featureFlagger.isFeatureOn(.newPermissionView) {
-            assert(permissionType.canPersistGrantedDecision || decision != .allow)
-            assert(permissionType.canPersistDeniedDecision || decision != .deny)
-        }
+        assert(permissionType.canPersistGrantedDecision(featureFlagger: featureFlagger) || decision != .allow)
+        assert(permissionType.canPersistDeniedDecision(featureFlagger: featureFlagger) || decision != .deny)
 
         let storedPermission: StoredPermission
         let domain = domain.droppingWwwPrefix()
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
index 467826cb877..34b3a42a9d7 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
@@ -17,8 +17,10 @@
 //
 
 import AVFoundation
+import BrowserServicesKit
 import Combine
 import CoreLocation
+import FeatureFlags
 import Foundation
 import Navigation
 import WebKit
@@ -36,6 +38,7 @@ final class PermissionModel {
 
     private let permissionManager: PermissionManagerProtocol
     private let geolocationService: GeolocationServiceProtocol
+    private let featureFlagger: FeatureFlagger
     weak var webView: WKWebView? {
         didSet {
             guard let webView = webView else { return }
@@ -48,9 +51,11 @@ final class PermissionModel {
 
     init(webView: WKWebView? = nil,
          permissionManager: PermissionManagerProtocol,
-         geolocationService: GeolocationServiceProtocol = GeolocationService.shared) {
+         geolocationService: GeolocationServiceProtocol = GeolocationService.shared,
+         featureFlagger: FeatureFlagger) {
         self.permissionManager = permissionManager
         self.geolocationService = geolocationService
+        self.featureFlagger = featureFlagger
         if let webView {
             self.webView = webView
             self.subscribe(to: webView)
@@ -268,9 +273,9 @@ final class PermissionModel {
         for permission in permissions {
             var grant: PersistedPermissionDecision
             let stored = permissionManager.permission(forDomain: domain, permissionType: permission)
-            if case .allow = stored, permission.canPersistGrantedDecision {
+            if case .allow = stored, permission.canPersistGrantedDecision(featureFlagger: featureFlagger) {
                 grant = .allow
-            } else if case .deny = stored, permission.canPersistDeniedDecision {
+            } else if case .deny = stored, permission.canPersistDeniedDecision(featureFlagger: featureFlagger) {
                 grant = .deny
             } else if let state = self.permissions[permission] {
                 switch state {
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
index af4a41a9c20..0df9de5aeb4 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
@@ -17,7 +17,9 @@
 //
 
 import Foundation
+import BrowserServicesKit
 import CommonObjCExtensions
+import FeatureFlags
 import WebKit
 
 enum PermissionType: Hashable {
@@ -69,22 +71,39 @@ extension PermissionType {
         return [.camera, .microphone, .geolocation]
     }
 
-    var canPersistGrantedDecision: Bool {
-        switch self {
-        case .camera, .microphone, .externalScheme:
-            return true
-        case .geolocation:
-            return false
-        case .popups:
-            return true
+    func canPersistGrantedDecision(featureFlagger: FeatureFlagger? = nil) -> Bool {
+        if let featureFlagger, featureFlagger.isFeatureOn(.newPermissionView) {
+            switch self {
+            case .camera, .microphone, .externalScheme, .popups:
+                return true
+            case .geolocation:
+                return false
+            }
+        } else {
+            switch self {
+            case .camera, .microphone, .externalScheme, .popups:
+                return true
+            case .geolocation:
+                return false
+            }
         }
     }
-    var canPersistDeniedDecision: Bool {
-        switch self {
-        case .camera, .microphone, .geolocation:
-            return true
-        case .popups, .externalScheme:
-            return false
+
+    func canPersistDeniedDecision(featureFlagger: FeatureFlagger? = nil) -> Bool {
+        if let featureFlagger, featureFlagger.isFeatureOn(.newPermissionView) {
+            switch self {
+            case .camera, .microphone, .geolocation, .externalScheme:
+                return true
+            case .popups:
+                return false
+            }
+        } else {
+            switch self {
+            case .camera, .microphone, .geolocation:
+                return true
+            case .popups, .externalScheme:
+                return false
+            }
         }
     }
 
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionContextMenu.swift b/macOS/DuckDuckGo/Permissions/View/PermissionContextMenu.swift
index cc16b5108f8..b9d2ce58ee8 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionContextMenu.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionContextMenu.swift
@@ -170,7 +170,7 @@ final class PermissionContextMenu: NSMenu {
         // only show one persistence option per permission type
         let reduced = permissions.reduce(into: [:], { $0[$1.key] = $1.value })
         for (permission, state) in reduced {
-            guard permission.canPersistGrantedDecision || permission.canPersistDeniedDecision else { continue }
+            guard permission.canPersistGrantedDecision(featureFlagger: featureFlagger) || permission.canPersistDeniedDecision(featureFlagger: featureFlagger) else { continue }
             if case .disabled = state { continue }
 
             addSeparator(if: numberOfItems > 0)
@@ -188,11 +188,11 @@ final class PermissionContextMenu: NSMenu {
             let isNotifyChecked = (permission == .popups && hasTemporaryPopupAllowance) ? false : (persistedValue == .ask)
             addItem(.alwaysAsk(permission, on: domain, target: self, isChecked: isNotifyChecked))
 
-            if permission.canPersistGrantedDecision {
+            if permission.canPersistGrantedDecision(featureFlagger: featureFlagger) {
                 addItem(.alwaysAllow(permission, on: domain, target: self, isChecked: persistedValue == .allow))
             }
 
-            if permission.canPersistDeniedDecision {
+            if permission.canPersistDeniedDecision(featureFlagger: featureFlagger) {
                 addItem(.alwaysDeny(permission, on: domain, target: self, isChecked: persistedValue == .deny))
             }
         }
diff --git a/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift b/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
index 88776b9d2e6..acbc2fb829d 100644
--- a/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
+++ b/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
@@ -102,9 +102,9 @@ final class PrivacyDashboardPermissionHandler {
             // don't show Permanently Allow if can't persist Granted Decision
             switch decision {
             case .grant:
-                guard item.permission.canPersistGrantedDecision else { return nil }
+                guard item.permission.canPersistGrantedDecision() else { return nil }
             case .deny:
-                guard item.permission.canPersistDeniedDecision else { return nil }
+                guard item.permission.canPersistDeniedDecision() else { return nil }
             case .ask: break
             }
             return [
diff --git a/macOS/DuckDuckGo/Tab/Model/Tab.swift b/macOS/DuckDuckGo/Tab/Model/Tab.swift
index 3a523c67904..dda4fc80d57 100644
--- a/macOS/DuckDuckGo/Tab/Model/Tab.swift
+++ b/macOS/DuckDuckGo/Tab/Model/Tab.swift
@@ -301,7 +301,8 @@ protocol TabDelegate: ContentOverlayUserScriptDelegate {
         webView.setAccessibilityIdentifier("WebView")
 
         permissions = PermissionModel(permissionManager: permissionManager,
-                                      geolocationService: geolocationService)
+                                      geolocationService: geolocationService,
+                                      featureFlagger: featureFlagger)
 
         let userContentControllerPromise = Future<UserContentController, Never>.promise()
         let userScriptsPublisher = userContentControllerPromise.future
diff --git a/macOS/UnitTests/Permissions/PermissionModelTests.swift b/macOS/UnitTests/Permissions/PermissionModelTests.swift
index 1a5abb23a0d..c75b9e937f6 100644
--- a/macOS/UnitTests/Permissions/PermissionModelTests.swift
+++ b/macOS/UnitTests/Permissions/PermissionModelTests.swift
@@ -33,6 +33,7 @@ final class PermissionModelTests: XCTestCase {
     var permissionManagerMock: PermissionManagerMock!
     var geolocationServiceMock: GeolocationServiceMock!
     var geolocationProviderMock: GeolocationProviderMock!
+    var featureFlaggerMock: MockFeatureFlagger!
     static var processPool: WKProcessPool!
     var webView: WebViewMock!
     var model: PermissionModel!
@@ -60,6 +61,7 @@ final class PermissionModelTests: XCTestCase {
 
         permissionManagerMock = PermissionManagerMock()
         geolocationServiceMock = GeolocationServiceMock()
+        featureFlaggerMock = MockFeatureFlagger()
 
         let configuration = WKWebViewConfiguration(processPool: Self.processPool)
         webView = WebViewMock(frame: NSRect(x: 0, y: 0, width: 50, height: 50), configuration: configuration)
@@ -69,7 +71,8 @@ final class PermissionModelTests: XCTestCase {
         webView.configuration.processPool.geolocationProvider = geolocationProviderMock
         model = PermissionModel(webView: webView,
                                 permissionManager: permissionManagerMock,
-                                geolocationService: geolocationServiceMock)
+                                geolocationService: geolocationServiceMock,
+                                featureFlagger: featureFlaggerMock)
 
         AVCaptureDeviceMock.authorizationStatuses = nil
     }
@@ -79,6 +82,7 @@ final class PermissionModelTests: XCTestCase {
         webView = nil
         permissionManagerMock = nil
         geolocationServiceMock = nil
+        featureFlaggerMock = nil
         pixelKit = nil
         geolocationProviderMock = nil
         model = nil
diff --git a/macOS/UnitTests/TabExtensionsTests/PopupHandlingTabExtensionTests.swift b/macOS/UnitTests/TabExtensionsTests/PopupHandlingTabExtensionTests.swift
index dccd3848795..49edf454bd7 100644
--- a/macOS/UnitTests/TabExtensionsTests/PopupHandlingTabExtensionTests.swift
+++ b/macOS/UnitTests/TabExtensionsTests/PopupHandlingTabExtensionTests.swift
@@ -46,7 +46,7 @@ final class PopupHandlingTabExtensionTests: XCTestCase {
         mockFeatureFlagger = MockFeatureFlagger()
         mockPopupBlockingConfig = MockPopupBlockingConfiguration()
         testPermissionManager = TestPermissionManager()
-        mockPermissionModel = PermissionModel(permissionManager: testPermissionManager)
+        mockPermissionModel = PermissionModel(permissionManager: testPermissionManager, featureFlagger: mockFeatureFlagger)
         webView = WebView()
         configuration = WKWebViewConfiguration()
         windowFeatures = WKWindowFeatures()

From d23abcf580d5c01fafe28cd4254b05cf60f170ab Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sat, 29 Nov 2025 18:49:25 +0100
Subject: [PATCH 20/40] Refactoring and polishing of the experience

---
 .../AddressBarButtonsViewController.swift     |   4 +-
 .../Permissions/Model/PermissionType.swift    |   4 +-
 .../Model/SystemPermissionManager.swift       |  38 +++++
 .../PermissionAuthorizationSwiftUIView.swift  | 142 +++++++++++++-----
 4 files changed, 148 insertions(+), 40 deletions(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 86ea7d70da5..df636698649 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -2290,9 +2290,7 @@ extension TabViewModel {
         let hasRequestedPermission = usedPermissions.values.contains(where: { $0.isRequested
         })
         let shouldShowWhileFocused = (tab.content == .newtab) && hasRequestedPermission
-        let isAnyPermissionPresent = usedPermissions.values.contains(where: {
-            !$0.isReloading
-        })
+        let isAnyPermissionPresent = !usedPermissions.values.isEmpty
 
         return (shouldShowWhileFocused || (!isTextFieldEditorFirstResponder && isAnyPermissionPresent))
         && !isAnyTrackerAnimationPlaying
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
index 0df9de5aeb4..1b7ba085df2 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
@@ -74,10 +74,8 @@ extension PermissionType {
     func canPersistGrantedDecision(featureFlagger: FeatureFlagger? = nil) -> Bool {
         if let featureFlagger, featureFlagger.isFeatureOn(.newPermissionView) {
             switch self {
-            case .camera, .microphone, .externalScheme, .popups:
+            case .camera, .microphone, .externalScheme, .popups, .geolocation:
                 return true
-            case .geolocation:
-                return false
             }
         } else {
             switch self {
diff --git a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
index f90639be74b..ba4dc1ab9cb 100644
--- a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
@@ -59,6 +59,19 @@ protocol SystemPermissionManagerProtocol: AnyObject {
     /// Requests geolocation authorization from the system using async/await
     /// - Returns: The authorization state after the user responds
     func requestGeolocationAuthorization() async -> SystemPermissionAuthorizationState
+
+    // MARK: - Generic Permission Methods
+
+    /// Returns true if system authorization is required for the given permission type
+    func isAuthorizationRequired(for permissionType: PermissionType) -> Bool
+
+    /// Requests system authorization for the given permission type
+    /// - Parameters:
+    ///   - permissionType: The permission type to request authorization for
+    ///   - completion: Called with the resulting authorization state
+    /// - Returns: A cancellable that can be used to cancel the observation (for permissions that support it)
+    @discardableResult
+    func requestAuthorization(for permissionType: PermissionType, completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable?
 }
 
 /// Manages system-level permissions required before website permissions can be granted
@@ -168,4 +181,29 @@ final class SystemPermissionManager: SystemPermissionManagerProtocol {
             }
         }
     }
+
+    // MARK: - Generic Permission Methods
+
+    /// Returns true if system authorization is required for the given permission type
+    func isAuthorizationRequired(for permissionType: PermissionType) -> Bool {
+        switch permissionType {
+        case .geolocation:
+            return isGeolocationAuthorizationRequired
+        case .camera, .microphone, .popups, .externalScheme:
+            return false // These don't require system permission through our two-step flow
+        }
+    }
+
+    /// Requests system authorization for the given permission type
+    @discardableResult
+    func requestAuthorization(for permissionType: PermissionType, completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable? {
+        switch permissionType {
+        case .geolocation:
+            return requestGeolocationAuthorization(completion: completion)
+        case .camera, .microphone, .popups, .externalScheme:
+            // These don't require system permission through our two-step flow
+            completion(.authorized)
+            return nil
+        }
+    }
 }
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index dfc2caa2e74..51fcc08de5e 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -16,8 +16,10 @@
 //  limitations under the License.
 //
 
-import SwiftUI
 import Combine
+import SwiftUI
+
+// MARK: - PermissionAuthorizationSwiftUIView
 
 struct PermissionAuthorizationSwiftUIView: View {
     let domain: String
@@ -28,7 +30,7 @@ struct PermissionAuthorizationSwiftUIView: View {
     let onAlwaysAllow: () -> Void
     let systemPermissionManager: SystemPermissionManagerProtocol
 
-    /// State for the system permission step in two-step geolocation flow
+    /// State for the system permission step in two-step flow
     enum SystemPermissionState {
         case initial
         case waiting
@@ -39,10 +41,12 @@ struct PermissionAuthorizationSwiftUIView: View {
     @State private var systemPermissionState: SystemPermissionState = .initial
     @State private var authorizationCancellable: AnyCancellable?
 
-    /// Whether to show the two-step UI (only for geolocation when system permission not granted)
+    // MARK: - Computed Properties
+
+    /// Whether to show the two-step UI
     private var showsTwoStepUI: Bool {
-        guard case .geolocation = permissionType else { return false }
-        return systemPermissionManager.isGeolocationAuthorizationRequired || systemPermissionState != .initial
+        guard permissionType.requiresSystemPermission else { return false }
+        return systemPermissionManager.isAuthorizationRequired(for: permissionType) || systemPermissionState != .initial
     }
 
     private var promptText: String {
@@ -62,17 +66,37 @@ struct PermissionAuthorizationSwiftUIView: View {
         }
     }
 
+    // MARK: - Button Titles & Actions
+
+    private var denyButtonTitle: String {
+        permissionType.usesPermanentDecisions ? UserText.permissionPopupAlwaysDenyButton : UserText.permissionPopupDenyButton
+    }
+
+    private var allowButtonTitle: String {
+        permissionType.usesPermanentDecisions ? UserText.permissionPopupAlwaysAllowButton : UserText.permissionPopupAllowButton
+    }
+
+    private var denyAction: () -> Void {
+        permissionType.usesPermanentDecisions ? onAlwaysDeny : onDeny
+    }
+
+    private var allowAction: () -> Void {
+        permissionType.usesPermanentDecisions ? onAlwaysAllow : onAllow
+    }
+
+    // MARK: - Body
+
     var body: some View {
         if showsTwoStepUI {
-            twoStepGeolocationView
+            twoStepPermissionView
         } else {
             standardPermissionView
         }
     }
 
-    // MARK: - Two-Step Geolocation View
+    // MARK: - Two-Step Permission View
 
-    private var twoStepGeolocationView: some View {
+    private var twoStepPermissionView: some View {
         VStack(spacing: 16) {
             // Prompt text
             Text(promptText)
@@ -104,7 +128,7 @@ struct PermissionAuthorizationSwiftUIView: View {
             switch systemPermissionState {
             case .initial:
                 Button(action: requestSystemPermission) {
-                    Text(UserText.permissionSystemLocationEnable)
+                    Text(permissionType.systemPermissionEnableText)
                         .font(.system(size: 13))
                         .foregroundColor(.white)
                         .frame(maxWidth: .infinity)
@@ -113,10 +137,10 @@ struct PermissionAuthorizationSwiftUIView: View {
                         .cornerRadius(8)
                 }
                 .buttonStyle(PlainButtonStyle())
-                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.enableSystemLocationButton")
+                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.enableSystemPermissionButton")
 
             case .waiting:
-                Text(UserText.permissionSystemLocationWaiting)
+                Text(permissionType.systemPermissionWaitingText)
                     .font(.system(size: 13))
                     .foregroundColor(Color(designSystemColor: .textSecondary))
                     .frame(maxWidth: .infinity)
@@ -130,7 +154,7 @@ struct PermissionAuthorizationSwiftUIView: View {
                         .foregroundColor(Color(NSColor.systemGreen))
                         .font(.system(size: 20))
 
-                    Text(UserText.permissionSystemLocationEnabled)
+                    Text(permissionType.systemPermissionEnabledText)
                         .font(.system(size: 13, weight: .medium))
                         .foregroundColor(Color(NSColor.systemGreen))
                 }
@@ -143,7 +167,7 @@ struct PermissionAuthorizationSwiftUIView: View {
                         .foregroundColor(Color(NSColor.systemRed))
                         .font(.system(size: 20))
 
-                    Text(UserText.permissionSystemLocationDenied)
+                    Text(permissionType.systemPermissionDeniedText)
                         .font(.system(size: 13, weight: .medium))
                         .foregroundColor(Color(NSColor.systemRed))
                 }
@@ -211,7 +235,7 @@ struct PermissionAuthorizationSwiftUIView: View {
     private func requestSystemPermission() {
         systemPermissionState = .waiting
 
-        authorizationCancellable = systemPermissionManager.requestGeolocationAuthorization { state in
+        authorizationCancellable = systemPermissionManager.requestAuthorization(for: permissionType) { state in
             DispatchQueue.main.async {
                 switch state {
                 case .authorized:
@@ -238,8 +262,8 @@ struct PermissionAuthorizationSwiftUIView: View {
                 .padding(.top, 16)
 
             HStack(spacing: 12) {
-                Button(action: standardDenyAction) {
-                    Text(standardDenyButtonTitle)
+                Button(action: denyAction) {
+                    Text(denyButtonTitle)
                         .font(.system(size: 13))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
@@ -250,8 +274,8 @@ struct PermissionAuthorizationSwiftUIView: View {
                 .buttonStyle(PlainButtonStyle())
                 .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.denyButton")
 
-                Button(action: standardAllowAction) {
-                    Text(standardAllowButtonTitle)
+                Button(action: allowAction) {
+                    Text(allowButtonTitle)
                         .font(.system(size: 13))
                         .foregroundColor(Color(designSystemColor: .textPrimary))
                         .frame(maxWidth: .infinity)
@@ -268,22 +292,6 @@ struct PermissionAuthorizationSwiftUIView: View {
         .frame(width: 360)
         .background(Color(designSystemColor: .containerFillPrimary))
     }
-
-    private var standardDenyButtonTitle: String {
-        permissionType == .geolocation ? UserText.permissionPopupDenyButton : UserText.permissionPopupAlwaysDenyButton
-    }
-
-    private var standardAllowButtonTitle: String {
-        permissionType == .geolocation ? UserText.permissionPopupAllowButton : UserText.permissionPopupAlwaysAllowButton
-    }
-
-    private var standardDenyAction: () -> Void {
-        permissionType == .geolocation ? onDeny : onAlwaysDeny
-    }
-
-    private var standardAllowAction: () -> Void {
-        permissionType == .geolocation ? onAllow : onAlwaysAllow
-    }
 }
 
 // MARK: - Convenience Initializer
@@ -307,6 +315,71 @@ extension PermissionAuthorizationSwiftUIView {
     }
 }
 
+// MARK: - PermissionType extension
+
+extension PermissionType {
+
+    /// Whether this permission type requires a two-step authorization flow (system permission first, then website permission)
+    var requiresSystemPermission: Bool {
+        switch self {
+        case .geolocation:
+            return true
+        case .camera, .microphone, .popups, .externalScheme:
+            return false
+        }
+    }
+
+    /// Whether this permission uses permanent decisions ("Always Allow" / "Never Allow") vs one-time decisions ("Allow" / "Deny")
+    var usesPermanentDecisions: Bool {
+        switch self {
+        case .camera, .microphone, .popups, .externalScheme, .geolocation:
+            return true
+        }
+    }
+
+    // MARK: - Two-Step UI Localized Strings
+
+    /// Button text for enabling system permission (Step 1)
+    var systemPermissionEnableText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemLocationEnable
+        case .camera, .microphone, .popups, .externalScheme:
+            return "" // Not used for these types
+        }
+    }
+
+    /// Text shown while waiting for system permission response
+    var systemPermissionWaitingText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemLocationWaiting
+        case .camera, .microphone, .popups, .externalScheme:
+            return ""
+        }
+    }
+
+    /// Text shown when system permission is granted
+    var systemPermissionEnabledText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemLocationEnabled
+        case .camera, .microphone, .popups, .externalScheme:
+            return ""
+        }
+    }
+
+    /// Text shown when system permission is denied
+    var systemPermissionDeniedText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemLocationDenied
+        case .camera, .microphone, .popups, .externalScheme:
+            return ""
+        }
+    }
+}
+
 #if DEBUG
 struct PermissionAuthorizationSwiftUIView_Previews: PreviewProvider {
     static var previews: some View {
@@ -332,3 +405,4 @@ struct PermissionAuthorizationSwiftUIView_Previews: PreviewProvider {
     }
 }
 #endif
+

From 346e667d8e2572f02e4a79f72155ba1cc51c0099 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sat, 29 Nov 2025 19:58:21 +0100
Subject: [PATCH 21/40] Changes to state when system geolocation permission is
 denied

---
 .../Common/Localizables/UserText.swift        |   4 +-
 .../Model/SystemPermissionManager.swift       |  13 ++
 .../PermissionAuthorizationSwiftUIView.swift  | 140 +++++++++++++-----
 3 files changed, 116 insertions(+), 41 deletions(-)

diff --git a/macOS/DuckDuckGo/Common/Localizables/UserText.swift b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
index 2d418110fe1..7d65d57743e 100644
--- a/macOS/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
@@ -991,7 +991,9 @@ struct UserText {
     static let permissionSystemLocationEnable = NSLocalizedString("permission.system.location.enable", value: "Enable System Location", comment: "Button to enable system location services")
     static let permissionSystemLocationWaiting = NSLocalizedString("permission.system.location.waiting", value: "Waiting for system permission…", comment: "Text shown while waiting for user to respond to system location permission dialog")
     static let permissionSystemLocationEnabled = NSLocalizedString("permission.system.location.enabled", value: "System location enabled!", comment: "Text shown after system location permission has been granted")
-    static let permissionSystemLocationDenied = NSLocalizedString("permission.system.location.denied", value: "System location denied", comment: "Text shown after system location permission has been denied")
+    static let permissionSystemLocationDisabled = NSLocalizedString("permission.system.location.disabled", value: "System location disabled. Turn it on in ", comment: "Text shown when system location was previously denied. Followed by a link to System Settings")
+    static let permissionSystemSettingsLocation = NSLocalizedString("permission.system.settings.location", value: "System Settings → Privacy", comment: "Link text to open System Settings Privacy section for location")
+    static let permissionRestartApp = NSLocalizedString("permission.restart.app", value: "Restart the DuckDuckGo application", comment: "Text shown when app restart is required for permission changes to take effect")
     static let permissionGeolocationPromptFormat = NSLocalizedString("permission.geolocation.prompt.format", value: "Allow %@ to use your current location?", comment: "Prompt asking if domain %@ can use location")
     static let permissionPopupNeverAllowButton = NSLocalizedString("permission.popup.never.allow.button", value: "Never Allow", comment: "Button that denies permission and remembers the decision for future requests")
 
diff --git a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
index ba4dc1ab9cb..ae073b6721b 100644
--- a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
@@ -62,6 +62,9 @@ protocol SystemPermissionManagerProtocol: AnyObject {
 
     // MARK: - Generic Permission Methods
 
+    /// Returns the current authorization state for the given permission type
+    func authorizationState(for permissionType: PermissionType) -> SystemPermissionAuthorizationState
+
     /// Returns true if system authorization is required for the given permission type
     func isAuthorizationRequired(for permissionType: PermissionType) -> Bool
 
@@ -184,6 +187,16 @@ final class SystemPermissionManager: SystemPermissionManagerProtocol {
 
     // MARK: - Generic Permission Methods
 
+    /// Returns the current authorization state for the given permission type
+    func authorizationState(for permissionType: PermissionType) -> SystemPermissionAuthorizationState {
+        switch permissionType {
+        case .geolocation:
+            return geolocationAuthorizationState
+        case .camera, .microphone, .popups, .externalScheme:
+            return .authorized // These don't require system permission through our two-step flow
+        }
+    }
+
     /// Returns true if system authorization is required for the given permission type
     func isAuthorizationRequired(for permissionType: PermissionType) -> Bool {
         switch permissionType {
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index 51fcc08de5e..898f53bd806 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -16,6 +16,7 @@
 //  limitations under the License.
 //
 
+import AppKit
 import Combine
 import SwiftUI
 
@@ -36,6 +37,8 @@ struct PermissionAuthorizationSwiftUIView: View {
         case waiting
         case authorized
         case denied
+        /// Permission was already denied/restricted/disabled before showing the UI
+        case alreadyDenied
     }
 
     @State private var systemPermissionState: SystemPermissionState = .initial
@@ -118,6 +121,24 @@ struct PermissionAuthorizationSwiftUIView: View {
         }
         .frame(width: 360)
         .background(Color(designSystemColor: .containerFillPrimary))
+        .onAppear {
+            initializeSystemPermissionState()
+        }
+    }
+
+    /// Check if system permission was already denied before showing the UI
+    private func initializeSystemPermissionState() {
+        guard systemPermissionState == .initial else { return }
+
+        let authState = systemPermissionManager.authorizationState(for: permissionType)
+        switch authState {
+        case .denied, .restricted, .systemDisabled:
+            systemPermissionState = .alreadyDenied
+        case .authorized:
+            systemPermissionState = .authorized
+        case .notDetermined:
+            break // Keep initial state
+        }
     }
 
     @ViewBuilder
@@ -161,55 +182,74 @@ struct PermissionAuthorizationSwiftUIView: View {
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .frame(height: 36)
 
-            case .denied:
-                HStack(spacing: 8) {
-                    Image(systemName: "xmark.circle.fill")
-                        .foregroundColor(Color(NSColor.systemRed))
-                        .font(.system(size: 20))
-
-                    Text(permissionType.systemPermissionDeniedText)
-                        .font(.system(size: 13, weight: .medium))
-                        .foregroundColor(Color(NSColor.systemRed))
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .frame(height: 36)
+            case .alreadyDenied, .denied:
+                systemPermissionDisabledView
             }
         }
     }
 
+    /// View shown when system permission was already denied - displays link to System Settings
+    private var systemPermissionDisabledView: some View {
+        (Text(permissionType.systemPermissionDisabledText)
+            .font(.system(size: 13))
+            .foregroundColor(Color(designSystemColor: .textPrimary))
+        + Text(permissionType.systemSettingsLinkText)
+            .font(.system(size: 13))
+            .foregroundColor(.accentColor))
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .fixedSize(horizontal: false, vertical: true)
+            .onTapGesture {
+                openSystemSettings()
+            }
+    }
+
+    private func openSystemSettings() {
+        guard let url = permissionType.systemSettingsURL else { return }
+        NSWorkspace.shared.open(url)
+    }
+
     @ViewBuilder
     private var stepTwoView: some View {
         let isEnabled = systemPermissionState == .authorized
+        let requiresRestart = systemPermissionState == .alreadyDenied || systemPermissionState == .denied
 
         HStack(spacing: 12) {
             stepIndicator(step: 2, isActive: isEnabled)
 
-            HStack(spacing: 8) {
-                Button(action: onAlwaysDeny) {
-                    Text(UserText.permissionPopupNeverAllowButton)
-                        .font(.system(size: 13))
-                        .foregroundColor(isEnabled ? Color(designSystemColor: .textPrimary) : Color(designSystemColor: .textSecondary))
-                        .frame(maxWidth: .infinity)
-                        .frame(height: 36)
-                        .background(isEnabled ? Color(designSystemColor: .controlsFillPrimary) : Color(designSystemColor: .controlsFillSecondary))
-                        .cornerRadius(8)
-                }
-                .buttonStyle(PlainButtonStyle())
-                .disabled(!isEnabled)
-                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.neverAllowButton")
-
-                Button(action: onAlwaysAllow) {
-                    Text(UserText.permissionPopupAlwaysAllowButton)
-                        .font(.system(size: 13))
-                        .foregroundColor(isEnabled ? Color(designSystemColor: .textPrimary) : Color(designSystemColor: .textSecondary))
-                        .frame(maxWidth: .infinity)
-                        .frame(height: 36)
-                        .background(isEnabled ? Color(designSystemColor: .controlsFillPrimary) : Color(designSystemColor: .controlsFillSecondary))
-                        .cornerRadius(8)
+            if requiresRestart {
+                Text(UserText.permissionRestartApp)
+                    .font(.system(size: 13))
+                    .foregroundColor(Color(designSystemColor: .textSecondary))
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .frame(height: 36)
+            } else {
+                HStack(spacing: 8) {
+                    Button(action: onAlwaysDeny) {
+                        Text(UserText.permissionPopupNeverAllowButton)
+                            .font(.system(size: 13))
+                            .foregroundColor(isEnabled ? Color(designSystemColor: .textPrimary) : Color(designSystemColor: .textSecondary))
+                            .frame(maxWidth: .infinity)
+                            .frame(height: 36)
+                            .background(isEnabled ? Color(designSystemColor: .controlsFillPrimary) : Color(designSystemColor: .controlsFillSecondary))
+                            .cornerRadius(8)
+                    }
+                    .buttonStyle(PlainButtonStyle())
+                    .disabled(!isEnabled)
+                    .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.neverAllowButton")
+
+                    Button(action: onAlwaysAllow) {
+                        Text(UserText.permissionPopupAlwaysAllowButton)
+                            .font(.system(size: 13))
+                            .foregroundColor(isEnabled ? Color(designSystemColor: .textPrimary) : Color(designSystemColor: .textSecondary))
+                            .frame(maxWidth: .infinity)
+                            .frame(height: 36)
+                            .background(isEnabled ? Color(designSystemColor: .controlsFillPrimary) : Color(designSystemColor: .controlsFillSecondary))
+                            .cornerRadius(8)
+                    }
+                    .buttonStyle(PlainButtonStyle())
+                    .disabled(!isEnabled)
+                    .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.alwaysAllowButton")
                 }
-                .buttonStyle(PlainButtonStyle())
-                .disabled(!isEnabled)
-                .accessibilityIdentifier("PermissionAuthorizationSwiftUIView.alwaysAllowButton")
             }
         }
     }
@@ -369,15 +409,35 @@ extension PermissionType {
         }
     }
 
-    /// Text shown when system permission is denied
-    var systemPermissionDeniedText: String {
+    /// Text shown when system permission was previously disabled (prefix before link)
+    var systemPermissionDisabledText: String {
         switch self {
         case .geolocation:
-            return UserText.permissionSystemLocationDenied
+            return UserText.permissionSystemLocationDisabled
         case .camera, .microphone, .popups, .externalScheme:
             return ""
         }
     }
+
+    /// Link text for opening System Settings
+    var systemSettingsLinkText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemSettingsLocation
+        case .camera, .microphone, .popups, .externalScheme:
+            return ""
+        }
+    }
+
+    /// URL to open the relevant System Settings pane
+    var systemSettingsURL: URL? {
+        switch self {
+        case .geolocation:
+            return URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_LocationServices")
+        case .camera, .microphone, .popups, .externalScheme:
+            return nil
+        }
+    }
 }
 
 #if DEBUG

From eb020a3ccac55ef39b573f4b1831bcecf9dd2d21 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sun, 30 Nov 2025 09:29:21 +0100
Subject: [PATCH 22/40] Refactoring SystemPermissionManager to only contain
 what's necessary

---
 .../Model/SystemPermissionManager.swift       | 140 +++++-------------
 1 file changed, 39 insertions(+), 101 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
index ae073b6721b..e9df7046299 100644
--- a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
@@ -36,32 +36,6 @@ enum SystemPermissionAuthorizationState {
 /// Protocol for managing system-level permissions required before website permissions can be granted
 protocol SystemPermissionManagerProtocol: AnyObject {
 
-    // MARK: - Geolocation
-
-    /// Returns the current geolocation authorization state
-    var geolocationAuthorizationState: SystemPermissionAuthorizationState { get }
-
-    /// Publisher that emits the current geolocation authorization state whenever it changes
-    var geolocationAuthorizationStatePublisher: AnyPublisher<SystemPermissionAuthorizationState, Never> { get }
-
-    /// Returns true if geolocation authorization has been granted
-    var isGeolocationAuthorized: Bool { get }
-
-    /// Returns true if geolocation authorization needs to be requested
-    var isGeolocationAuthorizationRequired: Bool { get }
-
-    /// Requests geolocation authorization from the system
-    /// - Parameter completion: Called with the resulting authorization state after the user responds
-    /// - Returns: A cancellable that can be used to cancel the observation
-    @discardableResult
-    func requestGeolocationAuthorization(completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable
-
-    /// Requests geolocation authorization from the system using async/await
-    /// - Returns: The authorization state after the user responds
-    func requestGeolocationAuthorization() async -> SystemPermissionAuthorizationState
-
-    // MARK: - Generic Permission Methods
-
     /// Returns the current authorization state for the given permission type
     func authorizationState(for permissionType: PermissionType) -> SystemPermissionAuthorizationState
 
@@ -86,10 +60,44 @@ final class SystemPermissionManager: SystemPermissionManagerProtocol {
         self.geolocationService = geolocationService
     }
 
-    // MARK: - Geolocation Authorization
+    // MARK: - Public Methods
+
+    /// Returns the current authorization state for the given permission type
+    func authorizationState(for permissionType: PermissionType) -> SystemPermissionAuthorizationState {
+        switch permissionType {
+        case .geolocation:
+            return geolocationAuthorizationState
+        case .camera, .microphone, .popups, .externalScheme:
+            return .authorized // These don't require system permission through our two-step flow
+        }
+    }
+
+    /// Returns true if system authorization is required for the given permission type
+    func isAuthorizationRequired(for permissionType: PermissionType) -> Bool {
+        switch permissionType {
+        case .geolocation:
+            return isGeolocationAuthorizationRequired
+        case .camera, .microphone, .popups, .externalScheme:
+            return false // These don't require system permission through our two-step flow
+        }
+    }
+
+    /// Requests system authorization for the given permission type
+    @discardableResult
+    func requestAuthorization(for permissionType: PermissionType, completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable? {
+        switch permissionType {
+        case .geolocation:
+            return requestGeolocationAuthorization(completion: completion)
+        case .camera, .microphone, .popups, .externalScheme:
+            // These don't require system permission through our two-step flow
+            completion(.authorized)
+            return nil
+        }
+    }
+
+    // MARK: - Private Geolocation Implementation
 
-    /// Returns the current geolocation authorization state
-    var geolocationAuthorizationState: SystemPermissionAuthorizationState {
+    private var geolocationAuthorizationState: SystemPermissionAuthorizationState {
         guard geolocationService.locationServicesEnabled() else {
             return .systemDisabled
         }
@@ -108,22 +116,7 @@ final class SystemPermissionManager: SystemPermissionManagerProtocol {
         }
     }
 
-    /// Publisher that emits the current geolocation authorization state whenever it changes
-    var geolocationAuthorizationStatePublisher: AnyPublisher<SystemPermissionAuthorizationState, Never> {
-        geolocationService.authorizationStatusPublisher
-            .map { [weak self] _ in
-                self?.geolocationAuthorizationState ?? .notDetermined
-            }
-            .eraseToAnyPublisher()
-    }
-
-    /// Returns true if geolocation authorization has been granted
-    var isGeolocationAuthorized: Bool {
-        geolocationAuthorizationState == .authorized
-    }
-
-    /// Returns true if geolocation authorization needs to be requested
-    var isGeolocationAuthorizationRequired: Bool {
+    private var isGeolocationAuthorizationRequired: Bool {
         switch geolocationAuthorizationState {
         case .notDetermined, .systemDisabled:
             return true
@@ -132,11 +125,8 @@ final class SystemPermissionManager: SystemPermissionManagerProtocol {
         }
     }
 
-    /// Requests geolocation authorization from the system
-    /// - Parameter completion: Called with the resulting authorization state after the user responds
-    /// - Returns: A cancellable that can be used to cancel the observation
     @discardableResult
-    func requestGeolocationAuthorization(completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable {
+    private func requestGeolocationAuthorization(completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable {
         // If already determined, return current state immediately
         guard geolocationAuthorizationState == .notDetermined else {
             completion(geolocationAuthorizationState)
@@ -167,56 +157,4 @@ final class SystemPermissionManager: SystemPermissionManagerProtocol {
             locationCancellable?.cancel()
         }
     }
-
-    /// Requests geolocation authorization from the system using async/await
-    /// - Returns: The authorization state after the user responds
-    func requestGeolocationAuthorization() async -> SystemPermissionAuthorizationState {
-        // If already determined, return current state immediately
-        guard geolocationAuthorizationState == .notDetermined else {
-            return geolocationAuthorizationState
-        }
-
-        return await withCheckedContinuation { continuation in
-            var cancellable: AnyCancellable?
-            cancellable = requestGeolocationAuthorization { state in
-                continuation.resume(returning: state)
-                cancellable?.cancel()
-            }
-        }
-    }
-
-    // MARK: - Generic Permission Methods
-
-    /// Returns the current authorization state for the given permission type
-    func authorizationState(for permissionType: PermissionType) -> SystemPermissionAuthorizationState {
-        switch permissionType {
-        case .geolocation:
-            return geolocationAuthorizationState
-        case .camera, .microphone, .popups, .externalScheme:
-            return .authorized // These don't require system permission through our two-step flow
-        }
-    }
-
-    /// Returns true if system authorization is required for the given permission type
-    func isAuthorizationRequired(for permissionType: PermissionType) -> Bool {
-        switch permissionType {
-        case .geolocation:
-            return isGeolocationAuthorizationRequired
-        case .camera, .microphone, .popups, .externalScheme:
-            return false // These don't require system permission through our two-step flow
-        }
-    }
-
-    /// Requests system authorization for the given permission type
-    @discardableResult
-    func requestAuthorization(for permissionType: PermissionType, completion: @escaping (SystemPermissionAuthorizationState) -> Void) -> AnyCancellable? {
-        switch permissionType {
-        case .geolocation:
-            return requestGeolocationAuthorization(completion: completion)
-        case .camera, .microphone, .popups, .externalScheme:
-            // These don't require system permission through our two-step flow
-            completion(.authorized)
-            return nil
-        }
-    }
 }

From 4c29debe0995641c9a897600a46373ed66ed403e Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sun, 30 Nov 2025 10:32:01 +0100
Subject: [PATCH 23/40] Foundation for permission center

---
 .../project.pbxproj                           |  32 ++-
 .../Common/Localizables/UserText.swift        |   6 +
 .../Localization/Localizable.xcstrings        | 148 ++++++++++---
 .../AddressBarButtonsViewController.swift     |  25 +++
 .../View/PermissionCenterView.swift           | 198 ++++++++++++++++++
 .../View/PermissionCenterViewController.swift |  57 +++++
 .../ViewModel/PermissionCenterViewModel.swift | 110 ++++++++++
 7 files changed, 547 insertions(+), 29 deletions(-)
 create mode 100644 macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
 create mode 100644 macOS/DuckDuckGo/Permissions/View/PermissionCenterViewController.swift
 create mode 100644 macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift

diff --git a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
index a7e6f87a22a..7b1c0390691 100644
--- a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
+++ b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
@@ -98,6 +98,12 @@
 		1D532BB52ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */; };
 		1D532BC92EDA1DF800D219FA /* SystemPermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BC82EDA1DF200D219FA /* SystemPermissionManager.swift */; };
 		1D532BCA2EDA1DF800D219FA /* SystemPermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BC82EDA1DF200D219FA /* SystemPermissionManager.swift */; };
+		1D532BDE2EDC3E4800D219FA /* PermissionCenterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BDD2EDC3E3F00D219FA /* PermissionCenterView.swift */; };
+		1D532BDF2EDC3E4800D219FA /* PermissionCenterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BDD2EDC3E3F00D219FA /* PermissionCenterView.swift */; };
+		1D532BE12EDC3E5500D219FA /* PermissionCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BE02EDC3E4D00D219FA /* PermissionCenterViewController.swift */; };
+		1D532BE22EDC3E5500D219FA /* PermissionCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BE02EDC3E4D00D219FA /* PermissionCenterViewController.swift */; };
+		1D532BE52EDC3E6D00D219FA /* PermissionCenterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BE32EDC3E6100D219FA /* PermissionCenterViewModel.swift */; };
+		1D532BE62EDC3E6D00D219FA /* PermissionCenterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D532BE32EDC3E6100D219FA /* PermissionCenterViewModel.swift */; };
 		1D5C1AF12CFF58220073ED65 /* Logger+WebExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D5C1AF02CFF58170073ED65 /* Logger+WebExtensions.swift */; };
 		1D6216B229069BBF00386B2C /* BWKeyStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6216B129069BBF00386B2C /* BWKeyStorage.swift */; };
 		1D638D612C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D638D602C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift */; };
@@ -4270,6 +4276,9 @@
 		1D4B03D82CA55DDF00224E99 /* BookmarkUrlExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkUrlExtensionTests.swift; sourceTree = "<group>"; };
 		1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionAuthorizationSwiftUIView.swift; sourceTree = "<group>"; };
 		1D532BC82EDA1DF200D219FA /* SystemPermissionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemPermissionManager.swift; sourceTree = "<group>"; };
+		1D532BDD2EDC3E3F00D219FA /* PermissionCenterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionCenterView.swift; sourceTree = "<group>"; };
+		1D532BE02EDC3E4D00D219FA /* PermissionCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionCenterViewController.swift; sourceTree = "<group>"; };
+		1D532BE32EDC3E6100D219FA /* PermissionCenterViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionCenterViewModel.swift; sourceTree = "<group>"; };
 		1D5C1AF02CFF58170073ED65 /* Logger+WebExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+WebExtensions.swift"; sourceTree = "<group>"; };
 		1D6216B129069BBF00386B2C /* BWKeyStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BWKeyStorage.swift; sourceTree = "<group>"; };
 		1D638D602C44F2BA00530DD5 /* ApplicationUpdateDetectorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationUpdateDetectorTests.swift; sourceTree = "<group>"; };
@@ -4748,7 +4757,7 @@
 		4B1E6EEC27AB5E5100F51793 /* PasswordManagementListSection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordManagementListSection.swift; sourceTree = "<group>"; };
 		4B1E6EEF27AB5E5D00F51793 /* NSPopUpButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSPopUpButtonView.swift; sourceTree = "<group>"; };
 		4B1E6EF027AB5E5D00F51793 /* PasswordManagementItemList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordManagementItemList.swift; sourceTree = "<group>"; };
-		4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debugg.systemextension */ = {isa = PBXFileReference; explicitFileType = "wrapper.system-extension"; includeInIndex = 0; path = "com.duckduckgo.macos.vpn.network-extension.debugg.systemextension"; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debug.systemextension */ = {isa = PBXFileReference; explicitFileType = "wrapper.system-extension"; includeInIndex = 0; path = "com.duckduckgo.macos.vpn.network-extension.debug.systemextension"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B25376C2A11BF6D00610219 /* NetworkProtectionSystemExtension_SparkleDistribution.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = NetworkProtectionSystemExtension_SparkleDistribution.entitlements; sourceTree = "<group>"; };
 		4B25376D2A11BF6D00610219 /* NetworkProtectionSystemExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = NetworkProtectionSystemExtension.entitlements; sourceTree = "<group>"; };
 		4B25376E2A11BF8B00610219 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -6733,6 +6742,14 @@
 			path = Services;
 			sourceTree = "<group>";
 		};
+		1D532BE42EDC3E6D00D219FA /* ViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				1D532BE32EDC3E6100D219FA /* PermissionCenterViewModel.swift */,
+			);
+			path = ViewModel;
+			sourceTree = "<group>";
+		};
 		1D6860512D36BD38006FC53E /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -9670,7 +9687,7 @@
 				3706FEB2293F662100E42796 /* Integration Tests App Store.xctest */,
 				B6EC37E829B5DA2A001ACE79 /* tests-server */,
 				4B4D603D2A0B290200BCD287 /* NetworkProtectionAppExtension.appex */,
-				4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debugg.systemextension */,
+				4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debug.systemextension */,
 				4B2D06392A11CFBB00DE1F49 /* DuckDuckGo VPN.app */,
 				4B2D06692A13318400DE1F49 /* DuckDuckGo VPN App Store.app */,
 				9D9AE8D12AAA39A70026E7DC /* DuckDuckGo Personal Information Removal.app */,
@@ -10885,6 +10902,7 @@
 			isa = PBXGroup;
 			children = (
 				B64C84EF269310000048FEBE /* Model */,
+				1D532BE42EDC3E6D00D219FA /* ViewModel */,
 				B64C84DC2692D6FC0048FEBE /* View */,
 			);
 			path = Permissions;
@@ -10900,6 +10918,8 @@
 				B6BBF17327475B15004F850E /* PopupBlockedPopover.swift */,
 				B64C852926942AC90048FEBE /* PermissionContextMenu.swift */,
 				B64C85412694590B0048FEBE /* PermissionButton.swift */,
+				1D532BDD2EDC3E3F00D219FA /* PermissionCenterView.swift */,
+				1D532BE02EDC3E4D00D219FA /* PermissionCenterViewController.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -12145,7 +12165,7 @@
 				7BC15A1B2E1917D6000062C8 /* VPNNotifications */,
 			);
 			productName = NetworkProtectionSystemExtension;
-			productReference = 4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debugg.systemextension */;
+			productReference = 4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debug.systemextension */;
 			productType = "com.apple.product-type.system-extension";
 		};
 		4B2D06382A11CFBA00DE1F49 /* DuckDuckGoVPN */ = {
@@ -13619,6 +13639,7 @@
 				3706FABF293F65D500E42796 /* CrashReportReader.swift in Sources */,
 				B6B4D1C62B0B3B5400C26286 /* DataImportReportModel.swift in Sources */,
 				3768D8452C2CC884004120AE /* RemoteMessagingConfigMatcherProvider.swift in Sources */,
+				1D532BE22EDC3E5500D219FA /* PermissionCenterViewController.swift in Sources */,
 				EE7E0FD82E3BA8FA00E51C8B /* SyncDialogController.swift in Sources */,
 				3772BEDD2D019CE90019B9EF /* DefaultsFavoritesActionHandler.swift in Sources */,
 				3706FAC0293F65D500E42796 /* DataTaskProviding.swift in Sources */,
@@ -14141,6 +14162,7 @@
 				4B9DB0212A983B24000927DB /* ProductWaitlistRequest.swift in Sources */,
 				BBE948D02D6FD11200FAC581 /* DefaultBrowserAndDockPromptStoring.swift in Sources */,
 				56D145EC29E6C99B00E3488A /* DataImportStatusProviding.swift in Sources */,
+				1D532BDF2EDC3E4800D219FA /* PermissionCenterView.swift in Sources */,
 				85774B002A713D3B00DE0561 /* BookmarksBarMenuFactory.swift in Sources */,
 				B602E81E2A1E25B1006D261F /* NEOnDemandRuleExtension.swift in Sources */,
 				3706FBC7293F65D500E42796 /* EncryptedHistoryStore.swift in Sources */,
@@ -14327,6 +14349,7 @@
 				3706FC16293F65D500E42796 /* PasswordManagementLoginModel.swift in Sources */,
 				3706FC17293F65D500E42796 /* TabViewModel.swift in Sources */,
 				3706FC18293F65D500E42796 /* TabDragAndDropManager.swift in Sources */,
+				1D532BE52EDC3E6D00D219FA /* PermissionCenterViewModel.swift in Sources */,
 				1DC669712B6CF0D700AA0645 /* TabSnapshotStore.swift in Sources */,
 				3706FC19293F65D500E42796 /* NSNotificationName+Favicons.swift in Sources */,
 				3706FC1A293F65D500E42796 /* PinningManager.swift in Sources */,
@@ -16072,6 +16095,7 @@
 				1DF78E0C2CE5F58B00AB898E /* WebExtensionManager.swift in Sources */,
 				C10529462C9F456C0041E502 /* AutofillCredentialsDebugViewModel.swift in Sources */,
 				4B4D60C02A0C848D00BCD287 /* NetworkProtectionControllerErrorStore.swift in Sources */,
+				1D532BE12EDC3E5500D219FA /* PermissionCenterViewController.swift in Sources */,
 				7BE146072A6A83C700C313B8 /* NetworkProtectionDebugMenu.swift in Sources */,
 				B6085D092743AAB600A9C456 /* FireproofDomains.xcdatamodeld in Sources */,
 				56BA1E752BAAF70F001CF69F /* SpecialErrorPageTabExtension.swift in Sources */,
@@ -16105,6 +16129,7 @@
 				1D9A37672BD8EA8800EBC58D /* DockPositionProvider.swift in Sources */,
 				4B9292D52667123700AD2C21 /* BookmarkManagementDetailViewController.swift in Sources */,
 				F188267C2BBEB3AA00D9AC4F /* GeneralPixel.swift in Sources */,
+				1D532BE62EDC3E6D00D219FA /* PermissionCenterViewModel.swift in Sources */,
 				37A4CEBA282E992F00D75B89 /* StartupPreferences.swift in Sources */,
 				C1CE84692C887CF60068913B /* FreemiumDBPScanResultPolling.swift in Sources */,
 				37C9F78C2CF1C776004D73A1 /* PrivacyStatsTabExtension.swift in Sources */,
@@ -16564,6 +16589,7 @@
 				37AFCE8B27DB69BC00471A10 /* PreferencesGeneralView.swift in Sources */,
 				37FD78112A29EBD100B36DB1 /* SyncErrorHandler.swift in Sources */,
 				3767318B2C7F32C500EB097B /* GradientBackground.swift in Sources */,
+				1D532BDE2EDC3E4800D219FA /* PermissionCenterView.swift in Sources */,
 				C11198312C898AB500F0272C /* FreemiumDBPFirstProfileSavedNotifier.swift in Sources */,
 				AA8EDF2424923E980071C2E8 /* URLExtension.swift in Sources */,
 				B634DBDF293C8F7F00C3C99E /* Tab+UIDelegate.swift in Sources */,
diff --git a/macOS/DuckDuckGo/Common/Localizables/UserText.swift b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
index 7d65d57743e..ffc0c1ab32c 100644
--- a/macOS/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
@@ -997,6 +997,12 @@ struct UserText {
     static let permissionGeolocationPromptFormat = NSLocalizedString("permission.geolocation.prompt.format", value: "Allow %@ to use your current location?", comment: "Prompt asking if domain %@ can use location")
     static let permissionPopupNeverAllowButton = NSLocalizedString("permission.popup.never.allow.button", value: "Never Allow", comment: "Button that denies permission and remembers the decision for future requests")
 
+    // Permission Center
+    static let permissionCenterTitle = NSLocalizedString("permission.center.title", value: "Permissions for \"%@\"", comment: "Title for permission center popover, %@ is the domain name")
+    static let permissionCenterAlwaysAsk = NSLocalizedString("permission.center.always.ask", value: "Always Ask", comment: "Permission center dropdown option to always ask for permission")
+    static let permissionCenterAlwaysAllow = NSLocalizedString("permission.center.always.allow", value: "Always Allow", comment: "Permission center dropdown option to always allow permission")
+    static let permissionCenterNeverAllow = NSLocalizedString("permission.center.never.allow", value: "Never Allow", comment: "Permission center dropdown option to never allow permission")
+
     static let privacyDashboardPopupsAlwaysAsk = NSLocalizedString("dashboard.popups.ask", value: "Notify", comment: "Make pop-up windows always request permission for the current domain")
 
     static let settings = NSLocalizedString("settings", value: "Settings", comment: "Menu item for opening settings")
diff --git a/macOS/DuckDuckGo/Localization/Localizable.xcstrings b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
index 9b8cea145a3..c42ba89503b 100644
--- a/macOS/DuckDuckGo/Localization/Localizable.xcstrings
+++ b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
@@ -1186,6 +1186,18 @@
         }
       }
     },
+    "address.bar.placeholder.with-duckai" : {
+      "comment" : "Address bar placeholder when Duck.ai toggle is available",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "⇥ Press tab then enter to ask Duck.ai"
+          }
+        }
+      }
+    },
     "address.bar.search.open.tab.suffix" : {
       "comment" : "Suffix of DuckDuckGo Search open tab suggestion. Example: cats – DuckDuckGo Search",
       "extractionState" : "extracted_with_value",
@@ -2091,6 +2103,18 @@
         }
       }
     },
+    "aichat.omnibar.placeholder" : {
+      "comment" : "Placeholder text shown in the Duck.ai chat input field",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Chat Privately"
+          }
+        }
+      }
+    },
     "aichat.search-the-web.tooltip" : {
       "comment" : "Tooltip for the search the web segment in the toggle control",
       "extractionState" : "extracted_with_value",
@@ -29918,122 +29942,122 @@
         }
       }
     },
-    "feedback.problem-subcategory.popup-windows-not-opening" : {
-      "comment" : "Problem subcategory for popup windows being blocked",
+    "feedback.problem-subcategory.passwords-management" : {
+      "comment" : "Problem subcategory for general password management issues",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Pop-ups öffnen sich nicht"
+            "value" : "Passwortverwaltung"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Pop-ups don't open"
+            "value" : "Passwords management"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Los pop-ups no se abren"
+            "value" : "Gestión de contraseñas"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Les pop-ups ne s'ouvrent pas"
+            "value" : "Gestion des mots de passe"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "I pop-up non si aprono"
+            "value" : "Gestione delle password"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Pop-ups openen niet"
+            "value" : "Wachtwoorden beheren"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wyskakujące okienka się nie otwierają"
+            "value" : "Zarządzanie hasłami"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Pop-ups não abrem"
+            "value" : "Gestão de palavras-passe"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Всплывающие окна не открываются"
+            "value" : "Управление паролями"
           }
         }
       }
     },
-    "feedback.problem-subcategory.passwords-management" : {
-      "comment" : "Problem subcategory for general password management issues",
+    "feedback.problem-subcategory.popup-windows-not-opening" : {
+      "comment" : "Problem subcategory for popup windows being blocked",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Passwortverwaltung"
+            "value" : "Pop-ups öffnen sich nicht"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Passwords management"
+            "value" : "Pop-ups don't open"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gestión de contraseñas"
+            "value" : "Los pop-ups no se abren"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gestion des mots de passe"
+            "value" : "Les pop-ups ne s'ouvrent pas"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gestione delle password"
+            "value" : "I pop-up non si aprono"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wachtwoorden beheren"
+            "value" : "Pop-ups openen niet"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Zarządzanie hasłami"
+            "value" : "Wyskakujące okienka się nie otwierają"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Gestão de palavras-passe"
+            "value" : "Pop-ups não abrem"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Управление паролями"
+            "value" : "Всплывающие окна не открываются"
           }
         }
       }
@@ -60366,6 +60390,54 @@
         }
       }
     },
+    "permission.center.always.allow" : {
+      "comment" : "Permission center dropdown option to always allow permission",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Always Allow"
+          }
+        }
+      }
+    },
+    "permission.center.always.ask" : {
+      "comment" : "Permission center dropdown option to always ask for permission",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Always Ask"
+          }
+        }
+      }
+    },
+    "permission.center.never.allow" : {
+      "comment" : "Permission center dropdown option to never allow permission",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Never Allow"
+          }
+        }
+      }
+    },
+    "permission.center.title" : {
+      "comment" : "Title for permission center popover, %@ is the domain name",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Permissions for \"%@\""
+          }
+        }
+      }
+    },
     "permission.disabled.app" : {
       "comment" : "The app (DuckDuckGo: %@ 2) has no access permission to (%@ 1) media device",
       "extractionState" : "extracted_with_value",
@@ -61607,14 +61679,26 @@
         }
       }
     },
-    "permission.system.location.denied" : {
-      "comment" : "Text shown after system location permission has been denied",
+    "permission.restart.app" : {
+      "comment" : "Text shown when app restart is required for permission changes to take effect",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "System location denied"
+            "value" : "Restart the DuckDuckGo application"
+          }
+        }
+      }
+    },
+    "permission.system.location.disabled" : {
+      "comment" : "Text shown when system location was previously denied. Followed by a link to System Settings",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "System location disabled. Turn it on in "
           }
         }
       }
@@ -61655,6 +61739,18 @@
         }
       }
     },
+    "permission.system.settings.location" : {
+      "comment" : "Link text to open System Settings Privacy section for location",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "System Settings → Privacy"
+          }
+        }
+      }
+    },
     "permission.unmute" : {
       "comment" : "Resume input media device %@ access for %@ website",
       "extractionState" : "extracted_with_value",
@@ -96964,4 +97060,4 @@
     }
   },
   "version" : "1.0"
-}
+}
\ No newline at end of file
diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index df636698649..55d67768640 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -70,6 +70,8 @@ final class AddressBarButtonsViewController: NSViewController {
         }()
     }
 
+    private var permissionCenterPopover: PermissionCenterPopover?
+
     private var popupBlockedPopover: PopupBlockedPopover?
     private func popupBlockedPopoverCreatingIfNeeded() -> PopupBlockedPopover {
         return popupBlockedPopover ?? {
@@ -1604,7 +1606,30 @@ final class AddressBarButtonsViewController: NSViewController {
     }
 
     @IBAction func permissionCenterButtonAction(_ sender: Any) {
+        guard featureFlagger.isFeatureOn(.newPermissionView) else { return }
+        guard let tabViewModel else { return }
+        guard let sender = sender as? NSView else { return }
+
+        // Close existing popover if shown
+        if let existingPopover = permissionCenterPopover, existingPopover.isShown {
+            existingPopover.close()
+            permissionCenterPopover = nil
+            return
+        }
+
+        let url = tabViewModel.tab.content.urlForWebView ?? .empty
+        let domain = url.isFileURL ? .localhost : (url.host ?? "")
+
+        let viewModel = PermissionCenterViewModel(
+            domain: domain,
+            usedPermissions: tabViewModel.usedPermissions,
+            permissionManager: permissionManager
+        )
+
+        let popover = PermissionCenterPopover(viewModel: viewModel)
+        permissionCenterPopover = popover
 
+        popover.show(relativeTo: sender.bounds, of: sender, preferredEdge: .maxY)
     }
 
     @IBAction func cameraButtonAction(_ sender: NSButton) {
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
new file mode 100644
index 00000000000..1ff730bc268
--- /dev/null
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
@@ -0,0 +1,198 @@
+//
+//  PermissionCenterView.swift
+//
+//  Copyright © 2025 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import SwiftUI
+
+// MARK: - PermissionCenterView
+
+struct PermissionCenterView: View {
+
+    @ObservedObject var viewModel: PermissionCenterViewModel
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            // Header
+            Text(String(format: UserText.permissionCenterTitle, viewModel.domain))
+                .font(.system(size: 13, weight: .semibold))
+                .foregroundColor(Color(designSystemColor: .textPrimary))
+                .padding(.horizontal, 16)
+                .padding(.top, 16)
+                .padding(.bottom, 12)
+
+            // Permission rows
+            VStack(spacing: 0) {
+                ForEach(viewModel.permissionItems) { item in
+                    PermissionRowView(
+                        item: item,
+                        onDecisionChanged: { decision in
+                            viewModel.setDecision(decision, for: item.permissionType)
+                        },
+                        onRemove: {
+                            viewModel.removePermission(item.permissionType)
+                        }
+                    )
+
+                    if item.id != viewModel.permissionItems.last?.id {
+                        Divider()
+                            .padding(.leading, 52)
+                    }
+                }
+            }
+            .padding(.horizontal, 16)
+            .padding(.bottom, 16)
+        }
+        .frame(width: 360)
+        .background(Color(designSystemColor: .containerFillPrimary))
+    }
+}
+
+// MARK: - PermissionRowView
+
+struct PermissionRowView: View {
+
+    let item: PermissionCenterItem
+    let onDecisionChanged: (PersistedPermissionDecision) -> Void
+    let onRemove: () -> Void
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            // Main row
+            HStack(spacing: 12) {
+                // Icon
+                permissionIcon
+                    .frame(width: 24, height: 24)
+
+                // Permission name
+                Text(item.displayName)
+                    .font(.system(size: 13))
+                    .foregroundColor(Color(designSystemColor: .textPrimary))
+
+                Spacer()
+
+                // Decision dropdown
+                decisionPicker
+
+                // Remove button
+                Button(action: onRemove) {
+                    Image(systemName: "xmark")
+                        .font(.system(size: 10, weight: .semibold))
+                        .foregroundColor(Color(designSystemColor: .textSecondary))
+                }
+                .buttonStyle(PlainButtonStyle())
+                .frame(width: 20, height: 20)
+            }
+            .padding(.vertical, 12)
+
+            // System disabled warning (if applicable)
+            if item.isSystemDisabled {
+                systemDisabledWarning
+                    .padding(.leading, 36)
+                    .padding(.bottom, 8)
+            }
+        }
+    }
+
+    // MARK: - Subviews
+
+    @ViewBuilder
+    private var permissionIcon: some View {
+        switch item.permissionType {
+        case .camera:
+            Image(systemName: "video.fill")
+                .foregroundColor(Color(NSColor.systemRed))
+        case .microphone:
+            Image(systemName: "mic.fill")
+                .foregroundColor(Color(designSystemColor: .textSecondary))
+        case .geolocation:
+            Image(systemName: "location.fill")
+                .foregroundColor(Color(designSystemColor: .textSecondary))
+        case .popups:
+            Image(systemName: "rectangle.on.rectangle")
+                .foregroundColor(Color(designSystemColor: .textSecondary))
+        case .externalScheme:
+            Image(systemName: "arrow.up.forward.app")
+                .foregroundColor(Color(designSystemColor: .textSecondary))
+        }
+    }
+
+    private var decisionPicker: some View {
+        Menu {
+            Button(UserText.permissionCenterAlwaysAsk) {
+                onDecisionChanged(.ask)
+            }
+            Button(UserText.permissionCenterAlwaysAllow) {
+                onDecisionChanged(.allow)
+            }
+            Button(UserText.permissionCenterNeverAllow) {
+                onDecisionChanged(.deny)
+            }
+        } label: {
+            HStack(spacing: 4) {
+                Text(decisionDisplayText)
+                    .font(.system(size: 12))
+                    .foregroundColor(Color(designSystemColor: .textPrimary))
+                Image(systemName: "chevron.down")
+                    .font(.system(size: 8, weight: .semibold))
+                    .foregroundColor(Color(designSystemColor: .textSecondary))
+            }
+            .padding(.horizontal, 10)
+            .padding(.vertical, 6)
+            .background(Color(designSystemColor: .controlsFillSecondary))
+            .cornerRadius(6)
+        }
+        .menuStyle(BorderlessButtonMenuStyle())
+        .fixedSize()
+    }
+
+    private var decisionDisplayText: String {
+        switch item.decision {
+        case .ask:
+            return UserText.permissionCenterAlwaysAsk
+        case .allow:
+            return UserText.permissionCenterAlwaysAllow
+        case .deny:
+            return UserText.permissionCenterNeverAllow
+        }
+    }
+
+    private var systemDisabledWarning: some View {
+        HStack(spacing: 0) {
+            Text(item.permissionType.systemPermissionDisabledText)
+                .font(.system(size: 11))
+                .foregroundColor(Color(designSystemColor: .textPrimary))
+
+            Button(action: openSystemSettings) {
+                Text(item.permissionType.systemSettingsLinkText)
+                    .font(.system(size: 11))
+                    .foregroundColor(.accentColor)
+            }
+            .buttonStyle(PlainButtonStyle())
+        }
+        .padding(8)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .background(Color.yellow.opacity(0.2))
+        .cornerRadius(6)
+    }
+
+    private func openSystemSettings() {
+        guard let url = item.permissionType.systemSettingsURL else { return }
+        NSWorkspace.shared.open(url)
+    }
+}
+
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionCenterViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionCenterViewController.swift
new file mode 100644
index 00000000000..5a98bc9286f
--- /dev/null
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionCenterViewController.swift
@@ -0,0 +1,57 @@
+//
+//  PermissionCenterViewController.swift
+//
+//  Copyright © 2025 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import SwiftUI
+
+final class PermissionCenterViewController: NSHostingController<PermissionCenterView> {
+
+    let viewModel: PermissionCenterViewModel
+
+    init(viewModel: PermissionCenterViewModel) {
+        self.viewModel = viewModel
+        let view = PermissionCenterView(viewModel: viewModel)
+        super.init(rootView: view)
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+// MARK: - PermissionCenterPopover
+
+final class PermissionCenterPopover: NSPopover {
+
+    let viewController: PermissionCenterViewController
+
+    init(viewModel: PermissionCenterViewModel) {
+        self.viewController = PermissionCenterViewController(viewModel: viewModel)
+        super.init()
+
+        self.contentViewController = viewController
+        self.behavior = .transient
+        self.animates = true
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
diff --git a/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift b/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
new file mode 100644
index 00000000000..a7e50560a05
--- /dev/null
+++ b/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
@@ -0,0 +1,110 @@
+//
+//  PermissionCenterViewModel.swift
+//
+//  Copyright © 2025 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Combine
+import Foundation
+
+/// Represents a permission item displayed in the Permission Center
+struct PermissionCenterItem: Identifiable {
+    let id: PermissionType
+    let permissionType: PermissionType
+    var decision: PersistedPermissionDecision
+    var isSystemDisabled: Bool
+
+    var displayName: String {
+        permissionType.localizedDescription
+    }
+}
+
+/// ViewModel for the Permission Center popover
+final class PermissionCenterViewModel: ObservableObject {
+
+    // MARK: - Published Properties
+
+    @Published private(set) var domain: String
+    @Published private(set) var permissionItems: [PermissionCenterItem] = []
+
+    // MARK: - Dependencies
+
+    private let permissionManager: PermissionManagerProtocol
+    private let systemPermissionManager: SystemPermissionManagerProtocol
+    private let usedPermissions: Permissions
+    private var cancellables = Set<AnyCancellable>()
+
+    // MARK: - Initialization
+
+    init(
+        domain: String,
+        usedPermissions: Permissions,
+        permissionManager: PermissionManagerProtocol,
+        systemPermissionManager: SystemPermissionManagerProtocol = SystemPermissionManager()
+    ) {
+        self.domain = domain
+        self.usedPermissions = usedPermissions
+        self.permissionManager = permissionManager
+        self.systemPermissionManager = systemPermissionManager
+
+        loadPermissions()
+        subscribeToPermissionChanges()
+    }
+
+    // MARK: - Public Methods
+
+    /// Updates the decision for a permission type
+    func setDecision(_ decision: PersistedPermissionDecision, for permissionType: PermissionType) {
+        permissionManager.setPermission(decision, forDomain: domain, permissionType: permissionType)
+    }
+
+    /// Removes the permission (resets to "ask")
+    func removePermission(_ permissionType: PermissionType) {
+        setDecision(.ask, for: permissionType)
+    }
+
+    // MARK: - Private Methods
+
+    private func loadPermissions() {
+        permissionItems = usedPermissions.keys.map { permissionType in
+            let decision = permissionManager.permission(forDomain: domain, permissionType: permissionType)
+            let isSystemDisabled = checkSystemDisabled(for: permissionType)
+
+            return PermissionCenterItem(
+                id: permissionType,
+                permissionType: permissionType,
+                decision: decision,
+                isSystemDisabled: isSystemDisabled
+            )
+        }.sorted { $0.permissionType.rawValue < $1.permissionType.rawValue }
+    }
+
+    private func checkSystemDisabled(for permissionType: PermissionType) -> Bool {
+        guard permissionType.requiresSystemPermission else { return false }
+
+        let authState = systemPermissionManager.authorizationState(for: permissionType)
+        return authState == .denied || authState == .restricted || authState == .systemDisabled
+    }
+
+    private func subscribeToPermissionChanges() {
+        permissionManager.permissionPublisher
+            .filter { [weak self] in $0.domain == self?.domain }
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.loadPermissions()
+            }
+            .store(in: &cancellables)
+    }
+}

From 561413d2eb4d5d7d606659a2726840cfbe381aff Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sun, 30 Nov 2025 11:02:06 +0100
Subject: [PATCH 24/40] Positioning of permission center fixed

---
 .../AddressBarButtonsViewController.swift     |  3 +-
 .../View/PermissionCenterViewController.swift | 31 +++++++++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 55d67768640..da7aec55ce9 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -1608,7 +1608,6 @@ final class AddressBarButtonsViewController: NSViewController {
     @IBAction func permissionCenterButtonAction(_ sender: Any) {
         guard featureFlagger.isFeatureOn(.newPermissionView) else { return }
         guard let tabViewModel else { return }
-        guard let sender = sender as? NSView else { return }
 
         // Close existing popover if shown
         if let existingPopover = permissionCenterPopover, existingPopover.isShown {
@@ -1629,7 +1628,7 @@ final class AddressBarButtonsViewController: NSViewController {
         let popover = PermissionCenterPopover(viewModel: viewModel)
         permissionCenterPopover = popover
 
-        popover.show(relativeTo: sender.bounds, of: sender, preferredEdge: .maxY)
+        popover.show(relativeTo: permissionCenterButton.bounds, of: permissionCenterButton, preferredEdge: .maxY)
     }
 
     @IBAction func cameraButtonAction(_ sender: NSButton) {
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionCenterViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionCenterViewController.swift
index 5a98bc9286f..7feb6aa7f67 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionCenterViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionCenterViewController.swift
@@ -19,20 +19,45 @@
 import AppKit
 import SwiftUI
 
-final class PermissionCenterViewController: NSHostingController<PermissionCenterView> {
+final class PermissionCenterViewController: NSViewController {
 
     let viewModel: PermissionCenterViewModel
+    private var hostingView: NSHostingView<PermissionCenterView>?
 
     init(viewModel: PermissionCenterViewModel) {
         self.viewModel = viewModel
-        let view = PermissionCenterView(viewModel: viewModel)
-        super.init(rootView: view)
+        super.init(nibName: nil, bundle: nil)
     }
 
     @available(*, unavailable)
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    override func loadView() {
+        view = NSView()
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupHostingView()
+    }
+
+    private func setupHostingView() {
+        let swiftUIView = PermissionCenterView(viewModel: viewModel)
+        let hostingView = NSHostingView(rootView: swiftUIView)
+        hostingView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(hostingView)
+
+        NSLayoutConstraint.activate([
+            hostingView.topAnchor.constraint(equalTo: view.topAnchor),
+            hostingView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            hostingView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            hostingView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
+
+        self.hostingView = hostingView
+    }
 }
 
 // MARK: - PermissionCenterPopover

From 09359a50a66224455b42d7a1d1a405e15d9f84a5 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sun, 30 Nov 2025 19:37:11 +0100
Subject: [PATCH 25/40] Permission center view polished

---
 .../View/PermissionCenterView.swift           | 83 +++++++++++--------
 1 file changed, 50 insertions(+), 33 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
index 1ff730bc268..67836b3802b 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
@@ -31,11 +31,12 @@ struct PermissionCenterView: View {
             Text(String(format: UserText.permissionCenterTitle, viewModel.domain))
                 .font(.system(size: 13, weight: .semibold))
                 .foregroundColor(Color(designSystemColor: .textPrimary))
-                .padding(.horizontal, 16)
+                .padding(.leading, 20)
+                .padding(.trailing, 16)
                 .padding(.top, 16)
                 .padding(.bottom, 12)
 
-            // Permission rows
+            // Permission rows in a rounded container
             VStack(spacing: 0) {
                 ForEach(viewModel.permissionItems) { item in
                     PermissionRowView(
@@ -50,10 +51,15 @@ struct PermissionCenterView: View {
 
                     if item.id != viewModel.permissionItems.last?.id {
                         Divider()
-                            .padding(.leading, 52)
                     }
                 }
             }
+            .background(Color(designSystemColor: .containerFillTertiary))
+            .cornerRadius(8)
+            .overlay(
+                RoundedRectangle(cornerRadius: 8)
+                    .stroke(Color(NSColor.separatorColor), lineWidth: 1)
+            )
             .padding(.horizontal, 16)
             .padding(.bottom, 16)
         }
@@ -70,6 +76,16 @@ struct PermissionRowView: View {
     let onDecisionChanged: (PersistedPermissionDecision) -> Void
     let onRemove: () -> Void
 
+    @State private var isRemoveButtonHovered = false
+    @State private var currentDecision: PersistedPermissionDecision
+
+    init(item: PermissionCenterItem, onDecisionChanged: @escaping (PersistedPermissionDecision) -> Void, onRemove: @escaping () -> Void) {
+        self.item = item
+        self.onDecisionChanged = onDecisionChanged
+        self.onRemove = onRemove
+        self._currentDecision = State(initialValue: item.decision)
+    }
+
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             // Main row
@@ -86,26 +102,39 @@ struct PermissionRowView: View {
                 Spacer()
 
                 // Decision dropdown
-                decisionPicker
+                decisionPopUpButton
 
-                // Remove button
+                // Remove button with hover effect
                 Button(action: onRemove) {
                     Image(systemName: "xmark")
                         .font(.system(size: 10, weight: .semibold))
                         .foregroundColor(Color(designSystemColor: .textSecondary))
                 }
                 .buttonStyle(PlainButtonStyle())
-                .frame(width: 20, height: 20)
+                .frame(width: 16, height: 16)
+                .background(
+                    RoundedRectangle(cornerRadius: 3)
+                        .fill(isRemoveButtonHovered ? Color(.buttonMouseOver) : Color.clear)
+                )
+                .onHover { hovering in
+                    isRemoveButtonHovered = hovering
+                }
             }
+            .padding(.leading, 16)
+            .padding(.trailing, 12)
             .padding(.vertical, 12)
 
             // System disabled warning (if applicable)
             if item.isSystemDisabled {
                 systemDisabledWarning
-                    .padding(.leading, 36)
+                    .padding(.leading, 52)
+                    .padding(.trailing, 12)
                     .padding(.bottom, 8)
             }
         }
+        .onChange(of: currentDecision) { newValue in
+            onDecisionChanged(newValue)
+        }
     }
 
     // MARK: - Subviews
@@ -131,37 +160,25 @@ struct PermissionRowView: View {
         }
     }
 
-    private var decisionPicker: some View {
-        Menu {
-            Button(UserText.permissionCenterAlwaysAsk) {
-                onDecisionChanged(.ask)
-            }
-            Button(UserText.permissionCenterAlwaysAllow) {
-                onDecisionChanged(.allow)
-            }
-            Button(UserText.permissionCenterNeverAllow) {
-                onDecisionChanged(.deny)
-            }
-        } label: {
-            HStack(spacing: 4) {
-                Text(decisionDisplayText)
-                    .font(.system(size: 12))
-                    .foregroundColor(Color(designSystemColor: .textPrimary))
-                Image(systemName: "chevron.down")
-                    .font(.system(size: 8, weight: .semibold))
-                    .foregroundColor(Color(designSystemColor: .textSecondary))
+    private var decisionPopUpButton: some View {
+        NSPopUpButtonView(selection: $currentDecision) {
+            let button = NSPopUpButton()
+            button.bezelStyle = .accessoryBarAction
+            button.isBordered = true
+            button.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+
+            for decision in [PersistedPermissionDecision.ask, .allow, .deny] {
+                let item = button.menu?.addItem(withTitle: decisionDisplayText(for: decision), action: nil, keyEquivalent: "")
+                item?.representedObject = decision
             }
-            .padding(.horizontal, 10)
-            .padding(.vertical, 6)
-            .background(Color(designSystemColor: .controlsFillSecondary))
-            .cornerRadius(6)
+
+            return button
         }
-        .menuStyle(BorderlessButtonMenuStyle())
         .fixedSize()
     }
 
-    private var decisionDisplayText: String {
-        switch item.decision {
+    private func decisionDisplayText(for decision: PersistedPermissionDecision) -> String {
+        switch decision {
         case .ask:
             return UserText.permissionCenterAlwaysAsk
         case .allow:

From 4262bd2f49ef7585c57d565d727834a4cde22d10 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sun, 30 Nov 2025 20:30:37 +0100
Subject: [PATCH 26/40] Edge case when system permissions are disabled polished
 in permission center

---
 .../Common/Extensions/NSColorExtension.swift  | 12 ++++++++
 .../View/PermissionCenterView.swift           | 30 ++++++++-----------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/macOS/DuckDuckGo/Common/Extensions/NSColorExtension.swift b/macOS/DuckDuckGo/Common/Extensions/NSColorExtension.swift
index 3b54b8271c4..6117eadec78 100644
--- a/macOS/DuckDuckGo/Common/Extensions/NSColorExtension.swift
+++ b/macOS/DuckDuckGo/Common/Extensions/NSColorExtension.swift
@@ -52,6 +52,18 @@ extension NSColor {
         .blackWhite10
     }
 
+    /// Background color for permission warning rows (system permission disabled)
+    /// Light mode: #FFF0C2, Dark mode: #C18010 at 16% opacity
+    static var permissionWarningBackground: NSColor {
+        NSColor(name: nil) { appearance in
+            if appearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua {
+                return NSColor(red: 0xC1 / 255.0, green: 0x80 / 255.0, blue: 0x10 / 255.0, alpha: 0.16)
+            } else {
+                return NSColor(red: 0xFF / 255.0, green: 0xF0 / 255.0, blue: 0xC2 / 255.0, alpha: 1.0)
+            }
+        }
+    }
+
     // MARK: - Helpers
 
     var ciColor: CIColor {
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
index 67836b3802b..bc838261490 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
@@ -128,10 +128,11 @@ struct PermissionRowView: View {
             if item.isSystemDisabled {
                 systemDisabledWarning
                     .padding(.leading, 52)
-                    .padding(.trailing, 12)
-                    .padding(.bottom, 8)
+                    .padding(.trailing, 16)
+                    .padding(.bottom, 12)
             }
         }
+        .background(item.isSystemDisabled ? Color(.permissionWarningBackground) : Color.clear)
         .onChange(of: currentDecision) { newValue in
             onDecisionChanged(newValue)
         }
@@ -189,22 +190,17 @@ struct PermissionRowView: View {
     }
 
     private var systemDisabledWarning: some View {
-        HStack(spacing: 0) {
-            Text(item.permissionType.systemPermissionDisabledText)
-                .font(.system(size: 11))
-                .foregroundColor(Color(designSystemColor: .textPrimary))
-
-            Button(action: openSystemSettings) {
-                Text(item.permissionType.systemSettingsLinkText)
-                    .font(.system(size: 11))
-                    .foregroundColor(.accentColor)
+        (Text(item.permissionType.systemPermissionDisabledText)
+            .font(.system(size: 12))
+            .foregroundColor(Color(designSystemColor: .textSecondary))
+        + Text(item.permissionType.systemSettingsLinkText)
+            .font(.system(size: 12))
+            .foregroundColor(.accentColor))
+            .fixedSize(horizontal: false, vertical: true)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .onTapGesture {
+                openSystemSettings()
             }
-            .buttonStyle(PlainButtonStyle())
-        }
-        .padding(8)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(Color.yellow.opacity(0.2))
-        .cornerRadius(6)
     }
 
     private func openSystemSettings() {

From 5f4b3fad65283798ff60b9d2ba4afa8eac24a5e4 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sun, 30 Nov 2025 21:35:24 +0100
Subject: [PATCH 27/40] Removing (and revoking) permission from permission
 center

---
 .../AddressBarButtonsViewController.swift     | 12 ++++-
 .../Permissions/Model/PermissionManager.swift | 18 +++++++
 .../Permissions/Model/PermissionModel.swift   | 19 +++++++
 .../ViewModel/PermissionCenterViewModel.swift | 50 ++++++++++++++-----
 4 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index da7aec55ce9..daf973cfb31 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -1622,7 +1622,17 @@ final class AddressBarButtonsViewController: NSViewController {
         let viewModel = PermissionCenterViewModel(
             domain: domain,
             usedPermissions: tabViewModel.usedPermissions,
-            permissionManager: permissionManager
+            permissionManager: permissionManager,
+            removePermission: { [weak tabViewModel] permissionType in
+                tabViewModel?.tab.permissions.remove(permissionType)
+            },
+            reloadPage: { [weak tabViewModel] in
+                tabViewModel?.tab.reload()
+            },
+            dismissPopover: { [weak self] in
+                self?.permissionCenterPopover?.close()
+                self?.permissionCenterPopover = nil
+            }
         )
 
         let popover = PermissionCenterPopover(viewModel: viewModel)
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
index a1e7432cfcb..9ea420f25ac 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
@@ -35,6 +35,9 @@ protocol PermissionManagerProtocol: AnyObject {
     func burnPermissions(except fireproofDomains: FireproofDomains, completion: @escaping @MainActor () -> Void)
     func burnPermissions(of baseDomains: Set<String>, tld: TLD, completion: @escaping @MainActor () -> Void)
 
+    /// Removes a specific permission for a domain (clears from storage)
+    func removePermission(forDomain domain: String, permissionType: PermissionType)
+
     var persistedPermissionTypes: Set<PermissionType> { get }
 }
 
@@ -133,4 +136,19 @@ final class PermissionManager: PermissionManagerProtocol {
         })
     }
 
+    func removePermission(forDomain domain: String, permissionType: PermissionType) {
+        let domain = domain.droppingWwwPrefix()
+
+        guard let storedPermission = permissions[domain]?[permissionType] else { return }
+
+        // Remove from in-memory cache
+        permissions[domain]?[permissionType] = nil
+
+        // Remove from persistent storage
+        store.remove(objectWithId: storedPermission.id)
+
+        // Notify subscribers
+        permissionSubject.send((domain, permissionType, .ask))
+    }
+
 }
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
index 34b3a42a9d7..408aa18a723 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
@@ -231,6 +231,25 @@ final class PermissionModel {
         }
     }
 
+    /// Removes a permission completely (revokes and removes from tracking)
+    func remove(_ permission: PermissionType) {
+        // First revoke the permission
+        switch permission {
+        case .camera, .microphone, .geolocation:
+            webView?.revokePermissions([permission])
+        case .popups, .externalScheme:
+            break
+        }
+
+        // Remove from dictionary (will trigger @Published update)
+        permissions[permission] = nil
+
+        // Remove from persisted storage
+        if let domain = webView?.url?.host {
+            permissionManager.removePermission(forDomain: domain, permissionType: permission)
+        }
+    }
+
     // MARK: - WebView delegated methods
 
     // Called before requestMediaCapturePermissionFor: to validate System Permissions
diff --git a/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift b/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
index a7e50560a05..ec20977bb23 100644
--- a/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
+++ b/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
@@ -44,7 +44,11 @@ final class PermissionCenterViewModel: ObservableObject {
     private let permissionManager: PermissionManagerProtocol
     private let systemPermissionManager: SystemPermissionManagerProtocol
     private let usedPermissions: Permissions
+    private let removePermissionFromTab: (PermissionType) -> Void
+    private let reloadPage: () -> Void
+    private let dismissPopover: () -> Void
     private var cancellables = Set<AnyCancellable>()
+    private var removedPermissions = Set<PermissionType>()
 
     // MARK: - Initialization
 
@@ -52,11 +56,17 @@ final class PermissionCenterViewModel: ObservableObject {
         domain: String,
         usedPermissions: Permissions,
         permissionManager: PermissionManagerProtocol,
+        removePermission: @escaping (PermissionType) -> Void,
+        reloadPage: @escaping () -> Void,
+        dismissPopover: @escaping () -> Void,
         systemPermissionManager: SystemPermissionManagerProtocol = SystemPermissionManager()
     ) {
         self.domain = domain
         self.usedPermissions = usedPermissions
         self.permissionManager = permissionManager
+        self.removePermissionFromTab = removePermission
+        self.reloadPage = reloadPage
+        self.dismissPopover = dismissPopover
         self.systemPermissionManager = systemPermissionManager
 
         loadPermissions()
@@ -70,25 +80,39 @@ final class PermissionCenterViewModel: ObservableObject {
         permissionManager.setPermission(decision, forDomain: domain, permissionType: permissionType)
     }
 
-    /// Removes the permission (resets to "ask")
+    /// Removes the permission completely (from webview, tracking, and storage)
     func removePermission(_ permissionType: PermissionType) {
-        setDecision(.ask, for: permissionType)
+        // Track removed permissions to prevent re-adding on reload
+        removedPermissions.insert(permissionType)
+        removePermissionFromTab(permissionType)
+        // Also remove from UI immediately
+        permissionItems.removeAll { $0.permissionType == permissionType }
+
+        // Reload page to ensure website loses access
+        reloadPage()
+
+        // Dismiss popover if no permissions left
+        if permissionItems.isEmpty {
+            dismissPopover()
+        }
     }
 
     // MARK: - Private Methods
 
     private func loadPermissions() {
-        permissionItems = usedPermissions.keys.map { permissionType in
-            let decision = permissionManager.permission(forDomain: domain, permissionType: permissionType)
-            let isSystemDisabled = checkSystemDisabled(for: permissionType)
-
-            return PermissionCenterItem(
-                id: permissionType,
-                permissionType: permissionType,
-                decision: decision,
-                isSystemDisabled: isSystemDisabled
-            )
-        }.sorted { $0.permissionType.rawValue < $1.permissionType.rawValue }
+        permissionItems = usedPermissions.keys
+            .filter { !removedPermissions.contains($0) }
+            .map { permissionType in
+                let decision = permissionManager.permission(forDomain: domain, permissionType: permissionType)
+                let isSystemDisabled = checkSystemDisabled(for: permissionType)
+
+                return PermissionCenterItem(
+                    id: permissionType,
+                    permissionType: permissionType,
+                    decision: decision,
+                    isSystemDisabled: isSystemDisabled
+                )
+            }.sorted { $0.permissionType.rawValue < $1.permissionType.rawValue }
     }
 
     private func checkSystemDisabled(for permissionType: PermissionType) -> Bool {

From 085136badeeb4e5060261350d5ba8992ba75a15f Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sun, 30 Nov 2025 21:55:41 +0100
Subject: [PATCH 28/40] Skip sending permissions state to Privacy Dashboard
 when new permission UI is active

---
 .../PrivacyDashboardPermissionHandler.swift       | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift b/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
index acbc2fb829d..30326ce994b 100644
--- a/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
+++ b/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
@@ -18,17 +18,23 @@
 
 import Foundation
 import Combine
+import FeatureFlags
 import PrivacyDashboard
+import BrowserServicesKit
+import AppKit
 
 typealias PrivacyDashboardPermissionAuthorizationState = [(permission: PermissionType, state: PermissionAuthorizationState)]
 
 final class PrivacyDashboardPermissionHandler {
 
-    init(permissionManager: PermissionManagerProtocol) {
+    init(permissionManager: PermissionManagerProtocol,
+         featureFlagger: FeatureFlagger = NSApp.delegateTyped.featureFlagger) {
         self.permissionManager = permissionManager
+        self.featureFlagger = featureFlagger
     }
 
     private let permissionManager: PermissionManagerProtocol
+    private let featureFlagger: FeatureFlagger
     private weak var tabViewModel: TabViewModel?
     private var onPermissionChange: (([AllowedPermission]) -> Void)?
     private var cancellables = Set<AnyCancellable>()
@@ -61,6 +67,13 @@ final class PrivacyDashboardPermissionHandler {
     }
 
     private func updatePermissions() {
+        // Skip permission updates when new permission view is enabled
+        // Permission management is handled by the new Permission Center
+        if featureFlagger.isFeatureOn(.newPermissionView) {
+            onPermissionChange?([])
+            return
+        }
+
         guard let usedPermissions = tabViewModel?.usedPermissions else {
             assertionFailure("PrivacyDashboardViewController: tabViewModel not set")
             return

From 8847ce6748d0fa05a677df6b3e3d6a39ad76f8f3 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Sun, 30 Nov 2025 22:48:58 +0100
Subject: [PATCH 29/40] External schemes handled

---
 .../Common/Localizables/UserText.swift        |  2 ++
 .../Localization/Localizable.xcstrings        | 24 +++++++++++++++++++
 .../View/PermissionCenterView.swift           | 18 ++++++++++----
 .../ViewModel/PermissionCenterViewModel.swift | 13 +++++++++-
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/macOS/DuckDuckGo/Common/Localizables/UserText.swift b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
index ffc0c1ab32c..ddad327ce1f 100644
--- a/macOS/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/macOS/DuckDuckGo/Common/Localizables/UserText.swift
@@ -1002,6 +1002,8 @@ struct UserText {
     static let permissionCenterAlwaysAsk = NSLocalizedString("permission.center.always.ask", value: "Always Ask", comment: "Permission center dropdown option to always ask for permission")
     static let permissionCenterAlwaysAllow = NSLocalizedString("permission.center.always.allow", value: "Always Allow", comment: "Permission center dropdown option to always allow permission")
     static let permissionCenterNeverAllow = NSLocalizedString("permission.center.never.allow", value: "Never Allow", comment: "Permission center dropdown option to never allow permission")
+    static let permissionCenterExternalSchemeDescription = NSLocalizedString("permission.center.external.scheme.description", value: "%@ to open \"%@\" links", comment: "Description for external scheme permission, first %@ is domain, second %@ is scheme name")
+    static let permissionCenterExternalApps = NSLocalizedString("permission.center.external.apps", value: "External Apps", comment: "Permission center header for external app permissions")
 
     static let privacyDashboardPopupsAlwaysAsk = NSLocalizedString("dashboard.popups.ask", value: "Notify", comment: "Make pop-up windows always request permission for the current domain")
 
diff --git a/macOS/DuckDuckGo/Localization/Localizable.xcstrings b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
index c42ba89503b..8fff15486fb 100644
--- a/macOS/DuckDuckGo/Localization/Localizable.xcstrings
+++ b/macOS/DuckDuckGo/Localization/Localizable.xcstrings
@@ -60414,6 +60414,30 @@
         }
       }
     },
+    "permission.center.external.apps" : {
+      "comment" : "Permission center header for external app permissions",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "External Apps"
+          }
+        }
+      }
+    },
+    "permission.center.external.scheme.description" : {
+      "comment" : "Description for external scheme permission, first %@ is domain, second %@ is scheme name",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "%1$@ to open \"%2$@\" links"
+          }
+        }
+      }
+    },
     "permission.center.never.allow" : {
       "comment" : "Permission center dropdown option to never allow permission",
       "extractionState" : "extracted_with_value",
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
index bc838261490..12731796041 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
@@ -89,7 +89,7 @@ struct PermissionRowView: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             // Main row
-            HStack(spacing: 12) {
+            HStack(spacing: 8) {
                 // Icon
                 permissionIcon
                     .frame(width: 24, height: 24)
@@ -120,15 +120,25 @@ struct PermissionRowView: View {
                     isRemoveButtonHovered = hovering
                 }
             }
-            .padding(.leading, 16)
+            .padding(.leading, 12)
             .padding(.trailing, 12)
             .padding(.vertical, 12)
 
+            // External scheme description (if applicable)
+            if let description = item.externalSchemeDescription {
+                Text(description)
+                    .font(.system(size: 12))
+                    .foregroundColor(Color(designSystemColor: .textSecondary))
+                    .padding(.leading, 44)
+                    .padding(.trailing, 12)
+                    .padding(.bottom, 12)
+            }
+
             // System disabled warning (if applicable)
             if item.isSystemDisabled {
                 systemDisabledWarning
-                    .padding(.leading, 52)
-                    .padding(.trailing, 16)
+                    .padding(.leading, 44)
+                    .padding(.trailing, 12)
                     .padding(.bottom, 12)
             }
         }
diff --git a/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift b/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
index ec20977bb23..32d369ad00d 100644
--- a/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
+++ b/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
@@ -23,11 +23,21 @@ import Foundation
 struct PermissionCenterItem: Identifiable {
     let id: PermissionType
     let permissionType: PermissionType
+    let domain: String
     var decision: PersistedPermissionDecision
     var isSystemDisabled: Bool
 
     var displayName: String {
-        permissionType.localizedDescription
+        if case .externalScheme = permissionType {
+            return UserText.permissionCenterExternalApps
+        }
+        return permissionType.localizedDescription
+    }
+
+    /// Additional description for external schemes (e.g., "zoom.us to open "zoomus" links")
+    var externalSchemeDescription: String? {
+        guard case .externalScheme(let scheme) = permissionType else { return nil }
+        return String(format: UserText.permissionCenterExternalSchemeDescription, domain, scheme)
     }
 }
 
@@ -109,6 +119,7 @@ final class PermissionCenterViewModel: ObservableObject {
                 return PermissionCenterItem(
                     id: permissionType,
                     permissionType: permissionType,
+                    domain: domain,
                     decision: decision,
                     isSystemDisabled: isSystemDisabled
                 )

From 37b8092d33d4c6e46e6dd69d4f17a51b72e01e1d Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Mon, 1 Dec 2025 11:06:13 +0100
Subject: [PATCH 30/40] Swiftlint

---
 .../Permissions/View/PermissionAuthorizationSwiftUIView.swift | 1 -
 .../View/PermissionAuthorizationViewController.swift          | 4 ++--
 macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift  | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index 898f53bd806..e4885a27401 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -465,4 +465,3 @@ struct PermissionAuthorizationSwiftUIView_Previews: PreviewProvider {
     }
 }
 #endif
-
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index 640b311ffeb..1c467ad89c2 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -106,7 +106,7 @@ final class PermissionAuthorizationViewController: NSViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+
         if newPermissionView {
             setupSwiftUIView()
         } else {
@@ -116,7 +116,7 @@ final class PermissionAuthorizationViewController: NSViewController {
 
     override func viewWillAppear() {
         guard !newPermissionView else { return }
-        
+
         alwaysAllowCheckbox.state = .off
         if query?.shouldShowCancelInsteadOfDeny == true {
             denyButton.title = UserText.cancel
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
index 12731796041..0b2b271792c 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
@@ -218,4 +218,3 @@ struct PermissionRowView: View {
         NSWorkspace.shared.open(url)
     }
 }
-

From cca0bf972a5ce4141954b246cb760f241a50dbf9 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Mon, 1 Dec 2025 12:54:03 +0100
Subject: [PATCH 31/40] Unit test compilation

---
 macOS/UnitTests/Permissions/PermissionManagerTests.swift     | 5 ++++-
 .../TabExtensionsTests/PopupHandlingTabExtensionTests.swift  | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/macOS/UnitTests/Permissions/PermissionManagerTests.swift b/macOS/UnitTests/Permissions/PermissionManagerTests.swift
index c0b7dcfae6b..f74f543f655 100644
--- a/macOS/UnitTests/Permissions/PermissionManagerTests.swift
+++ b/macOS/UnitTests/Permissions/PermissionManagerTests.swift
@@ -22,17 +22,20 @@ import XCTest
 
 final class PermissionManagerTests: XCTestCase {
     var store: PermissionStoreMock!
+    var featureFlagger: MockFeatureFlagger!
     lazy var manager: PermissionManager! = {
-        PermissionManager(store: store)
+        PermissionManager(store: store, featureFlagger: featureFlagger)
     }()
 
     override func setUp() {
         store = PermissionStoreMock()
+        featureFlagger = MockFeatureFlagger()
     }
 
     override func tearDown() {
         manager = nil
         store = nil
+        featureFlagger = nil
     }
 
     func testWhenPermissionManagerInitializedThenPermissionsAreLoaded() {
diff --git a/macOS/UnitTests/TabExtensionsTests/PopupHandlingTabExtensionTests.swift b/macOS/UnitTests/TabExtensionsTests/PopupHandlingTabExtensionTests.swift
index 6be3894f8ce..eaa235ee375 100644
--- a/macOS/UnitTests/TabExtensionsTests/PopupHandlingTabExtensionTests.swift
+++ b/macOS/UnitTests/TabExtensionsTests/PopupHandlingTabExtensionTests.swift
@@ -2225,6 +2225,10 @@ class TestPermissionManager: PermissionManagerProtocol {
         }
     }
 
+    func removePermission(forDomain domain: String, permissionType: PermissionType) {
+        persistedPermissions[domain]?[permissionType] = nil
+    }
+
     var persistedPermissionTypes: Set<PermissionType> { return [] }
 }
 

From 3d9b9859e15708e5957a0eef56c1e31ad6f89cee Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Mon, 1 Dec 2025 13:15:55 +0100
Subject: [PATCH 32/40] Addressing feedback from PR

---
 .../View/AddressBarButtonsViewController.swift  |  2 +-
 .../Model/SystemPermissionManager.swift         | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 38ee4dcc08c..eda4b56e718 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -1623,7 +1623,7 @@ final class AddressBarButtonsViewController: NSViewController {
         }
 
         let url = tabViewModel.tab.content.urlForWebView ?? .empty
-        let domain = url.isFileURL ? .localhost : (url.host ?? "")
+        let domain = (url.isFileURL ? .localhost : (url.host ?? "")).droppingWwwPrefix()
 
         let viewModel = PermissionCenterViewModel(
             domain: domain,
diff --git a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
index e9df7046299..f43b2f00470 100644
--- a/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/SystemPermissionManager.swift
@@ -133,28 +133,35 @@ final class SystemPermissionManager: SystemPermissionManagerProtocol {
             return AnyCancellable {}
         }
 
-        var locationCancellable: AnyCancellable?
+        // Use a holder class to ensure proper capture semantics
+        // This avoids the issue of capturing a nil variable before assignment
+        let cancellableHolder = CancellableHolder()
 
         // Subscribe to authorization status publisher to observe changes
         let authorizationCancellable = geolocationService.authorizationStatusPublisher
             .dropFirst() // Skip initial value, we want to observe changes
             .first() // Only need the first change
-            .sink { [weak self] _ in
+            .sink { [weak self, cancellableHolder] _ in
                 let state = self?.geolocationAuthorizationState ?? .notDetermined
                 // Cancel location subscription once we have the authorization result
-                locationCancellable?.cancel()
+                cancellableHolder.cancellable?.cancel()
                 completion(state)
             }
 
         // Subscribe to location publisher to trigger authorization request
         // The GeolocationService calls requestWhenInUseAuthorization() when first subscribed
         // We keep this subscription alive until authorization is determined
-        locationCancellable = geolocationService.locationPublisher
+        cancellableHolder.cancellable = geolocationService.locationPublisher
             .sink { _ in }
 
         return AnyCancellable {
             authorizationCancellable.cancel()
-            locationCancellable?.cancel()
+            cancellableHolder.cancellable?.cancel()
         }
     }
 }
+
+/// Helper class to hold a cancellable reference for proper capture semantics in closures
+private final class CancellableHolder {
+    var cancellable: AnyCancellable?
+}

From 9d27ec1c3bc2cb5c551de07e93d3b8fe41e36ad8 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Mon, 1 Dec 2025 14:06:30 +0100
Subject: [PATCH 33/40] Solving camera&microphone in one request

---
 .../PermissionAuthorizationSwiftUIView.swift  | 209 ++++++++++++++----
 ...ermissionAuthorizationViewController.swift |   3 +-
 2 files changed, 163 insertions(+), 49 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index e4885a27401..12b8a1b555a 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -20,11 +20,154 @@ import AppKit
 import Combine
 import SwiftUI
 
+// MARK: - PermissionAuthorizationType
+
+/// UI-only permission type for the authorization SwiftUI view.
+/// This handles the combined camera+microphone case without modifying the model layer.
+enum PermissionAuthorizationType {
+    case camera
+    case microphone
+    case cameraAndMicrophone
+    case geolocation
+    case popups
+    case externalScheme(scheme: String)
+
+    /// Creates the appropriate type from an array of PermissionType
+    init(from permissions: [PermissionType]) {
+        if Set(permissions) == Set([.camera, .microphone]) {
+            self = .cameraAndMicrophone
+        } else if let first = permissions.first {
+            switch first {
+            case .camera: self = .camera
+            case .microphone: self = .microphone
+            case .geolocation: self = .geolocation
+            case .popups: self = .popups
+            case .externalScheme(let scheme): self = .externalScheme(scheme: scheme)
+            }
+        } else {
+            self = .camera // fallback, shouldn't happen
+        }
+    }
+
+    var localizedDescription: String {
+        switch self {
+        case .camera:
+            return UserText.permissionCamera
+        case .microphone:
+            return UserText.permissionMicrophone
+        case .cameraAndMicrophone:
+            return UserText.permissionCameraAndMicrophone
+        case .geolocation:
+            return UserText.permissionGeolocation
+        case .popups:
+            return UserText.permissionPopups
+        case .externalScheme(scheme: let scheme):
+            guard let url = URL(string: scheme + URL.NavigationalScheme.separator),
+                  let app = NSWorkspace.shared.application(toOpen: url)
+            else { return scheme }
+            return app
+        }
+    }
+
+    /// Whether this permission type requires a two-step authorization flow (system permission first, then website permission)
+    var requiresSystemPermission: Bool {
+        switch self {
+        case .geolocation:
+            return true
+        case .camera, .microphone, .cameraAndMicrophone, .popups, .externalScheme:
+            return false
+        }
+    }
+
+    /// Whether this permission uses permanent decisions ("Always Allow" / "Never Allow") vs one-time decisions ("Allow" / "Deny")
+    var usesPermanentDecisions: Bool {
+        switch self {
+        case .camera, .microphone, .cameraAndMicrophone, .popups, .externalScheme, .geolocation:
+            return true
+        }
+    }
+
+    // MARK: - Two-Step UI Localized Strings
+
+    /// Button text for enabling system permission (Step 1)
+    var systemPermissionEnableText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemLocationEnable
+        case .camera, .microphone, .cameraAndMicrophone, .popups, .externalScheme:
+            return "" // Not used for these types
+        }
+    }
+
+    /// Text shown while waiting for system permission response
+    var systemPermissionWaitingText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemLocationWaiting
+        case .camera, .microphone, .cameraAndMicrophone, .popups, .externalScheme:
+            return ""
+        }
+    }
+
+    /// Text shown when system permission is granted
+    var systemPermissionEnabledText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemLocationEnabled
+        case .camera, .microphone, .cameraAndMicrophone, .popups, .externalScheme:
+            return ""
+        }
+    }
+
+    /// Text shown when system permission was previously disabled (prefix before link)
+    var systemPermissionDisabledText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemLocationDisabled
+        case .camera, .microphone, .cameraAndMicrophone, .popups, .externalScheme:
+            return ""
+        }
+    }
+
+    /// Link text for opening System Settings
+    var systemSettingsLinkText: String {
+        switch self {
+        case .geolocation:
+            return UserText.permissionSystemSettingsLocation
+        case .camera, .microphone, .cameraAndMicrophone, .popups, .externalScheme:
+            return ""
+        }
+    }
+
+    /// URL to open the relevant System Settings pane
+    var systemSettingsURL: URL? {
+        switch self {
+        case .geolocation:
+            return URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_LocationServices")
+        case .camera, .microphone, .cameraAndMicrophone, .popups, .externalScheme:
+            return nil
+        }
+    }
+
+    /// Converts back to a single PermissionType for system permission checks.
+    /// For cameraAndMicrophone, returns .camera as both require the same system permission flow.
+    var asPermissionType: PermissionType {
+        switch self {
+        case .camera: return .camera
+        case .microphone: return .microphone
+        case .cameraAndMicrophone: return .camera // Use camera for system permission checks
+        case .geolocation: return .geolocation
+        case .popups: return .popups
+        case .externalScheme(let scheme): return .externalScheme(scheme: scheme)
+        }
+    }
+}
+
 // MARK: - PermissionAuthorizationSwiftUIView
 
 struct PermissionAuthorizationSwiftUIView: View {
     let domain: String
-    let permissionType: PermissionType
+    let permissionType: PermissionAuthorizationType
     let onDeny: () -> Void
     let onAlwaysDeny: () -> Void
     let onAllow: () -> Void
@@ -49,14 +192,14 @@ struct PermissionAuthorizationSwiftUIView: View {
     /// Whether to show the two-step UI
     private var showsTwoStepUI: Bool {
         guard permissionType.requiresSystemPermission else { return false }
-        return systemPermissionManager.isAuthorizationRequired(for: permissionType) || systemPermissionState != .initial
+        return systemPermissionManager.isAuthorizationRequired(for: permissionType.asPermissionType) || systemPermissionState != .initial
     }
 
     private var promptText: String {
         switch permissionType {
         case .geolocation:
             return String(format: UserText.permissionGeolocationPromptFormat, domain)
-        case .camera, .microphone:
+        case .camera, .microphone, .cameraAndMicrophone:
             return String(format: UserText.devicePermissionAuthorizationFormat, domain, permissionType.localizedDescription.lowercased())
         case .popups:
             return String(format: UserText.popupWindowsPermissionAuthorizationFormat, domain, permissionType.localizedDescription.lowercased())
@@ -130,7 +273,7 @@ struct PermissionAuthorizationSwiftUIView: View {
     private func initializeSystemPermissionState() {
         guard systemPermissionState == .initial else { return }
 
-        let authState = systemPermissionManager.authorizationState(for: permissionType)
+        let authState = systemPermissionManager.authorizationState(for: permissionType.asPermissionType)
         switch authState {
         case .denied, .restricted, .systemDisabled:
             systemPermissionState = .alreadyDenied
@@ -275,7 +418,7 @@ struct PermissionAuthorizationSwiftUIView: View {
     private func requestSystemPermission() {
         systemPermissionState = .waiting
 
-        authorizationCancellable = systemPermissionManager.requestAuthorization(for: permissionType) { state in
+        authorizationCancellable = systemPermissionManager.requestAuthorization(for: permissionType.asPermissionType) { state in
             DispatchQueue.main.async {
                 switch state {
                 case .authorized:
@@ -339,7 +482,7 @@ struct PermissionAuthorizationSwiftUIView: View {
 extension PermissionAuthorizationSwiftUIView {
     init(
         domain: String,
-        permissionType: PermissionType,
+        permissionType: PermissionAuthorizationType,
         onDeny: @escaping () -> Void,
         onAlwaysDeny: @escaping () -> Void,
         onAllow: @escaping () -> Void,
@@ -355,7 +498,7 @@ extension PermissionAuthorizationSwiftUIView {
     }
 }
 
-// MARK: - PermissionType extension
+// MARK: - PermissionType UI Extensions
 
 extension PermissionType {
 
@@ -369,46 +512,6 @@ extension PermissionType {
         }
     }
 
-    /// Whether this permission uses permanent decisions ("Always Allow" / "Never Allow") vs one-time decisions ("Allow" / "Deny")
-    var usesPermanentDecisions: Bool {
-        switch self {
-        case .camera, .microphone, .popups, .externalScheme, .geolocation:
-            return true
-        }
-    }
-
-    // MARK: - Two-Step UI Localized Strings
-
-    /// Button text for enabling system permission (Step 1)
-    var systemPermissionEnableText: String {
-        switch self {
-        case .geolocation:
-            return UserText.permissionSystemLocationEnable
-        case .camera, .microphone, .popups, .externalScheme:
-            return "" // Not used for these types
-        }
-    }
-
-    /// Text shown while waiting for system permission response
-    var systemPermissionWaitingText: String {
-        switch self {
-        case .geolocation:
-            return UserText.permissionSystemLocationWaiting
-        case .camera, .microphone, .popups, .externalScheme:
-            return ""
-        }
-    }
-
-    /// Text shown when system permission is granted
-    var systemPermissionEnabledText: String {
-        switch self {
-        case .geolocation:
-            return UserText.permissionSystemLocationEnabled
-        case .camera, .microphone, .popups, .externalScheme:
-            return ""
-        }
-    }
-
     /// Text shown when system permission was previously disabled (prefix before link)
     var systemPermissionDisabledText: String {
         switch self {
@@ -461,7 +564,17 @@ struct PermissionAuthorizationSwiftUIView_Previews: PreviewProvider {
             onAllow: {},
             onAlwaysAllow: {}
         )
-        .previewDisplayName("Camera (Always Deny / Always Allow)")
+        .previewDisplayName("Camera")
+
+        PermissionAuthorizationSwiftUIView(
+            domain: "apple.com",
+            permissionType: .cameraAndMicrophone,
+            onDeny: {},
+            onAlwaysDeny: {},
+            onAllow: {},
+            onAlwaysAllow: {}
+        )
+        .previewDisplayName("Camera and Microphone")
     }
 }
 #endif
diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index 1c467ad89c2..df1a8483484 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -192,12 +192,13 @@ final class PermissionAuthorizationViewController: NSViewController {
     // MARK: - SwiftUI View Setup
 
     private func setupSwiftUIView() {
-        guard newPermissionView, let query = query, let permissionType = query.permissions.first else { return }
+        guard newPermissionView, let query = query, !query.permissions.isEmpty else { return }
 
         // Remove all existing subviews to ensure clean state
         view.subviews.forEach { $0.removeFromSuperview() }
         swiftUIHostingView = nil
 
+        let permissionType = PermissionAuthorizationType(from: query.permissions)
         let swiftUIView = PermissionAuthorizationSwiftUIView(
             domain: query.domain,
             permissionType: permissionType,

From 88b1b25315313ca18829d9257d90c0282a2a4765 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Tue, 2 Dec 2025 22:09:56 +0100
Subject: [PATCH 34/40] Default argument removed

---
 macOS/DuckDuckGo/Permissions/Model/PermissionType.swift       | 4 ++--
 .../PrivacyDashboard/PrivacyDashboardPermissionHandler.swift  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
index 1b7ba085df2..dc574b76311 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
@@ -71,7 +71,7 @@ extension PermissionType {
         return [.camera, .microphone, .geolocation]
     }
 
-    func canPersistGrantedDecision(featureFlagger: FeatureFlagger? = nil) -> Bool {
+    func canPersistGrantedDecision(featureFlagger: FeatureFlagger?) -> Bool {
         if let featureFlagger, featureFlagger.isFeatureOn(.newPermissionView) {
             switch self {
             case .camera, .microphone, .externalScheme, .popups, .geolocation:
@@ -87,7 +87,7 @@ extension PermissionType {
         }
     }
 
-    func canPersistDeniedDecision(featureFlagger: FeatureFlagger? = nil) -> Bool {
+    func canPersistDeniedDecision(featureFlagger: FeatureFlagger?) -> Bool {
         if let featureFlagger, featureFlagger.isFeatureOn(.newPermissionView) {
             switch self {
             case .camera, .microphone, .geolocation, .externalScheme:
diff --git a/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift b/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
index 30326ce994b..560badcb124 100644
--- a/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
+++ b/macOS/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
@@ -115,9 +115,9 @@ final class PrivacyDashboardPermissionHandler {
             // don't show Permanently Allow if can't persist Granted Decision
             switch decision {
             case .grant:
-                guard item.permission.canPersistGrantedDecision() else { return nil }
+                guard item.permission.canPersistGrantedDecision(featureFlagger: featureFlagger) else { return nil }
             case .deny:
-                guard item.permission.canPersistDeniedDecision() else { return nil }
+                guard item.permission.canPersistDeniedDecision(featureFlagger: featureFlagger) else { return nil }
             case .ask: break
             }
             return [

From 657094ebd3754e03f24b88b2535e2e1fdfa332e8 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Tue, 2 Dec 2025 22:21:29 +0100
Subject: [PATCH 35/40] No reloading of website after removing of permission

---
 .../View/AddressBarButtonsViewController.swift              | 3 ---
 .../Permissions/ViewModel/PermissionCenterViewModel.swift   | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index eda4b56e718..079e0cd5508 100644
--- a/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/macOS/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -1632,9 +1632,6 @@ final class AddressBarButtonsViewController: NSViewController {
             removePermission: { [weak tabViewModel] permissionType in
                 tabViewModel?.tab.permissions.remove(permissionType)
             },
-            reloadPage: { [weak tabViewModel] in
-                tabViewModel?.tab.reload()
-            },
             dismissPopover: { [weak self] in
                 self?.permissionCenterPopover?.close()
                 self?.permissionCenterPopover = nil
diff --git a/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift b/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
index 32d369ad00d..d723615169f 100644
--- a/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
+++ b/macOS/DuckDuckGo/Permissions/ViewModel/PermissionCenterViewModel.swift
@@ -55,7 +55,6 @@ final class PermissionCenterViewModel: ObservableObject {
     private let systemPermissionManager: SystemPermissionManagerProtocol
     private let usedPermissions: Permissions
     private let removePermissionFromTab: (PermissionType) -> Void
-    private let reloadPage: () -> Void
     private let dismissPopover: () -> Void
     private var cancellables = Set<AnyCancellable>()
     private var removedPermissions = Set<PermissionType>()
@@ -67,7 +66,6 @@ final class PermissionCenterViewModel: ObservableObject {
         usedPermissions: Permissions,
         permissionManager: PermissionManagerProtocol,
         removePermission: @escaping (PermissionType) -> Void,
-        reloadPage: @escaping () -> Void,
         dismissPopover: @escaping () -> Void,
         systemPermissionManager: SystemPermissionManagerProtocol = SystemPermissionManager()
     ) {
@@ -75,7 +73,6 @@ final class PermissionCenterViewModel: ObservableObject {
         self.usedPermissions = usedPermissions
         self.permissionManager = permissionManager
         self.removePermissionFromTab = removePermission
-        self.reloadPage = reloadPage
         self.dismissPopover = dismissPopover
         self.systemPermissionManager = systemPermissionManager
 
@@ -98,9 +95,6 @@ final class PermissionCenterViewModel: ObservableObject {
         // Also remove from UI immediately
         permissionItems.removeAll { $0.permissionType == permissionType }
 
-        // Reload page to ensure website loses access
-        reloadPage()
-
         // Dismiss popover if no permissions left
         if permissionItems.isEmpty {
             dismissPopover()

From b3277408a9da34a58d6fe6b419b41f7f45647347 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Tue, 2 Dec 2025 22:50:13 +0100
Subject: [PATCH 36/40] Assertion failure added + also handled local URLs as
 localhost domains for permissions

---
 .../Permissions/Model/PermissionModel.swift          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
index 408aa18a723..247a26f93fc 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionModel.swift
@@ -49,6 +49,12 @@ final class PermissionModel {
     }
     private var cancellables = Set<AnyCancellable>()
 
+    /// Returns the domain for the current webView URL, mapping file URLs to "localhost"
+    private var currentDomain: String? {
+        guard let url = webView?.url else { return nil }
+        return url.isFileURL ? .localhost : url.host
+    }
+
     init(webView: WKWebView? = nil,
          permissionManager: PermissionManagerProtocol,
          geolocationService: GeolocationServiceProtocol = GeolocationService.shared,
@@ -217,7 +223,7 @@ final class PermissionModel {
     }
 
     func revoke(_ permission: PermissionType) {
-        if let domain = webView?.url?.host,
+        if let domain = currentDomain,
            case .allow = permissionManager.permission(forDomain: domain, permissionType: permission) {
             permissionManager.setPermission(.ask, forDomain: domain, permissionType: permission)
         }
@@ -245,8 +251,10 @@ final class PermissionModel {
         permissions[permission] = nil
 
         // Remove from persisted storage
-        if let domain = webView?.url?.host {
+        if let domain = currentDomain {
             permissionManager.removePermission(forDomain: domain, permissionType: permission)
+        } else {
+            assertionFailure("webView URL should not be nil when removing a permission")
         }
     }
 

From 30c0fec4507692a73461d77ea51c423549377db8 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Tue, 2 Dec 2025 22:55:01 +0100
Subject: [PATCH 37/40] Assertion failure added

---
 .../Permissions/View/PermissionAuthorizationSwiftUIView.swift    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
index 12b8a1b555a..7439552567c 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionAuthorizationSwiftUIView.swift
@@ -45,6 +45,7 @@ enum PermissionAuthorizationType {
             case .externalScheme(let scheme): self = .externalScheme(scheme: scheme)
             }
         } else {
+            assertionFailure("Unexpected permission types combination")
             self = .camera // fallback, shouldn't happen
         }
     }

From 9e8363ede654ef6fca3d9ba188ab3e55e5e6d3d6 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Tue, 2 Dec 2025 23:07:51 +0100
Subject: [PATCH 38/40] PermissionAuthorizationTypeTests

---
 .../project.pbxproj                           |   6 +
 .../PermissionAuthorizationTypeTests.swift    | 211 ++++++++++++++++++
 2 files changed, 217 insertions(+)
 create mode 100644 macOS/UnitTests/Permissions/PermissionAuthorizationTypeTests.swift

diff --git a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
index 7b1c0390691..bb7f4db5fbf 100644
--- a/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
+++ b/macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
@@ -39,6 +39,8 @@
 		1D0DE9422C3BB9CC0037ABC2 /* ReleaseNotesParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D0DE9402C3BB9CC0037ABC2 /* ReleaseNotesParser.swift */; };
 		1D1A33492A6FEB170080ACED /* BurnerMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1A33482A6FEB170080ACED /* BurnerMode.swift */; };
 		1D1A334A2A6FEB170080ACED /* BurnerMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1A33482A6FEB170080ACED /* BurnerMode.swift */; };
+		1D1B4A462EDF97F400FE43C9 /* PermissionAuthorizationTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1B4A452EDF97EF00FE43C9 /* PermissionAuthorizationTypeTests.swift */; };
+		1D1B4A472EDF97F400FE43C9 /* PermissionAuthorizationTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1B4A452EDF97EF00FE43C9 /* PermissionAuthorizationTypeTests.swift */; };
 		1D1C36E329FAE8DA001FA40C /* FaviconManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1C36E229FAE8DA001FA40C /* FaviconManagerTests.swift */; };
 		1D1C36E429FAE8DA001FA40C /* FaviconManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1C36E229FAE8DA001FA40C /* FaviconManagerTests.swift */; };
 		1D1C36E629FB019C001FA40C /* HistoryTabExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1C36E529FB019C001FA40C /* HistoryTabExtensionTests.swift */; };
@@ -4242,6 +4244,7 @@
 		1D074B262909A433006E4AC3 /* PasswordManagerCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordManagerCoordinator.swift; sourceTree = "<group>"; };
 		1D0DE9402C3BB9CC0037ABC2 /* ReleaseNotesParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReleaseNotesParser.swift; sourceTree = "<group>"; };
 		1D1A33482A6FEB170080ACED /* BurnerMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BurnerMode.swift; sourceTree = "<group>"; };
+		1D1B4A452EDF97EF00FE43C9 /* PermissionAuthorizationTypeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionAuthorizationTypeTests.swift; sourceTree = "<group>"; };
 		1D1C36E229FAE8DA001FA40C /* FaviconManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaviconManagerTests.swift; sourceTree = "<group>"; };
 		1D1C36E529FB019C001FA40C /* HistoryTabExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryTabExtensionTests.swift; sourceTree = "<group>"; };
 		1D1D36212D8B7B8C005ED60C /* PinnedTabsManagerProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinnedTabsManagerProviderTests.swift; sourceTree = "<group>"; };
@@ -10820,6 +10823,7 @@
 			isa = PBXGroup;
 			children = (
 				B6106B9F26A7BE0B0013B453 /* PermissionManagerTests.swift */,
+				1D1B4A452EDF97EF00FE43C9 /* PermissionAuthorizationTypeTests.swift */,
 				B6106BB026A7D8720013B453 /* PermissionStoreTests.swift */,
 				B63ED0D726AE729600A9DAD1 /* PermissionModelTests.swift */,
 				B6106BAE26A7C6180013B453 /* PermissionStoreMock.swift */,
@@ -14675,6 +14679,7 @@
 				3706FDE5293F661700E42796 /* URLEventHandlerTests.swift in Sources */,
 				BB9851932E3102ED00FED56A /* NetworkProtectionNavBarButtonModelTests.swift in Sources */,
 				3785F6EE2EA6520400AF66E9 /* SuggestionLoadingDeciderTests.swift in Sources */,
+				1D1B4A462EDF97F400FE43C9 /* PermissionAuthorizationTypeTests.swift in Sources */,
 				3706FDE6293F661700E42796 /* BookmarkOutlineViewDataSourceTests.swift in Sources */,
 				BBC063E92C5A9E4B007BDC18 /* BookmarkManagementDetailViewModelTests.swift in Sources */,
 				3706FDE8293F661700E42796 /* TemporaryFileHandlerTests.swift in Sources */,
@@ -16731,6 +16736,7 @@
 				CCC87D732E1429570091344D /* ChromiumTopSitesReaderTests.swift in Sources */,
 				31FBF2312CDD130900626C17 /* AIChatUserScriptTests.swift in Sources */,
 				F1AFDBD42C231B9700710F2C /* SubscriptionErrorReporterTests.swift in Sources */,
+				1D1B4A472EDF97F400FE43C9 /* PermissionAuthorizationTypeTests.swift in Sources */,
 				1D8C2FEA2B70F5A7005E4BBD /* MockWebViewSnapshotRenderer.swift in Sources */,
 				CC3445702E674E7700019518 /* UserScriptErrorTests.swift in Sources */,
 				1DE717CE2E44B052009BDFFA /* MockNewTabPageTabPreloader.swift in Sources */,
diff --git a/macOS/UnitTests/Permissions/PermissionAuthorizationTypeTests.swift b/macOS/UnitTests/Permissions/PermissionAuthorizationTypeTests.swift
new file mode 100644
index 00000000000..2b604c405b1
--- /dev/null
+++ b/macOS/UnitTests/Permissions/PermissionAuthorizationTypeTests.swift
@@ -0,0 +1,211 @@
+//
+//  PermissionAuthorizationTypeTests.swift
+//
+//  Copyright © 2025 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+final class PermissionAuthorizationTypeTests: XCTestCase {
+
+    // MARK: - Initialization Tests
+
+    func testInitFromSingleCameraPermission() {
+        let type = PermissionAuthorizationType(from: [.camera])
+        XCTAssertEqual(type, .camera)
+    }
+
+    func testInitFromSingleMicrophonePermission() {
+        let type = PermissionAuthorizationType(from: [.microphone])
+        XCTAssertEqual(type, .microphone)
+    }
+
+    func testInitFromSingleGeolocationPermission() {
+        let type = PermissionAuthorizationType(from: [.geolocation])
+        XCTAssertEqual(type, .geolocation)
+    }
+
+    func testInitFromSinglePopupsPermission() {
+        let type = PermissionAuthorizationType(from: [.popups])
+        XCTAssertEqual(type, .popups)
+    }
+
+    func testInitFromSingleExternalSchemePermission() {
+        let type = PermissionAuthorizationType(from: [.externalScheme(scheme: "zoom")])
+        XCTAssertEqual(type, .externalScheme(scheme: "zoom"))
+    }
+
+    func testInitFromCameraAndMicrophonePermissions() {
+        let type = PermissionAuthorizationType(from: [.camera, .microphone])
+        XCTAssertEqual(type, .cameraAndMicrophone)
+    }
+
+    func testInitFromMicrophoneAndCameraPermissions_OrderIndependent() {
+        let type = PermissionAuthorizationType(from: [.microphone, .camera])
+        XCTAssertEqual(type, .cameraAndMicrophone)
+    }
+
+    // MARK: - requiresSystemPermission Tests
+
+    func testRequiresSystemPermission_Geolocation_ReturnsTrue() {
+        XCTAssertTrue(PermissionAuthorizationType.geolocation.requiresSystemPermission)
+    }
+
+    func testRequiresSystemPermission_Camera_ReturnsFalse() {
+        XCTAssertFalse(PermissionAuthorizationType.camera.requiresSystemPermission)
+    }
+
+    func testRequiresSystemPermission_Microphone_ReturnsFalse() {
+        XCTAssertFalse(PermissionAuthorizationType.microphone.requiresSystemPermission)
+    }
+
+    func testRequiresSystemPermission_CameraAndMicrophone_ReturnsFalse() {
+        XCTAssertFalse(PermissionAuthorizationType.cameraAndMicrophone.requiresSystemPermission)
+    }
+
+    func testRequiresSystemPermission_Popups_ReturnsFalse() {
+        XCTAssertFalse(PermissionAuthorizationType.popups.requiresSystemPermission)
+    }
+
+    func testRequiresSystemPermission_ExternalScheme_ReturnsFalse() {
+        XCTAssertFalse(PermissionAuthorizationType.externalScheme(scheme: "zoom").requiresSystemPermission)
+    }
+
+    // MARK: - usesPermanentDecisions Tests
+
+    func testUsesPermanentDecisions_AllCases_ReturnTrue() {
+        XCTAssertTrue(PermissionAuthorizationType.camera.usesPermanentDecisions)
+        XCTAssertTrue(PermissionAuthorizationType.microphone.usesPermanentDecisions)
+        XCTAssertTrue(PermissionAuthorizationType.cameraAndMicrophone.usesPermanentDecisions)
+        XCTAssertTrue(PermissionAuthorizationType.geolocation.usesPermanentDecisions)
+        XCTAssertTrue(PermissionAuthorizationType.popups.usesPermanentDecisions)
+        XCTAssertTrue(PermissionAuthorizationType.externalScheme(scheme: "zoom").usesPermanentDecisions)
+    }
+
+    // MARK: - asPermissionType Tests
+
+    func testAsPermissionType_Camera() {
+        XCTAssertEqual(PermissionAuthorizationType.camera.asPermissionType, .camera)
+    }
+
+    func testAsPermissionType_Microphone() {
+        XCTAssertEqual(PermissionAuthorizationType.microphone.asPermissionType, .microphone)
+    }
+
+    func testAsPermissionType_CameraAndMicrophone_ReturnsCamera() {
+        // cameraAndMicrophone maps to .camera for system permission checks
+        XCTAssertEqual(PermissionAuthorizationType.cameraAndMicrophone.asPermissionType, .camera)
+    }
+
+    func testAsPermissionType_Geolocation() {
+        XCTAssertEqual(PermissionAuthorizationType.geolocation.asPermissionType, .geolocation)
+    }
+
+    func testAsPermissionType_Popups() {
+        XCTAssertEqual(PermissionAuthorizationType.popups.asPermissionType, .popups)
+    }
+
+    func testAsPermissionType_ExternalScheme() {
+        XCTAssertEqual(PermissionAuthorizationType.externalScheme(scheme: "zoom").asPermissionType, .externalScheme(scheme: "zoom"))
+    }
+
+    // MARK: - localizedDescription Tests
+
+    func testLocalizedDescription_Camera() {
+        XCTAssertEqual(PermissionAuthorizationType.camera.localizedDescription, UserText.permissionCamera)
+    }
+
+    func testLocalizedDescription_Microphone() {
+        XCTAssertEqual(PermissionAuthorizationType.microphone.localizedDescription, UserText.permissionMicrophone)
+    }
+
+    func testLocalizedDescription_CameraAndMicrophone() {
+        XCTAssertEqual(PermissionAuthorizationType.cameraAndMicrophone.localizedDescription, UserText.permissionCameraAndMicrophone)
+    }
+
+    func testLocalizedDescription_Geolocation() {
+        XCTAssertEqual(PermissionAuthorizationType.geolocation.localizedDescription, UserText.permissionGeolocation)
+    }
+
+    func testLocalizedDescription_Popups() {
+        XCTAssertEqual(PermissionAuthorizationType.popups.localizedDescription, UserText.permissionPopups)
+    }
+
+    // MARK: - systemSettingsURL Tests
+
+    func testSystemSettingsURL_Geolocation_ReturnsValidURL() {
+        let url = PermissionAuthorizationType.geolocation.systemSettingsURL
+        XCTAssertNotNil(url)
+        XCTAssertEqual(url?.absoluteString, "x-apple.systempreferences:com.apple.preference.security?Privacy_LocationServices")
+    }
+
+    func testSystemSettingsURL_NonGeolocation_ReturnsNil() {
+        XCTAssertNil(PermissionAuthorizationType.camera.systemSettingsURL)
+        XCTAssertNil(PermissionAuthorizationType.microphone.systemSettingsURL)
+        XCTAssertNil(PermissionAuthorizationType.cameraAndMicrophone.systemSettingsURL)
+        XCTAssertNil(PermissionAuthorizationType.popups.systemSettingsURL)
+        XCTAssertNil(PermissionAuthorizationType.externalScheme(scheme: "zoom").systemSettingsURL)
+    }
+
+    // MARK: - Two-Step UI String Tests
+
+    func testSystemPermissionEnableText_Geolocation() {
+        XCTAssertEqual(PermissionAuthorizationType.geolocation.systemPermissionEnableText, UserText.permissionSystemLocationEnable)
+    }
+
+    func testSystemPermissionEnableText_NonGeolocation_ReturnsEmpty() {
+        XCTAssertEqual(PermissionAuthorizationType.camera.systemPermissionEnableText, "")
+        XCTAssertEqual(PermissionAuthorizationType.microphone.systemPermissionEnableText, "")
+        XCTAssertEqual(PermissionAuthorizationType.cameraAndMicrophone.systemPermissionEnableText, "")
+        XCTAssertEqual(PermissionAuthorizationType.popups.systemPermissionEnableText, "")
+        XCTAssertEqual(PermissionAuthorizationType.externalScheme(scheme: "zoom").systemPermissionEnableText, "")
+    }
+
+    func testSystemPermissionWaitingText_Geolocation() {
+        XCTAssertEqual(PermissionAuthorizationType.geolocation.systemPermissionWaitingText, UserText.permissionSystemLocationWaiting)
+    }
+
+    func testSystemPermissionEnabledText_Geolocation() {
+        XCTAssertEqual(PermissionAuthorizationType.geolocation.systemPermissionEnabledText, UserText.permissionSystemLocationEnabled)
+    }
+
+    func testSystemPermissionDisabledText_Geolocation() {
+        XCTAssertEqual(PermissionAuthorizationType.geolocation.systemPermissionDisabledText, UserText.permissionSystemLocationDisabled)
+    }
+
+    func testSystemSettingsLinkText_Geolocation() {
+        XCTAssertEqual(PermissionAuthorizationType.geolocation.systemSettingsLinkText, UserText.permissionSystemSettingsLocation)
+    }
+}
+
+// MARK: - Equatable Conformance for Tests
+
+extension PermissionAuthorizationType: Equatable {
+    public static func == (lhs: PermissionAuthorizationType, rhs: PermissionAuthorizationType) -> Bool {
+        switch (lhs, rhs) {
+        case (.camera, .camera),
+             (.microphone, .microphone),
+             (.cameraAndMicrophone, .cameraAndMicrophone),
+             (.geolocation, .geolocation),
+             (.popups, .popups):
+            return true
+        case (.externalScheme(let lhsScheme), .externalScheme(let rhsScheme)):
+            return lhsScheme == rhsScheme
+        default:
+            return false
+        }
+    }
+}

From c246a74528b7fc7f254dc0d56f7960d49e248df9 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Wed, 3 Dec 2025 09:52:39 +0100
Subject: [PATCH 39/40] Sync local state when the item's decision changes from
 external source

---
 .../DuckDuckGo/Permissions/View/PermissionCenterView.swift  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
index 0b2b271792c..86bb017f4a1 100644
--- a/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
+++ b/macOS/DuckDuckGo/Permissions/View/PermissionCenterView.swift
@@ -146,6 +146,12 @@ struct PermissionRowView: View {
         .onChange(of: currentDecision) { newValue in
             onDecisionChanged(newValue)
         }
+        .onChange(of: item.decision) { newValue in
+            // Sync local state when the item's decision changes from external source
+            if currentDecision != newValue {
+                currentDecision = newValue
+            }
+        }
     }
 
     // MARK: - Subviews

From 13003ad9c9ff911ccf664654cbe9cff71506eaf0 Mon Sep 17 00:00:00 2001
From: Tomas Strba <tom@duckduckgo.com>
Date: Wed, 3 Dec 2025 11:17:19 +0100
Subject: [PATCH 40/40] Code review adjustments

---
 .../DuckDuckGo/Permissions/Model/PermissionManager.swift  | 3 ---
 macOS/DuckDuckGo/Permissions/Model/PermissionType.swift   | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
index 9ea420f25ac..cab3204f352 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionManager.swift
@@ -84,9 +84,6 @@ final class PermissionManager: PermissionManagerProtocol {
 
     func setPermission(_ decision: PersistedPermissionDecision, forDomain domain: String, permissionType: PermissionType) {
 
-        assert(permissionType.canPersistGrantedDecision(featureFlagger: featureFlagger) || decision != .allow)
-        assert(permissionType.canPersistDeniedDecision(featureFlagger: featureFlagger) || decision != .deny)
-
         let storedPermission: StoredPermission
         let domain = domain.droppingWwwPrefix()
         guard self.permission(forDomain: domain, permissionType: permissionType) != decision else { return }
diff --git a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
index dc574b76311..69acf98b845 100644
--- a/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
+++ b/macOS/DuckDuckGo/Permissions/Model/PermissionType.swift
@@ -71,8 +71,8 @@ extension PermissionType {
         return [.camera, .microphone, .geolocation]
     }
 
-    func canPersistGrantedDecision(featureFlagger: FeatureFlagger?) -> Bool {
-        if let featureFlagger, featureFlagger.isFeatureOn(.newPermissionView) {
+    func canPersistGrantedDecision(featureFlagger: FeatureFlagger) -> Bool {
+        if featureFlagger.isFeatureOn(.newPermissionView) {
             switch self {
             case .camera, .microphone, .externalScheme, .popups, .geolocation:
                 return true
@@ -87,8 +87,8 @@ extension PermissionType {
         }
     }
 
-    func canPersistDeniedDecision(featureFlagger: FeatureFlagger?) -> Bool {
-        if let featureFlagger, featureFlagger.isFeatureOn(.newPermissionView) {
+    func canPersistDeniedDecision(featureFlagger: FeatureFlagger) -> Bool {
+        if featureFlagger.isFeatureOn(.newPermissionView) {
             switch self {
             case .camera, .microphone, .geolocation, .externalScheme:
                 return true