Trigger add product flow for products onboarding without switching tabs

Remove unused code for presenting add product flow

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -123,6 +123,7 @@ final class DashboardViewController: UIViewController {
         observeStatsVersionForDashboardUIUpdates()
         observeAnnouncements()
         observeShowWebViewSheet()
+        observeAddProductTrigger()
         viewModel.syncAnnouncements(for: siteID)
         Task { @MainActor in
             await reloadDashboardUIStatsVersion(forced: true)
@@ -303,6 +304,23 @@ private extension DashboardViewController {
         present(hostingController, animated: true, completion: nil)
     }
 
+    /// Subscribes to the trigger to start the Add Product flow for products onboarding
+    ///
+    private func observeAddProductTrigger() {
+        viewModel.addProductTrigger.sink { [weak self] _ in
+            self?.startAddProductFlow()
+        }
+        .store(in: &subscriptions)
+    }
+
+    /// Starts the Add Product flow (without switching tabs)
+    ///
+    private func startAddProductFlow() {
+        guard let announcementView, let navigationController else { return }
+        let coordinator = AddProductCoordinator(siteID: siteID, sourceView: announcementView, sourceNavigationController: navigationController)
+        coordinator.start()
+    }
+
     // This is used so we have a specific type for the view while applying modifiers.
     struct AnnouncementCardWrapper: View {
         let cardView: FeatureAnnouncementCardView

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewModel.swift

@@ -1,4 +1,5 @@
 import Yosemite
+import Combine
 import enum Networking.DotcomError
 import enum Storage.StatsVersion
 import protocol Experiments.FeatureFlagService
@@ -13,6 +14,10 @@ final class DashboardViewModel {
 
     @Published private(set) var showWebViewSheet: WebViewSheetViewModel? = nil
 
+    /// Trigger to start the Add Product flow
+    ///
+    let addProductTrigger = PassthroughSubject<Void, Never>()
+
     private let stores: StoresManager
     private let featureFlagService: FeatureFlagService
     private let analytics: Analytics
@@ -154,8 +159,7 @@ final class DashboardViewModel {
             guard let self else { return }
             if case let .success(isVisible) = result, isVisible {
                 let viewModel = ProductsOnboardingAnnouncementCardViewModel(onCTATapped: { [weak self] in
-                    self?.announcementViewModel = nil // Dismiss announcement
-                    MainTabBarController.presentAddProductFlow()
+                    self?.addProductTrigger.send()
                 })
                 self.announcementViewModel = viewModel
             }

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -414,19 +414,6 @@ extension MainTabBarController {
         }
     }
 
-    static func presentAddProductFlow() {
-        navigateTo(.products)
-
-        guard let productsViewController: ProductsViewController = childViewController() else {
-            return
-        }
-
-        // We give some time for the products tab transition to finish, so the add product button is present to start the flow
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-            productsViewController.addProduct()
-        }
-    }
-
     static func presentPayments() {
         switchToHubMenuTab()
 

WooCommerce/Classes/ViewRelated/Products/ProductsViewController.swift

@@ -220,16 +220,6 @@ final class ProductsViewController: UIViewController, GhostableViewController {
     }
 }
 
-// MARK: - Public API
-//
-extension ProductsViewController {
-    /// Adds a new product using the "Add Product" navigation bar button as the source
-    ///
-    func addProduct() {
-        addProduct(addProductButton)
-    }
-}
-
 // MARK: - Navigation Bar Actions
 //
 private extension ProductsViewController {