Merge pull request #7988 from woocommerce/issue/7978-products-onboarding-banner-buttons

Products Onboarding: Update buttons for onboarding banner

Author: rachelmcr

WooCommerce/Classes/ViewModels/Feature Announcement Cards/FeatureAnnouncementCardViewModel.swift

@@ -17,6 +17,7 @@ protocol AnnouncementCardViewModelProtocol {
     func onAppear()
     func ctaTapped()
 
+    var showDismissButton: Bool { get }
     var showDismissConfirmation: Bool { get }
     var dismissAlertTitle: String { get }
     var dismissAlertMessage: String { get }
@@ -45,6 +46,8 @@ class FeatureAnnouncementCardViewModel: AnnouncementCardViewModelProtocol {
         config.image
     }
 
+    var showDismissButton: Bool = true
+
     var showDismissConfirmation: Bool {
         config.showDismissConfirmation
     }

WooCommerce/Classes/ViewModels/Feature Announcement Cards/JustInTimeMessageAnnouncementCardViewModel.swift

@@ -22,6 +22,8 @@ struct JustInTimeMessageAnnouncementCardViewModel: AnnouncementCardViewModelProt
         // No-op
     }
 
+    var showDismissButton: Bool = true
+
     var showDismissConfirmation: Bool = false
 
     var dismissAlertTitle: String = ""

WooCommerce/Classes/ViewModels/Feature Announcement Cards/ProductsOnboardingAnnouncementCardViewModel.swift

@@ -18,7 +18,19 @@ struct ProductsOnboardingAnnouncementCardViewModel: AnnouncementCardViewModelPro
         // No-op
     }
 
+    // MARK: Call to Action
+
+    let onCTATapped: (() -> Void)?
+
     func ctaTapped() {
+        onCTATapped?()
+    }
+
+    // MARK: Dismiss button (disabled)
+
+    var showDismissButton: Bool = false
+
+    func dontShowAgainTapped() {
         // No-op
     }
 
@@ -30,10 +42,6 @@ struct ProductsOnboardingAnnouncementCardViewModel: AnnouncementCardViewModelPro
 
     var dismissAlertMessage: String = ""
 
-    func dontShowAgainTapped() {
-        // No-op
-    }
-
     func remindLaterTapped() {
         // No-op
     }

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewModel.swift

@@ -123,7 +123,14 @@ final class DashboardViewModel {
                     ServiceLocator.analytics.track(.productsOnboardingEligible)
 
                     if self?.featureFlagService.isFeatureFlagEnabled(.productsOnboarding) == true {
-                        let viewModel = ProductsOnboardingAnnouncementCardViewModel()
+                        let viewModel = ProductsOnboardingAnnouncementCardViewModel(onCTATapped: { [weak self] in
+                            guard let tabBarController = AppDelegate.shared.tabBarController else {
+                                return
+                            }
+
+                            self?.announcementViewModel = nil // Dismiss announcement
+                            tabBarController.navigateTo(.products)
+                        })
                         self?.announcementViewModel = viewModel
                     }
                 }

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/FeatureAnnouncementCardView.swift

@@ -30,7 +30,7 @@ struct FeatureAnnouncementCardView: View {
                 BadgeView(type: viewModel.badgeType)
                     .padding(.leading, Layout.padding)
                 Spacer()
-                if let dismiss = dismiss {
+                if viewModel.showDismissButton, let dismiss = dismiss {
                     Button(action: {
                         if viewModel.showDismissConfirmation {
                             showingDismissActionSheet = true