Add support for idealEnabledRegions remote config

signalapp · Jan 10, 2024 · bc33958 · bc33958
1 parent efae48e
commit bc33958
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/SignalMessaging/Subscriptions/DonationUtilities.swift b/SignalMessaging/Subscriptions/DonationUtilities.swift
@@ -113,10 +113,18 @@ public class DonationUtilities: Dependencies {
         }()
 
         let isIDEALAvailable = {
-            guard FeatureFlags.allowIDEALDonations else { return false }
+            // TODO[IDEAL]: Remove the "allow internal" check before release
+            guard
+                FeatureFlags.allowInternalIDEALDonations ||
+                RemoteConfig.idealEnabledRegions.contains(e164: localNumber)
+            else {
+                return false
+            }
+
             switch donationMode {
             case .oneTime, .monthly:
-                return true
+                // TODO[IDEAL]: Remove feature flag before release
+                return FeatureFlags.allowIDEALDonations
             case .gift:
                 return false
             }

diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift
@@ -88,7 +88,8 @@ public class FeatureFlags: BaseFlags {
 
     public static let groupCallDisposition = build.includes(.internal)
 
-    public static let allowIDEALDonations = build.includes(.dev)
+    public static let allowIDEALDonations = build.includes(.beta)
+    public static let allowInternalIDEALDonations = build.includes(.internal)
 
     public static let shouldShowCallsTab = false
 

diff --git a/SignalServiceKit/src/Util/RemoteConfigManager.swift b/SignalServiceKit/src/Util/RemoteConfigManager.swift
@@ -28,6 +28,7 @@ public class RemoteConfig: BaseFlags {
     private let creditAndDebitCardDisabledRegions: PhoneNumberRegions
     private let paypalDisabledRegions: PhoneNumberRegions
     private let sepaEnabledRegions: PhoneNumberRegions
+    private let idealEnabledRegions: PhoneNumberRegions
 
     init(
         clockSkew: TimeInterval,
@@ -44,6 +45,7 @@ public class RemoteConfig: BaseFlags {
         self.creditAndDebitCardDisabledRegions = Self.parsePhoneNumberRegions(valueFlags: valueFlags, flag: .creditAndDebitCardDisabledRegions)
         self.paypalDisabledRegions = Self.parsePhoneNumberRegions(valueFlags: valueFlags, flag: .paypalDisabledRegions)
         self.sepaEnabledRegions = Self.parsePhoneNumberRegions(valueFlags: valueFlags, flag: .sepaEnabledRegions)
+        self.idealEnabledRegions = Self.parsePhoneNumberRegions(valueFlags: valueFlags, flag: .idealEnabledRegions)
     }
 
     fileprivate static var emptyConfig: RemoteConfig {
@@ -138,6 +140,11 @@ public class RemoteConfig: BaseFlags {
         return remoteConfig.sepaEnabledRegions
     }
 
+    public static var idealEnabledRegions: PhoneNumberRegions {
+        guard let remoteConfig = Self.remoteConfigManager.cachedConfig else { return [] }
+        return remoteConfig.idealEnabledRegions
+    }
+
     public static var canDonateOneTimeWithApplePay: Bool {
         !isEnabled(.applePayOneTimeDonationKillSwitch)
     }
@@ -523,6 +530,7 @@ private enum ValueFlag: String, FlagType {
     case creditAndDebitCardDisabledRegions = "global.donations.ccDisabledRegions"
     case paypalDisabledRegions = "global.donations.paypalDisabledRegions"
     case sepaEnabledRegions = "global.donations.sepaEnabledRegions"
+    case idealEnabledRegions = "global.donations.idealEnabledRegions"
     case maxGroupCallRingSize = "global.calling.maxGroupCallRingSize"
     case minNicknameLength = "global.nicknames.min"
     case maxNicknameLength = "global.nicknames.max"
@@ -546,6 +554,7 @@ private enum ValueFlag: String, FlagType {
         case .creditAndDebitCardDisabledRegions: fallthrough
         case .paypalDisabledRegions: fallthrough
         case .sepaEnabledRegions: fallthrough
+        case .idealEnabledRegions: fallthrough
         case .maxGroupCallRingSize: fallthrough
         case .minNicknameLength: fallthrough
         case .maxNicknameLength: fallthrough
@@ -565,6 +574,7 @@ private enum ValueFlag: String, FlagType {
         case .creditAndDebitCardDisabledRegions: fallthrough
         case .paypalDisabledRegions: fallthrough
         case .sepaEnabledRegions: fallthrough
+        case .idealEnabledRegions: fallthrough
         case .maxGroupCallRingSize:
             return true