From ecb46a9ec7937d431cc921debfa05f05d37ef9eb Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 22 Jul 2025 18:24:17 +0400
Subject: [PATCH] Skip "Payment Methods" step for branded-only + BCDC and
 casual sellers.

---
 .../Screens/Onboarding/Steps/index.js           | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Steps/index.js b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Steps/index.js
index 5d0790cf6..aafadedc3 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Steps/index.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Steps/index.js
@@ -64,10 +64,19 @@ export const getSteps = ( flags ) => {
 		// Casual selling: Unlock the "Personal Account" choice.
 		( step ) => flags.canUseCasualSelling || step.id !== 'business',
 		// Skip payment methods screen.
-		( step ) =>
-			step.id !== 'methods' ||
-			( ! flags.shouldSkipPaymentMethods &&
-				! ( ownBrandOnly && isCasualSeller ) ),
+		( step ) => {
+			if ( step.id !== 'methods' ) {
+				return true;
+			}
+
+			const isBrandedBCDC = ownBrandOnly && ! flags.canUseCardPayments;
+			const shouldSkip =
+				flags.shouldSkipPaymentMethods ||
+				isCasualSeller ||
+				isBrandedBCDC;
+
+			return ! shouldSkip;
+		},
 	] );
 
 	const totalStepsCount = steps.length;