Merge pull request #5958 from woocommerce/issue/5593-generic-account-warnings

allendav · web-flow · commit b622d7b8baed · 2022-02-01T14:58:59.000-08:00
[Mobile Payments] Update logic, strings on account related onboarding views
diff --git a/Networking/Networking/Mapper/WCPayAccountMapper.swift b/Networking/Networking/Mapper/WCPayAccountMapper.swift
@@ -14,9 +14,8 @@ struct WCPayAccountMapper: Mapper {
         /// can cross that bridge when we need those decoded.
         decoder.dateDecodingStrategy = .secondsSince1970
 
-        /// Detect the exceptional case where we got a response of data:[] indicating
-        /// that the plugin is active but the merchant has not on-boarded (and therefore
-        /// has no account.)
+        /// Prior to WooCommerce Payments plugin version 2.9.0 (Aug 2021) `data` could contain an empty array []
+        /// indicating that the plugin was active but the merchant had not on-boarded (and therefore has no account.)
         if let _ = try? decoder.decode(WCPayNullAccountEnvelope.self, from: response) {
             return WCPayAccount.noAccount
         }
diff --git a/Networking/Networking/Model/StripeAccount.swift b/Networking/Networking/Model/StripeAccount.swift
@@ -91,22 +91,6 @@ public struct StripeAccount: Decodable {
     }
 }
 
-public extension StripeAccount {
-    static let noAccount = StripeAccount(
-        status: .noAccount,
-        isLiveAccount: false,
-        isInTestMode: false,
-        hasPendingRequirements: false,
-        hasOverdueRequirements: false,
-        currentDeadline: nil,
-        statementDescriptor: "",
-        defaultCurrency: "",
-        supportedCurrencies: [],
-        country: "",
-        isCardPresentEligible: false
-    )
-}
-
 private extension StripeAccount {
     enum CodingKeys: String, CodingKey {
         case status
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift
@@ -209,10 +209,11 @@ private extension CardPresentPaymentsOnboardingUseCase {
 
     func accountChecks(plugin: CardPresentPaymentsPlugins) -> CardPresentPaymentOnboardingState {
         guard let account = getPaymentGatewayAccount() else {
-            return .genericError
+            /// Active plugin but unable to fetch an account? Prompt the merchant to finish setting it up.
+            return .pluginSetupNotCompleted(plugin: plugin)
         }
         guard isPaymentGatewaySetupCompleted(account: account) else {
-            return .pluginSetupNotCompleted
+            return .pluginSetupNotCompleted(plugin: plugin)
         }
         guard !isPluginInTestModeWithLiveStripeAccount(account: account) else {
             return .pluginInTestModeWithLiveStripeAccount(plugin: plugin)
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewController.swift
@@ -40,8 +40,8 @@ struct InPersonPaymentsView: View {
             case .pluginInTestModeWithLiveStripeAccount(let plugin):
                 InPersonPaymentsLiveSiteInTestMode(plugin: plugin, onRefresh:
                     viewModel.refresh)
-            case .pluginSetupNotCompleted:
-                InPersonPaymentsWCPayNotSetup(onRefresh: viewModel.refresh)
+            case .pluginSetupNotCompleted(let plugin):
+                InPersonPaymentsPluginNotSetup(plugin: plugin, onRefresh: viewModel.refresh)
             case .stripeAccountOverdueRequirement:
                 InPersonPaymentsStripeAccountOverdue()
             case .stripeAccountPendingRequirement(let deadline):
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCountryNotSupported.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCountryNotSupported.swift
@@ -28,17 +28,17 @@ struct InPersonPaymentsCountryNotSupported: View {
 private enum Localization {
     static let title = NSLocalizedString(
         "We don’t support In-Person Payments in %1$@",
-        comment: "Title for the error screen when WooCommerce Payments is not supported in a specific country"
+        comment: "Title for the error screen when In-Person Payments is not supported in a specific country"
     )
 
     static let titleUnknownCountry = NSLocalizedString(
         "We don’t support In-Person Payments in your country",
-        comment: "Title for the error screen when WooCommerce Payments is not supported because we don't know the name of the country"
+        comment: "Title for the error screen when In-Person Payments is not supported because we don't know the name of the country"
     )
 
     static let message = NSLocalizedString(
         "You can still accept in-person cash payments by enabling the “Cash on Delivery” payment method on your store.",
-        comment: "Error message when WooCommerce Payments is not supported in a specific country"
+        comment: "Error message when In-Person Payments is not supported in a specific country"
     )
 }
 
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsPluginNotSetup.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsPluginNotSetup.swift
@@ -1,6 +1,8 @@
 import SwiftUI
+import Yosemite
 
-struct InPersonPaymentsWCPayNotSetup: View {
+struct InPersonPaymentsPluginNotSetup: View {
+    let plugin: CardPresentPaymentsPlugins
     let onRefresh: () -> Void
     @State var presentedSetupURL: URL? = nil
 
@@ -9,10 +11,10 @@ struct InPersonPaymentsWCPayNotSetup: View {
             Spacer()
 
             InPersonPaymentsOnboardingError.MainContent(
-                title: Localization.title,
-                message: Localization.message,
+                title: String(format: Localization.title, plugin.pluginName),
+                message: String(format: Localization.message, plugin.pluginName),
                 image: InPersonPaymentsOnboardingError.ImageInfo(
-                    image: .wcPayPlugin,
+                    image: plugin.image,
                     height: 108.0
                 ),
                 supportLink: false
@@ -47,22 +49,22 @@ struct InPersonPaymentsWCPayNotSetup: View {
 
 private enum Localization {
     static let title = NSLocalizedString(
-        "Finish setup WooCommerce Payments in your store admin",
-        comment: "Title for the error screen when WooCommerce Payments is installed but not set up"
+        "Finish setup for %1$@ in your store admin",
+        comment: "Title for the error screen when an in-person payments plugin is active but not set up. %1$@ contains the plugin name."
     )
 
     static let message = NSLocalizedString(
-        "You’re almost there! Please finish setting up WooCommerce Payments to start accepting Card-Present Payments.",
-        comment: "Error message when WooCommerce Payments is installed but not set up"
+        "You’re almost there! Please finish setting up %1$@ to start accepting In-Person Payments.",
+        comment: "Error message when an in-person payments plugin is activated but not set up. %1$@ contains the plugin name."
     )
 
     static let primaryButton = NSLocalizedString(
         "Finish Setup in Store Admin",
-        comment: "Button to set up the WooCommerce Payments plugin after installing it"
+        comment: "Button to set up an in-person payments plugin after activating it"
     )
 }
-struct InPersonPaymentsWCPayNotSetup_Previews: PreviewProvider {
+struct InPersonPaymentsPluginNotSetup_Previews: PreviewProvider {
     static var previews: some View {
-        InPersonPaymentsWCPayNotSetup(onRefresh: {})
+        InPersonPaymentsPluginNotSetup(plugin: .wcPay, onRefresh: {})
     }
 }
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeAccountPendingView.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeAccountPendingView.swift
@@ -6,7 +6,7 @@ struct InPersonPaymentsStripeAccountPending: View {
     var body: some View {
         InPersonPaymentsOnboardingError(
             title: Localization.title,
-            message: Localization.message,
+            message: message,
             image: InPersonPaymentsOnboardingError.ImageInfo(
                 image: .paymentErrorImage,
                 height: 180.0
@@ -27,26 +27,26 @@ struct InPersonPaymentsStripeAccountPending: View {
 
 private enum Localization {
     static let title = NSLocalizedString(
-        "Your WooCommerce Payments account has pending requirements",
-        comment: "Title for the error screen when the Stripe account is restricted because there are pending requirements"
+        "Your payments account has pending requirements",
+        comment: "Title for the error screen when the merchant's In-Person Payments account is restricted because there are pending requirements"
     )
 
     static let messageDeadline = NSLocalizedString(
-        "There are pending requirements in your account. Please complete those requirements by %1$@ to keep accepting in-Person Payments.",
-        comment: "Error message when WooCommerce Payments is not supported because there are pending requirements in the Stripe account."
+        "There are pending requirements for your account. Please complete those requirements by %1$@ to keep accepting In-Person Payments.",
+        comment: "Error message when In-Person Payments is not supported because there are pending requirements in the merchant's payment account."
             +
             "%1$d will contain the localized deadline (e.g. August 11, 2021)"
     )
 
     static let messageUnknownDeadline = NSLocalizedString(
-        "There are pending requirements in your account. Please complete those requirements to keep accepting in-Person Payments.",
-        comment: "Error message when WooCommerce Payments is not supported"
+        "There are pending requirements for your account. Please complete those requirements to keep accepting In-Person Payments.",
+        comment: "Error message when In-Person Payments is not supported"
             +
-            "There are pending requirements in the Stripe account (without a known deadline)"
+            "There are pending requirements in the merchant's payment account (without a known deadline)"
     )
 
      static let message = NSLocalizedString(
-         "There are pending requirements in your account. Please complete those requirements by",
+         "There are pending requirements for your account. Please complete those requirements by",
          comment: "Error message when the Stripe account is restricted because there are pending requirements"
      )
  }
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeAcountReviewView.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeAcountReviewView.swift
@@ -18,12 +18,12 @@ struct InPersonPaymentsStripeAcountReview: View {
 private enum Localization {
     static let title = NSLocalizedString(
         "In-Person Payments is currently unavailable",
-        comment: "Title for the error screen when the Stripe account is restricted because it's under reviw"
+        comment: "Title for the error screen when the merchant's payment account is restricted because it's under reviw"
     )
 
     static let message = NSLocalizedString(
         "You'll be able to accept In-Person Payments as soon as we finish reviewing your account.",
-        comment: "Error message when WooCommerce Payments is not supported because the Stripe account is under review"
+        comment: "Error message when the merchant's payment account is under review"
     )
 }
 
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeRejectedView.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsStripeRejectedView.swift
@@ -18,12 +18,12 @@ struct InPersonPaymentsStripeRejected: View {
 private enum Localization {
     static let title = NSLocalizedString(
         "In-Person Payments isn't available for this store",
-        comment: "Title for the error screen when the Stripe account rejected."
+        comment: "Title for the error screen when the merchant's payment account has been rejected."
     )
 
     static let message = NSLocalizedString(
         "We are sorry but we can't support In-Person Payments for this store.",
-        comment: "Error message when WooCommerce Payments is not supported because the Stripe account has been rejected"
+        comment: "Error message when the merchant's payment account has been rejected"
     )
 }
 
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -1535,7 +1535,7 @@
 		E1BAAEA026BBECEF00F2C037 /* ButtonStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1BAAE9F26BBECEF00F2C037 /* ButtonStyles.swift */; };
 		E1BE703A265E6F47006CA4D9 /* CardPresentModalScanningFailed.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1BE7039265E6F47006CA4D9 /* CardPresentModalScanningFailed.swift */; };
 		E1C47209267A1ECC00D06DA1 /* CrashLoggingStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C47208267A1ECC00D06DA1 /* CrashLoggingStack.swift */; };
-		E1C5E78226C2A971008D4C47 /* InPersonPaymentsWCPayNotSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C5E78126C2A971008D4C47 /* InPersonPaymentsWCPayNotSetup.swift */; };
+		E1C5E78226C2A971008D4C47 /* InPersonPaymentsPluginNotSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C5E78126C2A971008D4C47 /* InPersonPaymentsPluginNotSetup.swift */; };
 		E1D4E84426776A6B00256B83 /* HeadlineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1D4E84326776A6A00256B83 /* HeadlineTableViewCell.swift */; };
 		E1D4E84526776AD900256B83 /* HeadlineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D4E84226776A6A00256B83 /* HeadlineTableViewCell.xib */; };
 		E1E125AA26EB42530068A9B0 /* CardPresentModalUpdateProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E125A926EB42530068A9B0 /* CardPresentModalUpdateProgress.swift */; };
@@ -3154,7 +3154,7 @@
 		E1BAAE9F26BBECEF00F2C037 /* ButtonStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonStyles.swift; sourceTree = "<group>"; };
 		E1BE7039265E6F47006CA4D9 /* CardPresentModalScanningFailed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentModalScanningFailed.swift; sourceTree = "<group>"; };
 		E1C47208267A1ECC00D06DA1 /* CrashLoggingStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashLoggingStack.swift; sourceTree = "<group>"; };
-		E1C5E78126C2A971008D4C47 /* InPersonPaymentsWCPayNotSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InPersonPaymentsWCPayNotSetup.swift; sourceTree = "<group>"; };
+		E1C5E78126C2A971008D4C47 /* InPersonPaymentsPluginNotSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InPersonPaymentsPluginNotSetup.swift; sourceTree = "<group>"; };
 		E1D4E84226776A6A00256B83 /* HeadlineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HeadlineTableViewCell.xib; sourceTree = "<group>"; };
 		E1D4E84326776A6A00256B83 /* HeadlineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineTableViewCell.swift; sourceTree = "<group>"; };
 		E1E125A926EB42530068A9B0 /* CardPresentModalUpdateProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentModalUpdateProgress.swift; sourceTree = "<group>"; };
@@ -7333,7 +7333,7 @@
 				D85A3C4F26C153A500C0E026 /* InPersonPaymentsPluginNotActivatedView.swift */,
 				D8B4D5F126C2CF5B00F34E94 /* InPersonPaymentsStripeAccountOverdueView.swift */,
 				D8B4D5EF26C2C7EC00F34E94 /* InPersonPaymentsStripeAccountPendingView.swift */,
-				E1C5E78126C2A971008D4C47 /* InPersonPaymentsWCPayNotSetup.swift */,
+				E1C5E78126C2A971008D4C47 /* InPersonPaymentsPluginNotSetup.swift */,
 				D8B4D5ED26C2C26C00F34E94 /* InPersonPaymentsStripeAcountReviewView.swift */,
 				D8B4D5F326C30E7C00F34E94 /* InPersonPaymentsStripeRejectedView.swift */,
 				E15F163026C5117300D3059B /* InPersonPaymentsNoConnectionView.swift */,
@@ -8833,7 +8833,7 @@
 				260C31602524ECA900157BC2 /* IssueRefundViewController.swift in Sources */,
 				2667BFEB2535FF09008099D4 /* RefundShippingCalculationUseCase.swift in Sources */,
 				E1E125AA26EB42530068A9B0 /* CardPresentModalUpdateProgress.swift in Sources */,
-				E1C5E78226C2A971008D4C47 /* InPersonPaymentsWCPayNotSetup.swift in Sources */,
+				E1C5E78226C2A971008D4C47 /* InPersonPaymentsPluginNotSetup.swift in Sources */,
 				022F941E257F8E820011CD94 /* BoldableTextParser.swift in Sources */,
 				26FE09DD24D9F3F600B9BDF5 /* LoadingView.swift in Sources */,
 				457151AB243B6E8000EB2DFA /* ProductSlugViewController.swift in Sources */,
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/CardPresentPayments/CardPresentPaymentsOnboardingUseCaseTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/CardPresentPayments/CardPresentPaymentsOnboardingUseCaseTests.swift
@@ -382,58 +382,62 @@ class CardPresentPaymentsOnboardingUseCaseTests: XCTestCase {
 
     // MARK: - Payment Account checks
 
-    func test_onboarding_returns_generic_error_with_no_account_for_wcplay_plugin() {
+    func test_onboarding_returns_plugin_setup_not_completed_with_nil_account_for_wcplay_plugin() {
         // Given
         setupCountry(country: .us)
         setupWCPayPlugin(status: .active, version: WCPayPluginVersion.minimumSupportedVersion)
 
         // When
+        // i.e. getPaymentGatewayAccount returns nil account
         let useCase = CardPresentPaymentsOnboardingUseCase(storageManager: storageManager, stores: stores)
         let state = useCase.state
 
         // Then
-        XCTAssertEqual(state, .genericError)
+        XCTAssertEqual(state, .pluginSetupNotCompleted(plugin: .wcPay))
     }
 
-    func test_onboarding_returns_generic_error_with_no_account_for_stripe_plugin() {
+    func test_onboarding_returns_plugin_setup_not_completed_with_no_account_for_wcplay_plugin() {
         // Given
         setupCountry(country: .us)
-        setupStripePlugin(status: .active, version: StripePluginVersion.minimumSupportedVersion)
+        setupWCPayPlugin(status: .active, version: WCPayPluginVersion.minimumSupportedVersion)
+        setupPaymentGatewayAccount(accountType: WCPayAccount.self, status: .noAccount, hasPendingRequirements: false)
 
         // When
+        // i.e. getPaymentGatewayAccount returns status.noAccount
         let useCase = CardPresentPaymentsOnboardingUseCase(storageManager: storageManager, stores: stores)
         let state = useCase.state
 
         // Then
-        XCTAssertEqual(state, .genericError)
+        XCTAssertEqual(state, .pluginSetupNotCompleted(plugin: .wcPay))
     }
 
-    func test_onboarding_returns_generic_error_when_account_is_not_eligible_for_wcplay_plugin() {
+    func test_onboarding_returns_plugin_setup_not_completed_with_nil_account_for_stripe_plugin() {
         // Given
         setupCountry(country: .us)
-        setupWCPayPlugin(status: .active, version: WCPayPluginVersion.minimumSupportedVersion)
-        setupPaymentGatewayAccount(accountType: WCPayAccount.self, status: .complete, isCardPresentEligible: false)
+        setupStripePlugin(status: .active, version: StripePluginVersion.minimumSupportedVersion)
 
         // When
+        // i.e. getPaymentGatewayAccount returns nil account
         let useCase = CardPresentPaymentsOnboardingUseCase(storageManager: storageManager, stores: stores)
         let state = useCase.state
 
         // Then
-        XCTAssertEqual(state, .genericError)
+        XCTAssertEqual(state, .pluginSetupNotCompleted(plugin: .stripe))
     }
 
-    func test_onboarding_returns_not_completed_when_account_is_not_connected_for_wcplay_plugin() {
+    func test_onboarding_returns_plugin_setup_not_completed_with_no_account_for_stripe_plugin() {
         // Given
         setupCountry(country: .us)
-        setupWCPayPlugin(status: .active, version: WCPayPluginVersion.minimumSupportedVersion)
-        setupPaymentGatewayAccount(accountType: WCPayAccount.self, status: .noAccount)
+        setupStripePlugin(status: .active, version: StripePluginVersion.minimumSupportedVersion)
+        setupPaymentGatewayAccount(accountType: StripeAccount.self, status: .noAccount, hasPendingRequirements: false)
 
         // When
+        // i.e. getPaymentGatewayAccount returns status.noAccount
         let useCase = CardPresentPaymentsOnboardingUseCase(storageManager: storageManager, stores: stores)
         let state = useCase.state
 
         // Then
-        XCTAssertEqual(state, .pluginSetupNotCompleted)
+        XCTAssertEqual(state, .pluginSetupNotCompleted(plugin: .stripe))
     }
 
     func test_onboarding_returns_pending_requirements_when_account_is_restricted_with_pending_requirements_for_wcplay_plugin() {
diff --git a/Yosemite/Yosemite/Model/Enums/CardPresentPaymentsOnboardingState.swift b/Yosemite/Yosemite/Model/Enums/CardPresentPaymentsOnboardingState.swift
@@ -30,7 +30,7 @@ public enum CardPresentPaymentOnboardingState: Equatable {
 
     /// CPP plugin is installed and activated but requires to be setup first.
     ///
-    case pluginSetupNotCompleted
+    case pluginSetupNotCompleted(plugin: CardPresentPaymentsPlugins)
 
     /// This is a bit special case: The plugin is set to test mode but the connected Stripe account is a real (live) account.
     /// Connecting to a reader or accepting payments is not supported in this state.

Original file line number	Diff line number	Diff line change
`@@ -209,10 +209,11 @@ private extension CardPresentPaymentsOnboardingUseCase {`
`209`	`209`
`210`	`210`	`func accountChecks(plugin: CardPresentPaymentsPlugins) -> CardPresentPaymentOnboardingState {`
`211`	`211`	`guard let account = getPaymentGatewayAccount() else {`
`212`		`- return .genericError`
	`212`	`+ /// Active plugin but unable to fetch an account? Prompt the merchant to finish setting it up.`
	`213`	`+ return .pluginSetupNotCompleted(plugin: plugin)`
`213`	`214`	`}`
`214`	`215`	`guard isPaymentGatewaySetupCompleted(account: account) else {`
`215`		`- return .pluginSetupNotCompleted`
	`216`	`+ return .pluginSetupNotCompleted(plugin: plugin)`
`216`	`217`	`}`
`217`	`218`	`guard !isPluginInTestModeWithLiveStripeAccount(account: account) else {`
`218`	`219`	`return .pluginInTestModeWithLiveStripeAccount(plugin: plugin)`
Original file line number	Diff line number	Diff line change
`@@ -28,17 +28,17 @@ struct InPersonPaymentsCountryNotSupported: View {`
`28`	`28`	`private enum Localization {`
`29`	`29`	`static let title = NSLocalizedString(`
`30`	`30`	`"We don’t support In-Person Payments in %1$@",`
`31`		`- comment: "Title for the error screen when WooCommerce Payments is not supported in a specific country"`
	`31`	`+ comment: "Title for the error screen when In-Person Payments is not supported in a specific country"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`static let titleUnknownCountry = NSLocalizedString(`
`35`	`35`	`"We don’t support In-Person Payments in your country",`
`36`		`- comment: "Title for the error screen when WooCommerce Payments is not supported because we don't know the name of the country"`
	`36`	`+ comment: "Title for the error screen when In-Person Payments is not supported because we don't know the name of the country"`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`static let message = NSLocalizedString(`
`40`	`40`	`"You can still accept in-person cash payments by enabling the “Cash on Delivery” payment method on your store.",`
`41`		`- comment: "Error message when WooCommerce Payments is not supported in a specific country"`
	`41`	`+ comment: "Error message when In-Person Payments is not supported in a specific country"`
`42`	`42`	`)`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ struct InPersonPaymentsStripeAccountPending: View {`
`6`	`6`	`var body: some View {`
`7`	`7`	`InPersonPaymentsOnboardingError(`
`8`	`8`	`title: Localization.title,`
`9`		`- message: Localization.message,`
	`9`	`+ message: message,`
`10`	`10`	`image: InPersonPaymentsOnboardingError.ImageInfo(`
`11`	`11`	`image: .paymentErrorImage,`
`12`	`12`	`height: 180.0`
`@@ -27,26 +27,26 @@ struct InPersonPaymentsStripeAccountPending: View {`
`27`	`27`
`28`	`28`	`private enum Localization {`
`29`	`29`	`static let title = NSLocalizedString(`
`30`		`- "Your WooCommerce Payments account has pending requirements",`
`31`		`- comment: "Title for the error screen when the Stripe account is restricted because there are pending requirements"`
	`30`	`+ "Your payments account has pending requirements",`
	`31`	`+ comment: "Title for the error screen when the merchant's In-Person Payments account is restricted because there are pending requirements"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`static let messageDeadline = NSLocalizedString(`
`35`		`- "There are pending requirements in your account. Please complete those requirements by %1$@ to keep accepting in-Person Payments.",`
`36`		`- comment: "Error message when WooCommerce Payments is not supported because there are pending requirements in the Stripe account."`
	`35`	`+ "There are pending requirements for your account. Please complete those requirements by %1$@ to keep accepting In-Person Payments.",`
	`36`	`+ comment: "Error message when In-Person Payments is not supported because there are pending requirements in the merchant's payment account."`
`37`	`37`	`+`
`38`	`38`	`"%1$d will contain the localized deadline (e.g. August 11, 2021)"`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`static let messageUnknownDeadline = NSLocalizedString(`
`42`		`- "There are pending requirements in your account. Please complete those requirements to keep accepting in-Person Payments.",`
`43`		`- comment: "Error message when WooCommerce Payments is not supported"`
	`42`	`+ "There are pending requirements for your account. Please complete those requirements to keep accepting In-Person Payments.",`
	`43`	`+ comment: "Error message when In-Person Payments is not supported"`
`44`	`44`	`+`
`45`		`- "There are pending requirements in the Stripe account (without a known deadline)"`
	`45`	`+ "There are pending requirements in the merchant's payment account (without a known deadline)"`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`static let message = NSLocalizedString(`
`49`		`- "There are pending requirements in your account. Please complete those requirements by",`
	`49`	`+ "There are pending requirements for your account. Please complete those requirements by",`
`50`	`50`	`comment: "Error message when the Stripe account is restricted because there are pending requirements"`
`51`	`51`	`)`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ struct InPersonPaymentsStripeAcountReview: View {`
`18`	`18`	`private enum Localization {`
`19`	`19`	`static let title = NSLocalizedString(`
`20`	`20`	`"In-Person Payments is currently unavailable",`
`21`		`- comment: "Title for the error screen when the Stripe account is restricted because it's under reviw"`
	`21`	`+ comment: "Title for the error screen when the merchant's payment account is restricted because it's under reviw"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`static let message = NSLocalizedString(`
`25`	`25`	`"You'll be able to accept In-Person Payments as soon as we finish reviewing your account.",`
`26`		`- comment: "Error message when WooCommerce Payments is not supported because the Stripe account is under review"`
	`26`	`+ comment: "Error message when the merchant's payment account is under review"`
`27`	`27`	`)`
`28`	`28`	`}`
`29`	`29`