Merge pull request #7504 from woocommerce/issue/7502-skip-button-on-pending-requirements-onboarding-step

[Mobile Payments] Skip button on pending requirements onboarding step

Author: joshheald

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 - [**] In-Person Payments and Simple Payments have been moved to a new Payments section [https://github.com/woocommerce/woocommerce-ios/pull/7473]
 - [*] Login: on the WP.com password screen, the magic link login option is moved from below "Reset your password" to below the primary Continue button for higher visibility. [https://github.com/woocommerce/woocommerce-ios/pull/7469]
 - [*] Login: some minor enhancements are made to the error screen after entering an invalid WP.com email - a new "What is WordPress.com?" link, hiding the "Log in with store address" button when it's from the store address login flow, and some copy changes. [https://github.com/woocommerce/woocommerce-ios/pull/7485]
+- [**] In-Person Payments: Accounts with pending requirements are no longer blocked from taking payments - we have added a skip button to the relevant screen. [https://github.com/woocommerce/woocommerce-ios/pull/7504]
 
 9.9
 -----

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

@@ -36,6 +36,7 @@ final class CardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingU
     private let cardPresentPluginsDataProvider: CardPresentPluginsDataProvider
     private var preferredPluginLocal: CardPresentPaymentsPlugin?
     private var wasCodStepSkipped: Bool = false
+    private var pendingRequirementsStepSkipped: Bool = false
 
     @Published var state: CardPresentPaymentOnboardingState = .loading
 
@@ -64,6 +65,11 @@ final class CardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingU
         refreshOnboardingState()
     }
 
+    func skipPendingRequirements() {
+        pendingRequirementsStepSkipped = true
+        refresh()
+    }
+
     func forceRefresh() {
         state = .loading
         refreshOnboardingState()
@@ -298,7 +304,7 @@ private extension CardPresentPaymentsOnboardingUseCase {
         guard !isStripeAccountOverdueRequirements(account: account) else {
             return .stripeAccountOverdueRequirement(plugin: plugin)
         }
-        guard !isStripeAccountPendingRequirements(account: account) else {
+        guard !shouldShowPendingRequirements(account: account) else {
             return .stripeAccountPendingRequirement(plugin: plugin, deadline: account.currentDeadline)
         }
         guard !isStripeAccountRejected(account: account) else {
@@ -317,6 +323,8 @@ private extension CardPresentPaymentsOnboardingUseCase {
         let setAccount = CardPresentPaymentAction.use(paymentGatewayAccount: account)
         stores.dispatch(setAccount)
 
+        // Also reset the skipped pending requirements step, so that it can be shown again in the next flow
+        pendingRequirementsStepSkipped = false
         return .completed(plugin: CardPresentPaymentsPluginState(plugin: plugin))
     }
 
@@ -403,6 +411,10 @@ private extension CardPresentPaymentsOnboardingUseCase {
             || account.wcpayStatus == .restrictedSoon
     }
 
+    func shouldShowPendingRequirements(account: PaymentGatewayAccount) -> Bool {
+        isStripeAccountPendingRequirements(account: account) && !pendingRequirementsStepSkipped
+    }
+
     func isStripeAccountOverdueRequirements(account: PaymentGatewayAccount) -> Bool {
         account.wcpayStatus == .restricted && account.hasOverdueRequirements
     }

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

@@ -71,7 +71,7 @@ struct InPersonPaymentsView: View {
             case .stripeAccountOverdueRequirement:
                 InPersonPaymentsStripeAccountOverdue()
             case .stripeAccountPendingRequirement(_, let deadline):
-                InPersonPaymentsStripeAccountPending(deadline: deadline)
+                InPersonPaymentsStripeAccountPending(deadline: deadline, onSkip: viewModel.skipPendingRequirements)
             case .stripeAccountUnderReview:
                 InPersonPaymentsStripeAccountReview()
             case .stripeAccountRejected:

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

@@ -58,6 +58,12 @@ final class InPersonPaymentsViewModel: ObservableObject {
         useCase.refresh()
     }
 
+    /// Skips the Pending Requirements step when the user taps `Skip`
+    ///
+    func skipPendingRequirements() {
+        useCase.skipPendingRequirements()
+    }
+
     /// Selects the plugin to use as a payment gateway when there are multiple available
     ///
     func selectPlugin(_ plugin: CardPresentPaymentsPlugin) {

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

@@ -2,19 +2,24 @@ import SwiftUI
 
 struct InPersonPaymentsStripeAccountPending: View {
     let deadline: Date?
+    let onSkip: () -> ()
 
     var body: some View {
         InPersonPaymentsOnboardingError(
             title: Localization.title,
             message: message,
             image: InPersonPaymentsOnboardingErrorMainContentView.ImageInfo(
                 image: .paymentErrorImage,
-                height: 180.0
+                height: Constants.imageHeight
             ),
             supportLink: true,
-            learnMore: true
+            learnMore: true,
+            button: InPersonPaymentsOnboardingError.ButtonInfo(
+                text: Localization.skipButton,
+                action: onSkip
+            )
         )
-      }
+    }
 
     private var message: String {
         guard let deadline = deadline else {
@@ -28,31 +33,32 @@ struct InPersonPaymentsStripeAccountPending: View {
 private enum Localization {
     static let title = NSLocalizedString(
         "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"
+        comment: "Title for the error screen when the merchant's In-Person Payments account has pending " +
+        "requirements which will result in their account being restricted if not resolved by a deadline"
     )
 
     static let messageDeadline = NSLocalizedString(
         "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)"
+        comment: "Error message when because there are pending requirements in the merchant's " +
+        "In-Person Payments account. %1$d will contain the localized deadline (e.g. August 11, 2021)"
     )
 
     static let messageUnknownDeadline = NSLocalizedString(
         "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 merchant's payment account (without a known deadline)"
+        comment: "Error message when there are pending requirements in the merchant's payment account (without a known deadline)"
     )
 
-     static let message = NSLocalizedString(
-         "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"
-     )
- }
+    static let skipButton = NSLocalizedString(
+        "Skip",
+        comment: "Title for the button to skip the onboarding step informing the merchant of pending account requirements")
+}
 
 struct InPersonPaymentsStripeAccountPending_Previews: PreviewProvider {
     static var previews: some View {
-        InPersonPaymentsStripeAccountPending(deadline: Date())
+        InPersonPaymentsStripeAccountPending(deadline: Date(), onSkip: {})
     }
 }
+
+private enum Constants {
+    static let imageHeight: CGFloat = 180.0
+}