[iOS] Fix request desktop site action in new menu UI

This change merges the UIActivity version of "Request Desktop Site"/"Request Mobile Site" to a single identifier that matches the new menu UI's action identifier and then correctly sets it up in the new menu.

We specifically set it up as such because the new menu has to treat "Request Desktop Site" & "Request Mobile Site" as a single item since its user customizable

ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Menu.swift

@@ -493,14 +493,15 @@ extension BrowserViewController {
   func presentBrowserMenu(
     from sourceView: UIView,
     activities: [UIActivity],
+    tab: Tab?,
     pageURL: URL?,
     webView: WKWebView?
   ) {
     var actions: [Action] = []
     actions.append(vpnMenuAction)
     actions.append(contentsOf: destinationMenuActions(for: pageURL))
     actions.append(contentsOf: pageActions(for: pageURL, webView: webView))
-    let pageActivities: Set<Action> = Set(
+    var pageActivities: Set<Action> = Set(
       activities
         .compactMap { activity in
           guard let id = (activity as? MenuActivity)?.id,
@@ -519,6 +520,27 @@ extension BrowserViewController {
           }
         }
     )
+    if let tab,
+      let requestDesktopPageActivity = pageActivities.first(where: { $0.id == .requestDesktopSite })
+    {
+      // Remove the UIActivity version and replace it with a manual version.
+      // The request desktop activity is special in the sense that it is dynamic based on the
+      // current tab user agent, but we don't use rely on the UIActivity information to populate
+      // actions in the new menu UI, so this replaces it with how we would compose it manually
+      pageActivities.remove(requestDesktopPageActivity)
+      pageActivities.insert(
+        .init(
+          id: .requestDesktopSite,
+          title: tab.isDesktopSite ? Strings.appMenuViewMobileSiteTitleString : nil,
+          image: tab.isDesktopSite ? "leo.smartphone" : nil,
+          handler: { @MainActor [unowned self, weak tab] _ in
+            tab?.switchUserAgent()
+            self.dismiss(animated: true)
+            return .none
+          }
+        )
+      )
+    }
     // Sets up empty actions for any page actions that weren't setup as UIActivity's
     let remainingPageActivities: [Action] = Action.ID.allPageActivites
       .subtracting(pageActivities.map(\.id))

ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+ShareActivity.swift

@@ -145,9 +145,15 @@ extension BrowserViewController {
       }
 
       // Request Desktop Site Activity
+      let isDesktopSite = tab?.isDesktopSite ?? false
+      var requestDesktopSite = BasicMenuActivity.ActivityType.requestDesktopSite
+      if isDesktopSite {
+        requestDesktopSite.title = Strings.appMenuViewMobileSiteTitleString
+        requestDesktopSite.braveSystemImage = "leo.smartphone"
+      }
       activities.append(
         BasicMenuActivity(
-          activityType: tab?.isDesktopSite == true ? .requestMobileSite : .requestDesktopSite,
+          activityType: requestDesktopSite,
           callback: {
             tab?.switchUserAgent()
           }

ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+ToolbarDelegate.swift

@@ -961,6 +961,7 @@ extension BrowserViewController: ToolbarDelegate {
       presentBrowserMenu(
         from: tabToolbar.menuButton,
         activities: activities,
+        tab: tabManager.selectedTab,
         pageURL: selectedTabURL,
         webView: tabManager.selectedTab?.webView
       )

ios/brave-ios/Sources/Brave/Frontend/Share/ShareExtensionHelper.swift

@@ -94,13 +94,8 @@ extension BasicMenuActivity.ActivityType {
     title: Strings.addToFavorites,
     braveSystemImage: "leo.widget.generic"
   )
-  static let requestMobileSite: Self = .init(
-    id: "RequestMobileSite",
-    title: Strings.appMenuViewMobileSiteTitleString,
-    braveSystemImage: "leo.smartphone"
-  )
   static let requestDesktopSite: Self = .init(
-    id: "RequestDesktopSite",
+    id: "ToggleUserAgent",
     title: Strings.appMenuViewDesktopSiteTitleString,
     braveSystemImage: "leo.monitor"
   )

ios/brave-ios/Sources/BrowserMenu/BrowserMenu.swift

@@ -132,10 +132,8 @@ public struct BrowserMenu: View {
             }
           }
           .modifier(MenuRowButtonStyleModifier())
-          .background(
-            Color(braveSystemName: .iosBrowserContainerHighlightIos),
-            in: .rect(cornerRadius: 14, style: .continuous)
-          )
+          .background(Color(braveSystemName: .iosBrowserContainerHighlightIos))
+          .clipShape(.rect(cornerRadius: 14, style: .continuous))
           .transition(.blurReplace())
         }
         Button {
@@ -144,10 +142,8 @@ public struct BrowserMenu: View {
           Label(Strings.BrowserMenu.allSettingsButtonTitle, braveSystemImage: "leo.settings")
         }
         .modifier(MenuRowButtonStyleModifier())
-        .background(
-          Color(braveSystemName: .iosBrowserContainerHighlightIos),
-          in: .rect(cornerRadius: 14, style: .continuous)
-        )
+        .background(Color(braveSystemName: .iosBrowserContainerHighlightIos))
+        .clipShape(.rect(cornerRadius: 14, style: .continuous))
       }
       .padding()
     }