From 2193d1569ff6e446a83d3111ae7bea968b913880 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Wed, 7 Feb 2024 21:48:09 +0530
Subject: [PATCH] fix: improve logic to detect v2 donation form edit page

---
 .../Controllers/NewStripeAccountOnBoardingController.php  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/PaymentGateways/Stripe/Controllers/NewStripeAccountOnBoardingController.php b/src/PaymentGateways/Stripe/Controllers/NewStripeAccountOnBoardingController.php
index 5a676a9f0b..8326f2a241 100644
--- a/src/PaymentGateways/Stripe/Controllers/NewStripeAccountOnBoardingController.php
+++ b/src/PaymentGateways/Stripe/Controllers/NewStripeAccountOnBoardingController.php
@@ -42,8 +42,12 @@ public function __invoke()
             return;
         }
 
-        $isDonationFormPage = isset($_GET['give_tab']) && $_GET['give_tab'] !== 'stripe_form_account_options';
-        $isSettingPage = isset($_GET['tab'], $_GET['tab'])
+        $isDonationFormPage = isset($_GET['give_tab'], $_GET['post_type'])
+                              && $_GET['post_type'] === 'give_forms'
+                              && $_GET['give_tab'] !== 'stripe_form_account_options';
+        $isSettingPage = isset($_GET['post_type'], $_GET['page'], $_GET['tab'], $_GET['section'])
+                         && $_GET['post_type'] === 'give_forms'
+                         && $_GET['page'] === 'give-settings'
                          && Give_Admin_Settings::is_setting_page('gateways', 'stripe-settings');
 
         // Exit if admin is not redirect to the GiveWP settings page or donation form page.