Skip to content

Commit 341eea6

Browse files
committed
Use allCases to return non-nil manuals
1 parent 3b43c52 commit 341eea6

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

Hardware/Hardware/CardReader/CardReaderType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// Card reader type. Indicates if a reader is meant to be used
22
/// handheld or as a countertop device
3-
public enum CardReaderType {
3+
public enum CardReaderType: CaseIterable {
44
/// Chipper
55
case chipper
66
/// Stripe M2

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardReaderManualsViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ final class CardReaderManualsViewModel {
1313

1414
init() {
1515
// Display all card readers at all times. Ref: pdfdoF-1aF-p2
16-
self.manuals = CardReaderType.allSupportedReaders.map { $0.manual }
16+
self.manuals = CardReaderType.allCases.compactMap { $0.manual }
1717
}
1818
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import Foundation
22
import Yosemite
33

44
extension CardReaderType {
5-
static let allSupportedReaders: [CardReaderType] = [CardReaderType.chipper, CardReaderType.stripeM2, CardReaderType.wisepad3]
6-
7-
var manual: Manual {
5+
var manual: Manual? {
86
switch self {
97
case .chipper:
108
return Manual(
@@ -28,7 +26,7 @@ extension CardReaderType {
2826
urlString: "https://stripe.com/files/docs/terminal/wp3_product_sheet.pdf"
2927
)
3028
case .other:
31-
return Manual(id: 5, image: .cardReaderManualIcon, name: "", urlString: "")
29+
return nil
3230
}
3331
}
3432
}

0 commit comments

Comments
 (0)