Fix onboarding looking only at accounts for the gateway we are checking

Author: koke

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

@@ -218,7 +218,7 @@ private extension CardPresentPaymentsOnboardingUseCase {
     }
 
     func accountChecks(plugin: CardPresentPaymentsPlugin) -> CardPresentPaymentOnboardingState {
-        guard let account = getPaymentGatewayAccount() else {
+        guard let account = getPaymentGatewayAccount(plugin: plugin) else {
             /// Active plugin but unable to fetch an account? Prompt the merchant to finish setting it up.
             return .pluginSetupNotCompleted(plugin: plugin)
         }
@@ -272,13 +272,13 @@ private extension CardPresentPaymentsOnboardingUseCase {
 
     // Note: This counts on synchronizeStoreCountryAndPlugins having been called to get
     // the appropriate account for the site, be that Stripe or WCPay
-    func getPaymentGatewayAccount() -> PaymentGatewayAccount? {
+    func getPaymentGatewayAccount(plugin: CardPresentPaymentsPlugin) -> PaymentGatewayAccount? {
         guard let siteID = siteID else {
             return nil
         }
         return storageManager.viewStorage
             .loadPaymentGatewayAccounts(siteID: siteID)
-            .first(where: \.isCardPresentEligible)?
+            .first(where: { $0.isCardPresentEligible && $0.gatewayID == plugin.gatewayID })?
             .toReadOnly()
     }
 

WooCommerce/WooCommerceTests/ViewRelated/CardPresentPayments/CardPresentPaymentsOnboardingUseCaseTests.swift

@@ -235,7 +235,7 @@ class CardPresentPaymentsOnboardingUseCaseTests: XCTestCase {
         // Given
         setupCountry(country: .us)
         setupWCPayPlugin(status: .active, version: WCPayPluginVersion.minimumSupportedVersion)
-        setupPaymentGatewayAccount(accountType: StripeAccount.self, status: .complete, isLive: true, isInTestMode: true)
+        setupPaymentGatewayAccount(accountType: WCPayAccount.self, status: .complete, isLive: true, isInTestMode: true)
 
         // When
         let useCase = CardPresentPaymentsOnboardingUseCase(storageManager: storageManager, stores: stores)
@@ -334,7 +334,7 @@ class CardPresentPaymentsOnboardingUseCaseTests: XCTestCase {
         setupCountry(country: .us)
         setupWCPayPlugin(status: .inactive, version: WCPayPluginVersion.minimumSupportedVersion)
         setupStripePlugin(status: .active, version: StripePluginVersion.minimumSupportedVersion)
-        setupPaymentGatewayAccount(accountType: WCPayAccount.self, status: .complete)
+        setupPaymentGatewayAccount(accountType: StripeAccount.self, status: .complete)
 
         // When
         let useCase = CardPresentPaymentsOnboardingUseCase(storageManager: storageManager, stores: stores)