[PAY-1894] Updated Optimizely Feature Flag For Payment Sheet in Setti…

…ngs (#1716)
kickstarter · Aug 31, 2022 · 5304313 · 5304313
1 parent 31562b1
commit 5304313
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 7 deletions.
diff --git a/Kickstarter-iOS/Views/Controllers/OptimizelyFeatureFlagToolsViewControllerTests.swift b/Kickstarter-iOS/Views/Controllers/OptimizelyFeatureFlagToolsViewControllerTests.swift
@@ -24,6 +24,8 @@ final class OptimizelyFeatureFlagToolsViewControllerTests: TestCase {
         OptimizelyFeature.commentFlaggingEnabled.rawValue: false,
         OptimizelyFeature.projectPageStoryTabEnabled.rawValue: false,
         OptimizelyFeature.rewardLocalPickupEnabled.rawValue: false,
+        OptimizelyFeature.paymentSheetEnabled.rawValue: false,
+        OptimizelyFeature.settingsPaymentSheetEnabled.rawValue: false,
         OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue: false
       ]
 

diff --git a/Library/OptimizelyClientTypeTests.swift b/Library/OptimizelyClientTypeTests.swift
@@ -24,7 +24,7 @@ final class OptimizelyClientTypeTests: TestCase {
         OptimizelyFeature.commentFlaggingEnabled.rawValue: true
       ]
 
-    XCTAssert(mockOptimizelyClient.allFeatures().count == 5)
+    XCTAssert(mockOptimizelyClient.allFeatures().count == 6)
   }
 
   func testVariantForExperiment_NoError() {

diff --git a/Library/OptimizelyFeature+Helpers.swift b/Library/OptimizelyFeature+Helpers.swift
@@ -28,7 +28,14 @@ public func featurePaymentSheetEnabled() -> Bool {
       .isFeatureEnabled(featureKey: OptimizelyFeature.paymentSheetEnabled.rawValue) ?? false)
 }
 
-public func facebookLoginDeprecationEnabled() -> Bool {
+public func featureSettingsPaymentSheetEnabled() -> Bool {
+  return AppEnvironment.current.userDefaults
+    .optimizelyFeatureFlags[OptimizelyFeature.settingsPaymentSheetEnabled.rawValue] ??
+    (AppEnvironment.current.optimizelyClient?
+      .isFeatureEnabled(featureKey: OptimizelyFeature.settingsPaymentSheetEnabled.rawValue) ?? false)
+}
+
+public func featureFacebookLoginDeprecationEnabled() -> Bool {
   return AppEnvironment.current.userDefaults
     .optimizelyFeatureFlags[OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue] ??
     (AppEnvironment.current.optimizelyClient?

diff --git a/Library/OptimizelyFeature+HelpersTests.swift b/Library/OptimizelyFeature+HelpersTests.swift
@@ -75,12 +75,21 @@ final class OptimizelyFeatureHelpersTests: TestCase {
     }
   }
 
+  func testSettingsPaymentSheet_Optimizely_FeatureFlag_False() {
+    let mockOptimizelyClient = MockOptimizelyClient()
+      |> \.features .~ [OptimizelyFeature.settingsPaymentSheetEnabled.rawValue: false]
+
+    withEnvironment(optimizelyClient: mockOptimizelyClient) {
+      XCTAssertFalse(featureSettingsPaymentSheetEnabled())
+    }
+  }
+
   func testFacebookDeprecation_Optimizely_FeatureFlag_False() {
     let mockOptimizelyClient = MockOptimizelyClient()
       |> \.features .~ [OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue: false]
 
     withEnvironment(optimizelyClient: mockOptimizelyClient) {
-      XCTAssertFalse(facebookLoginDeprecationEnabled())
+      XCTAssertFalse(featureFacebookLoginDeprecationEnabled())
     }
   }
 }
diff --git a/Library/OptimizelyFeature.swift b/Library/OptimizelyFeature.swift
@@ -2,20 +2,22 @@ import Foundation
 
 public enum OptimizelyFeature: String, CaseIterable {
   case commentFlaggingEnabled = "ios_comment_threading_comment_flagging"
+  case facebookLoginDeprecationEnabled = "ios_facebook_deprecation"
+  case paymentSheetEnabled = "ios_payment_sheet"
   case projectPageStoryTabEnabled = "project_page_v2_story"
   case rewardLocalPickupEnabled = "ios_local_pickup"
-  case paymentSheetEnabled = "ios_payment_sheet"
-  case facebookLoginDeprecationEnabled = "ios_facebook_deprecation"
+  case settingsPaymentSheetEnabled = "ios_settings_payment_sheet"
 }
 
 extension OptimizelyFeature: CustomStringConvertible {
   public var description: String {
     switch self {
     case .commentFlaggingEnabled: return "Comment Flagging"
+    case .facebookLoginDeprecationEnabled: return "Facebook Login Deprecation"
+    case .paymentSheetEnabled: return "Payment Sheet"
     case .projectPageStoryTabEnabled: return "Project Page Story Tab"
     case .rewardLocalPickupEnabled: return "Local Pickup Rewards"
-    case .paymentSheetEnabled: return "Payment Sheet"
-    case .facebookLoginDeprecationEnabled: return "Facebook Login Deprecation"
+    case .settingsPaymentSheetEnabled: return "Settings Payment Sheet"
     }
   }
 }
diff --git a/Library/ViewModels/OptimizelyFeatureFlagToolsViewModel.swift b/Library/ViewModels/OptimizelyFeatureFlagToolsViewModel.swift
@@ -104,6 +104,9 @@ private func getValueFromUserDefaults(for feature: OptimizelyFeature) -> Bool? {
   case .paymentSheetEnabled:
     return AppEnvironment.current.userDefaults
       .optimizelyFeatureFlags[OptimizelyFeature.paymentSheetEnabled.rawValue]
+  case .settingsPaymentSheetEnabled:
+    return AppEnvironment.current.userDefaults
+      .optimizelyFeatureFlags[OptimizelyFeature.settingsPaymentSheetEnabled.rawValue]
   case .facebookLoginDeprecationEnabled:
     return AppEnvironment.current.userDefaults
       .optimizelyFeatureFlags[OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue]
@@ -126,6 +129,9 @@ private func setValueInUserDefaults(for feature: OptimizelyFeature, and value: B
   case .paymentSheetEnabled:
     return AppEnvironment.current.userDefaults
       .optimizelyFeatureFlags[OptimizelyFeature.paymentSheetEnabled.rawValue] = value
+  case .settingsPaymentSheetEnabled:
+    return AppEnvironment.current.userDefaults
+      .optimizelyFeatureFlags[OptimizelyFeature.settingsPaymentSheetEnabled.rawValue] = value
   case .facebookLoginDeprecationEnabled:
     return AppEnvironment.current.userDefaults
       .optimizelyFeatureFlags[OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue] = value

diff --git a/Library/ViewModels/OptimizelyFeatureFlagToolsViewModelTests.swift b/Library/ViewModels/OptimizelyFeatureFlagToolsViewModelTests.swift
@@ -26,6 +26,7 @@ final class OptimizelyFlagToolsViewModelTests: TestCase {
         OptimizelyFeature.projectPageStoryTabEnabled.rawValue: true,
         OptimizelyFeature.rewardLocalPickupEnabled.rawValue: true,
         OptimizelyFeature.paymentSheetEnabled.rawValue: true,
+        OptimizelyFeature.settingsPaymentSheetEnabled.rawValue: true,
         OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue: true
       ]
 
@@ -49,6 +50,7 @@ final class OptimizelyFlagToolsViewModelTests: TestCase {
         OptimizelyFeature.projectPageStoryTabEnabled.rawValue: false,
         OptimizelyFeature.rewardLocalPickupEnabled.rawValue: false,
         OptimizelyFeature.paymentSheetEnabled.rawValue: false,
+        OptimizelyFeature.settingsPaymentSheetEnabled.rawValue: false,
         OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue: false
       ]
 

diff --git a/...lagToolsViewControllerTests/testOptimizelyFeatureFlagToolsViewController@2x.png b/...lagToolsViewControllerTests/testOptimizelyFeatureFlagToolsViewController@2x.png