Remove stripe IPP from experiments; always true now

allendav · allendav · commit fe9591d13cdd · 2022-02-16T10:36:39.000-08:00
diff --git a/Networking/Networking/Model/Copiable/Models+Copiable.generated.swift b/Networking/Networking/Model/Copiable/Models+Copiable.generated.swift
@@ -1741,8 +1741,8 @@ extension WCPayCardPresentPaymentDetails {
 extension WCPayCardPresentReceiptDetails {
     public func copy(
         accountType: CopiableProp<WCPayCardFunding> = .copy,
-        applicationPreferredName: CopiableProp<String> = .copy,
-        dedicatedFileName: CopiableProp<String> = .copy
+        applicationPreferredName: NullableCopiableProp<String> = .copy,
+        dedicatedFileName: NullableCopiableProp<String> = .copy
     ) -> WCPayCardPresentReceiptDetails {
         let accountType = accountType ?? self.accountType
         let applicationPreferredName = applicationPreferredName ?? self.applicationPreferredName
diff --git a/Storage/Storage/Model/Copiable/Models+Copiable.generated.swift b/Storage/Storage/Model/Copiable/Models+Copiable.generated.swift
@@ -10,7 +10,6 @@ extension GeneralAppSettings {
         feedbacks: CopiableProp<[FeedbackType: FeedbackSettings]> = .copy,
         isViewAddOnsSwitchEnabled: CopiableProp<Bool> = .copy,
         isOrderCreationSwitchEnabled: CopiableProp<Bool> = .copy,
-        isStripeInPersonPaymentsSwitchEnabled: CopiableProp<Bool> = .copy,
         isCanadaInPersonPaymentsSwitchEnabled: CopiableProp<Bool> = .copy,
         isProductSKUInputScannerSwitchEnabled: CopiableProp<Bool> = .copy,
         isCouponManagementSwitchEnabled: CopiableProp<Bool> = .copy,
@@ -22,7 +21,6 @@ extension GeneralAppSettings {
         let feedbacks = feedbacks ?? self.feedbacks
         let isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled ?? self.isViewAddOnsSwitchEnabled
         let isOrderCreationSwitchEnabled = isOrderCreationSwitchEnabled ?? self.isOrderCreationSwitchEnabled
-        let isStripeInPersonPaymentsSwitchEnabled = isStripeInPersonPaymentsSwitchEnabled ?? self.isStripeInPersonPaymentsSwitchEnabled
         let isCanadaInPersonPaymentsSwitchEnabled = isCanadaInPersonPaymentsSwitchEnabled ?? self.isCanadaInPersonPaymentsSwitchEnabled
         let isProductSKUInputScannerSwitchEnabled = isProductSKUInputScannerSwitchEnabled ?? self.isProductSKUInputScannerSwitchEnabled
         let isCouponManagementSwitchEnabled = isCouponManagementSwitchEnabled ?? self.isCouponManagementSwitchEnabled
@@ -35,7 +33,6 @@ extension GeneralAppSettings {
             feedbacks: feedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
             isOrderCreationSwitchEnabled: isOrderCreationSwitchEnabled,
-            isStripeInPersonPaymentsSwitchEnabled: isStripeInPersonPaymentsSwitchEnabled,
             isCanadaInPersonPaymentsSwitchEnabled: isCanadaInPersonPaymentsSwitchEnabled,
             isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
             isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
diff --git a/Storage/Storage/Model/GeneralAppSettings.swift b/Storage/Storage/Model/GeneralAppSettings.swift
@@ -28,10 +28,6 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     ///
     public let isOrderCreationSwitchEnabled: Bool
 
-    /// The state for the Stripe Gateway Extension IPP feature switch
-    ///
-    public let isStripeInPersonPaymentsSwitchEnabled: Bool
-
     /// The state for the In-Person Payments in Canada feature switch
     ///
     public let isCanadaInPersonPaymentsSwitchEnabled: Bool
@@ -60,7 +56,6 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
                 feedbacks: [FeedbackType: FeedbackSettings],
                 isViewAddOnsSwitchEnabled: Bool,
                 isOrderCreationSwitchEnabled: Bool,
-                isStripeInPersonPaymentsSwitchEnabled: Bool,
                 isCanadaInPersonPaymentsSwitchEnabled: Bool,
                 isProductSKUInputScannerSwitchEnabled: Bool,
                 isCouponManagementSwitchEnabled: Bool,
@@ -71,7 +66,6 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
         self.feedbacks = feedbacks
         self.isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled
         self.isOrderCreationSwitchEnabled = isOrderCreationSwitchEnabled
-        self.isStripeInPersonPaymentsSwitchEnabled = isStripeInPersonPaymentsSwitchEnabled
         self.isCanadaInPersonPaymentsSwitchEnabled = isCanadaInPersonPaymentsSwitchEnabled
         self.isProductSKUInputScannerSwitchEnabled = isProductSKUInputScannerSwitchEnabled
         self.isCouponManagementSwitchEnabled = isCouponManagementSwitchEnabled
@@ -102,7 +96,6 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
             feedbacks: updatedFeedbacks,
             isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
             isOrderCreationSwitchEnabled: isOrderCreationSwitchEnabled,
-            isStripeInPersonPaymentsSwitchEnabled: isStripeInPersonPaymentsSwitchEnabled,
             isCanadaInPersonPaymentsSwitchEnabled: isCanadaInPersonPaymentsSwitchEnabled,
             isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
             isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
@@ -123,7 +116,6 @@ extension GeneralAppSettings {
         self.feedbacks = try container.decodeIfPresent([FeedbackType: FeedbackSettings].self, forKey: .feedbacks) ?? [:]
         self.isViewAddOnsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isViewAddOnsSwitchEnabled) ?? false
         self.isOrderCreationSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isOrderCreationSwitchEnabled) ?? false
-        self.isStripeInPersonPaymentsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isStripeInPersonPaymentsSwitchEnabled) ?? false
         self.isCanadaInPersonPaymentsSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isCanadaInPersonPaymentsSwitchEnabled) ?? false
         self.isProductSKUInputScannerSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isProductSKUInputScannerSwitchEnabled) ?? false
         self.isCouponManagementSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isCouponManagementSwitchEnabled) ?? false
diff --git a/Storage/StorageTests/Model/AppSettings/GeneralAppSettingsTests.swift b/Storage/StorageTests/Model/AppSettings/GeneralAppSettingsTests.swift
@@ -62,7 +62,6 @@ final class GeneralAppSettingsTests: XCTestCase {
                                                   feedbacks: feedbackSettings,
                                                   isViewAddOnsSwitchEnabled: true,
                                                   isOrderCreationSwitchEnabled: true,
-                                                  isStripeInPersonPaymentsSwitchEnabled: true,
                                                   isCanadaInPersonPaymentsSwitchEnabled: true,
                                                   isProductSKUInputScannerSwitchEnabled: true,
                                                   isCouponManagementSwitchEnabled: true,
@@ -85,7 +84,6 @@ final class GeneralAppSettingsTests: XCTestCase {
         assertEqual(newSettings.lastEligibilityErrorInfo, eligibilityInfo)
         assertEqual(newSettings.isViewAddOnsSwitchEnabled, false)
         assertEqual(newSettings.isOrderCreationSwitchEnabled, true)
-        assertEqual(newSettings.isStripeInPersonPaymentsSwitchEnabled, true)
         assertEqual(newSettings.isCanadaInPersonPaymentsSwitchEnabled, true)
         assertEqual(newSettings.isProductSKUInputScannerSwitchEnabled, true)
         assertEqual(newSettings.isCouponManagementSwitchEnabled, true)
@@ -98,7 +96,6 @@ private extension GeneralAppSettingsTests {
                                   feedbacks: [FeedbackType: FeedbackSettings] = [:],
                                   isViewAddOnsSwitchEnabled: Bool = false,
                                   isOrderCreationSwitchEnabled: Bool = false,
-                                  isStripeInPersonPaymentsSwitchEnabled: Bool = false,
                                   isCanadaInPersonPaymentsSwitchEnabled: Bool = false,
                                   isProductSKUInputScannerSwitchEnabled: Bool = false,
                                   isCouponManagementSwitchEnabled: Bool = false,
@@ -109,7 +106,6 @@ private extension GeneralAppSettingsTests {
                            feedbacks: feedbacks,
                            isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
                            isOrderCreationSwitchEnabled: isOrderCreationSwitchEnabled,
-                           isStripeInPersonPaymentsSwitchEnabled: isStripeInPersonPaymentsSwitchEnabled,
                            isCanadaInPersonPaymentsSwitchEnabled: isCanadaInPersonPaymentsSwitchEnabled,
                            isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
                            isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Beta features/BetaFeaturesViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Beta features/BetaFeaturesViewController.swift
@@ -94,10 +94,6 @@ private extension BetaFeaturesViewController {
     func inPersonPaymentsSection() -> Section? {
         var rows: [Row] = []
 
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.stripeExtensionInPersonPayments) {
-            rows += [.stripeExtensionInPersonPayments, .stripeExtensionInPersonPaymentsDescription]
-        }
-
         if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.canadaInPersonPayments) {
             rows += [.canadaInPersonPayments, .canadaInPersonPaymentsDescription]
         }
@@ -153,11 +149,6 @@ private extension BetaFeaturesViewController {
             configureOrderCreationSwitch(cell: cell)
         case let cell as BasicTableViewCell where row == .orderCreationDescription:
             configureOrderCreationDescription(cell: cell)
-        // WooCommerce Stripe Payment Gateway extension In-Person Payments
-        case let cell as SwitchTableViewCell where row == .stripeExtensionInPersonPayments:
-            configureStripeExtensionInPersonPaymentsSwitch(cell: cell)
-        case let cell as BasicTableViewCell where row == .stripeExtensionInPersonPaymentsDescription:
-            configureStripeExtensionInPersonPaymentsDescription(cell: cell)
         // In-Person Payments in Canada
         case let cell as SwitchTableViewCell where row == .canadaInPersonPayments:
             configureCanadaInPersonPaymentsSwitch(cell: cell)
@@ -243,37 +234,6 @@ private extension BetaFeaturesViewController {
         cell.textLabel?.text = Localization.orderCreationDescription
     }
 
-    func configureStripeExtensionInPersonPaymentsSwitch(cell: SwitchTableViewCell) {
-        configureCommonStylesForSwitchCell(cell)
-        cell.title = Localization.stripeExtensionInPersonPaymentsTitle
-
-        // Fetch switch's state stored value.
-        let action = AppSettingsAction.loadStripeInPersonPaymentsSwitchState { result in
-            guard let isEnabled = try? result.get() else {
-                return cell.isOn = false
-            }
-            cell.isOn = isEnabled
-        }
-        ServiceLocator.stores.dispatch(action)
-
-        // Change switch's state stored value
-        cell.onChange = { isSwitchOn in
-            let action = AppSettingsAction.setStripeInPersonPaymentsSwitchState(isEnabled: isSwitchOn, onCompletion: { result in
-                // Roll back toggle if an error occurred
-                if result.isFailure {
-                    cell.isOn.toggle()
-                }
-            })
-            ServiceLocator.stores.dispatch(action)
-        }
-        cell.accessibilityIdentifier = "beta-features-stripe-extension-in-person-payments-cell"
-    }
-
-    func configureStripeExtensionInPersonPaymentsDescription(cell: BasicTableViewCell) {
-        configureCommonStylesForDescriptionCell(cell)
-        cell.textLabel?.text = Localization.stripeExtensionInPersonPaymentsDescription
-    }
-
     func configureCanadaInPersonPaymentsSwitch(cell: SwitchTableViewCell) {
         configureCommonStylesForSwitchCell(cell)
         cell.title = Localization.canadaExtensionInPersonPaymentsTitle
@@ -434,10 +394,6 @@ private enum Row: CaseIterable {
     case orderCreation
     case orderCreationDescription
 
-    // WooCommerce Stripe Payment Gateway extension In-Person Payments
-    case stripeExtensionInPersonPayments
-    case stripeExtensionInPersonPaymentsDescription
-
     // In-Person Payments in Canada
     case canadaInPersonPayments
     case canadaInPersonPaymentsDescription
@@ -452,9 +408,9 @@ private enum Row: CaseIterable {
 
     var type: UITableViewCell.Type {
         switch self {
-        case .orderAddOns, .orderCreation, .stripeExtensionInPersonPayments, .canadaInPersonPayments, .productSKUInputScanner, .couponManagement:
+        case .orderAddOns, .orderCreation, .canadaInPersonPayments, .productSKUInputScanner, .couponManagement:
             return SwitchTableViewCell.self
-        case .orderAddOnsDescription, .orderCreationDescription, .stripeExtensionInPersonPaymentsDescription, .canadaInPersonPaymentsDescription,
+        case .orderAddOnsDescription, .orderCreationDescription, .canadaInPersonPaymentsDescription,
                 .productSKUInputScannerDescription, .couponManagementDescription:
             return BasicTableViewCell.self
         }
@@ -481,15 +437,6 @@ private extension BetaFeaturesViewController {
             "Test out creating new manual orders as we get ready to launch",
             comment: "Cell description on the beta features screen to enable creating new orders")
 
-        static let stripeExtensionInPersonPaymentsTitle = NSLocalizedString(
-            "IPP with Stripe extension",
-            comment: "Cell title on beta features screen to enable accepting in-person payments for stores with the " +
-            "WooCommerce Stripe Payment Gateway extension")
-        static let stripeExtensionInPersonPaymentsDescription = NSLocalizedString(
-            "Test out In-Person Payments with the Stripe Payment Gateway extension",
-            comment: "Cell description on beta features screen to enable accepting in-person payments for stores with " +
-            "the WooCommerce Stripe Payment Gateway extension")
-
         static let canadaExtensionInPersonPaymentsTitle = NSLocalizedString(
             "In-Person Payments in Canada",
             comment: "Cell title on beta features screen to enable accepting in-person payments for stores in Canada ")
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift
@@ -30,7 +30,6 @@ protocol CardPresentPaymentsOnboardingUseCaseProtocol {
 final class CardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingUseCaseProtocol, ObservableObject {
     let storageManager: StorageManagerType
     let stores: StoresManager
-    private var stripeGatewayIPPEnabled: Bool = false
     private var canadaIPPEnabled: Bool = false
 
     @Published var state: CardPresentPaymentOnboardingState = .loading
@@ -46,16 +45,6 @@ final class CardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingU
         self.storageManager = storageManager
         self.stores = stores
 
-        let stripeAction = AppSettingsAction.loadStripeInPersonPaymentsSwitchState(onCompletion: { [weak self] result in
-            switch result {
-            case .success(let stripeGatewayIPPEnabled):
-                self?.stripeGatewayIPPEnabled = stripeGatewayIPPEnabled
-            default:
-                break
-            }
-        })
-        stores.dispatch(stripeAction)
-
         let canadaAction = AppSettingsAction.loadCanadaInPersonPaymentsSwitchState(onCompletion: { [weak self]  result in
             switch result {
             case .success(let canadaIPPEnabled):
@@ -165,7 +154,6 @@ private extension CardPresentPaymentsOnboardingUseCase {
         do {
             configuration = try CardPresentPaymentsConfiguration(
                 country: countryCode,
-                stripeEnabled: stripeGatewayIPPEnabled,
                 canadaEnabled: canadaIPPEnabled
             )
         } catch is CardPresentPaymentsConfigurationMissingError {
diff --git a/Yosemite/Yosemite/Actions/AppSettingsAction.swift b/Yosemite/Yosemite/Actions/AppSettingsAction.swift
@@ -128,14 +128,6 @@ public enum AppSettingsAction: Action {
     ///
     case setOrderCreationFeatureSwitchState(isEnabled: Bool, onCompletion: (Result<Void, Error>) -> Void)
 
-    /// Loads the most recent state for the WooCommerce Stripe Payment Gateway extension In-Person Payments beta feature switch
-    ///
-    case loadStripeInPersonPaymentsSwitchState(onCompletion: (Result<Bool, Error>) -> Void)
-
-    /// Sets the state for the WooCommerce Stripe Payment Gateway extension In-Person Payments beta feature switch
-    ///
-    case setStripeInPersonPaymentsSwitchState(isEnabled: Bool, onCompletion: (Result<Void, Error>) -> Void)
-
     /// Loads the most recent state for the In-Person Payments in Canada beta feature switch
     ///
     case loadCanadaInPersonPaymentsSwitchState(onCompletion: (Result<Bool, Error>) -> Void)
diff --git a/Yosemite/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift b/Yosemite/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift
@@ -11,20 +11,14 @@ public struct CardPresentPaymentsConfiguration {
         self.paymentGateways = paymentGateways
     }
 
-    public init(country: String, stripeEnabled: Bool, canadaEnabled: Bool) throws {
+    public init(country: String, canadaEnabled: Bool) throws {
         switch country {
-        case "US" where stripeEnabled == true:
+        case "US":
             self.init(
                 paymentMethods: [.cardPresent],
                 currencies: ["USD"],
                 paymentGateways: [WCPayAccount.gatewayID, StripeAccount.gatewayID]
             )
-        case "US" where stripeEnabled == false:
-            self.init(
-                paymentMethods: [.cardPresent],
-                currencies: ["USD"],
-                paymentGateways: [WCPayAccount.gatewayID]
-            )
         case "CA" where canadaEnabled == true:
             self.init(
                 paymentMethods: [.cardPresent, .interacPresent],
diff --git a/Yosemite/Yosemite/Stores/AppSettingsStore.swift b/Yosemite/Yosemite/Stores/AppSettingsStore.swift
@@ -193,10 +193,6 @@ public class AppSettingsStore: Store {
             getSimplePaymentsTaxesToggleState(siteID: siteID, onCompletion: onCompletion)
         case .resetGeneralStoreSettings:
             resetGeneralStoreSettings()
-        case .loadStripeInPersonPaymentsSwitchState(onCompletion: let onCompletion):
-            loadStripeInPersonPaymentsSwitchState(onCompletion: onCompletion)
-        case .setStripeInPersonPaymentsSwitchState(isEnabled: let isEnabled, onCompletion: let onCompletion):
-            setStripeInPersonPaymentsSwitchState(isEnabled: isEnabled, onCompletion: onCompletion)
         case .loadCanadaInPersonPaymentsSwitchState(onCompletion: let onCompletion):
             loadCanadaInPersonPaymentsSwitchState(onCompletion: onCompletion)
         case .setCanadaInPersonPaymentsSwitchState(isEnabled: let isEnabled, onCompletion: let onCompletion):
@@ -304,25 +300,6 @@ private extension AppSettingsStore {
 
     }
 
-    /// Loads the current WooCommerce Stripe Payment Gateway extension In-Person Payments beta feature switch state from `GeneralAppSettings`
-    ///
-    func loadStripeInPersonPaymentsSwitchState(onCompletion: (Result<Bool, Error>) -> Void) {
-        let settings = loadOrCreateGeneralAppSettings()
-        onCompletion(.success(settings.isStripeInPersonPaymentsSwitchEnabled))
-    }
-
-    /// Sets the provided WooCommerce Stripe Payment Gateway extension In-Person Payments  beta feature switch state into `GeneralAppSettings`
-    ///
-    func setStripeInPersonPaymentsSwitchState(isEnabled: Bool, onCompletion: (Result<Void, Error>) -> Void) {
-        do {
-            let settings = loadOrCreateGeneralAppSettings().copy(isStripeInPersonPaymentsSwitchEnabled: isEnabled)
-            try saveGeneralAppSettings(settings)
-            onCompletion(.success(()))
-        } catch {
-            onCompletion(.failure(error))
-        }
-    }
-
     /// Loads the current In-Person Payments in Canada beta feature switch state from `GeneralAppSettings`
     ///
     func loadCanadaInPersonPaymentsSwitchState(onCompletion: (Result<Bool, Error>) -> Void) {
@@ -437,7 +414,6 @@ private extension AppSettingsStore {
                                       feedbacks: [:],
                                       isViewAddOnsSwitchEnabled: false,
                                       isOrderCreationSwitchEnabled: false,
-                                      isStripeInPersonPaymentsSwitchEnabled: false,
                                       isCanadaInPersonPaymentsSwitchEnabled: false,
                                       isProductSKUInputScannerSwitchEnabled: false,
                                       isCouponManagementSwitchEnabled: false,
diff --git a/Yosemite/YosemiteTests/Stores/AppSettings/InAppFeedbackCardVisibilityUseCaseTests.swift b/Yosemite/YosemiteTests/Stores/AppSettings/InAppFeedbackCardVisibilityUseCaseTests.swift
diff --git a/Yosemite/YosemiteTests/Stores/AppSettingsStoreTests.swift b/Yosemite/YosemiteTests/Stores/AppSettingsStoreTests.swift
