Skip to content

Commit b3ed08a

Browse files
committed
Make analyticReason non-optional everywhere
1 parent 87c18f3 commit b3ed08a

8 files changed

+18
-18
lines changed

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCountryNotSupported.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import SwiftUI
22

33
struct InPersonPaymentsCountryNotSupported: View {
44
let countryCode: String
5-
let analyticReason: String?
5+
let analyticReason: String
66

77
var body: some View {
88
InPersonPaymentsOnboardingError(
@@ -47,8 +47,8 @@ private enum Localization {
4747
struct InPersonPaymentsCountryNotSupported_Previews: PreviewProvider {
4848
static var previews: some View {
4949
// Valid country code
50-
InPersonPaymentsCountryNotSupported(countryCode: "ES", analyticReason: nil)
50+
InPersonPaymentsCountryNotSupported(countryCode: "ES", analyticReason: "")
5151
// Invalid country code
52-
InPersonPaymentsCountryNotSupported(countryCode: "OO", analyticReason: nil)
52+
InPersonPaymentsCountryNotSupported(countryCode: "OO", analyticReason: "")
5353
}
5454
}

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCountryNotSupportedStripe.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import SwiftUI
22

33
struct InPersonPaymentsCountryNotSupportedStripe: View {
44
let countryCode: String
5-
let analyticReason: String?
5+
let analyticReason: String
66

77
var body: some View {
88
InPersonPaymentsOnboardingError(
@@ -47,8 +47,8 @@ private enum Localization {
4747
struct InPersonPaymentsCountryNotSupportedStripe_Previews: PreviewProvider {
4848
static var previews: some View {
4949
// Valid country code
50-
InPersonPaymentsCountryNotSupportedStripe(countryCode: "ES", analyticReason: nil)
50+
InPersonPaymentsCountryNotSupportedStripe(countryCode: "ES", analyticReason: "")
5151
// Invalid country code
52-
InPersonPaymentsCountryNotSupportedStripe(countryCode: "OO", analyticReason: nil)
52+
InPersonPaymentsCountryNotSupportedStripe(countryCode: "OO", analyticReason: "")
5353
}
5454
}

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsOnboardingError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct InPersonPaymentsOnboardingError: View {
77
let image: InPersonPaymentsOnboardingErrorMainContentView.ImageInfo
88
let supportLink: Bool
99
let learnMore: Bool
10-
let analyticReason: String?
10+
let analyticReason: String
1111
var buttonViewModel: InPersonPaymentsOnboardingErrorButtonViewModel? = nil
1212

1313
var body: some View {

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsPluginNotSetup.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Yosemite
33

44
struct InPersonPaymentsPluginNotSetup: View {
55
let plugin: CardPresentPaymentsPlugin
6-
let analyticReason: String?
6+
let analyticReason: String
77
private let cardPresentConfiguration = CardPresentConfigurationLoader().configuration
88
let onRefresh: () -> Void
99
@State private var presentedSetupURL: URL? = nil
@@ -28,7 +28,7 @@ struct InPersonPaymentsPluginNotSetup: View {
2828
presentedSetupURL = setupURL
2929
ServiceLocator.analytics.track(
3030
event: WooAnalyticsEvent.InPersonPayments.cardPresentOnboardingCtaTapped(
31-
reason: analyticReason ?? "",
31+
reason: analyticReason,
3232
countryCode: cardPresentConfiguration.countryCode))
3333
} label: {
3434
HStack {
@@ -71,6 +71,6 @@ private enum Localization {
7171
}
7272
struct InPersonPaymentsPluginNotSetup_Previews: PreviewProvider {
7373
static var previews: some View {
74-
InPersonPaymentsPluginNotSetup(plugin: .wcPay, analyticReason: nil, onRefresh: {})
74+
InPersonPaymentsPluginNotSetup(plugin: .wcPay, analyticReason: "", onRefresh: {})
7575
}
7676
}

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeAccountOverdueView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SwiftUI
22

33
struct InPersonPaymentsStripeAccountOverdue: View {
4-
let analyticReason: String?
4+
let analyticReason: String
55

66
var body: some View {
77
InPersonPaymentsOnboardingError(
@@ -33,6 +33,6 @@ private enum Localization {
3333

3434
struct InPersonPaymentsStripeAccountOverdue_Previews: PreviewProvider {
3535
static var previews: some View {
36-
InPersonPaymentsStripeAccountOverdue(analyticReason: nil)
36+
InPersonPaymentsStripeAccountOverdue(analyticReason: "")
3737
}
3838
}

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeAcountReviewView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SwiftUI
22

33
struct InPersonPaymentsStripeAccountReview: View {
4-
let analyticReason: String?
4+
let analyticReason: String
55

66
var body: some View {
77
InPersonPaymentsOnboardingError(
@@ -32,6 +32,6 @@ private enum Localization {
3232

3333
struct InPersonPaymentsStripeAccountReview_Previews: PreviewProvider {
3434
static var previews: some View {
35-
InPersonPaymentsStripeAccountReview(analyticReason: nil)
35+
InPersonPaymentsStripeAccountReview(analyticReason: "")
3636
}
3737
}

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeRejectedView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SwiftUI
22

33
struct InPersonPaymentsStripeRejected: View {
4-
let analyticReason: String?
4+
let analyticReason: String
55
var body: some View {
66
InPersonPaymentsOnboardingError(
77
title: Localization.title,
@@ -31,6 +31,6 @@ private enum Localization {
3131

3232
struct InPersonPaymentsStripeRejected_Previews: PreviewProvider {
3333
static var previews: some View {
34-
InPersonPaymentsStripeRejected(analyticReason: nil)
34+
InPersonPaymentsStripeRejected(analyticReason: "")
3535
}
3636
}

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsUnavailableView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SwiftUI
22

33
struct InPersonPaymentsUnavailable: View {
4-
let analyticReason: String?
4+
let analyticReason: String
55

66
var body: some View {
77
InPersonPaymentsOnboardingError(
@@ -32,6 +32,6 @@ private enum Localization {
3232

3333
struct InPersonPaymentsUnavailable_Previews: PreviewProvider {
3434
static var previews: some View {
35-
InPersonPaymentsUnavailable(analyticReason: nil)
35+
InPersonPaymentsUnavailable(analyticReason: "")
3636
}
3737
}

0 commit comments

Comments
 (0)