From 847b6a700f70bb2e695e4ee259e3333cdc6e4cd2 Mon Sep 17 00:00:00 2001
From: mattlichtenstein <lichtensteinmp@gmail.com>
Date: Fri, 20 Dec 2024 16:28:46 -0500
Subject: [PATCH] Merge fixes

---
 .../Client/Coordinators/Browser/BrowserCoordinator.swift   | 6 ++++--
 .../Client/Coordinators/Library/BookmarksCoordinator.swift | 6 ++----
 .../Client/Coordinators/Library/LibraryCoordinator.swift   | 4 ++--
 .../Client/Frontend/Browser/MainMenuActionHelper.swift     | 1 -
 .../Bookmarks/Edit Bookmark/EditBookmarkViewModel.swift    | 7 ++++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift b/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift
index 3fbfd48bf4903..32235c7e373af 100644
--- a/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift
+++ b/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift
@@ -29,7 +29,8 @@ class BrowserCoordinator: BaseCoordinator,
                           WindowEventCoordinator,
                           MainMenuCoordinatorDelegate,
                           ETPCoordinatorSSLStatusDelegate,
-                          SearchEngineSelectionCoordinatorDelegate {
+                          SearchEngineSelectionCoordinatorDelegate,
+                          BookmarksRefactorFeatureFlagProvider {
     private struct UX {
         static let searchEnginePopoverSize = CGSize(width: 250, height: 536)
     }
@@ -188,7 +189,8 @@ class BrowserCoordinator: BaseCoordinator,
             profile: profile,
             windowUUID: windowUUID,
             libraryCoordinator: self,
-            libraryNavigationHandler: nil
+            libraryNavigationHandler: nil,
+            isBookmarkRefactorEnabled: isBookmarkRefactorEnabled
         )
         add(child: bookmarksCoordinator)
         bookmarksCoordinator.start(parentFolder: parentFolder, bookmark: bookmark)
diff --git a/firefox-ios/Client/Coordinators/Library/BookmarksCoordinator.swift b/firefox-ios/Client/Coordinators/Library/BookmarksCoordinator.swift
index b2b8e9b7a8eb3..94879167cbc52 100644
--- a/firefox-ios/Client/Coordinators/Library/BookmarksCoordinator.swift
+++ b/firefox-ios/Client/Coordinators/Library/BookmarksCoordinator.swift
@@ -60,16 +60,14 @@ class BookmarksCoordinator: BaseCoordinator,
         router: Router,
         profile: Profile,
         windowUUID: WindowUUID,
-        parentCoordinator: LibraryCoordinatorDelegate?,
-        navigationHandler: LibraryNavigationHandler?,
+        libraryCoordinator: LibraryCoordinatorDelegate?,
+        libraryNavigationHandler: LibraryNavigationHandler?,
         isBookmarkRefactorEnabled: Bool
     ) {
         self.profile = profile
         self.windowUUID = windowUUID
         self.libraryCoordinator = libraryCoordinator
         self.libraryNavigationHandler = libraryNavigationHandler
-        self.parentCoordinator = parentCoordinator
-        self.navigationHandler = navigationHandler
         self.isBookmarkRefactorEnabled = isBookmarkRefactorEnabled
         super.init(router: router)
     }
diff --git a/firefox-ios/Client/Coordinators/Library/LibraryCoordinator.swift b/firefox-ios/Client/Coordinators/Library/LibraryCoordinator.swift
index c767df64b2154..16e2ffa031d97 100644
--- a/firefox-ios/Client/Coordinators/Library/LibraryCoordinator.swift
+++ b/firefox-ios/Client/Coordinators/Library/LibraryCoordinator.swift
@@ -127,8 +127,8 @@ class LibraryCoordinator: BaseCoordinator,
             router: router,
             profile: profile,
             windowUUID: windowUUID,
-            parentCoordinator: parentCoordinator,
-            navigationHandler: self,
+            libraryCoordinator: parentCoordinator,
+            libraryNavigationHandler: self,
             isBookmarkRefactorEnabled: isBookmarkRefactorEnabled
         )
         add(child: bookmarksCoordinator)
diff --git a/firefox-ios/Client/Frontend/Browser/MainMenuActionHelper.swift b/firefox-ios/Client/Frontend/Browser/MainMenuActionHelper.swift
index 0433a64da9e82..e3947bd684873 100644
--- a/firefox-ios/Client/Frontend/Browser/MainMenuActionHelper.swift
+++ b/firefox-ios/Client/Frontend/Browser/MainMenuActionHelper.swift
@@ -28,7 +28,6 @@ protocol ToolBarActionMenuDelegate: AnyObject {
     func showSignInView(fxaParameters: FxASignInViewParameters)
     func showFilePicker(fileURL: URL)
     func showEditBookmark()
-    func showEditBookmark()
 }
 
 extension ToolBarActionMenuDelegate {
diff --git a/firefox-ios/Client/Frontend/Library/Bookmarks/Edit Bookmark/EditBookmarkViewModel.swift b/firefox-ios/Client/Frontend/Library/Bookmarks/Edit Bookmark/EditBookmarkViewModel.swift
index 9260a6dd88c51..df4eaea5749c1 100644
--- a/firefox-ios/Client/Frontend/Library/Bookmarks/Edit Bookmark/EditBookmarkViewModel.swift	
+++ b/firefox-ios/Client/Frontend/Library/Bookmarks/Edit Bookmark/EditBookmarkViewModel.swift	
@@ -128,6 +128,10 @@ class EditBookmarkViewModel: ParentFolderSelector {
         }
     }
 
+    func didFinish() {
+        bookmarkCoordinatorDelegate?.didFinish()
+    }
+
     // MARK: ParentFolderSelector
 
     func selectFolderCreatedFromChild(folder: Folder) {
@@ -135,9 +139,6 @@ class EditBookmarkViewModel: ParentFolderSelector {
         selectedFolder = folder
         folderStructures = [folder]
         onFolderStatusUpdate?()
-        
-    func didFinish() {
-        bookmarkCoordinatorDelegate?.didFinish()
     }
 }