From cd00b927f90ef8a63efcff40423b9d3478d29c45 Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Thu, 9 Nov 2023 17:13:47 +0530
Subject: [PATCH 1/9] refactor: remove conditions

---
 src/Donations/Components/DonationsForm.tsx    | 14 ++++-----
 .../PaymentMethods/PaymentMethodTabs.tsx      |  4 +--
 .../PaymentRequestCustomButton.tsx            | 30 +++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/Donations/Components/DonationsForm.tsx b/src/Donations/Components/DonationsForm.tsx
index 6652bff0..0e3e7371 100644
--- a/src/Donations/Components/DonationsForm.tsx
+++ b/src/Donations/Components/DonationsForm.tsx
@@ -108,7 +108,7 @@ function DonationsForm(): ReactElement {
   //Only used for native pay. Is this still applicable, or should this be removed?
   const onPaymentFunction = async (
     paymentMethod: PaymentMethod,
-    paymentRequest: PaymentRequest,
+    paymentRequest: PaymentRequest
   ) => {
     // eslint-disable-next-line no-underscore-dangle
     setPaymentType(paymentRequest._activeBackingLibraryName); //TODOO - is _activeBackingLibraryName a private variable?
@@ -223,7 +223,7 @@ function DonationsForm(): ReactElement {
           amount: getFormatedCurrency(
             i18n.language,
             currency,
-            paymentSetup.unitCost * quantity,
+            paymentSetup.unitCost * quantity
           ),
         });
         break;
@@ -233,7 +233,7 @@ function DonationsForm(): ReactElement {
           amount: getFormatedCurrency(
             i18n.language,
             currency,
-            paymentSetup.unitCost * quantity,
+            paymentSetup.unitCost * quantity
           ),
         });
         break;
@@ -389,13 +389,13 @@ function DonationsForm(): ReactElement {
                   paymentSetup?.gateways?.stripe?.account &&
                   currency ? (
                     <NativePay
-                      isApplePayEnabled={false}
-                      isGooglePayEnabled={false}
+                      // isApplePayEnabled={true}
+                      // isGooglePayEnabled={true}
                       country={country}
                       currency={currency}
                       amount={formatAmountForStripe(
                         paymentSetup?.unitCost * quantity,
-                        currency.toLowerCase(),
+                        currency.toLowerCase()
                       )}
                       onPaymentFunction={onPaymentFunction}
                       paymentSetup={paymentSetup}
@@ -405,7 +405,7 @@ function DonationsForm(): ReactElement {
                             query: { ...router.query, step: CONTACT },
                           },
                           undefined,
-                          { shallow: true },
+                          { shallow: true }
                         );
                         setRetainQuantityValue(true);
                       }}
diff --git a/src/Donations/PaymentMethods/PaymentMethodTabs.tsx b/src/Donations/PaymentMethods/PaymentMethodTabs.tsx
index 636fb456..49de44cf 100644
--- a/src/Donations/PaymentMethods/PaymentMethodTabs.tsx
+++ b/src/Donations/PaymentMethods/PaymentMethodTabs.tsx
@@ -218,8 +218,8 @@ export default function PaymentMethodTabs({
         {/*9 May 2023 - Apple Pay / Google Pay is disabled currently as it is not working correctly*/}
         {showNativePay && (
           <NativePay
-            isApplePayEnabled={false}
-            isGooglePayEnabled={false}
+            // isApplePayEnabled={true}
+            // isGooglePayEnabled={true}
             country={country}
             currency={currency}
             amount={formatAmountForStripe(
diff --git a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
index dbb6cc35..da1eafd2 100644
--- a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
+++ b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
@@ -29,8 +29,8 @@ interface PaymentButtonProps {
   paymentLabel: string;
   frequency: string | null;
   paymentSetup: PaymentOptions;
-  isApplePayEnabled: boolean;
-  isGooglePayEnabled: boolean;
+  // isApplePayEnabled: boolean;
+  // isGooglePayEnabled: boolean;
 }
 
 export const PaymentRequestCustomButton = ({
@@ -43,9 +43,9 @@ export const PaymentRequestCustomButton = ({
   paymentLabel,
   frequency,
   paymentSetup,
-  isApplePayEnabled,
-  isGooglePayEnabled,
-}: PaymentButtonProps): ReactElement | null => {
+}: // isApplePayEnabled,
+// isGooglePayEnabled,
+PaymentButtonProps): ReactElement | null => {
   const { t, ready } = useTranslation(["common"]);
   const { paymentRequest, setPaymentRequest } = useContext(QueryParamContext);
 
@@ -74,6 +74,7 @@ export const PaymentRequestCustomButton = ({
         if (result) {
           setPaymentRequest(pr);
         }
+        console.log(result);
       });
     }
   }, [stripe, paymentRequest, country, currency, amount]);
@@ -130,6 +131,7 @@ export const PaymentRequestCustomButton = ({
       }
     };
   }, [paymentRequest, onPaymentFunction]);
+  console.log(paymentRequest);
 
   return ready ? (
     <div
@@ -146,8 +148,7 @@ export const PaymentRequestCustomButton = ({
       (frequency !== "once"
         ? paymentSetup?.recurrency?.methods?.includes("card")
         : true) ? (
-        paymentRequest._canMakePaymentAvailability.APPLE_PAY &&
-        isApplePayEnabled ? ( //TODOO - is _canMakePaymentAvailability a private variable?
+        paymentRequest._canMakePaymentAvailability.APPLE_PAY ? ( //TODOO - is _canMakePaymentAvailability a private variable?
           <div className="w-100">
             <button
               onClick={() => paymentRequest.show()}
@@ -170,8 +171,7 @@ export const PaymentRequestCustomButton = ({
               <div className="separator-text mb-10">{t("or")}</div>
             )}
           </div>
-        ) : paymentRequest._canMakePaymentAvailability.GOOGLE_PAY &&
-          isGooglePayEnabled ? ( //TODOO - is _canMakePaymentAvailability a private variable?
+        ) : paymentRequest._canMakePaymentAvailability.GOOGLE_PAY ? ( //TODOO - is _canMakePaymentAvailability a private variable?
           <div className="w-100">
             <button
               onClick={() => {
@@ -215,8 +215,8 @@ export const PaymentRequestCustomButton = ({
 /* 9 May 2023 - Apple Pay / Google Pay is disabled currently as it is not working correctly*/
 
 interface NativePayProps {
-  isApplePayEnabled: boolean;
-  isGooglePayEnabled: boolean;
+  // isApplePayEnabled: boolean;
+  // isGooglePayEnabled: boolean;
   country: string;
   currency: string;
   amount: number;
@@ -231,8 +231,8 @@ interface NativePayProps {
   frequency: string | null;
 }
 export const NativePay = ({
-  isApplePayEnabled = false,
-  isGooglePayEnabled = false,
+  // isApplePayEnabled = true,
+  // isGooglePayEnabled = true,
   country,
   currency,
   amount,
@@ -279,8 +279,8 @@ export const NativePay = ({
         paymentLabel={paymentLabel}
         frequency={frequency}
         paymentSetup={paymentSetup}
-        isApplePayEnabled={isApplePayEnabled}
-        isGooglePayEnabled={isGooglePayEnabled}
+        // isApplePayEnabled={true}
+        // isGooglePayEnabled={true}
       />
     </Elements>
   );

From 19669654e914db82cd3305bce60e19d354092854 Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Wed, 22 Nov 2023 20:13:19 +0530
Subject: [PATCH 2/9] console paymenrequest

---
 src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
index da1eafd2..8a759d84 100644
--- a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
+++ b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
@@ -69,12 +69,12 @@ PaymentButtonProps): ReactElement | null => {
         requestPayerName: true,
         requestPayerEmail: true,
       });
+      console.log(pr);
       // Check the availability of the Payment Request API.
       pr.canMakePayment().then((result) => {
         if (result) {
           setPaymentRequest(pr);
         }
-        console.log(result);
       });
     }
   }, [stripe, paymentRequest, country, currency, amount]);
@@ -88,6 +88,7 @@ PaymentButtonProps): ReactElement | null => {
   }, [country, currency, amount]);
 
   useEffect(() => {
+    console.log(paymentRequest);
     let subscribed = true;
     if (paymentRequest) {
       paymentRequest

From de0c5994b7b24a957ca3ad453f28a9deef932309 Mon Sep 17 00:00:00 2001
From: Norbert Schuler <norbert.schuler@epublica.de>
Date: Thu, 7 Dec 2023 16:18:00 +0100
Subject: [PATCH 3/9] deleted commented code

---
 src/Donations/Components/DonationsForm.tsx           |  2 --
 src/Donations/PaymentMethods/PaymentMethodTabs.tsx   |  2 --
 .../PaymentMethods/PaymentRequestCustomButton.tsx    | 12 +-----------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/Donations/Components/DonationsForm.tsx b/src/Donations/Components/DonationsForm.tsx
index 0e3e7371..c230d144 100644
--- a/src/Donations/Components/DonationsForm.tsx
+++ b/src/Donations/Components/DonationsForm.tsx
@@ -389,8 +389,6 @@ function DonationsForm(): ReactElement {
                   paymentSetup?.gateways?.stripe?.account &&
                   currency ? (
                     <NativePay
-                      // isApplePayEnabled={true}
-                      // isGooglePayEnabled={true}
                       country={country}
                       currency={currency}
                       amount={formatAmountForStripe(
diff --git a/src/Donations/PaymentMethods/PaymentMethodTabs.tsx b/src/Donations/PaymentMethods/PaymentMethodTabs.tsx
index 49de44cf..9e735a13 100644
--- a/src/Donations/PaymentMethods/PaymentMethodTabs.tsx
+++ b/src/Donations/PaymentMethods/PaymentMethodTabs.tsx
@@ -218,8 +218,6 @@ export default function PaymentMethodTabs({
         {/*9 May 2023 - Apple Pay / Google Pay is disabled currently as it is not working correctly*/}
         {showNativePay && (
           <NativePay
-            // isApplePayEnabled={true}
-            // isGooglePayEnabled={true}
             country={country}
             currency={currency}
             amount={formatAmountForStripe(
diff --git a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
index 8a759d84..c97358b8 100644
--- a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
+++ b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
@@ -29,8 +29,6 @@ interface PaymentButtonProps {
   paymentLabel: string;
   frequency: string | null;
   paymentSetup: PaymentOptions;
-  // isApplePayEnabled: boolean;
-  // isGooglePayEnabled: boolean;
 }
 
 export const PaymentRequestCustomButton = ({
@@ -43,9 +41,7 @@ export const PaymentRequestCustomButton = ({
   paymentLabel,
   frequency,
   paymentSetup,
-}: // isApplePayEnabled,
-// isGooglePayEnabled,
-PaymentButtonProps): ReactElement | null => {
+}: PaymentButtonProps): ReactElement | null => {
   const { t, ready } = useTranslation(["common"]);
   const { paymentRequest, setPaymentRequest } = useContext(QueryParamContext);
 
@@ -216,8 +212,6 @@ PaymentButtonProps): ReactElement | null => {
 /* 9 May 2023 - Apple Pay / Google Pay is disabled currently as it is not working correctly*/
 
 interface NativePayProps {
-  // isApplePayEnabled: boolean;
-  // isGooglePayEnabled: boolean;
   country: string;
   currency: string;
   amount: number;
@@ -232,8 +226,6 @@ interface NativePayProps {
   frequency: string | null;
 }
 export const NativePay = ({
-  // isApplePayEnabled = true,
-  // isGooglePayEnabled = true,
   country,
   currency,
   amount,
@@ -280,8 +272,6 @@ export const NativePay = ({
         paymentLabel={paymentLabel}
         frequency={frequency}
         paymentSetup={paymentSetup}
-        // isApplePayEnabled={true}
-        // isGooglePayEnabled={true}
       />
     </Elements>
   );

From 0741a44dacfd7b8c5d37f653a902202cd2af5dfd Mon Sep 17 00:00:00 2001
From: mohitb35 <44917347+mohitb35@users.noreply.github.com>
Date: Wed, 3 Jan 2024 15:09:35 -0500
Subject: [PATCH 4/9] fix: prevents repeated Google/ApplePay charges

---
 .../PaymentRequestCustomButton.tsx            | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
index c97358b8..d09ee423 100644
--- a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
+++ b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
@@ -22,7 +22,7 @@ interface PaymentButtonProps {
   amount: number;
   onPaymentFunction: (
     paymentMethod: PaymentMethod,
-    paymentRequest: PaymentRequest
+    paymentRequest: PaymentRequest,
   ) => Promise<void>;
   continueNext: () => void;
   isPaymentPage: boolean;
@@ -65,7 +65,7 @@ export const PaymentRequestCustomButton = ({
         requestPayerName: true,
         requestPayerEmail: true,
       });
-      console.log(pr);
+      console.log("Stripe PR: ", pr);
       // Check the availability of the Payment Request API.
       pr.canMakePayment().then((result) => {
         if (result) {
@@ -84,7 +84,7 @@ export const PaymentRequestCustomButton = ({
   }, [country, currency, amount]);
 
   useEffect(() => {
-    console.log(paymentRequest);
+    console.log("Context PR: ", paymentRequest);
     let subscribed = true;
     if (paymentRequest) {
       paymentRequest
@@ -106,29 +106,24 @@ export const PaymentRequestCustomButton = ({
   useEffect(() => {
     if (paymentRequest && !paymentLoading) {
       setPaymentLoading(true);
+      paymentRequest.off("paymentmethod");
       paymentRequest.on(
         "paymentmethod",
         ({ complete, paymentMethod }: PaymentRequestPaymentMethodEvent) => {
           onPaymentFunction(paymentMethod, paymentRequest);
           complete("success");
           setPaymentLoading(false);
-        }
+        },
       );
     }
     return () => {
       if (paymentRequest && !paymentLoading) {
-        paymentRequest.off(
-          "paymentmethod",
-          ({ complete, paymentMethod }: PaymentRequestPaymentMethodEvent) => {
-            onPaymentFunction(paymentMethod, paymentRequest);
-            complete("success");
-            setPaymentLoading(false);
-          }
-        );
+        paymentRequest.off("paymentmethod", () => {
+          setPaymentLoading(false);
+        });
       }
     };
   }, [paymentRequest, onPaymentFunction]);
-  console.log(paymentRequest);
 
   return ready ? (
     <div
@@ -217,7 +212,7 @@ interface NativePayProps {
   amount: number;
   onPaymentFunction: (
     paymentMethod: PaymentMethod,
-    paymentRequest: PaymentRequest
+    paymentRequest: PaymentRequest,
   ) => Promise<void>;
   paymentSetup: PaymentOptions;
   continueNext: () => void;
@@ -239,7 +234,7 @@ export const NativePay = ({
   const { i18n } = useTranslation();
   const [stripePromise, setStripePromise] =
     useState<null | Promise<Stripe | null>>(() =>
-      getStripe(paymentSetup, i18n.language)
+      getStripe(paymentSetup, i18n.language),
     );
 
   useEffect(() => {

From 2d16d702165d5a2f795613e7f12a7887d311a115 Mon Sep 17 00:00:00 2001
From: mohitb35 <44917347+mohitb35@users.noreply.github.com>
Date: Wed, 3 Jan 2024 15:10:12 -0500
Subject: [PATCH 5/9] feat: adds env vars to enable Google/ApplePay

---
 .env.production                                           | 5 ++++-
 next.config.js                                            | 4 +++-
 .../PaymentMethods/PaymentRequestCustomButton.tsx         | 8 ++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.env.production b/.env.production
index 9c1b3341..f9b510c1 100644
--- a/.env.production
+++ b/.env.production
@@ -20,4 +20,7 @@ SENTRY_AUTH_TOKEN=
 SOURCE_VERSION=
 RECURRENCY=true
 
-TRACKING_KEY=
\ No newline at end of file
+TRACKING_KEY=
+
+ENABLE_APPLE_PAY=
+ENABLE_GOOGLE_PAY=
\ No newline at end of file
diff --git a/next.config.js b/next.config.js
index 29ea5bb9..5ea16b7e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -95,7 +95,7 @@ const nextConfig = {
           stripPrefix: ["webpack://_N_E/"],
           urlPrefix: `~${basePath}/_next`,
           release: COMMIT_SHA,
-        })
+        }),
       );
     }
     return config;
@@ -115,6 +115,8 @@ const nextConfig = {
     ESRI_CLIENT_SECRET: process.env.ESRI_CLIENT_SECRET,
     RECURRENCY: process.env.RECURRENCY,
     TRACKING_KEY: process.env.TRACKING_KEY,
+    ENABLE_GOOGLE_PAY: process.env.ENABLE_GOOGLE_PAY,
+    ENABLE_APPLE_PAY: process.env.ENABLE_APPLE_PAY,
   },
   trailingSlash: false,
   reactStrictMode: true,
diff --git a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
index d09ee423..c096d22e 100644
--- a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
+++ b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
@@ -42,6 +42,8 @@ export const PaymentRequestCustomButton = ({
   frequency,
   paymentSetup,
 }: PaymentButtonProps): ReactElement | null => {
+  const isApplePayEnabled = process.env.ENABLE_APPLE_PAY === "true" || false;
+  const isGooglePayEnabled = process.env.ENABLE_GOOGLE_PAY === "true" || true;
   const { t, ready } = useTranslation(["common"]);
   const { paymentRequest, setPaymentRequest } = useContext(QueryParamContext);
 
@@ -140,7 +142,8 @@ export const PaymentRequestCustomButton = ({
       (frequency !== "once"
         ? paymentSetup?.recurrency?.methods?.includes("card")
         : true) ? (
-        paymentRequest._canMakePaymentAvailability.APPLE_PAY ? ( //TODOO - is _canMakePaymentAvailability a private variable?
+        paymentRequest._canMakePaymentAvailability.APPLE_PAY &&
+        isApplePayEnabled ? ( //TODOO - is _canMakePaymentAvailability a private variable?
           <div className="w-100">
             <button
               onClick={() => paymentRequest.show()}
@@ -163,7 +166,8 @@ export const PaymentRequestCustomButton = ({
               <div className="separator-text mb-10">{t("or")}</div>
             )}
           </div>
-        ) : paymentRequest._canMakePaymentAvailability.GOOGLE_PAY ? ( //TODOO - is _canMakePaymentAvailability a private variable?
+        ) : paymentRequest._canMakePaymentAvailability.GOOGLE_PAY &&
+          isGooglePayEnabled ? ( //TODOO - is _canMakePaymentAvailability a private variable?
           <div className="w-100">
             <button
               onClick={() => {

From 057c639359e02f9317456b3060a89c95a7ba74af Mon Sep 17 00:00:00 2001
From: mohitb35 <44917347+mohitb35@users.noreply.github.com>
Date: Mon, 8 Jan 2024 17:12:11 +0530
Subject: [PATCH 6/9] fix: initializes`paymentRequest` on project change

- `paymentRequest` initialized on initial render of `PaymentRequestCustomButton`
---
 src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
index c096d22e..de27ea6c 100644
--- a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
+++ b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
@@ -51,6 +51,10 @@ export const PaymentRequestCustomButton = ({
   const [canMakePayment, setCanMakePayment] = useState(false);
   const [paymentLoading, setPaymentLoading] = useState(false);
 
+	useEffect(()=> {
+		setPaymentRequest(null);
+	},[])
+
   useEffect(() => {
     if (
       stripe &&

From 5bbb7878dca8c71294f8c5622d12cea2466aefbc Mon Sep 17 00:00:00 2001
From: mohitb35 <44917347+mohitb35@users.noreply.github.com>
Date: Fri, 12 Jan 2024 12:34:48 +0530
Subject: [PATCH 7/9] feat: conditionally prevent redirect to VERCEL_URL

- redirect prevented if env.DISABLE_VERCEL_REDIRECT is true
---
 next.config.js | 3 ++-
 pages/_app.tsx | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/next.config.js b/next.config.js
index 5ea16b7e..12f79d42 100644
--- a/next.config.js
+++ b/next.config.js
@@ -95,7 +95,7 @@ const nextConfig = {
           stripPrefix: ["webpack://_N_E/"],
           urlPrefix: `~${basePath}/_next`,
           release: COMMIT_SHA,
-        }),
+        })
       );
     }
     return config;
@@ -117,6 +117,7 @@ const nextConfig = {
     TRACKING_KEY: process.env.TRACKING_KEY,
     ENABLE_GOOGLE_PAY: process.env.ENABLE_GOOGLE_PAY,
     ENABLE_APPLE_PAY: process.env.ENABLE_APPLE_PAY,
+    DISABLE_VERCEL_REDIRECT: process.env.DISABLE_VERCEL_REDIRECT,
   },
   trailingSlash: false,
   reactStrictMode: true,
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 39c3fa57..dd5b986a 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -87,7 +87,10 @@ function MyApp({
     process.env.VERCEL_URL &&
     typeof window !== "undefined"
   ) {
-    if (process.env.VERCEL_URL !== window.location.hostname) {
+    if (
+      process.env.VERCEL_URL !== window.location.hostname &&
+      process.env.DISABLE_VERCEL_REDIRECT !== "true"
+    ) {
       router.replace(`https://${process.env.VERCEL_URL}`);
     }
   }

From e9c24ebe24f35e32a7faad500d4e658f5d2833c2 Mon Sep 17 00:00:00 2001
From: Norbert Schuler <norbert.schuler@epublica.de>
Date: Sat, 13 Jan 2024 13:06:57 +0100
Subject: [PATCH 8/9] enable ApplePay by default like GooglePay is enabled by
 default

---
 src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
index de27ea6c..4bf1ded8 100644
--- a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
+++ b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
@@ -42,7 +42,7 @@ export const PaymentRequestCustomButton = ({
   frequency,
   paymentSetup,
 }: PaymentButtonProps): ReactElement | null => {
-  const isApplePayEnabled = process.env.ENABLE_APPLE_PAY === "true" || false;
+  const isApplePayEnabled = process.env.ENABLE_APPLE_PAY === "true" || true;
   const isGooglePayEnabled = process.env.ENABLE_GOOGLE_PAY === "true" || true;
   const { t, ready } = useTranslation(["common"]);
   const { paymentRequest, setPaymentRequest } = useContext(QueryParamContext);

From 6887189935a2eef4c8cc73d147b8242c24d5e202 Mon Sep 17 00:00:00 2001
From: mohitb35 <44917347+mohitb35@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:46:24 +0530
Subject: [PATCH 9/9] feat: disables native payments by default

- requires explicit enabling of native payments
---
 .../PaymentRequestCustomButton.tsx            | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
index 4bf1ded8..4f237529 100644
--- a/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
+++ b/src/Donations/PaymentMethods/PaymentRequestCustomButton.tsx
@@ -22,7 +22,7 @@ interface PaymentButtonProps {
   amount: number;
   onPaymentFunction: (
     paymentMethod: PaymentMethod,
-    paymentRequest: PaymentRequest,
+    paymentRequest: PaymentRequest
   ) => Promise<void>;
   continueNext: () => void;
   isPaymentPage: boolean;
@@ -42,8 +42,8 @@ export const PaymentRequestCustomButton = ({
   frequency,
   paymentSetup,
 }: PaymentButtonProps): ReactElement | null => {
-  const isApplePayEnabled = process.env.ENABLE_APPLE_PAY === "true" || true;
-  const isGooglePayEnabled = process.env.ENABLE_GOOGLE_PAY === "true" || true;
+  const isApplePayEnabled = process.env.ENABLE_APPLE_PAY === "true" || false;
+  const isGooglePayEnabled = process.env.ENABLE_GOOGLE_PAY === "true" || false;
   const { t, ready } = useTranslation(["common"]);
   const { paymentRequest, setPaymentRequest } = useContext(QueryParamContext);
 
@@ -51,9 +51,9 @@ export const PaymentRequestCustomButton = ({
   const [canMakePayment, setCanMakePayment] = useState(false);
   const [paymentLoading, setPaymentLoading] = useState(false);
 
-	useEffect(()=> {
-		setPaymentRequest(null);
-	},[])
+  useEffect(() => {
+    setPaymentRequest(null);
+  }, []);
 
   useEffect(() => {
     if (
@@ -71,7 +71,6 @@ export const PaymentRequestCustomButton = ({
         requestPayerName: true,
         requestPayerEmail: true,
       });
-      console.log("Stripe PR: ", pr);
       // Check the availability of the Payment Request API.
       pr.canMakePayment().then((result) => {
         if (result) {
@@ -90,7 +89,6 @@ export const PaymentRequestCustomButton = ({
   }, [country, currency, amount]);
 
   useEffect(() => {
-    console.log("Context PR: ", paymentRequest);
     let subscribed = true;
     if (paymentRequest) {
       paymentRequest
@@ -119,7 +117,7 @@ export const PaymentRequestCustomButton = ({
           onPaymentFunction(paymentMethod, paymentRequest);
           complete("success");
           setPaymentLoading(false);
-        },
+        }
       );
     }
     return () => {
@@ -220,7 +218,7 @@ interface NativePayProps {
   amount: number;
   onPaymentFunction: (
     paymentMethod: PaymentMethod,
-    paymentRequest: PaymentRequest,
+    paymentRequest: PaymentRequest
   ) => Promise<void>;
   paymentSetup: PaymentOptions;
   continueNext: () => void;
@@ -242,7 +240,7 @@ export const NativePay = ({
   const { i18n } = useTranslation();
   const [stripePromise, setStripePromise] =
     useState<null | Promise<Stripe | null>>(() =>
-      getStripe(paymentSetup, i18n.language),
+      getStripe(paymentSetup, i18n.language)
     );
 
   useEffect(() => {