From e69b10ecbb9dd3fb47bd6fec2cee1aa7356bff53 Mon Sep 17 00:00:00 2001
From: Fernando Bunn <bunn@idevzilla.com>
Date: Thu, 17 Oct 2024 19:40:01 +0100
Subject: [PATCH 1/9] WIP: AI Chat Toolbar

---
 DuckDuckGo/Common/Localizables/UserText.swift |  3 +++
 DuckDuckGo/Menus/MainMenu.swift               |  4 +++
 DuckDuckGo/Menus/MainMenuActions.swift        |  4 +++
 DuckDuckGo/NavigationBar/PinningManager.swift |  4 +++
 .../View/NavigationBarViewController.swift    | 27 +++++++++++++++++++
 5 files changed, 42 insertions(+)

diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
index 7b33cf1bd9..68c8b5d1fc 100644
--- a/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -978,6 +978,9 @@ struct UserText {
     static let bitwardenCommunicationInfo = NSLocalizedString("bitwarden.connect.communication-info", value: "All communication between Bitwarden and DuckDuckGo is encrypted and the data never leaves your device.", comment: "Warns users that all communication between the DuckDuckGo browser and the password manager Bitwarden is encrypted and doesn't leave the user device")
     static let bitwardenHistoryInfo = NSLocalizedString("bitwarden.connect.history-info", value: "Bitwarden will have access to your browsing history.", comment: "Warn users that the password Manager Bitwarden will have access to their browsing history")
 
+    static let showAIChatShortcut = NSLocalizedString("pinning.show-aichat-shortcut", value: "Show AI Chat Shortcut", comment: "Menu item for showing the AI Chat shortcut")
+    static let hideAIChatShortcut = NSLocalizedString("pinning.hide-aichat-shortcut", value: "Hide AI Chat Shortcut", comment: "Menu item for hiding the AI Chat shortcut")
+
     static let showAutofillShortcut = NSLocalizedString("pinning.show-autofill-shortcut", value: "Show Passwords Shortcut", comment: "Menu item for showing the passwords shortcut")
     static let hideAutofillShortcut = NSLocalizedString("pinning.hide-autofill-shortcut", value: "Hide Passwords Shortcut", comment: "Menu item for hiding the passwords shortcut")
 
diff --git a/DuckDuckGo/Menus/MainMenu.swift b/DuckDuckGo/Menus/MainMenu.swift
index 6a5f42e49a..f44fdbdd0b 100644
--- a/DuckDuckGo/Menus/MainMenu.swift
+++ b/DuckDuckGo/Menus/MainMenu.swift
@@ -85,6 +85,8 @@ final class MainMenu: NSMenu {
     var aiChatMenu = NSMenuItem(title: UserText.newAIChatMenuItem, action: #selector(AppDelegate.newAIChat), keyEquivalent: [.option, .command, "n"])
     let toggleNetworkProtectionShortcutMenuItem = NSMenuItem(title: UserText.showNetworkProtectionShortcut, action: #selector(MainViewController.toggleNetworkProtectionShortcut), keyEquivalent: "N")
 
+    let toggleAIChatShortcutMenuItem = NSMenuItem(title: UserText.showAIChatShortcut, action: #selector(MainViewController.toggleAIChatShortcut), keyEquivalent: "L")
+
     // MARK: Window
     let windowsMenu = NSMenu(title: UserText.mainMenuWindow)
 
@@ -276,6 +278,8 @@ final class MainMenu: NSMenu {
 
             toggleNetworkProtectionShortcutMenuItem
 
+            toggleAIChatShortcutMenuItem
+
             NSMenuItem.separator()
 
             toggleFullscreenMenuItem
diff --git a/DuckDuckGo/Menus/MainMenuActions.swift b/DuckDuckGo/Menus/MainMenuActions.swift
index 2b5f8d0d17..87e8af2c5a 100644
--- a/DuckDuckGo/Menus/MainMenuActions.swift
+++ b/DuckDuckGo/Menus/MainMenuActions.swift
@@ -510,6 +510,10 @@ extension MainViewController {
         LocalPinningManager.shared.togglePinning(for: .networkProtection)
     }
 
+    @objc func toggleAIChatShortcut(_ sender: Any) {
+        LocalPinningManager.shared.togglePinning(for: .aiChat)
+    }
+
     // MARK: - History
 
     @objc func back(_ sender: Any?) {
diff --git a/DuckDuckGo/NavigationBar/PinningManager.swift b/DuckDuckGo/NavigationBar/PinningManager.swift
index 37eceb098c..01858412b0 100644
--- a/DuckDuckGo/NavigationBar/PinningManager.swift
+++ b/DuckDuckGo/NavigationBar/PinningManager.swift
@@ -25,6 +25,7 @@ enum PinnableView: String {
     case downloads
     case homeButton
     case networkProtection
+    case aiChat
 }
 
 protocol PinningManager {
@@ -112,6 +113,9 @@ final class LocalPinningManager: PinningManager {
         case .homeButton: return ""
         case .networkProtection:
             return isPinned(.networkProtection) ? UserText.hideNetworkProtectionShortcut : UserText.showNetworkProtectionShortcut
+        case .aiChat:
+            return isPinned(.aiChat) ? UserText.hideAIChatShortcut : UserText.showAIChatShortcut
+
         }
     }
 
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
index 34dbc05f58..a6c313c92a 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -365,6 +365,8 @@ final class NavigationBarViewController: NSViewController {
                     self.updateHomeButton()
                 case .networkProtection:
                     self.networkProtectionButtonModel.updateVisibility()
+                case .aiChat:
+                    self.updateAIChatButton()
                 }
             } else {
                 assertionFailure("Failed to get changed pinned view type")
@@ -873,6 +875,21 @@ final class NavigationBarViewController: NSViewController {
         }
     }
 
+    private func updateAIChatButton() {
+        let menu = NSMenu()
+        let title = LocalPinningManager.shared.shortcutTitle(for: .aiChat)
+        menu.addItem(withTitle: title, action: #selector(toggleAIChatPanelPinning(_:)), keyEquivalent: "")
+
+        bookmarkListButton.menu = menu
+        bookmarkListButton.toolTip = UserText.bookmarksShortcutTooltip
+
+        if LocalPinningManager.shared.isPinned(.bookmarks) {
+            bookmarkListButton.isHidden = false
+        } else {
+            bookmarkListButton.isHidden = !popovers.bookmarkListPopoverShown
+        }
+    }
+
     private func subscribeToCredentialsToSave() {
         credentialsToSaveCancellable = tabCollectionViewModel.selectedTabViewModel?.tab.autofillDataToSavePublisher
             .receive(on: DispatchQueue.main)
@@ -965,6 +982,11 @@ extension NavigationBarViewController: NSMenuDelegate {
             let networkProtectionTitle = LocalPinningManager.shared.shortcutTitle(for: .networkProtection)
             menu.addItem(withTitle: networkProtectionTitle, action: #selector(toggleNetworkProtectionPanelPinning), keyEquivalent: "")
         }
+
+#warning("TODO Feature flag")
+        let aiChatTitle = LocalPinningManager.shared.shortcutTitle(for: .aiChat)
+        menu.addItem(withTitle: aiChatTitle, action: #selector(toggleAIChatPanelPinning), keyEquivalent: "L")
+
     }
 
     @objc
@@ -982,6 +1004,11 @@ extension NavigationBarViewController: NSMenuDelegate {
         LocalPinningManager.shared.togglePinning(for: .downloads)
     }
 
+    @objc
+    private func toggleAIChatPanelPinning(_ sender: NSMenuItem) {
+        LocalPinningManager.shared.togglePinning(for: .aiChat)
+    }
+
     @objc
     private func toggleNetworkProtectionPanelPinning(_ sender: NSMenuItem) {
         LocalPinningManager.shared.togglePinning(for: .networkProtection)

From 35da3a19e705c0c84c282d185005838ef3dbf6e2 Mon Sep 17 00:00:00 2001
From: Fernando Bunn <bunn@idevzilla.com>
Date: Fri, 18 Oct 2024 14:15:36 +0100
Subject: [PATCH 2/9] AI Chat button

---
 .../View/NavigationBar.storyboard             | 42 ++++++++++++++++---
 .../View/NavigationBarViewController.swift    | 17 +++++---
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
index b4c3b61cc1..2dbc9c21a8 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
+++ b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="o2v-eH-jTI">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="o2v-eH-jTI">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -174,9 +174,9 @@
                             <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aWu-Jm-Oaz" userLabel="Menu Buttons">
                                 <rect key="frame" x="835" y="30" width="92" height="28"/>
                                 <subviews>
-                                    <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G8p-di-fq4" userLabel="Downloads Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
+                                    <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G8p-di-fq4" userLabel="AI Chat Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="28" height="28"/>
-                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Downloads" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="GwE-DM-8UC">
+                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="AIChat" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="GwE-DM-8UC">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
@@ -197,7 +197,33 @@
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                         <connections>
-                                            <action selector="downloadsButtonAction:" target="o2v-eH-jTI" id="UIu-gq-V20"/>
+                                            <action selector="aiChatButtonAction:" target="o2v-eH-jTI" id="F42-cw-WpC"/>
+                                        </connections>
+                                    </button>
+                                    <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l0L-Gq-8p3" userLabel="Downloads Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="0.0" width="28" height="28"/>
+                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Downloads" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="oqg-Yl-ZvV">
+                                            <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="28" id="GB6-Ad-cop"/>
+                                            <constraint firstAttribute="width" constant="28" id="OQQ-cJ-hZg"/>
+                                        </constraints>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
+                                                <color key="value" name="ButtonMouseOverColor"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
+                                                <color key="value" name="ButtonMouseDownColor"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                <real key="value" value="4"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                        <connections>
+                                            <action selector="downloadsButtonAction:" target="o2v-eH-jTI" id="BBW-ii-lgU"/>
                                         </connections>
                                     </button>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="1nW-I1-nut" userLabel="Password Management Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
@@ -311,6 +337,7 @@
                                     <integer value="1000"/>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
+                                    <integer value="1000"/>
                                 </visibilityPriorities>
                                 <customSpacing>
                                     <real value="3.4028234663852886e+38"/>
@@ -318,6 +345,7 @@
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
                                 </customSpacing>
                             </stackView>
                         </subviews>
@@ -353,10 +381,11 @@
                         <outlet property="addressBarProportionalWidthConstraint" destination="rqL-Vd-lnY" id="zxF-f6-8wE"/>
                         <outlet property="addressBarStack" destination="gIy-el-24l" id="vlT-AD-nDv"/>
                         <outlet property="addressBarTopConstraint" destination="km5-nE-hfK" id="dR8-qN-sMa"/>
+                        <outlet property="aiChatButton" destination="G8p-di-fq4" id="s1c-9f-UFg"/>
                         <outlet property="bookmarkListButton" destination="4sj-qN-UUY" id="Fjs-KE-Lfp"/>
                         <outlet property="buttonsTopConstraint" destination="qeF-30-DZN" id="WfB-NP-nV7"/>
                         <outlet property="daxLogo" destination="8Ha-or-PB2" id="Id4-3e-U4K"/>
-                        <outlet property="downloadsButton" destination="G8p-di-fq4" id="oxD-pc-8hn"/>
+                        <outlet property="downloadsButton" destination="l0L-Gq-8p3" id="ujH-qR-rUH"/>
                         <outlet property="goBackButton" destination="kky-0N-Cfd" id="RA9-yE-URS"/>
                         <outlet property="goForwardButton" destination="mdE-u0-Ei5" id="7wT-nX-Avr"/>
                         <outlet property="homeButton" destination="s7D-YB-p00" id="sjk-Af-Zl4"/>
@@ -899,6 +928,7 @@
         </scene>
     </scenes>
     <resources>
+        <image name="AIChat" width="16" height="16"/>
         <image name="Back" width="16" height="16"/>
         <image name="Bookmark" width="16" height="16"/>
         <image name="Bookmarks" width="16" height="16"/>
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
index a6c313c92a..532f2ceefa 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -52,6 +52,7 @@ final class NavigationBarViewController: NSViewController {
     @IBOutlet weak var daxLogo: NSImageView!
     @IBOutlet weak var addressBarStack: NSStackView!
 
+    @IBOutlet weak var aiChatButton: MouseOverButton!
     @IBOutlet var addressBarLeftToNavButtonsConstraint: NSLayoutConstraint!
     @IBOutlet var addressBarProportionalWidthConstraint: NSLayoutConstraint!
     @IBOutlet var navigationBarButtonsLeadingConstraint: NSLayoutConstraint!
@@ -173,6 +174,7 @@ final class NavigationBarViewController: NSViewController {
         downloadsButton.sendAction(on: .leftMouseDown)
         networkProtectionButton.sendAction(on: .leftMouseDown)
         passwordManagementButton.sendAction(on: .leftMouseDown)
+        aiChatButton.sendAction(on: .leftMouseDown)
 
         optionsButton.toolTip = UserText.applicationMenuTooltip
         optionsButton.setAccessibilityIdentifier("NavigationBarViewController.optionsButton")
@@ -191,6 +193,7 @@ final class NavigationBarViewController: NSViewController {
         updatePasswordManagementButton()
         updateBookmarksButton()
         updateHomeButton()
+        updateAIChatButton()
 
         if view.window?.isPopUpWindow == true {
             goBackButton.isHidden = true
@@ -320,6 +323,10 @@ final class NavigationBarViewController: NSViewController {
         toggleDownloadsPopover(keepButtonVisible: false)
     }
 
+    @IBAction func aiChatButtonAction(_ sender: NSButton) {
+        AIChatTabOpener.openAIChatTab()
+    }
+
     override func mouseDown(with event: NSEvent) {
         if let menu = view.menu, NSEvent.isContextClick(event) {
             NSMenu.popUpContextMenu(menu, with: event, for: view)
@@ -880,13 +887,13 @@ final class NavigationBarViewController: NSViewController {
         let title = LocalPinningManager.shared.shortcutTitle(for: .aiChat)
         menu.addItem(withTitle: title, action: #selector(toggleAIChatPanelPinning(_:)), keyEquivalent: "")
 
-        bookmarkListButton.menu = menu
-        bookmarkListButton.toolTip = UserText.bookmarksShortcutTooltip
+        aiChatButton.menu = menu
+        aiChatButton.toolTip = UserText.aiChat
 
-        if LocalPinningManager.shared.isPinned(.bookmarks) {
-            bookmarkListButton.isHidden = false
+         if LocalPinningManager.shared.isPinned(.aiChat) {
+            aiChatButton.isHidden = false
         } else {
-            bookmarkListButton.isHidden = !popovers.bookmarkListPopoverShown
+            aiChatButton.isHidden = !popovers.bookmarkListPopoverShown
         }
     }
 

From 23458746da77bd2958c6712c17aa1816f54c6212 Mon Sep 17 00:00:00 2001
From: Fernando Bunn <bunn@idevzilla.com>
Date: Fri, 18 Oct 2024 14:29:15 +0100
Subject: [PATCH 3/9] Use pinningManager to track state of toolbar

---
 .../Preferences/Model/AIChatPreferences.swift | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/DuckDuckGo/Preferences/Model/AIChatPreferences.swift b/DuckDuckGo/Preferences/Model/AIChatPreferences.swift
index bc5ab8c87c..695cfd40a6 100644
--- a/DuckDuckGo/Preferences/Model/AIChatPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/AIChatPreferences.swift
@@ -22,18 +22,27 @@ import Foundation
 final class AIChatPreferences: ObservableObject {
     static let shared = AIChatPreferences()
 
+    private let pinningManager: PinningManager
     private var preferencesStorage: AIChatPreferencesStorage
     private let learnMoreURL = URL(string: "https://duckduckgo.com/duckduckgo-help-pages/aichat/")!
+    private var cancellables = Set<AnyCancellable>()
 
-    init(storage: AIChatPreferencesStorage = AIChatPreferencesUserDefaultsStorage()) {
+    init(storage: AIChatPreferencesStorage = AIChatPreferencesUserDefaultsStorage(),
+         pinningManager: PinningManager = LocalPinningManager.shared) {
         self.preferencesStorage = storage
-        self.showShortcutInToolbar = storage.showShortcutInToolbar
         self.showShortcutInApplicationMenu = storage.showShortcutInApplicationMenu
+        self.pinningManager = pinningManager
+        self.showShortcutInToolbar = pinningManager.isPinned(.aiChat)
+        subscribeToShowInBrowserToolbarSettingsChanges()
     }
 
     @Published var showShortcutInToolbar: Bool {
         didSet {
-            preferencesStorage.showShortcutInToolbar = showShortcutInToolbar
+            if showShortcutInToolbar {
+                pinningManager.pin(.aiChat)
+            } else {
+                pinningManager.unpin(.aiChat)
+            }
         }
     }
 
@@ -46,10 +55,27 @@ final class AIChatPreferences: ObservableObject {
     @MainActor func openLearnMoreLink() {
         WindowControllersManager.shared.show(url: learnMoreURL, source: .ui, newTab: true)
     }
+
+    private func subscribeToShowInBrowserToolbarSettingsChanges() {
+        NotificationCenter.default.publisher(for: .PinnedViewsChanged).sink { [weak self] notification in
+            guard let self = self else {
+                return
+            }
+
+            if let userInfo = notification.userInfo as? [String: Any],
+               let viewType = userInfo[LocalPinningManager.pinnedViewChangedNotificationViewTypeKey] as? String,
+               let view = PinnableView(rawValue: viewType) {
+                switch view {
+                case .aiChat: self.showShortcutInToolbar = self.pinningManager.isPinned(.aiChat)
+                default: break
+                }
+            }
+        }
+        .store(in: &cancellables)
+    }
 }
 
 protocol AIChatPreferencesStorage {
-    var showShortcutInToolbar: Bool { get set }
     var showShortcutInApplicationMenu: Bool { get set }
 }
 
@@ -60,11 +86,6 @@ struct AIChatPreferencesUserDefaultsStorage: AIChatPreferencesStorage {
         self.userDefaults = userDefaults
     }
 
-    var showShortcutInToolbar: Bool {
-        get { userDefaults.showAIChatShortcutInToolbar }
-        set { userDefaults.showAIChatShortcutInToolbar = newValue }
-    }
-
     var showShortcutInApplicationMenu: Bool {
         get { userDefaults.showAIChatShortcutInApplicationMenu }
         set { userDefaults.showAIChatShortcutInApplicationMenu = newValue }
@@ -73,7 +94,6 @@ struct AIChatPreferencesUserDefaultsStorage: AIChatPreferencesStorage {
 
 private extension UserDefaults {
     enum Keys {
-        static let showAIChatShortcutInToolbar = "aichat.showAIChatShortcutInToolbar"
         static let showAIChatShortcutInApplicationMenu = "aichat.showAIChatShortcutInApplicationMenu"
     }
 
@@ -81,9 +101,4 @@ private extension UserDefaults {
         get { bool(forKey: Keys.showAIChatShortcutInApplicationMenu) }
         set { set(newValue, forKey: Keys.showAIChatShortcutInApplicationMenu) }
     }
-
-    var showAIChatShortcutInToolbar: Bool {
-        get { bool(forKey: Keys.showAIChatShortcutInToolbar) }
-        set { set(newValue, forKey: Keys.showAIChatShortcutInToolbar) }
-    }
 }

From 7a3f02958e33aa2d6d62b7cd92c1035746fc57a8 Mon Sep 17 00:00:00 2001
From: Fernando Bunn <bunn@idevzilla.com>
Date: Fri, 18 Oct 2024 19:33:35 +0100
Subject: [PATCH 4/9] WIP: Toolbar icon

---
 DuckDuckGo.xcodeproj/project.pbxproj          |   6 ++
 .../AIChatMenuVisibilityConfigurable.swift    |  57 ++++++----
 .../AIChat/AIChatPreferencesStorage.swift     | 101 ++++++++++++++++++
 .../Preferences/Model/AIChatPreferences.swift | 101 +++++++-----------
 .../Preferences/View/PreferencesAIChat.swift  |  12 ++-
 5 files changed, 190 insertions(+), 87 deletions(-)
 create mode 100644 DuckDuckGo/AIChat/AIChatPreferencesStorage.swift

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index c418156c0c..503ea3ad79 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -250,6 +250,8 @@
 		316913272BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913252BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift */; };
 		316913292BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913282BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift */; };
 		3169132A2BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913282BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift */; };
+		316C48EF2CC2B232000B08C1 /* AIChatPreferencesStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316C48EE2CC2B231000B08C1 /* AIChatPreferencesStorage.swift */; };
+		316C48F02CC2B232000B08C1 /* AIChatPreferencesStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316C48EE2CC2B231000B08C1 /* AIChatPreferencesStorage.swift */; };
 		3171D6B82889849F0068632A /* CookieManagedNotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6B72889849F0068632A /* CookieManagedNotificationView.swift */; };
 		3171D6BA288984D00068632A /* BadgeAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6B9288984D00068632A /* BadgeAnimationView.swift */; };
 		3171D6DB2889B64D0068632A /* CookieManagedNotificationContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6DA2889B64D0068632A /* CookieManagedNotificationContainerView.swift */; };
@@ -3320,6 +3322,7 @@
 		316913222BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionPixelsHandler.swift; sourceTree = "<group>"; };
 		316913252BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerPrerequisitesStatusVerifier.swift; sourceTree = "<group>"; };
 		316913282BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionErrorViewController.swift; sourceTree = "<group>"; };
+		316C48EE2CC2B231000B08C1 /* AIChatPreferencesStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AIChatPreferencesStorage.swift; sourceTree = "<group>"; };
 		3171D6B72889849F0068632A /* CookieManagedNotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CookieManagedNotificationView.swift; sourceTree = "<group>"; };
 		3171D6B9288984D00068632A /* BadgeAnimationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeAnimationView.swift; sourceTree = "<group>"; };
 		3171D6DA2889B64D0068632A /* CookieManagedNotificationContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CookieManagedNotificationContainerView.swift; sourceTree = "<group>"; };
@@ -5193,6 +5196,7 @@
 		31521ABE2CC0139C00248E6F /* AIChat */ = {
 			isa = PBXGroup;
 			children = (
+				316C48EE2CC2B231000B08C1 /* AIChatPreferencesStorage.swift */,
 				31521AC22CC01BC300248E6F /* AIChatTabOpener.swift */,
 				31521ABF2CC013A400248E6F /* AIChatMenuVisibilityConfigurable.swift */,
 			);
@@ -10875,6 +10879,7 @@
 				3706FB56293F65D500E42796 /* NSSavePanelExtension.swift in Sources */,
 				B6B5F5802B024105008DB58A /* DataImportSummaryView.swift in Sources */,
 				4B9DB0422A983B24000927DB /* WaitlistDialogView.swift in Sources */,
+				316C48EF2CC2B232000B08C1 /* AIChatPreferencesStorage.swift in Sources */,
 				3706FB57293F65D500E42796 /* AppPrivacyConfigurationDataProvider.swift in Sources */,
 				3199AF7A2C80734A003AEBDC /* DuckPlayerOnboardingViewModel.swift in Sources */,
 				C1B1CBE22BE1915100B6049C /* DataImportShortcutsViewModel.swift in Sources */,
@@ -12578,6 +12583,7 @@
 				4BE65476271FCD41008D1D63 /* PasswordManagementCreditCardItemView.swift in Sources */,
 				AA5C8F59258FE21F00748EB7 /* NSTextFieldExtension.swift in Sources */,
 				3706FEC8293F6F7500E42796 /* BWManagement.swift in Sources */,
+				316C48F02CC2B232000B08C1 /* AIChatPreferencesStorage.swift in Sources */,
 				B6830961274CDE99004B46BB /* FireproofDomainsContainer.swift in Sources */,
 				B687B7CC2947A1E9001DEA6F /* ExternalAppSchemeHandler.swift in Sources */,
 				B65536AE2685E17200085A79 /* GeolocationService.swift in Sources */,
diff --git a/DuckDuckGo/AIChat/AIChatMenuVisibilityConfigurable.swift b/DuckDuckGo/AIChat/AIChatMenuVisibilityConfigurable.swift
index ba5f94d73d..0410edd087 100644
--- a/DuckDuckGo/AIChat/AIChatMenuVisibilityConfigurable.swift
+++ b/DuckDuckGo/AIChat/AIChatMenuVisibilityConfigurable.swift
@@ -21,57 +21,72 @@ import Combine
 protocol AIChatMenuVisibilityConfigurable {
     var shouldDisplayApplicationMenuShortcut: Bool { get }
     var shouldDisplayToolbarShortcut: Bool { get }
+
+    var isFeatureEnabledForApplicationMenuShortcut: Bool { get }
+    var isFeatureEnabledForToolbarShortcut: Bool { get }
+
     var shortcutURL: URL { get }
     var valuesChangedPublisher: PassthroughSubject<Void, Never> { get }
 }
 
 final class AIChatMenuConfiguration: AIChatMenuVisibilityConfigurable {
-    var valuesChangedPublisher = PassthroughSubject<Void, Never>()
-    private var cancellables = Set<AnyCancellable>()
-    private let preferences: AIChatPreferences
-
     enum ShortcutType {
         case applicationMenu
         case toolbar
     }
 
-    // MARK: - Public
+    private var cancellables = Set<AnyCancellable>()
+    private var storage: AIChatPreferencesStorage
 
-    var shouldDisplayApplicationMenuShortcut: Bool {
-        return isFeatureEnabledFor(shortcutType: .applicationMenu) && preferences.showShortcutInApplicationMenu
+    var valuesChangedPublisher = PassthroughSubject<Void, Never>()
+
+    var isFeatureEnabledForApplicationMenuShortcut: Bool {
+        isFeatureEnabledFor(shortcutType: .applicationMenu)
+    }
+
+    var isFeatureEnabledForToolbarShortcut: Bool {
+        isFeatureEnabledFor(shortcutType: .toolbar)
     }
 
     var shouldDisplayToolbarShortcut: Bool {
-        return isFeatureEnabledFor(shortcutType: .toolbar) && preferences.showShortcutInToolbar
+        return isFeatureEnabledForToolbarShortcut && storage.shouldDisplayToolbarShortcut
+    }
+
+    var shouldDisplayApplicationMenuShortcut: Bool {
+        return isFeatureEnabledForApplicationMenuShortcut && storage.showShortcutInApplicationMenu
     }
 
     var shortcutURL: URL {
         URL(string: "https://duckduckgo.com/?q=DuckDuckGo+AI+Chat&ia=chat&duckai=2")!
     }
 
-    init(preferences: AIChatPreferences = .shared) {
-        self.preferences = preferences
-        subscribeToValueChanges()
+    init(storage: AIChatPreferencesStorage = DefaultAIChatPreferencesStorage()) {
+        self.storage = storage
+        self.subscribeToValuesChanged()
     }
 
-    // MARK: - Private
+    private func subscribeToValuesChanged() {
+        storage.shouldDisplayToolbarShortcutPublisher
+            .removeDuplicates()
+            .sink { [weak self] _ in
+                self?.valuesChangedPublisher.send()
+            }.store(in: &cancellables)
 
-    private func subscribeToValueChanges() {
-        preferences.$showShortcutInToolbar
-            .merge(with: preferences.$showShortcutInApplicationMenu)
-            .dropFirst()
+        storage.showShortcutInApplicationMenuPublisher
+            .removeDuplicates()
             .sink { [weak self] _ in
-                self?.valuesChangedPublisher.send(())
-            }
-            .store(in: &cancellables)
+                self?.valuesChangedPublisher.send()
+            }.store(in: &cancellables)
     }
 
     private func isFeatureEnabledFor(shortcutType: ShortcutType) -> Bool {
         switch shortcutType {
         case .applicationMenu:
-            return true
+            // Use privacy config here
+            return false
         case .toolbar:
-            return true
+            // Use privacy config here
+            return false
         }
     }
 }
diff --git a/DuckDuckGo/AIChat/AIChatPreferencesStorage.swift b/DuckDuckGo/AIChat/AIChatPreferencesStorage.swift
new file mode 100644
index 0000000000..4957b96d8c
--- /dev/null
+++ b/DuckDuckGo/AIChat/AIChatPreferencesStorage.swift
@@ -0,0 +1,101 @@
+//
+//  AIChatPreferencesConfiguration.swift
+//
+//  Copyright © 2024 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
+
+protocol AIChatPreferencesStorage {
+    var showShortcutInApplicationMenu: Bool { get set }
+    var shouldDisplayToolbarShortcut: Bool { get set }
+
+    var showShortcutInApplicationMenuPublisher: AnyPublisher<Bool, Never> { get }
+    var shouldDisplayToolbarShortcutPublisher: AnyPublisher<Bool, Never> { get }
+}
+
+struct DefaultAIChatPreferencesStorage: AIChatPreferencesStorage {
+    var showShortcutInApplicationMenuPublisher: AnyPublisher<Bool, Never> {
+        userDefaults.showAIChatShortcutInApplicationMenuPublisher
+    }
+
+    var shouldDisplayToolbarShortcutPublisher: AnyPublisher<Bool, Never> {
+        NotificationCenter.default.publisher(for: .PinnedViewsChanged)
+            .compactMap { notification -> PinnableView? in
+                guard let userInfo = notification.userInfo as? [String: Any],
+                      let viewType = userInfo[LocalPinningManager.pinnedViewChangedNotificationViewTypeKey] as? String,
+                      let view = PinnableView(rawValue: viewType) else {
+                    return nil
+                }
+                return view == .aiChat ? view : nil
+            }
+            .flatMap { view -> AnyPublisher<Bool, Never> in
+                return Just(self.pinningManager.isPinned(view)).eraseToAnyPublisher()
+            }
+            .eraseToAnyPublisher()
+    }
+
+    private let userDefaults: UserDefaults
+    private let pinningManager: PinningManager
+
+    init(userDefaults: UserDefaults = .standard,
+         pinningManager: PinningManager = LocalPinningManager.shared) {
+        self.userDefaults = userDefaults
+        self.pinningManager = pinningManager
+    }
+
+    var shouldDisplayToolbarShortcut: Bool {
+        get { pinningManager.isPinned(.aiChat) }
+        set {
+            if newValue {
+                pinningManager.pin(.aiChat)
+            } else {
+                pinningManager.unpin(.aiChat)
+            }
+        }
+    }
+
+    var showShortcutInApplicationMenu: Bool {
+        get { userDefaults.showAIChatShortcutInApplicationMenu }
+        set { userDefaults.showAIChatShortcutInApplicationMenu = newValue }
+    }
+}
+
+private extension UserDefaults {
+    private var showAIChatShortcutInApplicationMenuKey: String {
+        "aichat.showAIChatShortcutInApplicationMenu"
+    }
+
+    static let showAIChatShortcutInApplicationMenuDefaultValue = false
+
+    @objc
+    dynamic var showAIChatShortcutInApplicationMenu: Bool {
+        get {
+            value(forKey: showAIChatShortcutInApplicationMenuKey) as? Bool ?? Self.showAIChatShortcutInApplicationMenuDefaultValue
+        }
+
+        set {
+            guard newValue != showAIChatShortcutInApplicationMenu else {
+                return
+            }
+
+            set(newValue, forKey: showAIChatShortcutInApplicationMenuKey)
+        }
+    }
+
+    var showAIChatShortcutInApplicationMenuPublisher: AnyPublisher<Bool, Never> {
+        publisher(for: \.showAIChatShortcutInApplicationMenu).eraseToAnyPublisher()
+    }
+}
diff --git a/DuckDuckGo/Preferences/Model/AIChatPreferences.swift b/DuckDuckGo/Preferences/Model/AIChatPreferences.swift
index 695cfd40a6..d9fadda8d0 100644
--- a/DuckDuckGo/Preferences/Model/AIChatPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/AIChatPreferences.swift
@@ -18,87 +18,64 @@
 
 import Combine
 import Foundation
+import BrowserServicesKit
 
 final class AIChatPreferences: ObservableObject {
     static let shared = AIChatPreferences()
-
-    private let pinningManager: PinningManager
-    private var preferencesStorage: AIChatPreferencesStorage
-    private let learnMoreURL = URL(string: "https://duckduckgo.com/duckduckgo-help-pages/aichat/")!
+    private var storage: AIChatPreferencesStorage
     private var cancellables = Set<AnyCancellable>()
+    private let configuration: AIChatMenuVisibilityConfigurable
+    private let learnMoreURL = URL(string: "https://duckduckgo.com/duckduckgo-help-pages/aichat/")!
 
-    init(storage: AIChatPreferencesStorage = AIChatPreferencesUserDefaultsStorage(),
-         pinningManager: PinningManager = LocalPinningManager.shared) {
-        self.preferencesStorage = storage
-        self.showShortcutInApplicationMenu = storage.showShortcutInApplicationMenu
-        self.pinningManager = pinningManager
-        self.showShortcutInToolbar = pinningManager.isPinned(.aiChat)
-        subscribeToShowInBrowserToolbarSettingsChanges()
-    }
+    init(storage: AIChatPreferencesStorage = DefaultAIChatPreferencesStorage(),
+         configuration: AIChatMenuVisibilityConfigurable = AIChatMenuConfiguration()) {
+        self.storage = storage
+        self.configuration = configuration
 
-    @Published var showShortcutInToolbar: Bool {
-        didSet {
-            if showShortcutInToolbar {
-                pinningManager.pin(.aiChat)
-            } else {
-                pinningManager.unpin(.aiChat)
-            }
-        }
-    }
+        showShortcutInToolbar = storage.shouldDisplayToolbarShortcut
+        showShortcutInApplicationMenu = storage.showShortcutInApplicationMenu
 
-    @Published var showShortcutInApplicationMenu: Bool {
-        didSet {
-            preferencesStorage.showShortcutInApplicationMenu = showShortcutInApplicationMenu
-        }
+        subscribeToShowInToolbarSettingsChanges()
+        subscribeToShowInApplicationMenuSettingsChanges()
     }
 
-    @MainActor func openLearnMoreLink() {
-        WindowControllersManager.shared.show(url: learnMoreURL, source: .ui, newTab: true)
+    func subscribeToShowInToolbarSettingsChanges() {
+        storage.shouldDisplayToolbarShortcutPublisher
+            .removeDuplicates()
+            .receive(on: DispatchQueue.main)
+            .assign(to: \.showShortcutInToolbar, onWeaklyHeld: self)
+            .store(in: &cancellables)
     }
 
-    private func subscribeToShowInBrowserToolbarSettingsChanges() {
-        NotificationCenter.default.publisher(for: .PinnedViewsChanged).sink { [weak self] notification in
-            guard let self = self else {
-                return
-            }
-
-            if let userInfo = notification.userInfo as? [String: Any],
-               let viewType = userInfo[LocalPinningManager.pinnedViewChangedNotificationViewTypeKey] as? String,
-               let view = PinnableView(rawValue: viewType) {
-                switch view {
-                case .aiChat: self.showShortcutInToolbar = self.pinningManager.isPinned(.aiChat)
-                default: break
-                }
-            }
-        }
-        .store(in: &cancellables)
+    func subscribeToShowInApplicationMenuSettingsChanges() {
+        storage.showShortcutInApplicationMenuPublisher
+            .removeDuplicates()
+            .receive(on: DispatchQueue.main)
+            .assign(to: \.showShortcutInApplicationMenu, onWeaklyHeld: self)
+            .store(in: &cancellables)
     }
-}
-
-protocol AIChatPreferencesStorage {
-    var showShortcutInApplicationMenu: Bool { get set }
-}
 
-struct AIChatPreferencesUserDefaultsStorage: AIChatPreferencesStorage {
-    private let userDefaults: UserDefaults
+    var shouldShowToolBarShortcutOption: Bool {
+        self.configuration.isFeatureEnabledForToolbarShortcut
+    }
 
-    init(userDefaults: UserDefaults = .standard) {
-        self.userDefaults = userDefaults
+    var shouldShowApplicationMenuShortcutOption: Bool {
+        self.configuration.isFeatureEnabledForApplicationMenuShortcut
     }
 
-    var showShortcutInApplicationMenu: Bool {
-        get { userDefaults.showAIChatShortcutInApplicationMenu }
-        set { userDefaults.showAIChatShortcutInApplicationMenu = newValue }
+    @Published var showShortcutInToolbar: Bool {
+        didSet {
+            storage.shouldDisplayToolbarShortcut = showShortcutInToolbar
+        }
     }
-}
 
-private extension UserDefaults {
-    enum Keys {
-        static let showAIChatShortcutInApplicationMenu = "aichat.showAIChatShortcutInApplicationMenu"
+    @Published var showShortcutInApplicationMenu: Bool {
+        didSet {
+            storage.showShortcutInApplicationMenu = showShortcutInApplicationMenu
+        }
     }
 
-    var showAIChatShortcutInApplicationMenu: Bool {
-        get { bool(forKey: Keys.showAIChatShortcutInApplicationMenu) }
-        set { set(newValue, forKey: Keys.showAIChatShortcutInApplicationMenu) }
+    @MainActor func openLearnMoreLink() {
+        WindowControllersManager.shared.show(url: learnMoreURL, source: .ui, newTab: true)
     }
 }
diff --git a/DuckDuckGo/Preferences/View/PreferencesAIChat.swift b/DuckDuckGo/Preferences/View/PreferencesAIChat.swift
index 37f937e083..4cce8719f1 100644
--- a/DuckDuckGo/Preferences/View/PreferencesAIChat.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesAIChat.swift
@@ -38,10 +38,14 @@ extension Preferences {
                 }
 
                 PreferencePaneSection {
-                    ToggleMenuItem(UserText.aiChatShowInToolbarToggle,
-                                   isOn: $model.showShortcutInToolbar)
-                    ToggleMenuItem(UserText.aiChatShowInApplicationMenuToggle,
-                                   isOn: $model.showShortcutInApplicationMenu)
+                    if model.shouldShowToolBarShortcutOption {
+                        ToggleMenuItem(UserText.aiChatShowInToolbarToggle,
+                                       isOn: $model.showShortcutInToolbar)
+                    }
+                    if model.shouldShowApplicationMenuShortcutOption {
+                        ToggleMenuItem(UserText.aiChatShowInApplicationMenuToggle,
+                                       isOn: $model.showShortcutInApplicationMenu)
+                    }
                 }
             }
         }

From 2ee051db113081dc083a5c61f6fa52712ae151bc Mon Sep 17 00:00:00 2001
From: Fernando Bunn <bunn@idevzilla.com>
Date: Fri, 18 Oct 2024 19:57:32 +0100
Subject: [PATCH 5/9] Toolbar feature flag

---
 .../AIChatMenuVisibilityConfigurable.swift    |  4 +--
 .../MainWindow/MainViewController.swift       | 12 +++++++--
 DuckDuckGo/Menus/MainMenu.swift               |  4 ++-
 .../View/NavigationBarViewController.swift    | 25 ++++++++++---------
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/DuckDuckGo/AIChat/AIChatMenuVisibilityConfigurable.swift b/DuckDuckGo/AIChat/AIChatMenuVisibilityConfigurable.swift
index 0410edd087..404a5246cd 100644
--- a/DuckDuckGo/AIChat/AIChatMenuVisibilityConfigurable.swift
+++ b/DuckDuckGo/AIChat/AIChatMenuVisibilityConfigurable.swift
@@ -83,10 +83,10 @@ final class AIChatMenuConfiguration: AIChatMenuVisibilityConfigurable {
         switch shortcutType {
         case .applicationMenu:
             // Use privacy config here
-            return false
+            return true
         case .toolbar:
             // Use privacy config here
-            return false
+            return true
         }
     }
 }
diff --git a/DuckDuckGo/MainWindow/MainViewController.swift b/DuckDuckGo/MainWindow/MainViewController.swift
index 5be152d0be..2e17d7f2bc 100644
--- a/DuckDuckGo/MainWindow/MainViewController.swift
+++ b/DuckDuckGo/MainWindow/MainViewController.swift
@@ -43,6 +43,7 @@ final class MainViewController: NSViewController {
     private var tabViewModelCancellables = Set<AnyCancellable>()
     private var bookmarksBarVisibilityChangedCancellable: AnyCancellable?
     private var eventMonitorCancellables = Set<AnyCancellable>()
+    private let aiChatMenuConfig: AIChatMenuVisibilityConfigurable
 
     private var bookmarksBarIsVisible: Bool {
         return bookmarksBarViewController.parent != nil
@@ -59,8 +60,10 @@ final class MainViewController: NSViewController {
     init(tabCollectionViewModel: TabCollectionViewModel? = nil,
          bookmarkManager: BookmarkManager = LocalBookmarkManager.shared,
          autofillPopoverPresenter: AutofillPopoverPresenter,
-         vpnXPCClient: VPNControllerXPCClient = .shared) {
+         vpnXPCClient: VPNControllerXPCClient = .shared,
+         aiChatMenuConfig: AIChatMenuVisibilityConfigurable = AIChatMenuConfiguration()) {
 
+        self.aiChatMenuConfig = aiChatMenuConfig
         let tabCollectionViewModel = tabCollectionViewModel ?? TabCollectionViewModel()
         self.tabCollectionViewModel = tabCollectionViewModel
         self.isBurner = tabCollectionViewModel.isBurner
@@ -108,7 +111,12 @@ final class MainViewController: NSViewController {
             )
         }()
 
-        navigationBarViewController = NavigationBarViewController.create(tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionPopoverManager: networkProtectionPopoverManager, networkProtectionStatusReporter: networkProtectionStatusReporter, autofillPopoverPresenter: autofillPopoverPresenter)
+        navigationBarViewController = NavigationBarViewController.create(tabCollectionViewModel: tabCollectionViewModel,
+                                                                         isBurner: isBurner,
+                                                                         networkProtectionPopoverManager: networkProtectionPopoverManager,
+                                                                         networkProtectionStatusReporter: networkProtectionStatusReporter,
+                                                                         autofillPopoverPresenter: autofillPopoverPresenter,
+                                                                         aiChatMenuConfig: aiChatMenuConfig)
 
         browserTabViewController = BrowserTabViewController(tabCollectionViewModel: tabCollectionViewModel, bookmarkManager: bookmarkManager)
         findInPageViewController = FindInPageViewController.create()
diff --git a/DuckDuckGo/Menus/MainMenu.swift b/DuckDuckGo/Menus/MainMenu.swift
index f44fdbdd0b..0e282de800 100644
--- a/DuckDuckGo/Menus/MainMenu.swift
+++ b/DuckDuckGo/Menus/MainMenu.swift
@@ -278,7 +278,9 @@ final class MainMenu: NSMenu {
 
             toggleNetworkProtectionShortcutMenuItem
 
-            toggleAIChatShortcutMenuItem
+            if aiChatMenuConfig.shouldDisplayToolbarShortcut {
+                toggleAIChatShortcutMenuItem
+            }
 
             NSMenuItem.separator()
 
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
index 532f2ceefa..365e9aa305 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -109,6 +109,7 @@ final class NavigationBarViewController: NSViewController {
     private var navigationButtonsCancellables = Set<AnyCancellable>()
     private var downloadsCancellables = Set<AnyCancellable>()
     private var cancellables = Set<AnyCancellable>()
+    private let aiChatMenuConfig: AIChatMenuVisibilityConfigurable
 
     @UserDefaultsWrapper(key: .homeButtonPosition, defaultValue: .right)
     static private var homeButtonPosition: HomeButtonPosition
@@ -124,13 +125,15 @@ final class NavigationBarViewController: NSViewController {
                        dragDropManager: BookmarkDragDropManager = .shared,
                        networkProtectionPopoverManager: NetPPopoverManager,
                        networkProtectionStatusReporter: NetworkProtectionStatusReporter,
-                       autofillPopoverPresenter: AutofillPopoverPresenter) -> NavigationBarViewController {
+                       autofillPopoverPresenter: AutofillPopoverPresenter,
+                       aiChatMenuConfig: AIChatMenuVisibilityConfigurable) -> NavigationBarViewController {
         NSStoryboard(name: "NavigationBar", bundle: nil).instantiateInitialController { coder in
-            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionFeatureActivation: networkProtectionFeatureActivation, downloadListCoordinator: downloadListCoordinator, dragDropManager: dragDropManager, networkProtectionPopoverManager: networkProtectionPopoverManager, networkProtectionStatusReporter: networkProtectionStatusReporter, autofillPopoverPresenter: autofillPopoverPresenter)
+            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionFeatureActivation: networkProtectionFeatureActivation, downloadListCoordinator: downloadListCoordinator, dragDropManager: dragDropManager, networkProtectionPopoverManager: networkProtectionPopoverManager, networkProtectionStatusReporter: networkProtectionStatusReporter, autofillPopoverPresenter: autofillPopoverPresenter, aiChatMenuConfig: aiChatMenuConfig)
         }!
     }
 
-    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, networkProtectionFeatureActivation: NetworkProtectionFeatureActivation, downloadListCoordinator: DownloadListCoordinator, dragDropManager: BookmarkDragDropManager, networkProtectionPopoverManager: NetPPopoverManager, networkProtectionStatusReporter: NetworkProtectionStatusReporter, autofillPopoverPresenter: AutofillPopoverPresenter) {
+    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, networkProtectionFeatureActivation: NetworkProtectionFeatureActivation, downloadListCoordinator: DownloadListCoordinator, dragDropManager: BookmarkDragDropManager, networkProtectionPopoverManager: NetPPopoverManager, networkProtectionStatusReporter: NetworkProtectionStatusReporter, autofillPopoverPresenter: AutofillPopoverPresenter,
+          aiChatMenuConfig: AIChatMenuVisibilityConfigurable) {
 
         self.popovers = NavigationBarPopovers(networkProtectionPopoverManager: networkProtectionPopoverManager, autofillPopoverPresenter: autofillPopoverPresenter)
         self.tabCollectionViewModel = tabCollectionViewModel
@@ -139,6 +142,7 @@ final class NavigationBarViewController: NSViewController {
         self.networkProtectionFeatureActivation = networkProtectionFeatureActivation
         self.downloadListCoordinator = downloadListCoordinator
         self.dragDropManager = dragDropManager
+        self.aiChatMenuConfig = aiChatMenuConfig
         goBackButtonMenuDelegate = NavigationButtonMenuDelegate(buttonType: .back, tabCollectionViewModel: tabCollectionViewModel)
         goForwardButtonMenuDelegate = NavigationButtonMenuDelegate(buttonType: .forward, tabCollectionViewModel: tabCollectionViewModel)
         super.init(coder: coder)
@@ -883,6 +887,7 @@ final class NavigationBarViewController: NSViewController {
     }
 
     private func updateAIChatButton() {
+
         let menu = NSMenu()
         let title = LocalPinningManager.shared.shortcutTitle(for: .aiChat)
         menu.addItem(withTitle: title, action: #selector(toggleAIChatPanelPinning(_:)), keyEquivalent: "")
@@ -890,11 +895,7 @@ final class NavigationBarViewController: NSViewController {
         aiChatButton.menu = menu
         aiChatButton.toolTip = UserText.aiChat
 
-         if LocalPinningManager.shared.isPinned(.aiChat) {
-            aiChatButton.isHidden = false
-        } else {
-            aiChatButton.isHidden = !popovers.bookmarkListPopoverShown
-        }
+        aiChatButton.isHidden = !(LocalPinningManager.shared.isPinned(.aiChat) && aiChatMenuConfig.isFeatureEnabledForToolbarShortcut)
     }
 
     private func subscribeToCredentialsToSave() {
@@ -990,10 +991,10 @@ extension NavigationBarViewController: NSMenuDelegate {
             menu.addItem(withTitle: networkProtectionTitle, action: #selector(toggleNetworkProtectionPanelPinning), keyEquivalent: "")
         }
 
-#warning("TODO Feature flag")
-        let aiChatTitle = LocalPinningManager.shared.shortcutTitle(for: .aiChat)
-        menu.addItem(withTitle: aiChatTitle, action: #selector(toggleAIChatPanelPinning), keyEquivalent: "L")
-
+        if aiChatMenuConfig.isFeatureEnabledForToolbarShortcut {
+            let aiChatTitle = LocalPinningManager.shared.shortcutTitle(for: .aiChat)
+            menu.addItem(withTitle: aiChatTitle, action: #selector(toggleAIChatPanelPinning), keyEquivalent: "L")
+        }
     }
 
     @objc

From af159eb7fae73474d41919feae07a94049e8faed Mon Sep 17 00:00:00 2001
From: Fernando Bunn <bunn@idevzilla.com>
Date: Fri, 18 Oct 2024 19:59:05 +0100
Subject: [PATCH 6/9] add panel

---
 DuckDuckGo/Preferences/Model/PreferencesSection.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/DuckDuckGo/Preferences/Model/PreferencesSection.swift b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
index 980f798aa4..29bd9d321d 100644
--- a/DuckDuckGo/Preferences/Model/PreferencesSection.swift
+++ b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
@@ -42,6 +42,9 @@ struct PreferencesSection: Hashable, Identifiable {
                 panes.append(.duckPlayer)
             }
 
+#warning("TODO: use feature flag here, remove before merging")
+            panes.append(.aiChat)
+
             return panes
         }()
 

From c86f8f296140c32eea03f08826eb34ce8efe4781 Mon Sep 17 00:00:00 2001
From: "bunn@idevzilla.com" <bunn@IntelBook.local>
Date: Sat, 19 Oct 2024 12:18:50 +0100
Subject: [PATCH 7/9] Add AI configuration tests

---
 DuckDuckGo.xcodeproj/project.pbxproj          |  14 ++
 .../AIChat/AIChatMenuConfigurationTests.swift | 131 ++++++++++++++++++
 UnitTests/Menus/MainMenuTests.swift           |   3 +
 3 files changed, 148 insertions(+)
 create mode 100644 UnitTests/AIChat/AIChatMenuConfigurationTests.swift

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 503ea3ad79..1dbc83ace4 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -313,6 +313,8 @@
 		31EF1E812B63FFB800E6DB17 /* DataBrokerProtectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3139A1512AA4B3C000969C7D /* DataBrokerProtectionManager.swift */; };
 		31EF1E832B63FFCA00E6DB17 /* LoginItem+DataBrokerProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D8FA00B2AC5BDCE005DD0D0 /* LoginItem+DataBrokerProtection.swift */; };
 		31EF1E842B63FFD100E6DB17 /* DataBrokerProtectionDebugMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316850712AF3AD58009A2828 /* DataBrokerProtectionDebugMenu.swift */; };
+		31F25EFF2CC3CA02002F9084 /* AIChatMenuConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F25EFE2CC3CA00002F9084 /* AIChatMenuConfigurationTests.swift */; };
+		31F25F002CC3CA02002F9084 /* AIChatMenuConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F25EFE2CC3CA00002F9084 /* AIChatMenuConfigurationTests.swift */; };
 		31F28C4F28C8EEC500119F70 /* YoutubePlayerUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F28C4C28C8EEC500119F70 /* YoutubePlayerUserScript.swift */; };
 		31F28C5128C8EEC500119F70 /* YoutubeOverlayUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F28C4E28C8EEC500119F70 /* YoutubeOverlayUserScript.swift */; };
 		31F28C5328C8EECA00119F70 /* DuckURLSchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F28C5228C8EECA00119F70 /* DuckURLSchemeHandler.swift */; };
@@ -3359,6 +3361,7 @@
 		31E163BC293A579E00963C10 /* PrivacyReferenceTestHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyReferenceTestHelper.swift; sourceTree = "<group>"; };
 		31E163BF293A581900963C10 /* privacy-reference-tests */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "privacy-reference-tests"; path = "Submodules/privacy-reference-tests"; sourceTree = SOURCE_ROOT; };
 		31ECDA102BED339600AE679F /* DataBrokerAuthenticationManagerBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerAuthenticationManagerBuilder.swift; sourceTree = "<group>"; };
+		31F25EFE2CC3CA00002F9084 /* AIChatMenuConfigurationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AIChatMenuConfigurationTests.swift; sourceTree = "<group>"; };
 		31F28C4C28C8EEC500119F70 /* YoutubePlayerUserScript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YoutubePlayerUserScript.swift; sourceTree = "<group>"; };
 		31F28C4E28C8EEC500119F70 /* YoutubeOverlayUserScript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YoutubeOverlayUserScript.swift; sourceTree = "<group>"; };
 		31F28C5228C8EECA00119F70 /* DuckURLSchemeHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DuckURLSchemeHandler.swift; sourceTree = "<group>"; };
@@ -5308,6 +5311,14 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
+		31F25EFD2CC3C9F9002F9084 /* AIChat */ = {
+			isa = PBXGroup;
+			children = (
+				31F25EFE2CC3CA00002F9084 /* AIChatMenuConfigurationTests.swift */,
+			);
+			path = AIChat;
+			sourceTree = "<group>";
+		};
 		31F28C4B28C8EE9000119F70 /* YoutubePlayer */ = {
 			isa = PBXGroup;
 			children = (
@@ -7500,6 +7511,7 @@
 		AA585D93248FD31400E9A3E2 /* UnitTests */ = {
 			isa = PBXGroup;
 			children = (
+				31F25EFD2CC3C9F9002F9084 /* AIChat */,
 				56A054392C20876F007D8FAB /* DuckSchemeHandler */,
 				C13909F22B85FD60001626ED /* Autofill */,
 				5629846D2AC460DF00AC20EB /* Sync */,
@@ -11703,6 +11715,7 @@
 				56AC09C82C2D7DD6002D70E0 /* BookmarksBarViewControllerTests.swift in Sources */,
 				3706FE5B293F661700E42796 /* FirefoxLoginReaderTests.swift in Sources */,
 				1D1C36E429FAE8DA001FA40C /* FaviconManagerTests.swift in Sources */,
+				31F25EFF2CC3CA02002F9084 /* AIChatMenuConfigurationTests.swift in Sources */,
 				37716D8029707E5D00A9FC6D /* FireproofingReferenceTests.swift in Sources */,
 				561D29CB2BDA7530007B91D0 /* MockAppearancePreferencesPersistor.swift in Sources */,
 				B6AA64742994B43300D99CD6 /* FutureExtensionTests.swift in Sources */,
@@ -13266,6 +13279,7 @@
 				4B9292C32667103100AD2C21 /* PasteboardBookmarkTests.swift in Sources */,
 				F1AFDBD22C231B7A00710F2C /* SubscriptionAppStoreRestorerTests.swift in Sources */,
 				B610F2E427A8F37A00FCEBE9 /* CBRCompileTimeReporterTests.swift in Sources */,
+				31F25F002CC3CA02002F9084 /* AIChatMenuConfigurationTests.swift in Sources */,
 				AABAF59C260A7D130085060C /* FaviconManagerMock.swift in Sources */,
 				37D046A42C7DAA8900AEAA50 /* ImageProcessorMock.swift in Sources */,
 				1DFAB5222A8983DE00A0F7F6 /* SetExtensionTests.swift in Sources */,
diff --git a/UnitTests/AIChat/AIChatMenuConfigurationTests.swift b/UnitTests/AIChat/AIChatMenuConfigurationTests.swift
new file mode 100644
index 0000000000..b0b1f2dbc2
--- /dev/null
+++ b/UnitTests/AIChat/AIChatMenuConfigurationTests.swift
@@ -0,0 +1,131 @@
+//
+//  AIChatMenuConfigurationTests.swift
+//
+//  Copyright © 2024 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
+import Combine
+@testable import DuckDuckGo_Privacy_Browser
+
+class AIChatMenuConfigurationTests: XCTestCase {
+    var configuration: AIChatMenuConfiguration!
+    var mockStorage: MockAIChatPreferencesStorage!
+
+    override func setUp() {
+        super.setUp()
+        mockStorage = MockAIChatPreferencesStorage()
+        configuration = AIChatMenuConfiguration(storage: mockStorage)
+    }
+
+    override func tearDown() {
+        configuration = nil
+        mockStorage = nil
+        super.tearDown()
+    }
+
+    func testShouldDisplayApplicationMenuShortcut() {
+        mockStorage.showShortcutInApplicationMenu = true
+        let featureEnabled = true
+
+        let result = configuration.shouldDisplayApplicationMenuShortcut
+
+        XCTAssertTrue(result, "Application menu shortcut should be displayed when enabled.")
+    }
+
+    func testShouldDisplayToolbarShortcut() {
+        mockStorage.shouldDisplayToolbarShortcut = true
+        let featureEnabled = true
+        let result = configuration.shouldDisplayToolbarShortcut
+
+        XCTAssertTrue(result, "Toolbar shortcut should be displayed when enabled.")
+    }
+
+    func testShortcutURL() {
+        let url = configuration.shortcutURL
+
+        XCTAssertEqual(url.absoluteString, "https://duckduckgo.com/?q=DuckDuckGo+AI+Chat&ia=chat&duckai=2", "Shortcut URL should match the expected URL.")
+    }
+
+    func testToolbarValuesChangedPublisher() {
+        // Given
+        let expectation = self.expectation(description: "Values changed publisher should emit a value.")
+        var receivedValue: Void?
+
+        let cancellable = configuration.valuesChangedPublisher.sink {
+            receivedValue = $0
+            expectation.fulfill()
+        }
+
+        mockStorage.updateToolbarShortcutDisplay(to: true)
+
+        waitForExpectations(timeout: 1) { error in
+            XCTAssertNil(error, "Values changed publisher did not emit a value in time.")
+            XCTAssertNotNil(receivedValue, "Values changed publisher should emit a value when storage changes.")
+        }
+        cancellable.cancel()
+    }
+    
+    func testApplicationMenuValuesChangedPublisher() {
+        let expectation = self.expectation(description: "Values changed publisher should emit a value.")
+        var receivedValue: Void?
+
+        let cancellable = configuration.valuesChangedPublisher.sink {
+            receivedValue = $0
+            expectation.fulfill()
+        }
+
+        mockStorage.updateApplicationMenuShortcutDisplay(to: true)
+
+        waitForExpectations(timeout: 1) { error in
+            XCTAssertNil(error, "Values changed publisher did not emit a value in time.")
+            XCTAssertNotNil(receivedValue, "Values changed publisher should emit a value when storage changes.")
+        }
+        cancellable.cancel()
+    }
+}
+
+class MockAIChatPreferencesStorage: AIChatPreferencesStorage {
+    var showShortcutInApplicationMenu: Bool = false {
+        didSet {
+            showShortcutInApplicationMenuSubject.send(showShortcutInApplicationMenu)
+        }
+    }
+    
+    var shouldDisplayToolbarShortcut: Bool = false {
+        didSet {
+            shouldDisplayToolbarShortcutSubject.send(shouldDisplayToolbarShortcut)
+        }
+    }
+    
+    private var showShortcutInApplicationMenuSubject = PassthroughSubject<Bool, Never>()
+    private var shouldDisplayToolbarShortcutSubject = PassthroughSubject<Bool, Never>()
+
+    var showShortcutInApplicationMenuPublisher: AnyPublisher<Bool, Never> {
+        showShortcutInApplicationMenuSubject.eraseToAnyPublisher()
+    }
+
+    var shouldDisplayToolbarShortcutPublisher: AnyPublisher<Bool, Never> {
+        shouldDisplayToolbarShortcutSubject.eraseToAnyPublisher()
+    }
+
+    func updateApplicationMenuShortcutDisplay(to value: Bool) {
+        showShortcutInApplicationMenu = value
+    }
+
+    func updateToolbarShortcutDisplay(to value: Bool) {
+        shouldDisplayToolbarShortcut = value
+    }
+}
diff --git a/UnitTests/Menus/MainMenuTests.swift b/UnitTests/Menus/MainMenuTests.swift
index 861cc59804..65a9f72c44 100644
--- a/UnitTests/Menus/MainMenuTests.swift
+++ b/UnitTests/Menus/MainMenuTests.swift
@@ -115,6 +115,9 @@ private class DummyFeatureFlagger: FeatureFlagger {
 private class DummyAIChatConfig: AIChatMenuVisibilityConfigurable {
     var shouldDisplayApplicationMenuShortcut: Bool { false }
     var shouldDisplayToolbarShortcut: Bool { false }
+    var isFeatureEnabledForApplicationMenuShortcut: Bool { false }
+    var isFeatureEnabledForToolbarShortcut: Bool { false }
+
     var shortcutURL: URL { URL(string: "https://example.com")! }
 
     var valuesChangedPublisher: PassthroughSubject<Void, Never> {

From 288b179edf0f092889ed43ea78ffcae74cfd62c8 Mon Sep 17 00:00:00 2001
From: "bunn@idevzilla.com" <bunn@IntelBook.local>
Date: Sat, 19 Oct 2024 13:05:20 +0100
Subject: [PATCH 8/9] Add tests for AIChat menu

---
 UnitTests/Menus/MainMenuTests.swift | 51 ++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/UnitTests/Menus/MainMenuTests.swift b/UnitTests/Menus/MainMenuTests.swift
index 65a9f72c44..9cb500daa6 100644
--- a/UnitTests/Menus/MainMenuTests.swift
+++ b/UnitTests/Menus/MainMenuTests.swift
@@ -104,6 +104,49 @@ class MainMenuTests: XCTestCase {
         XCTAssertEqual(result.keyEquivalent, "d")
         XCTAssertEqual(result.keyEquivalentModifierMask, [.command, .shift])
     }
+
+    // MARK: - AI Chat
+
+    @MainActor
+    func testMainMenuInitializedWithFalseAiChatFlag_ThenAiChatIsNotVisible() throws {
+        // GIVEN
+        let aiChatConfig = DummyAIChatConfig()
+        let sut = MainMenu(featureFlagger: DummyFeatureFlagger(),
+                           bookmarkManager: MockBookmarkManager(),
+                           faviconManager: FaviconManagerMock(),
+                           aiChatMenuConfig: aiChatConfig)
+
+        let fileMenu = try XCTUnwrap(sut.item(withTitle: UserText.mainMenuFile))
+
+        // WHEN
+        let aiChatMenu = fileMenu.submenu?.item(withTitle: UserText.newAIChatMenuItem)
+
+        // THEN
+        XCTAssertNotNil(aiChatMenu, "AI Chat menu item should exist in the file menu.")
+        XCTAssertTrue(aiChatMenu?.isHidden == true, "AI Chat menu item should be hidden when the AI chat flag is false.")
+    }
+
+    @MainActor
+    func testMainMenuInitializedWithTrueAiChatFlag_ThenAiChatIsVisible() throws {
+        // GIVEN
+        let aiChatConfig = DummyAIChatConfig()
+        aiChatConfig.shouldDisplayApplicationMenuShortcut = true
+        aiChatConfig.isFeatureEnabledForApplicationMenuShortcut = true
+
+        let sut = MainMenu(featureFlagger: DummyFeatureFlagger(),
+                           bookmarkManager: MockBookmarkManager(),
+                           faviconManager: FaviconManagerMock(),
+                           aiChatMenuConfig: aiChatConfig)
+
+        let fileMenu = try XCTUnwrap(sut.item(withTitle: UserText.mainMenuFile))
+
+        // WHEN
+        let aiChatMenu = fileMenu.submenu?.item(withTitle: UserText.newAIChatMenuItem)
+
+        // THEN
+        XCTAssertNotNil(aiChatMenu, "AI Chat menu item should exist in the file menu.")
+        XCTAssertFalse(aiChatMenu?.isHidden ?? true, "AI Chat menu item should be visible when the AI chat flag is true.")
+    }
 }
 
 private class DummyFeatureFlagger: FeatureFlagger {
@@ -113,10 +156,10 @@ private class DummyFeatureFlagger: FeatureFlagger {
 }
 
 private class DummyAIChatConfig: AIChatMenuVisibilityConfigurable {
-    var shouldDisplayApplicationMenuShortcut: Bool { false }
-    var shouldDisplayToolbarShortcut: Bool { false }
-    var isFeatureEnabledForApplicationMenuShortcut: Bool { false }
-    var isFeatureEnabledForToolbarShortcut: Bool { false }
+    var shouldDisplayApplicationMenuShortcut = false
+    var shouldDisplayToolbarShortcut = false
+    var isFeatureEnabledForApplicationMenuShortcut = false
+    var isFeatureEnabledForToolbarShortcut = false
 
     var shortcutURL: URL { URL(string: "https://example.com")! }
 

From 16d0c7d265ab54f1432da059ce899da61d0c8d2a Mon Sep 17 00:00:00 2001
From: "bunn@idevzilla.com" <bunn@IntelBook.local>
Date: Sat, 19 Oct 2024 13:16:59 +0100
Subject: [PATCH 9/9] Linter

---
 DuckDuckGo/AIChat/AIChatPreferencesStorage.swift    | 2 +-
 UnitTests/AIChat/AIChatMenuConfigurationTests.swift | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DuckDuckGo/AIChat/AIChatPreferencesStorage.swift b/DuckDuckGo/AIChat/AIChatPreferencesStorage.swift
index 4957b96d8c..ad917a3e10 100644
--- a/DuckDuckGo/AIChat/AIChatPreferencesStorage.swift
+++ b/DuckDuckGo/AIChat/AIChatPreferencesStorage.swift
@@ -1,5 +1,5 @@
 //
-//  AIChatPreferencesConfiguration.swift
+//  AIChatPreferencesStorage.swift
 //
 //  Copyright © 2024 DuckDuckGo. All rights reserved.
 //
diff --git a/UnitTests/AIChat/AIChatMenuConfigurationTests.swift b/UnitTests/AIChat/AIChatMenuConfigurationTests.swift
index b0b1f2dbc2..0e515cb997 100644
--- a/UnitTests/AIChat/AIChatMenuConfigurationTests.swift
+++ b/UnitTests/AIChat/AIChatMenuConfigurationTests.swift
@@ -77,7 +77,7 @@ class AIChatMenuConfigurationTests: XCTestCase {
         }
         cancellable.cancel()
     }
-    
+
     func testApplicationMenuValuesChangedPublisher() {
         let expectation = self.expectation(description: "Values changed publisher should emit a value.")
         var receivedValue: Void?
@@ -103,13 +103,13 @@ class MockAIChatPreferencesStorage: AIChatPreferencesStorage {
             showShortcutInApplicationMenuSubject.send(showShortcutInApplicationMenu)
         }
     }
-    
+
     var shouldDisplayToolbarShortcut: Bool = false {
         didSet {
             shouldDisplayToolbarShortcutSubject.send(shouldDisplayToolbarShortcut)
         }
     }
-    
+
     private var showShortcutInApplicationMenuSubject = PassthroughSubject<Bool, Never>()
     private var shouldDisplayToolbarShortcutSubject = PassthroughSubject<Bool, Never>()