Skip to content

Commit 5e5825b

Browse files
committed
Remove the stripe feature flag too
1 parent 261498a commit 5e5825b

File tree

4 files changed

+2
-26
lines changed

4 files changed

+2
-26
lines changed

Experiments/Experiments/DefaultFeatureFlagService.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
3333
return true
3434
case .systemStatusReport:
3535
return true
36-
case .stripeExtensionInPersonPayments:
37-
return buildConfig == .localDeveloper || buildConfig == .alpha
3836
case .myStoreTabUpdates:
3937
return true
4038
case .couponView:

Experiments/Experiments/FeatureFlag.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ public enum FeatureFlag: Int {
6666
///
6767
case systemStatusReport
6868

69-
/// Allows sites using the WooCommerce Stripe Payment Gateway extension to accept In-Person Payments
70-
///
71-
case stripeExtensionInPersonPayments
72-
7369
/// Home Screen project milestone 2: design updates to the My Store tab
7470
///
7571
case myStoreTabUpdates

WooCommerce/Classes/Yosemite/AuthenticatedState.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class AuthenticatedState: StoresManagerState {
2626
let storageManager = ServiceLocator.storageManager
2727
let network = AlamofireNetwork(credentials: credentials)
2828

29-
/// TODO - remove this feature flag related logic when no longer needed
30-
let allowStripeIPP = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.stripeExtensionInPersonPayments)
31-
3229
services = [
3330
AccountStore(dispatcher: dispatcher, storageManager: storageManager, network: network),
3431
AppSettingsStore(dispatcher: dispatcher, storageManager: storageManager, fileStorage: PListFileStorage()),
@@ -67,8 +64,7 @@ class AuthenticatedState: StoresManagerState {
6764
CardPresentPaymentStore(dispatcher: dispatcher,
6865
storageManager: storageManager,
6966
network: network,
70-
cardReaderService: ServiceLocator.cardReaderService,
71-
allowStripeIPP: allowStripeIPP),
67+
cardReaderService: ServiceLocator.cardReaderService),
7268
ReceiptStore(dispatcher: dispatcher,
7369
storageManager: storageManager,
7470
network: network,

Yosemite/Yosemite/Stores/CardPresentPaymentStore.swift

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ public final class CardPresentPaymentStore: Store {
1717
///
1818
private let commonReaderConfigProvider: CommonReaderConfigProvider
1919

20-
/// Instead of adding a reference to the feature flag service (in the WooCommerce layer),
21-
/// and since feature flag values don't mutate, let's just have a private bool passed into this service
22-
/// to allow (or not) Stripe IPP.
23-
/// TODO: Remove this feature flag when no longer needed.
24-
///
25-
private var allowStripeIPP: Bool
26-
2720
/// Which backend is the store using? Default to WCPay until told otherwise
2821
private var usingBackend: CardPresentPaymentStoreBackend = .wcpay
2922

@@ -39,14 +32,12 @@ public final class CardPresentPaymentStore: Store {
3932
dispatcher: Dispatcher,
4033
storageManager: StorageManagerType,
4134
network: Network,
42-
cardReaderService: CardReaderService,
43-
allowStripeIPP: Bool
35+
cardReaderService: CardReaderService
4436
) {
4537
self.cardReaderService = cardReaderService
4638
self.commonReaderConfigProvider = CommonReaderConfigProvider()
4739
self.remote = WCPayRemote(network: network)
4840
self.stripeRemote = StripeRemote(network: network)
49-
self.allowStripeIPP = allowStripeIPP
5041
super.init(dispatcher: dispatcher, storageManager: storageManager, network: network)
5142
}
5243

@@ -365,11 +356,6 @@ private extension CardPresentPaymentStore {
365356
/// Sets the store to use a given payment gateway
366357
///
367358
func use(paymentGatewayAccount: PaymentGatewayAccount) {
368-
guard allowStripeIPP else {
369-
DDLogError("useStripeAsBackend called when stripeExtensionInPersonPayments disabled")
370-
return
371-
}
372-
373359
guard paymentGatewayAccount.isWCPay else {
374360
usingBackend = .stripe
375361
return

0 commit comments

Comments
 (0)