[IPPInAppFeedback] Banner dismiss logic

Storage/Storage/Model/Feature Announcements/FeatureAnnouncementCampaign.swift

@@ -4,6 +4,7 @@ public enum FeatureAnnouncementCampaign: String, Codable, Equatable {
     case upsellCardReaders = "upsell_card_readers"
     case linkedProductsPromo = "linked_products_promo"
     case productsOnboarding = "products_onboarding_first_product"
+    case IPP = "IPP_feedback_request"
 
     /// Added for use in `test_setFeatureAnnouncementDismissed_with_another_campaign_previously_dismissed_keeps_values_for_both`
     /// This can be removed when we have a second campaign, which can be used in the above test instead.

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

@@ -108,6 +108,7 @@ class FeatureAnnouncementCardViewModel: AnnouncementCardViewModelProtocol {
     private func storeDismissedSetting(remindLater: Bool) {
         let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: config.campaign,
                                                                        remindLater: remindLater,
+                                                                       remindAfter: nil,
                                                                        onCompletion: nil)
         stores.dispatch(action)
         shouldBeVisible = false

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

@@ -35,6 +35,7 @@ struct ProductsOnboardingAnnouncementCardViewModel: AnnouncementCardViewModelPro
     func dontShowAgainTapped() {
         let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .productsOnboarding,
                                                                        remindLater: false,
+                                                                       remindAfter: nil,
                                                                        onCompletion: nil)
         ServiceLocator.stores.dispatch(action)
     }

WooCommerce/Classes/ViewRelated/Orders/OrderListViewController.swift

@@ -796,14 +796,19 @@ private extension OrderListViewController {
     private func createIPPFeedbackTopBanner() -> TopBannerView {
         let shareIPPFeedbackAction = TopBannerViewModel.ActionButton(title: Localization.shareFeedbackButton, action: { _ in
             self.displayIPPFeedbackBannerSurvey()
+            // We dismiss the banner at this point as well, as we cannot know if was successfully submited or not at this point
+            // We will check the FeedbackStatus to know if we must display it again or not
+            self.viewModel.dismissIPPFeedbackBanner(remindLater: false, remindAfter: nil)
         })
 
         let viewModel = TopBannerViewModel(
             title: Localization.feedbackBannerTitle,
             infoText: Localization.feedbackBannerContent,
             icon: UIImage.gridicon(.comment),
             isExpanded: true,
-            topButton: .dismiss(handler: {  }),
+            topButton: .dismiss(handler: {
+                self.dismissIPPFeedbackBannerSurvey()
+            }),
             actionButtons: [shareIPPFeedbackAction]
         )
         let topBannerView = TopBannerView(viewModel: viewModel)
@@ -816,6 +821,34 @@ private extension OrderListViewController {
         let surveyNavigation = SurveyCoordinatingController(survey: .IPPFeedback)
         self.present(surveyNavigation, animated: true, completion: nil)
     }
+
+    private func dismissIPPFeedbackBannerSurvey() {
+        let actionSheet = UIAlertController(
+            title: Localization.dismissTitle,
+            message: Localization.dismissMessage,
+            preferredStyle: .alert
+        )
+
+        let remindMeLaterAction = UIAlertAction( title: Localization.remindMeLater, style: .default) { [weak self] _ in
+            self?.remindMeLaterTapped()
+        }
+        actionSheet.addAction(remindMeLaterAction)
+
+        let dontShowAgainAction = UIAlertAction( title: Localization.dontShowAgain, style: .default) { [weak self] _ in
+            self?.dontShowAgainTapped()
+        }
+        actionSheet.addAction(dontShowAgainAction)
+
+        self.present(actionSheet, animated: true)
+    }
+
+    private func remindMeLaterTapped() {
+        viewModel.dismissIPPFeedbackBanner(remindLater: true, remindAfter: Settings.remindAfterDays)
+    }
+
+    private func dontShowAgainTapped() {
+        viewModel.dismissIPPFeedbackBanner(remindLater: false, remindAfter: nil)
+    }
 }
 
 // MARK: - Constants
@@ -846,6 +879,17 @@ private extension OrderListViewController {
                                                            comment: "Title of the feedback action button on the In-Person Payments feedback banner"
         )
 
+        static let dismissTitle = NSLocalizedString("Give feedback",
+                                                    comment: "Title of the modal confirmation screen when the In-Person Payments feedback banner is dismissed"
+        )
+
+        static let dismissMessage = NSLocalizedString("No worries! You can always go to Settings in the Menu to send us feedback.",
+                    comment: "Message of the modal confirmation screen when the In-Person Payments feedback banner is dismissed")
+
+        static let remindMeLater = NSLocalizedString("Remind me later", comment: "")
+
+        static let dontShowAgain = NSLocalizedString("Don't show again", comment: "")
+
         static func markCompletedNoticeTitle(orderID: Int64) -> String {
             let format = NSLocalizedString(
                 "Order #%1$d marked as completed",
@@ -867,6 +911,7 @@ private extension OrderListViewController {
         static let estimatedHeaderHeight = CGFloat(43)
         static let estimatedRowHeight = CGFloat(86)
         static let placeholderRowsPerSection = [3]
+        static let remindAfterDays = 7
     }
 
     enum State {

WooCommerce/Classes/ViewRelated/Orders/OrderListViewModel.swift

@@ -196,6 +196,23 @@ final class OrderListViewModel {
         stores.dispatch(action)
     }
 
+    func dismissIPPFeedbackBanner(remindLater: Bool, remindAfter: Int?) {
+        //  Updates the IPP feedback banner status as dismissed
+        let updateFeedbackStatus = AppSettingsAction.updateFeedbackStatus(type: .IPP, status: .dismissed, onCompletion: { _ in
+            self.hideIPPFeedbackBanner = true
+        })
+        stores.dispatch(updateFeedbackStatus)
+
+        //  Updates the IPP feedback banner status to be reminded later, or never
+        let updateBannerVisibility = AppSettingsAction.setFeatureAnnouncementDismissed(
+            campaign: .IPP,
+            remindLater: remindLater,
+            remindAfter: remindAfter,
+            onCompletion: nil
+        )
+        stores.dispatch(updateBannerVisibility)
+    }
+
     /// Starts the snapshotsProvider, logging any errors.
     private func startReceivingSnapshots() {
         do {

Yosemite/Yosemite/Actions/AppSettingsAction.swift

@@ -197,7 +197,12 @@ public enum AppSettingsAction: Action {
 
     // MARK: - Feature Announcement Card Visibility
 
-    case setFeatureAnnouncementDismissed(campaign: FeatureAnnouncementCampaign, remindLater: Bool, onCompletion: ((Result<Bool, Error>) -> ())?)
+    case setFeatureAnnouncementDismissed(
+        campaign: FeatureAnnouncementCampaign,
+        remindLater: Bool,
+        remindAfter: Int?,
+        onCompletion: ((Result<Bool, Error>) -> ())?
+    )
 
     case getFeatureAnnouncementVisibility(campaign: FeatureAnnouncementCampaign, onCompletion: (Result<Bool, Error>) -> ())
 

Yosemite/Yosemite/Stores/AppSettingsStore.swift

@@ -178,8 +178,8 @@ public class AppSettingsStore: Store {
             setCouponManagementFeatureSwitchState(isEnabled: isEnabled, onCompletion: onCompletion)
         case .loadCouponManagementFeatureSwitchState(let onCompletion):
             loadCouponManagementFeatureSwitchState(onCompletion: onCompletion)
-        case .setFeatureAnnouncementDismissed(campaign: let campaign, remindLater: let remindLater, onCompletion: let completion):
-            setFeatureAnnouncementDismissed(campaign: campaign, remindLater: remindLater, onCompletion: completion)
+        case .setFeatureAnnouncementDismissed(campaign: let campaign, remindLater: let remindLater, remindAfter: let remindAfter, onCompletion: let completion):
+            setFeatureAnnouncementDismissed(campaign: campaign, remindLater: remindLater, remindAfter: remindAfter, onCompletion: completion)
         case .getFeatureAnnouncementVisibility(campaign: let campaign, onCompletion: let completion):
             getFeatureAnnouncementVisibility(campaign: campaign, onCompletion: completion)
         case .setSkippedCashOnDeliveryOnboardingStep(siteID: let siteID):
@@ -758,20 +758,24 @@ private extension AppSettingsStore {
 
 extension AppSettingsStore {
 
-    func setFeatureAnnouncementDismissed(campaign: FeatureAnnouncementCampaign, remindLater: Bool, onCompletion: ((Result<Bool, Error>) -> ())?) {
-        do {
-            let remindAfter = remindLater ? Date().addingDays(14) : nil
-            let newSettings = FeatureAnnouncementCampaignSettings(dismissedDate: Date(), remindAfter: remindAfter)
-
-            let settings = generalAppSettings.settings
-            let settingsToSave = settings.replacing(featureAnnouncementSettings: newSettings, for: campaign)
-            try generalAppSettings.saveSettings(settingsToSave)
-
-            onCompletion?(.success(true))
-        } catch {
-            onCompletion?(.failure(error))
+    func setFeatureAnnouncementDismissed(
+        campaign: FeatureAnnouncementCampaign,
+        remindLater: Bool,
+        remindAfter: Int? = 14,
+        onCompletion: ((Result<Bool, Error>) -> ())?) {
+            do {
+                let remindAfter = remindLater ? Date().addingDays(remindAfter ?? 14) : nil
+                let newSettings = FeatureAnnouncementCampaignSettings(dismissedDate: Date(), remindAfter: remindAfter)
+
+                let settings = generalAppSettings.settings
+                let settingsToSave = settings.replacing(featureAnnouncementSettings: newSettings, for: campaign)
+                try generalAppSettings.saveSettings(settingsToSave)
+
+                onCompletion?(.success(true))
+            } catch {
+                onCompletion?(.failure(error))
+            }
         }
-    }
 
     func getFeatureAnnouncementVisibility(campaign: FeatureAnnouncementCampaign, onCompletion: (Result<Bool, Error>) -> ()) {
         guard let campaignSettings = generalAppSettings.value(for: \.featureAnnouncementCampaignSettings)[campaign] else {

Yosemite/YosemiteTests/Stores/AppSettingsStoreTests.swift

@@ -848,7 +848,7 @@ extension AppSettingsStoreTests {
         try fileStorage?.deleteFile(at: expectedGeneralStoreSettingsFileURL)
 
         // When
-        let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .upsellCardReaders, remindLater: false, onCompletion: nil)
+        let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .upsellCardReaders, remindLater: false, remindAfter: nil, onCompletion: nil)
         subject?.onAction(action)
 
         // Then
@@ -866,7 +866,7 @@ extension AppSettingsStoreTests {
         try fileStorage?.deleteFile(at: expectedGeneralStoreSettingsFileURL)
 
         // When
-        let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .upsellCardReaders, remindLater: true, onCompletion: nil)
+        let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .upsellCardReaders, remindLater: true, remindAfter: nil, onCompletion: nil)
         subject?.onAction(action)
 
         // Then
@@ -877,6 +877,24 @@ extension AppSettingsStoreTests {
         XCTAssert(Calendar.current.isDate(actualRemindAfter, inSameDayAs: twoWeeksTime))
     }
 
+    func test_setFeatureAnnouncementDismissed_with_remindAfter_seven_days_stores_reminder_date_in_one_week() throws {
+        // Given
+        let oneWeekTime = Calendar.current.date(byAdding: .day, value: 7, to: Date())!
+
+        try fileStorage?.deleteFile(at: expectedGeneralStoreSettingsFileURL)
+
+        // When
+        let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .upsellCardReaders, remindLater: true, remindAfter: 7, onCompletion: nil)
+        subject?.onAction(action)
+
+        // Then
+        let savedSettings: GeneralAppSettings = try XCTUnwrap(fileStorage?.data(for: expectedGeneralAppSettingsFileURL))
+
+        let actualRemindAfter = try XCTUnwrap( savedSettings.featureAnnouncementCampaignSettings[.upsellCardReaders]?.remindAfter)
+
+        XCTAssert(Calendar.current.isDate(actualRemindAfter, inSameDayAs: oneWeekTime))
+    }
+
     func test_setFeatureAnnouncementDismissed_with_another_campaign_previously_dismissed_keeps_values_for_both() throws {
         // Given
         try fileStorage?.deleteFile(at: expectedGeneralStoreSettingsFileURL)
@@ -888,7 +906,7 @@ extension AppSettingsStoreTests {
         try fileStorage?.write(settings, to: expectedGeneralAppSettingsFileURL)
 
         // When
-        let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .upsellCardReaders, remindLater: false, onCompletion: nil)
+        let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .upsellCardReaders, remindLater: false, remindAfter: nil, onCompletion: nil)
         subject?.onAction(action)
 
         // Then