Merge pull request #8183 from woocommerce/issue/8182-remove-red-badge-moooore-ipp

[Moooore IPP] Remove Payments Feature Announcement (Red Badge) and Simple Payments from Orders

Author: toupper

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 
 11.4
 -----
+- [*] In-Person Payments: We removed any references to Simple Payments from Orders, and the red badge from the Menu tab and Menu Payments icon announcing the new Payments section. [https://github.com/woocommerce/woocommerce-ios/pull/8183] 
 - [*] Add System Status Report to ZenDesk support requests. [https://github.com/woocommerce/woocommerce-ios/pull/8171]
 
 

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

@@ -3,8 +3,6 @@ import Foundation
 public enum FeatureAnnouncementCampaign: String, Codable, Equatable {
     case upsellCardReaders = "upsell_card_readers"
     case linkedProductsPromo = "linked_products_promo"
-    case paymentsInMenuTabBarButton = "payments_menu_tabbar_button"
-    case paymentsInHubMenuButton = "payments_hub_menu_button"
     case productsOnboarding = "products_onboarding_first_product"
 
     /// Added for use in `test_setFeatureAnnouncementDismissed_with_another_campaign_previously_dismissed_keeps_values_for_both`

WooCommerce/Classes/ViewModels/MainTabViewModel.swift

@@ -92,9 +92,6 @@ final class MainTabViewModel {
 
         listenToReviewsBadgeReloadRequired()
         retrieveShouldShowReviewsBadgeOnHubMenuTabValue()
-
-        listenToNewFeatureBadgeReloadRequired()
-        retrieveShouldShowNewFeatureBadgeOnHubMenuTabValue()
     }
 }
 
@@ -200,23 +197,6 @@ private extension MainTabViewModel {
                                                object: nil)
     }
 
-    func listenToNewFeatureBadgeReloadRequired() {
-        NotificationCenter.default.addObserver(self,
-                                               selector: #selector(hubMenuViewDidAppear),
-                                               name: .hubMenuViewDidAppear,
-                                               object: nil)
-
-    }
-
-    /// Updates the badge after the hub menu did appear
-    ///
-    @objc func hubMenuViewDidAppear() {
-        let action = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .paymentsInMenuTabBarButton, remindLater: false, onCompletion: nil)
-        storesManager.dispatch(action)
-
-        shouldShowNewFeatureBadgeOnHubMenuTab = false
-    }
-
     /// Retrieves whether we should show the reviews on the Menu button and updates `shouldShowReviewsBadge`
     ///
     @objc func retrieveShouldShowReviewsBadgeOnHubMenuTabValue() {
@@ -231,22 +211,6 @@ private extension MainTabViewModel {
         storesManager.dispatch(notificationCountAction)
     }
 
-    /// Retrieves whether we should show the new feature badge on the Menu button and updates `shouldShowReviewsBadge`
-    ///
-    func retrieveShouldShowNewFeatureBadgeOnHubMenuTabValue() {
-        let action = AppSettingsAction.getFeatureAnnouncementVisibility(campaign: .paymentsInMenuTabBarButton) { [weak self] result in
-            guard let self = self else { return }
-            switch result {
-            case .success(let visible):
-                self.shouldShowNewFeatureBadgeOnHubMenuTab = visible
-            case .failure:
-                self.shouldShowNewFeatureBadgeOnHubMenuTab = false
-            }
-        }
-
-        storesManager.dispatch(action)
-    }
-
     /// Listens for changes on the menu badge display logic and updates it depending on them
     ///
     func synchronizeShouldShowBadgeOnHubMenuTabLogic() {

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenu.swift

@@ -62,7 +62,6 @@ struct HubMenu: View {
                                                            ])
                             switch type(of: menu).id {
                             case HubMenuViewModel.Payments.id:
-                                viewModel.paymentsScreenWasOpened()
                                 showingPayments = true
                             case HubMenuViewModel.WoocommerceAdmin.id:
                                 showingWooCommerceAdmin = true

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift

@@ -113,33 +113,6 @@ final class HubMenuViewModel: ObservableObject {
         }
 
         stores.dispatch(action)
-
-        setupPaymentsBadge()
-    }
-
-    private func setupPaymentsBadge() {
-        let featureAnnouncementVisibilityAction = AppSettingsAction.getFeatureAnnouncementVisibility(campaign: .paymentsInHubMenuButton) {
-            [weak self] result in
-                guard let self = self else { return }
-                switch result {
-                case .success(let visible):
-                    if visible {
-                        self.updatePaymentsBadge(type: .newFeature)
-                    }
-                default:
-                    break
-                }
-        }
-
-        stores.dispatch(featureAnnouncementVisibilityAction)
-    }
-
-    private func updatePaymentsBadge(type badge: HubMenuBadgeType) {
-        if let paymentsMenuItemIndex = self.menuElements.firstIndex(where: { item in
-            type(of: item).id == Payments.id
-        }) {
-            self.menuElements[paymentsMenuItemIndex] = Payments(badge: badge)
-        }
     }
 
     /// Present the `StorePickerViewController` using the `StorePickerCoordinator`, passing the navigation controller from the entry point.
@@ -157,15 +130,6 @@ final class HubMenuViewModel: ObservableObject {
         showingReviewDetail = true
     }
 
-    func paymentsScreenWasOpened() {
-        updatePaymentsBadge(type: .number(number: 0))
-
-        let featureAnnouncementVisibilityAction = AppSettingsAction.setFeatureAnnouncementDismissed(campaign: .paymentsInHubMenuButton,
-                                                                                                    remindLater: false,
-                                                                                                    onCompletion: nil)
-        stores.dispatch(featureAnnouncementVisibilityAction)
-    }
-
     func getReviewDetailDestination() -> ReviewDetailView? {
         guard let parcel = productReviewFromNoteParcel else {
             return nil