Merge pull request #5297 from woocommerce/ec/order-remove-flag

Author: Ecarrion

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Beta features/BetaFeaturesViewController.swift

@@ -90,7 +90,7 @@ private extension BetaFeaturesViewController {
     /// A section is returned only when the store is ready to receive payments
     ///
     func ordersSection() -> Section? {
-        guard ServiceLocator.featureFlagService.isFeatureFlagEnabled(.quickOrderPrototype), paymentsStoreUseCase.state == .completed else {
+        guard paymentsStoreUseCase.state == .completed else {
             return nil
         }
 

WooCommerce/Classes/ViewRelated/Orders/OrderListViewModel.swift

@@ -90,10 +90,6 @@ final class OrderListViewModel {
     ///
     @Published var hideQuickOrderBanners: Bool = false
 
-    /// Tracks if the Quick Order feature is ready to be released to the public
-    ///
-    private let isQuickOrderDevelopmentComplete = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.quickOrderPrototype)
-
     init(siteID: Int64,
          stores: StoresManager = ServiceLocator.stores,
          storageManager: StorageManagerType = ServiceLocator.storageManager,
@@ -251,14 +247,13 @@ extension OrderListViewModel {
         let errorState = $hasErrorLoadingData.removeDuplicates()
         let experimentalState = $isQuickOrderEnabled.removeDuplicates()
         Publishers.CombineLatest4(enrolledState, errorState, experimentalState, $hideQuickOrderBanners)
-            .map { [weak self] enrolledState, hasError, isQuickOrderEnabled, hasDismissedBanners -> TopBanner in
-                guard let self = self else { return .none }
+            .map { enrolledState, hasError, isQuickOrderEnabled, hasDismissedBanners -> TopBanner in
 
                 guard !hasError else {
                     return .error
                 }
 
-                guard self.isQuickOrderDevelopmentComplete, !hasDismissedBanners else {
+                guard !hasDismissedBanners else {
                     return .none
                 }
 

WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift

@@ -110,9 +110,8 @@ private extension OrdersRootViewController {
     ///
     func configureNavigationButtons(isQuickOrderExperimentalToggleEnabled: Bool) {
         let shouldShowQuickOrderButton: Bool = {
-            let isQuickOrderEnabled = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.quickOrderPrototype) && isQuickOrderExperimentalToggleEnabled
             let isInPersonPaymentsConfigured = inPersonPaymentsUseCase.state == .completed
-            return isQuickOrderEnabled && isInPersonPaymentsConfigured
+            return isQuickOrderExperimentalToggleEnabled && isInPersonPaymentsConfigured
         }()
         let buttons: [UIBarButtonItem?] = [
             ordersViewController.createSearchBarButtonItem(),