Merge pull request #7594 from woocommerce/issue/7593-remove-inPersonPaymentGatewaySelection-feature-flag

[Mobille Payments] Remove inPersonPaymentGatewaySelection feature flag

Author: joshheald

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -35,8 +35,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .inPersonPaymentGatewaySelection:
-            return true
         case .backgroundProductImageUpload:
             return true
         case .appleIDAccountDeletion:

Experiments/Experiments/FeatureFlag.swift

@@ -70,10 +70,6 @@ public enum FeatureFlag: Int {
     ///
     case shippingLabelsOnboardingM1
 
-    /// Enable selection of payment gateway to use for In-Person Payments when there is more than one available
-    ///
-    case inPersonPaymentGatewaySelection
-
     /// Enable image upload after leaving the product form
     ///
     case backgroundProductImageUpload

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift

@@ -225,10 +225,6 @@ private extension CardPresentPaymentsOnboardingUseCase {
     }
 
     func bothPluginsInstalledAndActiveOnboardingState(wcPay: SystemPlugin, stripe: SystemPlugin) -> CardPresentPaymentOnboardingState {
-        guard featureFlagService.isFeatureFlagEnabled(.inPersonPaymentGatewaySelection) else {
-            return legacyBothPluginsInstalledAndActiveOnboardingState(wcPay: wcPay, stripe: stripe)
-        }
-
         if preferredPluginLocal == nil {
             preferredPluginLocal = storedPreferredPlugin
         }
@@ -245,14 +241,6 @@ private extension CardPresentPaymentsOnboardingUseCase {
         return augmentStateWithAvailablePlugins(state: state, available: [.wcPay, .stripe])
     }
 
-    func legacyBothPluginsInstalledAndActiveOnboardingState(wcPay: SystemPlugin, stripe: SystemPlugin) -> CardPresentPaymentOnboardingState {
-        if !isStripeSupportedInCountry {
-            return .pluginShouldBeDeactivated(plugin: .stripe)
-        }
-
-        return .selectPlugin(pluginSelectionWasCleared: false)
-    }
-
     func onboardingStateForPlugin(_ plugin: CardPresentPaymentsPlugin, wcPay: SystemPlugin, stripe: SystemPlugin) -> CardPresentPaymentOnboardingState {
         switch plugin {
         case .wcPay:

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewController.swift

@@ -40,22 +40,11 @@ struct InPersonPaymentsView: View {
             case .loading:
                 InPersonPaymentsLoading()
             case let .selectPlugin(pluginSelectionWasCleared):
-                if viewModel.gatewaySelectionAvailable {
-                    // Preselect WCPay only if there was no selection done before
-                    InPersonPaymentsSelectPluginView(selectedPlugin: pluginSelectionWasCleared == true ? nil : .wcPay) { plugin in
-                        viewModel.selectPlugin(plugin)
-                        ServiceLocator.analytics.track(.cardPresentPaymentGatewaySelected, withProperties: ["payment_gateway": plugin.pluginName])
-                    }
-                } else if viewModel.userIsAdministrator {
-                    InPersonPaymentsPluginConflictAdmin(analyticReason: viewModel.state.reasonForAnalytics, onRefresh: viewModel.refresh)
-                } else {
-                    InPersonPaymentsPluginConflictShopManager(analyticReason: viewModel.state.reasonForAnalytics, onRefresh: viewModel.refresh)
+                // Preselect WCPay only if there was no selection done before
+                InPersonPaymentsSelectPluginView(selectedPlugin: pluginSelectionWasCleared == true ? nil : .wcPay) { plugin in
+                    viewModel.selectPlugin(plugin)
+                    ServiceLocator.analytics.track(.cardPresentPaymentGatewaySelected, withProperties: ["payment_gateway": plugin.pluginName])
                 }
-            case let .pluginShouldBeDeactivated(plugin) where plugin == .stripe:
-                InPersonPaymentsDeactivateStripeView(
-                    analyticReason: viewModel.state.reasonForAnalytics,
-                    onRefresh: viewModel.refresh,
-                    showSetupPluginsButton: viewModel.userIsAdministrator)
             case .countryNotSupported(let countryCode):
                 InPersonPaymentsCountryNotSupported(countryCode: countryCode, analyticReason: viewModel.state.reasonForAnalytics)
             case .countryNotSupportedStripe(_, let countryCode):

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewModel.swift

@@ -6,7 +6,6 @@ final class InPersonPaymentsViewModel: ObservableObject {
     @Published var state: CardPresentPaymentOnboardingState
     var userIsAdministrator: Bool
     var learnMoreURL: URL? = nil
-    let gatewaySelectionAvailable: Bool
     private let useCase: CardPresentPaymentsOnboardingUseCase
     let stores: StoresManager
 
@@ -22,7 +21,6 @@ final class InPersonPaymentsViewModel: ObservableObject {
          useCase: CardPresentPaymentsOnboardingUseCase = CardPresentPaymentsOnboardingUseCase()) {
         self.stores = stores
         self.useCase = useCase
-        gatewaySelectionAvailable = featureFlagService.isFeatureFlagEnabled(.inPersonPaymentGatewaySelection)
         state = useCase.state
         userIsAdministrator = ServiceLocator.stores.sessionManager.defaultRoles.contains(.administrator)
 
@@ -43,10 +41,8 @@ final class InPersonPaymentsViewModel: ObservableObject {
     init(
         fixedState: CardPresentPaymentOnboardingState,
         fixedUserIsAdministrator: Bool = false,
-        stores: StoresManager = ServiceLocator.stores,
-        featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
+        stores: StoresManager = ServiceLocator.stores) {
             self.stores = stores
-            gatewaySelectionAvailable = featureFlagService.isFeatureFlagEnabled(.inPersonPaymentGatewaySelection)
             state = fixedState
             useCase = CardPresentPaymentsOnboardingUseCase()
             userIsAdministrator = fixedUserIsAdministrator
@@ -110,13 +106,9 @@ private extension InPersonPaymentsViewModel {
     }
 
     func trackState(_ state: CardPresentPaymentOnboardingState) {
-        // When we remove this feature flag, we can switch reason to let and remove the state.isSelectPlugin block
-        guard var reason = state.reasonForAnalytics else {
+        guard let reason = state.reasonForAnalytics else {
             return
         }
-        if state.isSelectPlugin && !gatewaySelectionAvailable {
-            reason = "multiple_plugins_installed"
-        }
         ServiceLocator.analytics
             .track(event: .InPersonPayments
                     .cardPresentOnboardingNotCompleted(reason: reason,