Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -45,6 +46,8 @@ class FeatureAnnouncementCardViewModel: AnnouncementCardViewModelProtocol {
config.image
}

var showDismissButton: Bool = true

var showDismissConfirmation: Bool {
config.showDismissConfirmation
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ struct JustInTimeMessageAnnouncementCardViewModel: AnnouncementCardViewModelProt
// No-op
}

var showDismissButton: Bool = true

var showDismissConfirmation: Bool = false

var dismissAlertTitle: String = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -30,10 +42,6 @@ struct ProductsOnboardingAnnouncementCardViewModel: AnnouncementCardViewModelPro

var dismissAlertMessage: String = ""

func dontShowAgainTapped() {
// No-op
}

func remindLaterTapped() {
// No-op
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down