From 8301da15506800d5ee4f82891d051a16a3e94b87 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Wed, 22 May 2024 21:02:42 +0400
Subject: [PATCH 1/2] Do not add shipping handlers when option is checked

---
 .../resources/js/modules/Renderer/Renderer.js    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
index 5c0461e57..193f60629 100644
--- a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
+++ b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
@@ -91,20 +91,26 @@ class Renderer {
         let venmoButtonClicked = false;
 
         const buttonsOptions = () => {
-            return {
+            const options = {
                 style,
                 ...contextConfig,
-                onClick:  this.onSmartButtonClick,
+                onClick: this.onSmartButtonClick,
                 onInit: (data, actions) => {
                     if (this.onSmartButtonsInit) {
                         this.onSmartButtonsInit(data, actions);
                     }
                     this.handleOnButtonsInit(wrapper, data, actions);
                 },
-                onShippingOptionsChange: (data, actions) => this.shouldHandleShippingInPaypal(venmoButtonClicked) ? handleShippingOptionsChange(data, actions, this.defaultSettings) : null,
-                onShippingAddressChange: (data, actions) => this.shouldHandleShippingInPaypal(venmoButtonClicked) ? handleShippingAddressChange(data, actions, this.defaultSettings) : null,
+            };
+
+            // Check the condition and add the onShippingOptionsChange handler if needed
+            if (this.shouldHandleShippingInPaypal(venmoButtonClicked)) {
+                options.onShippingOptionsChange = (data, actions) => handleShippingOptionsChange(data, actions, this.defaultSettings);
+                options.onShippingAddressChange = (data, actions) => handleShippingAddressChange(data, actions, this.defaultSettings);
             }
-        }
+
+            return options;
+        };
 
         jQuery(document)
             .off(this.reloadEventName, wrapper)

From 796196bbbe97acd65f9d0c7e68fc942e9608f065 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Wed, 22 May 2024 21:14:36 +0400
Subject: [PATCH 2/2] Remove unnecessary console log

---
 .../ppcp-button/resources/js/modules/Renderer/Renderer.js    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
index 193f60629..d7de31ec8 100644
--- a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
+++ b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
@@ -70,7 +70,6 @@ class Renderer {
 
     shouldHandleShippingInPaypal = (venmoButtonClicked) => {
         if (!this.defaultSettings.should_handle_shipping_in_paypal) {
-            console.log('no')
             return false;
         }
 
@@ -105,8 +104,8 @@ class Renderer {
 
             // Check the condition and add the onShippingOptionsChange handler if needed
             if (this.shouldHandleShippingInPaypal(venmoButtonClicked)) {
-                options.onShippingOptionsChange = (data, actions) => handleShippingOptionsChange(data, actions, this.defaultSettings);
-                options.onShippingAddressChange = (data, actions) => handleShippingAddressChange(data, actions, this.defaultSettings);
+                options.onShippingOptionsChange = (data, actions) => null;
+                options.onShippingAddressChange = (data, actions) => null;
             }
 
             return options;