Merge pull request #7334 from woocommerce/issue/7305-cancel-button-feature-announcement-alert

Add cancel button to the Upsell Card Reader banner dismiss dialog

Author: toupper

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

@@ -2,7 +2,7 @@ import SwiftUI
 
 struct FeatureAnnouncementCardView: View {
     private let viewModel: FeatureAnnouncementCardViewModel
-    @State private var showingDismissAlert = false
+    @State private var showingDismissActionSheet = false
 
     let dismiss: (() -> Void)?
     let callToAction: (() -> Void)?
@@ -23,25 +23,31 @@ struct FeatureAnnouncementCardView: View {
                 Spacer()
                 if let dismiss = dismiss {
                     Button(action: {
-                        showingDismissAlert = true
+                        showingDismissActionSheet = true
                     }) {
                         Image(systemName: "xmark")
                             .foregroundColor(Color(.withColorStudio(.gray)))
                     }
                     .padding(.trailing, Layout.padding)
-                    .alert(isPresented: $showingDismissAlert,
-                           content: {
-                        Alert(title: Text(viewModel.dismissAlertTitle),
-                              message: Text(viewModel.dismissAlertMessage),
-                              primaryButton: .cancel(Text(Localization.remindLaterButton), action: {
-                            viewModel.remindLaterTapped()
-                            dismiss()
-                        }),
-                              secondaryButton: .default(Text(Localization.dontShowAgainButton), action: {
-                            viewModel.dontShowAgainTapped()
-                            dismiss()
-                        }))
-                    })
+                    .actionSheet(isPresented: $showingDismissActionSheet) {
+                        ActionSheet(
+                            title: Text(viewModel.dismissAlertTitle),
+                            message: Text(viewModel.dismissAlertMessage),
+                            buttons: [
+                                .default(Text(Localization.remindLaterButton),
+                                         action: {
+                                             viewModel.remindLaterTapped()
+                                             dismiss()
+                                         }),
+                                .default(Text(Localization.dontShowAgainButton),
+                                         action: {
+                                             viewModel.dontShowAgainTapped()
+                                             dismiss()
+                                         }),
+                                .cancel()
+                            ]
+                        )
+                    }
                 }
             }
             .padding(.top, Layout.padding)