Add feature flag & toggle for Tap to Pay on iPhone

joshheald · joshheald · commit d74d11c9984f · 2022-11-21T12:21:03.000Z
diff --git a/Experiments/Experiments/DefaultFeatureFlagService.swift b/Experiments/Experiments/DefaultFeatureFlagService.swift
@@ -53,6 +53,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .analyticsHub:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .tapToPayOnIPhone:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }
diff --git a/Experiments/Experiments/FeatureFlag.swift b/Experiments/Experiments/FeatureFlag.swift
@@ -70,6 +70,10 @@ public enum FeatureFlag: Int {
     ///
     case inAppPurchases
 
+    /// Enables Tap to Pay on iPhone flow in In-Person Payments, on eligible devices.
+    ///
+    case tapToPayOnIPhone
+
     /// Store creation MVP.
     ///
     case storeCreationMVP
diff --git a/Storage/Storage/Model/Copiable/Models+Copiable.generated.swift b/Storage/Storage/Model/Copiable/Models+Copiable.generated.swift
@@ -27,6 +27,7 @@ extension Storage.GeneralAppSettings {
         isProductSKUInputScannerSwitchEnabled: CopiableProp<Bool> = .copy,
         isCouponManagementSwitchEnabled: CopiableProp<Bool> = .copy,
         isInAppPurchasesSwitchEnabled: CopiableProp<Bool> = .copy,
+        isTapToPayOnIPhoneSwitchEnabled: CopiableProp<Bool> = .copy,
         knownCardReaders: CopiableProp<[String]> = .copy,
         lastEligibilityErrorInfo: NullableCopiableProp<EligibilityErrorInfo> = .copy,
         lastJetpackBenefitsBannerDismissedTime: NullableCopiableProp<Date> = .copy,
@@ -38,6 +39,7 @@ extension Storage.GeneralAppSettings {
         let isProductSKUInputScannerSwitchEnabled = isProductSKUInputScannerSwitchEnabled ?? self.isProductSKUInputScannerSwitchEnabled
         let isCouponManagementSwitchEnabled = isCouponManagementSwitchEnabled ?? self.isCouponManagementSwitchEnabled
         let isInAppPurchasesSwitchEnabled = isInAppPurchasesSwitchEnabled ?? self.isInAppPurchasesSwitchEnabled
+        let isTapToPayOnIPhoneSwitchEnabled = isTapToPayOnIPhoneSwitchEnabled ?? self.isTapToPayOnIPhoneSwitchEnabled
         let knownCardReaders = knownCardReaders ?? self.knownCardReaders
         let lastEligibilityErrorInfo = lastEligibilityErrorInfo ?? self.lastEligibilityErrorInfo
         let lastJetpackBenefitsBannerDismissedTime = lastJetpackBenefitsBannerDismissedTime ?? self.lastJetpackBenefitsBannerDismissedTime
@@ -50,6 +52,7 @@ extension Storage.GeneralAppSettings {
             isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
             isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
             isInAppPurchasesSwitchEnabled: isInAppPurchasesSwitchEnabled,
+            isTapToPayOnIPhoneSwitchEnabled: isTapToPayOnIPhoneSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo,
             lastJetpackBenefitsBannerDismissedTime: lastJetpackBenefitsBannerDismissedTime,
diff --git a/Storage/Storage/Model/GeneralAppSettings.swift b/Storage/Storage/Model/GeneralAppSettings.swift
@@ -36,6 +36,10 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
     ///
     public var isInAppPurchasesSwitchEnabled: Bool
 
+    /// The state for the Tap to Pay on iPhone feature switch.
+    ///
+    public var isTapToPayOnIPhoneSwitchEnabled: Bool
+
     /// A list (possibly empty) of known card reader IDs - i.e. IDs of card readers that should be reconnected to automatically
     /// e.g. ["CHB204909005931"]
     ///
@@ -58,6 +62,7 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
                 isProductSKUInputScannerSwitchEnabled: Bool,
                 isCouponManagementSwitchEnabled: Bool,
                 isInAppPurchasesSwitchEnabled: Bool,
+                isTapToPayOnIPhoneSwitchEnabled: Bool,
                 knownCardReaders: [String],
                 lastEligibilityErrorInfo: EligibilityErrorInfo? = nil,
                 lastJetpackBenefitsBannerDismissedTime: Date? = nil,
@@ -72,6 +77,7 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
         self.lastJetpackBenefitsBannerDismissedTime = lastJetpackBenefitsBannerDismissedTime
         self.featureAnnouncementCampaignSettings = featureAnnouncementCampaignSettings
         self.isInAppPurchasesSwitchEnabled = isInAppPurchasesSwitchEnabled
+        self.isTapToPayOnIPhoneSwitchEnabled = isTapToPayOnIPhoneSwitchEnabled
     }
 
     public static var `default`: Self {
@@ -81,6 +87,7 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
               isProductSKUInputScannerSwitchEnabled: false,
               isCouponManagementSwitchEnabled: false,
               isInAppPurchasesSwitchEnabled: false,
+              isTapToPayOnIPhoneSwitchEnabled: false,
               knownCardReaders: [],
               lastEligibilityErrorInfo: nil,
               featureAnnouncementCampaignSettings: [:])
@@ -110,6 +117,7 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
             isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
             isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
             isInAppPurchasesSwitchEnabled: isInAppPurchasesSwitchEnabled,
+            isTapToPayOnIPhoneSwitchEnabled: isTapToPayOnIPhoneSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo,
             featureAnnouncementCampaignSettings: featureAnnouncementCampaignSettings
@@ -130,6 +138,7 @@ public struct GeneralAppSettings: Codable, Equatable, GeneratedCopiable {
             isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
             isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
             isInAppPurchasesSwitchEnabled: isInAppPurchasesSwitchEnabled,
+            isTapToPayOnIPhoneSwitchEnabled: isTapToPayOnIPhoneSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo,
             featureAnnouncementCampaignSettings: updatedSettings
@@ -150,6 +159,7 @@ extension GeneralAppSettings {
         self.isProductSKUInputScannerSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isProductSKUInputScannerSwitchEnabled) ?? false
         self.isCouponManagementSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isCouponManagementSwitchEnabled) ?? false
         self.isInAppPurchasesSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isInAppPurchasesSwitchEnabled) ?? false
+        self.isTapToPayOnIPhoneSwitchEnabled = try container.decodeIfPresent(Bool.self, forKey: .isTapToPayOnIPhoneSwitchEnabled) ?? false
         self.knownCardReaders = try container.decodeIfPresent([String].self, forKey: .knownCardReaders) ?? []
         self.lastEligibilityErrorInfo = try container.decodeIfPresent(EligibilityErrorInfo.self, forKey: .lastEligibilityErrorInfo)
         self.lastJetpackBenefitsBannerDismissedTime = try container.decodeIfPresent(Date.self, forKey: .lastJetpackBenefitsBannerDismissedTime)
diff --git a/Storage/StorageTests/Model/AppSettings/GeneralAppSettingsTests.swift b/Storage/StorageTests/Model/AppSettings/GeneralAppSettingsTests.swift
@@ -67,6 +67,7 @@ final class GeneralAppSettingsTests: XCTestCase {
                                                   isProductSKUInputScannerSwitchEnabled: true,
                                                   isCouponManagementSwitchEnabled: true,
                                                   isInAppPurchasesSwitchEnabled: false,
+                                                  isTapToPayOnIPhoneSwitchEnabled: false,
                                                   knownCardReaders: readers,
                                                   lastEligibilityErrorInfo: eligibilityInfo,
                                                   lastJetpackBenefitsBannerDismissedTime: jetpackBannerDismissedDate,
@@ -103,6 +104,7 @@ private extension GeneralAppSettingsTests {
                                   isProductSKUInputScannerSwitchEnabled: Bool = false,
                                   isCouponManagementSwitchEnabled: Bool = false,
                                   isInAppPurchasesSwitchEnabled: Bool = false,
+                                  isTapToPayOnIPhoneSwitchEnabled: Bool = false,
                                   knownCardReaders: [String] = [],
                                   lastEligibilityErrorInfo: EligibilityErrorInfo? = nil,
                                   lastJetpackBenefitsBannerDismissedTime: Date? = nil,
@@ -114,6 +116,7 @@ private extension GeneralAppSettingsTests {
                            isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
                            isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
                            isInAppPurchasesSwitchEnabled: isInAppPurchasesSwitchEnabled,
+                           isTapToPayOnIPhoneSwitchEnabled: isTapToPayOnIPhoneSwitchEnabled,
                            knownCardReaders: knownCardReaders,
                            lastEligibilityErrorInfo: lastEligibilityErrorInfo,
                            lastJetpackBenefitsBannerDismissedTime: lastJetpackBenefitsBannerDismissedTime,
diff --git a/WooCommerce/Classes/Model/BetaFeature.swift b/WooCommerce/Classes/Model/BetaFeature.swift
@@ -5,6 +5,7 @@ enum BetaFeature: String, CaseIterable {
     case productSKUScanner
     case couponManagement
     case inAppPurchases
+    case tapToPayOnIPhone
 }
 
 extension BetaFeature {
@@ -18,6 +19,8 @@ extension BetaFeature {
             return Localization.couponManagementTitle
         case .inAppPurchases:
             return Localization.inAppPurchasesManagementTitle
+        case .tapToPayOnIPhone:
+            return Localization.tapToPayOnIPhoneTitle
         }
     }
 
@@ -31,6 +34,8 @@ extension BetaFeature {
             return Localization.couponManagementDescription
         case .inAppPurchases:
             return Localization.inAppPurchasesManagementDescription
+        case .tapToPayOnIPhone:
+            return Localization.tapToPayOnIPhoneDescription
         }
     }
 
@@ -44,6 +49,8 @@ extension BetaFeature {
             return \.isCouponManagementSwitchEnabled
         case .inAppPurchases:
             return \.isInAppPurchasesSwitchEnabled
+        case .tapToPayOnIPhone:
+            return \.isTapToPayOnIPhoneSwitchEnabled
         }
     }
 
@@ -62,6 +69,8 @@ extension BetaFeature {
         switch self {
         case .inAppPurchases:
             return ServiceLocator.featureFlagService.isFeatureFlagEnabled(.inAppPurchases)
+        case .tapToPayOnIPhone:
+            return ServiceLocator.featureFlagService.isFeatureFlagEnabled(.tapToPayOnIPhone)
         default:
             return true
         }
@@ -139,5 +148,14 @@ private extension BetaFeature {
         static let inAppPurchasesManagementDescription = NSLocalizedString(
             "Test out in-app purchases as we get ready to launch",
             comment: "Cell description on beta features screen to enable in-app purchases")
+
+        static let tapToPayOnIPhoneTitle = NSLocalizedString(
+            "Tap to Pay on iPhone",
+            comment: "Cell tytle on beta features screen to enable Tap to Pay on iPhone: card payments with the " +
+            "phone's built in reader")
+        static let tapToPayOnIPhoneDescription = NSLocalizedString(
+            "Test out In-Person Payments using your phone's built-in card reader, as we get ready to launch. " +
+            "Supported on iPhone XS and newer phones, running iOS 15.5 or above.",
+            comment: "Cell description on beta features screen to enable in-app purchases")
     }
 }
diff --git a/Yosemite/YosemiteTests/Stores/AppSettings/InAppFeedbackCardVisibilityUseCaseTests.swift b/Yosemite/YosemiteTests/Stores/AppSettings/InAppFeedbackCardVisibilityUseCaseTests.swift
@@ -162,6 +162,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
                                           isProductSKUInputScannerSwitchEnabled: false,
                                           isCouponManagementSwitchEnabled: false,
                                           isInAppPurchasesSwitchEnabled: false,
+                                          isTapToPayOnIPhoneSwitchEnabled: false,
                                           knownCardReaders: [],
                                           featureAnnouncementCampaignSettings: [:])
         let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .ordersCreation)
@@ -230,6 +231,7 @@ private extension InAppFeedbackCardVisibilityUseCaseTests {
             isProductSKUInputScannerSwitchEnabled: false,
             isCouponManagementSwitchEnabled: false,
             isInAppPurchasesSwitchEnabled: false,
+            isTapToPayOnIPhoneSwitchEnabled: false,
             knownCardReaders: [],
             featureAnnouncementCampaignSettings: [:]
         )
diff --git a/Yosemite/YosemiteTests/Stores/AppSettingsStoreTests.swift b/Yosemite/YosemiteTests/Stores/AppSettingsStoreTests.swift
@@ -1007,6 +1007,7 @@ private extension AppSettingsStoreTests {
             isProductSKUInputScannerSwitchEnabled: false,
             isCouponManagementSwitchEnabled: false,
             isInAppPurchasesSwitchEnabled: false,
+            isTapToPayOnIPhoneSwitchEnabled: false,
             knownCardReaders: [],
             featureAnnouncementCampaignSettings: [:]
         )
@@ -1021,6 +1022,7 @@ private extension AppSettingsStoreTests {
             isProductSKUInputScannerSwitchEnabled: false,
             isCouponManagementSwitchEnabled: false,
             isInAppPurchasesSwitchEnabled: false,
+            isTapToPayOnIPhoneSwitchEnabled: false,
             knownCardReaders: [],
             featureAnnouncementCampaignSettings: featureAnnouncementCampaignSettings
         )

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {`
`53`	`53`	`return buildConfig == .localDeveloper \|\| buildConfig == .alpha`
`54`	`54`	`case .analyticsHub:`
`55`	`55`	`return buildConfig == .localDeveloper \|\| buildConfig == .alpha`
	`56`	`+ case .tapToPayOnIPhone:`
	`57`	`+ return buildConfig == .localDeveloper \|\| buildConfig == .alpha`
`56`	`58`	`default:`
`57`	`59`	`return true`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ enum BetaFeature: String, CaseIterable {`
`5`	`5`	`case productSKUScanner`
`6`	`6`	`case couponManagement`
`7`	`7`	`case inAppPurchases`
	`8`	`+ case tapToPayOnIPhone`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`extension BetaFeature {`
`@@ -18,6 +19,8 @@ extension BetaFeature {`
`18`	`19`	`return Localization.couponManagementTitle`
`19`	`20`	`case .inAppPurchases:`
`20`	`21`	`return Localization.inAppPurchasesManagementTitle`
	`22`	`+ case .tapToPayOnIPhone:`
	`23`	`+ return Localization.tapToPayOnIPhoneTitle`
`21`	`24`	`}`
`22`	`25`	`}`
`23`	`26`
`@@ -31,6 +34,8 @@ extension BetaFeature {`
`31`	`34`	`return Localization.couponManagementDescription`
`32`	`35`	`case .inAppPurchases:`
`33`	`36`	`return Localization.inAppPurchasesManagementDescription`
	`37`	`+ case .tapToPayOnIPhone:`
	`38`	`+ return Localization.tapToPayOnIPhoneDescription`
`34`	`39`	`}`
`35`	`40`	`}`
`36`	`41`
`@@ -44,6 +49,8 @@ extension BetaFeature {`
`44`	`49`	`return \.isCouponManagementSwitchEnabled`
`45`	`50`	`case .inAppPurchases:`
`46`	`51`	`return \.isInAppPurchasesSwitchEnabled`
	`52`	`+ case .tapToPayOnIPhone:`
	`53`	`+ return \.isTapToPayOnIPhoneSwitchEnabled`
`47`	`54`	`}`
`48`	`55`	`}`
`49`	`56`
`@@ -62,6 +69,8 @@ extension BetaFeature {`
`62`	`69`	`switch self {`
`63`	`70`	`case .inAppPurchases:`
`64`	`71`	`return ServiceLocator.featureFlagService.isFeatureFlagEnabled(.inAppPurchases)`
	`72`	`+ case .tapToPayOnIPhone:`
	`73`	`+ return ServiceLocator.featureFlagService.isFeatureFlagEnabled(.tapToPayOnIPhone)`
`65`	`74`	`default:`
`66`	`75`	`return true`
`67`	`76`	`}`
`@@ -139,5 +148,14 @@ private extension BetaFeature {`
`139`	`148`	`static let inAppPurchasesManagementDescription = NSLocalizedString(`
`140`	`149`	`"Test out in-app purchases as we get ready to launch",`
`141`	`150`	`comment: "Cell description on beta features screen to enable in-app purchases")`
	`151`	`+`
	`152`	`+ static let tapToPayOnIPhoneTitle = NSLocalizedString(`
	`153`	`+ "Tap to Pay on iPhone",`
	`154`	`+ comment: "Cell tytle on beta features screen to enable Tap to Pay on iPhone: card payments with the " +`
	`155`	`+ "phone's built in reader")`
	`156`	`+ static let tapToPayOnIPhoneDescription = NSLocalizedString(`
	`157`	`+ "Test out In-Person Payments using your phone's built-in card reader, as we get ready to launch. " +`
	`158`	`+ "Supported on iPhone XS and newer phones, running iOS 15.5 or above.",`
	`159`	`+ comment: "Cell description on beta features screen to enable in-app purchases")`
`142`	`160`	`}`
`143`	`161`	`}`