Skip to content

Commit 3b43c52

Browse files
committed
Show all available card reader manuals at all times
In order to have consistency with Android we’ll be showing all card reader manuals at all times, despite their store eligibility. Ref: pdfdoF-1aF-p2
1 parent 9bf2a29 commit 3b43c52

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Foundation
2-
import SwiftUI
32
import Yosemite
43

54
struct Manual: Identifiable, Equatable {
@@ -10,13 +9,10 @@ struct Manual: Identifiable, Equatable {
109
}
1110

1211
final class CardReaderManualsViewModel {
13-
var configurationLoader: CardPresentConfigurationLoader
1412
let manuals: [Manual]
1513

1614
init() {
17-
// Initialize the View Model only with the supported readers for a specific Store
18-
self.configurationLoader = CardPresentConfigurationLoader()
19-
let supportedReaders = configurationLoader.configuration.supportedReaders
20-
self.manuals = supportedReaders.map { $0.manual }
15+
// Display all card readers at all times. Ref: pdfdoF-1aF-p2
16+
self.manuals = CardReaderType.allSupportedReaders.map { $0.manual }
2117
}
2218
}

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardReaderType+Manual.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Foundation
22
import Yosemite
33

44
extension CardReaderType {
5+
static let allSupportedReaders: [CardReaderType] = [CardReaderType.chipper, CardReaderType.stripeM2, CardReaderType.wisepad3]
56

67
var manual: Manual {
78
switch self {

WooCommerce/WooCommerceTests/ViewRelated/CardPresentPayments/CardReaderManualsViewModelTests.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class CardReaderManualsViewModelTests: XCTestCase {
77
private var storageManager: MockStorageManager!
88
private var stores: MockStoresManager!
99
private let sampleSiteID: Int64 = 1234
10+
private let availableReaderTypes = [CardReaderType.chipper, CardReaderType.stripeM2, CardReaderType.wisepad3]
1011

1112
override func setUpWithError() throws {
1213
try super.setUpWithError()
@@ -32,7 +33,7 @@ class CardReaderManualsViewModelTests: XCTestCase {
3233
XCTAssertNotNil(viewModel)
3334
}
3435

35-
func test_viewModel_when_US_store_then_available_card_reader_manuals() {
36+
func test_viewModel_when_US_store_then_all_card_reader_manuals_are_available() {
3637
// Given
3738
let setting = SiteSetting.fake()
3839
.copy(
@@ -46,14 +47,13 @@ class CardReaderManualsViewModelTests: XCTestCase {
4647
let viewModel = CardReaderManualsViewModel()
4748

4849
// When
49-
let availableReaderTypes = [CardReaderType.chipper, CardReaderType.stripeM2]
5050
let expectedManuals = availableReaderTypes.map { $0.manual }
5151

5252
// Then
5353
XCTAssertEqual(viewModel.manuals, expectedManuals)
5454
}
5555

56-
func test_viewModel_when_CA_store_then_available_card_reader_manuals() {
56+
func test_viewModel_when_CA_store_then_all_card_reader_manuals_are_available() {
5757
// Given
5858
let setting = SiteSetting.fake()
5959
.copy(
@@ -67,14 +67,13 @@ class CardReaderManualsViewModelTests: XCTestCase {
6767
let viewModel = CardReaderManualsViewModel()
6868

6969
// When:
70-
let availableReaderTypes = [CardReaderType.wisepad3]
7170
let expectedManuals = availableReaderTypes.map { $0.manual }
7271

7372
// Then
7473
XCTAssertEqual(viewModel.manuals, expectedManuals)
7574
}
7675

77-
func test_viewModel_when_IPP_not_available_country_then_available_card_reader_manuals_is_empty() {
76+
func test_viewModel_when_IPP_not_available_country_then_all_card_reader_manuals_are_available() {
7877
// Given
7978
let setting = SiteSetting.fake()
8079
.copy(
@@ -87,7 +86,6 @@ class CardReaderManualsViewModelTests: XCTestCase {
8786
let viewModel = CardReaderManualsViewModel.init()
8887

8988
// When
90-
let availableReaderTypes: [CardReaderType] = []
9189
let expectedManuals = availableReaderTypes.map { $0.manual }
9290

9391
// Then

0 commit comments

Comments
 (0)