Remove Products M5 feedback banner

Author: ealeksandrov

Storage/Storage/Model/FeedbackType.swift

@@ -5,10 +5,6 @@ public enum FeedbackType: String, Codable {
     ///
     case general
 
-    /// Identifier for the Products M5: Linked Products, Downloadable Files, Trashing.
-    ///
-    case productsM5
-
     /// Identifier for the Products Variations.
     ///
     case productsVariations

WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift

@@ -58,9 +58,6 @@ extension WooAnalyticsEvent {
     public enum FeedbackContext: String {
         /// Shown in Stats but is for asking general feedback.
         case general
-        /// Shown in products banner for Milestone 4 features. New product banners should have
-        /// their own `FeedbackContext` option.
-        case productsM4 = "products_m4"
         /// Shown in products banner for Variations release.
         case productsVariations = "products_variations"
         /// Shown in shipping labels banner for Milestone 1 features.

WooCommerce/Classes/System/WooConstants.swift

@@ -79,9 +79,9 @@ extension WooConstants {
         case inAppFeedback = "https://automattic.survey.fm/woo-app-general-feedback-user-survey"
 #endif
 
-        /// URL for the products M4 feedback survey
+        /// URL for the products feedback survey
         ///
-        case productsM4Feedback = "https://automattic.survey.fm/woo-app-feature-feedback-products"
+        case productsFeedback = "https://automattic.survey.fm/woo-app-feature-feedback-products"
 
         /// URL for the shipping labels M1 feedback survey
         ///

WooCommerce/Classes/ViewRelated/Products/ProductsTopBannerFactory.swift

@@ -4,7 +4,6 @@ import Yosemite
 struct ProductsTopBannerFactory {
 
     enum BannerType {
-        case productsM4
         case variations
 
         var title: String {
@@ -13,17 +12,13 @@ struct ProductsTopBannerFactory {
 
         var info: String {
             switch self {
-            case .productsM4:
-                return Localization.infoFilesAndLinkedProducts
             case .variations:
                 return Localization.infoVariations
             }
         }
 
         var feedbackContext: WooAnalyticsEvent.FeedbackContext {
             switch self {
-            case .productsM4:
-                return .productsM4
             case .variations:
                 return .productsVariations
             }
@@ -75,10 +70,6 @@ private extension ProductsTopBannerFactory {
         static let title = NSLocalizedString("New features available!",
                                              comment: "The title of the top banner on the Products tab.")
 
-        static let infoFilesAndLinkedProducts =
-            NSLocalizedString(
-                "You can now add downloadable files to a product and link upsell & cross-sell products. No longer want a product? Trash it!",
-                comment: "The info of the top banner on the Products tab.")
         static let infoVariations = NSLocalizedString("You can now create and manage product variations!",
                                                       comment: "The info of the top banner on the Products tab.")
 

WooCommerce/Classes/ViewRelated/Products/ProductsViewController.swift

@@ -162,7 +162,7 @@ final class ProductsViewController: UIViewController {
         configureSyncingCoordinator()
         registerTableViewCells()
 
-        showTopBannerViewIfNeeded(for: .productsM4)
+        showTopBannerViewIfNeeded()
 
         /// We sync the local product settings for configuring local sorting and filtering.
         /// If there are some info stored when this screen is loaded, the data will be updated using the stored sort/filters.
@@ -397,18 +397,14 @@ private extension ProductsViewController {
 private extension ProductsViewController {
     /// Fetches products feedback visibility from AppSettingsStore and update products top banner accordingly
     ///
-    func showTopBannerViewIfNeeded(for bannerType: ProductsTopBannerFactory.BannerType) {
-        let action = AppSettingsAction.loadFeedbackVisibility(type: bannerType == .productsM4 ? .productsM5 : .productsVariations) { [weak self] result in
+    func showTopBannerViewIfNeeded() {
+        let action = AppSettingsAction.loadFeedbackVisibility(type: .productsVariations) { [weak self] result in
             switch result {
             case .success(let visible):
                 if visible {
-                    self?.requestAndShowNewTopBannerView(for: bannerType)
+                    self?.requestAndShowNewTopBannerView(for: .variations)
                 } else {
-                    if bannerType == .productsM4 {
-                        self?.showTopBannerViewIfNeeded(for: .variations)
-                    } else {
-                        self?.hideTopBannerView()
-                    }
+                    self?.hideTopBannerView()
                 }
             case.failure(let error):
                 self?.hideTopBannerView()
@@ -427,9 +423,9 @@ private extension ProductsViewController {
                                            expandedStateChangeHandler: { [weak self] in
             self?.updateTableHeaderViewHeight()
         }, onGiveFeedbackButtonPressed: { [weak self] in
-            self?.presentProductsFeedback(for: bannerType)
+            self?.presentProductsFeedback()
         }, onDismissButtonPressed: { [weak self] in
-            self?.dismissProductsBanner(for: bannerType)
+            self?.dismissProductsBanner()
         }, onCompletion: { [weak self] topBannerView in
             self?.topBannerContainerView.updateSubview(topBannerView)
             self?.topBannerView = topBannerView
@@ -596,16 +592,16 @@ private extension ProductsViewController {
 
     /// Presents products survey
     ///
-    func presentProductsFeedback(for bannerType: ProductsTopBannerFactory.BannerType) {
+    func presentProductsFeedback() {
         // Present survey
-        let navigationController = SurveyCoordinatingController(survey: bannerType == .productsM4 ? .productsM5Feedback : .productsVariationsFeedback)
+        let navigationController = SurveyCoordinatingController(survey: .productsVariationsFeedback)
         present(navigationController, animated: true, completion: nil)
     }
 
     /// Mark feedback request as dismissed and update banner visibility
     ///
-    func dismissProductsBanner(for bannerType: ProductsTopBannerFactory.BannerType) {
-        let action = AppSettingsAction.updateFeedbackStatus(type: bannerType == .productsM4 ? .productsM5 : .productsVariations,
+    func dismissProductsBanner() {
+        let action = AppSettingsAction.updateFeedbackStatus(type: .productsVariations,
                                                             status: .dismissed) { [weak self] result in
             if let error = result.failure {
                 CrashLogging.logError(error)

WooCommerce/Classes/ViewRelated/Survey/SurveyViewController.swift

@@ -63,7 +63,6 @@ final class SurveyViewController: UIViewController, SurveyViewControllerOutputs
 extension SurveyViewController {
     enum Source {
         case inAppFeedback
-        case productsM5Feedback
         case productsVariationsFeedback
         case shippingLabelsRelease1Feedback
 
@@ -75,14 +74,8 @@ extension SurveyViewController {
                     .tagPlatform("ios")
                     .tagAppVersion(Bundle.main.bundleVersion())
 
-            case .productsM5Feedback:
-                return WooConstants.URLs.productsM4Feedback
-                    .asURL()
-                    .tagPlatform("ios")
-                    .tagProductMilestone("5")
-                    .tagAppVersion(Bundle.main.bundleVersion())
             case .productsVariationsFeedback:
-                return WooConstants.URLs.productsM4Feedback
+                return WooConstants.URLs.productsFeedback
                     .asURL()
                     .tagPlatform("ios")
                     .tagAppVersion(Bundle.main.bundleVersion())
@@ -99,7 +92,7 @@ extension SurveyViewController {
             switch self {
             case .inAppFeedback:
                 return Localization.title
-            case .productsM5Feedback, .productsVariationsFeedback, .shippingLabelsRelease1Feedback:
+            case .productsVariationsFeedback, .shippingLabelsRelease1Feedback:
                 return Localization.giveFeedback
             }
         }
@@ -109,8 +102,6 @@ extension SurveyViewController {
             switch self {
             case .inAppFeedback:
                 return .general
-            case .productsM5Feedback:
-                return .productsM4
             case .productsVariationsFeedback:
                 return .productsVariations
             case .shippingLabelsRelease1Feedback:

Yosemite/Yosemite/Stores/AppSettings/InAppFeedbackCardVisibilityUseCase.swift

@@ -37,7 +37,7 @@ struct InAppFeedbackCardVisibilityUseCase {
         switch feedbackType {
         case .general:
             return try shouldGeneralFeedbackBeVisible(currentDate: currentDate)
-        case .productsM5, .productsVariations:
+        case .productsVariations:
             return shouldProductsFeedbackBeVisible()
         case .shippingLabelsRelease1:
             return shouldShippingLabelsRelease1FeedbackBeVisible()