Remove barcode scanning feature flags

Author: staskus

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -88,11 +88,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .productImageOptimizedHandling:
             return true
-        case .pointOfSaleBarcodeScanningi1:
-            return true
-        case .showPointOfSaleBarcodeSimulator:
-            // Enables a simulated barcode scanner in dev builds for testing. Do not ship this one!
-            return false
         case .pointOfSaleAsATabi1:
             return true
         case .pointOfSaleAsATabi2:
@@ -101,8 +96,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .pointOfSaleOrdersi2:
             return true
-        case .pointOfSaleBarcodeScanningi2:
-            return true
         case .pointOfSaleSettingsi1:
             return false
         case .orderAddressMapSearch:

Modules/Sources/Experiments/FeatureFlag.swift

@@ -183,14 +183,6 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleReceipts
 
-    /// Enables barcode scanning with an external scanner in POS
-    ///
-    case pointOfSaleBarcodeScanningi1
-
-    /// Enables a simulated barcode scanner for testing in POS. Do not ship this one!
-    ///
-    case showPointOfSaleBarcodeSimulator
-
     /// Enables displaying POS as a tab in the tab bar with the same eligibility as the previous entry point
     ///
     case pointOfSaleAsATabi1
@@ -207,10 +199,6 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleOrdersi2
 
-    /// Enables the Point of Sale Barcode Scanner set up flows, as part of i2
-    ///
-    case pointOfSaleBarcodeScanningi2
-
     /// Enables the entry point for Point of Sale Settings
     ///
     case pointOfSaleSettingsi1

WooCommerce/Classes/POS/Presentation/Barcode Scanning/BarcodeScanningModifier.swift

@@ -9,15 +9,11 @@ struct BarcodeScanningModifier: ViewModifier {
     /// Callback that is triggered when a barcode is successfully scanned
     let onScan: (Result<String, HIDBarcodeParserError>) -> Void
 
-    private var isBarcodeScani1FeatureEnabled: Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1)
-    }
-
     func body(content: Content) -> some View {
         ZStack {
             content
 
-            if enabled && isBarcodeScani1FeatureEnabled {
+            if enabled {
                 BarcodeScannerContainer(onScan: onScan)
             }
         }

WooCommerce/Classes/POS/Presentation/ItemListView.swift

@@ -51,14 +51,6 @@ struct ItemListView: View {
     @State private var searchTask: Task<Void, Never>?
     @State private var didFinishSearch = true
 
-    private var isBarcodeScani1FeatureEnabled: Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1)
-    }
-
-    private var isBarcodeScanSimulatorEnabled: Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.showPointOfSaleBarcodeSimulator)
-    }
-
     private var isAddingCouponAllowed: Bool {
         guard case .coupons = selectedItemListType else { return false }
         let itemListState = itemListState(selectedItemListType)
@@ -71,9 +63,6 @@ struct ItemListView: View {
 
     @State private var showCouponCreationModal: Bool = false
 
-    @State private var barcodeScanSimulatorIsPresented: Bool = false
-    @State private var barcodeScanSimulatorText: String = ""
-
     var body: some View {
         if #available(iOS 18.0, *) {
             NavigationStack {
@@ -244,9 +233,6 @@ private extension ItemListView {
                     } else {
                         createCouponButton
 
-                        simulatedScanButton
-                            .renderedIf(isBarcodeScanSimulatorEnabled && isBarcodeScani1FeatureEnabled)
-
                         POSPageHeaderActionButton(systemName: "magnifyingglass") {
                             analyticsTracker.trackSearchTapped(itemListType: selectedItemListType)
                             setSearch(true)
@@ -256,9 +242,6 @@ private extension ItemListView {
 
                 }
             })
-
-            barcodeScanSimulator
-                .renderedIf(barcodeScanSimulatorIsPresented)
         }
         .animation(.easeInOut(duration: Constants.animationDuration), value: isSearching)
         .animation(.easeInOut(duration: Constants.animationDuration), value: isAddingCouponAllowed)
@@ -307,31 +290,6 @@ private extension ItemListView {
         .transition(.opacity.combined(with: .scale))
     }
 
-    @ViewBuilder
-    private var simulatedScanButton: some View {
-        POSPageHeaderActionButton(systemName: "barcode") {
-            barcodeScanSimulatorIsPresented.toggle()
-        }
-        .transition(.opacity.combined(with: .scale))
-    }
-
-    @ViewBuilder
-    private var barcodeScanSimulator: some View {
-        HStack {
-            TextField(text: $barcodeScanSimulatorText) {
-                Text("Barcode value")
-            }
-
-            Button {
-                posModel.barcodeScanned(.success(barcodeScanSimulatorText))
-            } label: {
-                Text("Scan!")
-            }
-            .buttonStyle(POSFilledButtonStyle(size: .extraSmall))
-        }
-        .padding([.bottom, .horizontal], 16)
-    }
-
     @ViewBuilder
     var emptyView: some View {
         switch selectedItemListType {

WooCommerce/Classes/POS/Presentation/POSFloatingControlView.swift

@@ -60,21 +60,15 @@ struct POSFloatingControlView: View {
                         title: { Text(Localization.productRestrictionsInfo) },
                         icon: { Image(systemName: "magnifyingglass") })
                 }
-                if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1) {
-                    Button {
-                        showBarcodeScanningModal = true
-                        ServiceLocator.analytics.track(.pointOfSaleBarcodeScanningMenuItemTapped)
-                    } label: {
-                        Label(
-                            title: {
-                                if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi2) {
-                                    Text(Localization.barcodeScanningSetup)
-                                } else {
-                                    Text(Localization.barcodeScanning)
-                                }
-                            },
-                            icon: { Image(systemName: "barcode.viewfinder") })
-                    }
+                Button {
+                    showBarcodeScanningModal = true
+                    ServiceLocator.analytics.track(.pointOfSaleBarcodeScanningMenuItemTapped)
+                } label: {
+                    Label(
+                        title: {
+                            Text(Localization.barcodeScanningSetup)
+                        },
+                        icon: { Image(systemName: "barcode.viewfinder") })
                 }
                 if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleSettingsi1) {
                     Button {
@@ -123,11 +117,7 @@ struct POSFloatingControlView: View {
             SimpleProductsOnlyInformation(isPresented: $showProductRestrictionsModal)
         }
         .posModal(isPresented: $showBarcodeScanningModal) {
-            if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi2) {
-                PointOfSaleBarcodeScannerSetup(isPresented: $showBarcodeScanningModal)
-            } else {
-                PointOfSaleBarcodeScannerInformationModal(isPresented: $showBarcodeScanningModal)
-            }
+            PointOfSaleBarcodeScannerSetup(isPresented: $showBarcodeScanningModal)
         }
         .frame(height: Constants.size)
         .background(Color.clear)
@@ -204,12 +194,6 @@ private extension POSFloatingControlView {
             "We only show simple and variable products in POS, this shows a modal to help explain that limitation."
         )
 
-        static let barcodeScanning = NSLocalizedString(
-            "pointOfSale.floatingButtons.barcodeScanning.button.title",
-            value: "Barcode scanning",
-            comment: "The title of the menu button to view barcode scanner documentation, shown in a popover menu."
-        )
-
         static let barcodeScanningSetup = NSLocalizedString(
             "pointOfSale.floatingButtons.barcodeScanningSetup.button.title",
             value: "Initial barcode scanner setup",