Skip to content

Commit ff00f98

Browse files
committed
Remove POSIneligibleReason.featureSwitchSyncFailure now that POS feature switch loading is combined with WC plugin. Update test cases.
1 parent dd73d5d commit ff00f98

File tree

3 files changed

+37
-144
lines changed

3 files changed

+37
-144
lines changed

WooCommerce/Classes/POS/TabBar/POSIneligibleView.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ struct POSIneligibleView: View {
9797
value: "Point of Sale must be enabled to proceed. " +
9898
"Please enable the POS feature from your WordPress admin under WooCommerce settings > Advanced > Features.",
9999
comment: "Suggestion for disabled feature switch: enable feature in WooCommerce settings")
100-
case .featureSwitchSyncFailure:
101-
return NSLocalizedString("pos.ineligible.suggestion.featureSwitchSyncFailure",
102-
value: "Please check your internet connection and try again.",
103-
comment: "Suggestion for feature switch sync failure: check connection and retry")
104100
case let .unsupportedCurrency(supportedCurrencies):
105101
let currencyList = supportedCurrencies.map { $0.rawValue }
106102
let formattedCurrencyList = ListFormatter.localizedString(byJoining: currencyList)
@@ -194,15 +190,6 @@ private extension POSIneligibleView {
194190
}
195191
}
196192

197-
#Preview("Feature switch sync failure") {
198-
if #available(iOS 17.0, *) {
199-
POSIneligibleView(
200-
reason: .featureSwitchSyncFailure,
201-
onRefresh: {}
202-
)
203-
}
204-
}
205-
206193
#Preview("Unsupported WooCommerce version") {
207194
if #available(iOS 17.0, *) {
208195
POSIneligibleView(

WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import class Yosemite.POSEligibilityService
1111
import struct Yosemite.SystemPlugin
1212
import enum Yosemite.FeatureFlagAction
1313
import enum Yosemite.SettingAction
14-
import protocol Yosemite.PluginsServiceProtocol
15-
import class Yosemite.PluginsService
1614
import protocol Yosemite.POSSystemStatusServiceProtocol
1715
import class Yosemite.POSSystemStatusService
1816

@@ -23,7 +21,6 @@ enum POSIneligibleReason: Equatable {
2321
case siteSettingsNotAvailable
2422
case wooCommercePluginNotFound
2523
case featureSwitchDisabled
26-
case featureSwitchSyncFailure
2724
case unsupportedCurrency(supportedCurrencies: [CurrencyCode])
2825
case selfDeallocated
2926
}
@@ -49,7 +46,6 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
4946
private let siteID: Int64
5047
private let userInterfaceIdiom: UIUserInterfaceIdiom
5148
private let siteSettings: SelectedSiteSettingsProtocol
52-
private let pluginsService: PluginsServiceProtocol
5349
private let eligibilityService: POSEligibilityServiceProtocol
5450
private let stores: StoresManager
5551
private let featureFlagService: FeatureFlagService
@@ -58,7 +54,6 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
5854
init(siteID: Int64,
5955
userInterfaceIdiom: UIUserInterfaceIdiom = UIDevice.current.userInterfaceIdiom,
6056
siteSettings: SelectedSiteSettingsProtocol = ServiceLocator.selectedSiteSettings,
61-
pluginsService: PluginsServiceProtocol = PluginsService(storageManager: ServiceLocator.storageManager),
6257
eligibilityService: POSEligibilityServiceProtocol = POSEligibilityService(),
6358
stores: StoresManager = ServiceLocator.stores,
6459
featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService,
@@ -67,7 +62,6 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
6762
self.siteID = siteID
6863
self.userInterfaceIdiom = userInterfaceIdiom
6964
self.siteSettings = siteSettings
70-
self.pluginsService = pluginsService
7165
self.eligibilityService = eligibilityService
7266
self.stores = stores
7367
self.featureFlagService = featureFlagService
@@ -142,7 +136,7 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
142136
// TODO: WOOMOB-759 - enable feature switch via API and check eligibility again
143137
// For now, just checks eligibility again.
144138
return await checkEligibility()
145-
case .featureSwitchSyncFailure, .selfDeallocated:
139+
case .selfDeallocated:
146140
return await checkEligibility()
147141
}
148142
}

0 commit comments

Comments
 (0)