Merge pull request #4970 from wikimedia/watchlist-bugs

Watchlist navigation bugs
wikimedia · Sep 13, 2024 · bad1397 · bad1397
2 parents f5233f6 + 7b6b24e
commit bad1397
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/...mponents/Sources/WMFComponents/Components/Shared/Buttons/WMFSmallMenuButtonDelegate.swift b/...mponents/Sources/WMFComponents/Components/Shared/Buttons/WMFSmallMenuButtonDelegate.swift
@@ -3,8 +3,7 @@ import UIKit
 public protocol WMFSmallMenuButtonDelegate: AnyObject {
     func wmfMenuButton(_ sender: WMFSmallMenuButton, didTapMenuItem item: WMFSmallMenuButton.MenuItem)
     func wmfMenuButtonDidTap(_ sender: WMFSmallMenuButton)
-
-	func wmfSwiftUIMenuButtonUserDidTap(configuration: WMFSmallMenuButton.Configuration, item: WMFSmallMenuButton.MenuItem?)
+    func wmfSwiftUIMenuButtonUserDidTap(configuration: WMFSmallMenuButton.Configuration, item: WMFSmallMenuButton.MenuItem?)
     func wmfSwiftUIMenuButtonUserDidTapAccessibility(configuration: WMFSmallMenuButton.Configuration, item: WMFSmallMenuButton.MenuItem?)
 }
 

diff --git a/WMFComponents/Sources/WMFComponents/Components/Watchlist/WKWatchlistViewController.swift b/WMFComponents/Sources/WMFComponents/Components/Watchlist/WKWatchlistViewController.swift
@@ -51,7 +51,7 @@ public final class WMFWatchlistViewController: WMFCanvasViewController {
             self.articleTitleMetadataKey = articleTitleMetadaKey
 		}
 
-		func WMFSwiftUIMenuButtonUserDidTap(configuration: WMFSmallMenuButton.Configuration, item: WMFSmallMenuButton.MenuItem?) {
+		func wmfSwiftUIMenuButtonUserDidTap(configuration: WMFSmallMenuButton.Configuration, item: WMFSmallMenuButton.MenuItem?) {
             guard let username = configuration.title, let tappedTitle = item?.title,
                     let wmfProject = configuration.metadata[wmfProjectMetadataKey] as? WMFProject,
                   let revisionID = configuration.metadata[revisionIDMetadataKey] as? UInt,
@@ -84,7 +84,7 @@ public final class WMFWatchlistViewController: WMFCanvasViewController {
             }
 		}
 
-        func WMFSwiftUIMenuButtonUserDidTapAccessibility(configuration: WMFSmallMenuButton.Configuration, item: WMFSmallMenuButton.MenuItem?) {
+        func wmfSwiftUIMenuButtonUserDidTapAccessibility(configuration: WMFSmallMenuButton.Configuration, item: WMFSmallMenuButton.MenuItem?) {
             guard let username = configuration.title, let tappedTitle = item?.title,
                     let wmfProject = configuration.metadata[wmfProjectMetadataKey] as? WMFProject,
                   let revisionID = configuration.metadata[revisionIDMetadataKey] as? UInt,

diff --git a/Wikipedia/Code/ViewControllerRouter.swift b/Wikipedia/Code/ViewControllerRouter.swift
@@ -226,7 +226,7 @@ class ViewControllerRouter: NSObject {
     }
 
     private func watchlistTargetNavigationController() -> UINavigationController? {
-        var targetNavigationController = appViewController.navigationController
+        var targetNavigationController: UINavigationController? = appViewController.currentTabNavigationController
         if let presentedNavigationController = appViewController.presentedViewController as? UINavigationController,
            presentedNavigationController.viewControllers[0] is WMFSettingsViewController {
             targetNavigationController = presentedNavigationController