@swirepay-developer/swirepay-payment-sdk 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swirepay-developer/swirepay-payment-sdk",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "swirepay sdk for apple and google pay",
   "main": "swirepayPaypalWalletPayment.js",
   "scripts": {

package/swirepayPaypalWalletPayment.js

@@ -1,9 +1,9 @@
 class PaypalPaymentMethod {
     static paypal_sdk_url = "https://www.paypal.com/sdk/js";
     static intent = "capture";
-    
+
     // CACHE: Stores active loading promises to prevent race conditions
-    static _scriptLoadingPromises = {}; 
+    static _scriptLoadingPromises = {};
 
     constructor(config) {
         this.mountId = config.mountId;
@@ -64,13 +64,13 @@ class PaypalPaymentMethod {
         const loadPromise = new Promise((resolve, reject) => {
             const script = document.createElement("script");
             Object.entries(attrs).forEach(([k, v]) => script.setAttribute(k, v));
-            
+
             script.onload = () => resolve();
             script.onerror = (err) => {
                 delete PaypalPaymentMethod._scriptLoadingPromises[id]; // Cleanup on fail
                 reject(err);
             };
-            
+
             document.head.appendChild(script);
         });
 
@@ -120,14 +120,14 @@ class PaypalPaymentMethod {
         const gateway = this.getEndpoints().gateway;
         let url = `${gateway}/v1/customer`;
         const config = { method: 'GET', headers: { 'Content-Type': 'application/json', 'x-api-key': this.apiKey } };
-        
+
         let params = [];
-        if(name) params.push(`name.EQ=${name}`);
-        if(email) params.push(`email.EQ=${email}`);
-        if(phone) params.push(`phoneNumber.EQ=${phone}`);
-        
-        if(params.length > 0) url += `?${params.join('&')}`;
-        
+        if (name) params.push(`name.EQ=${name}`);
+        if (email) params.push(`email.EQ=${email}`);
+        if (phone) params.push(`phoneNumber.EQ=${phone}`);
+
+        if (params.length > 0) url += `?${params.join('&')}`;
+
         const response = await fetch(url, config);
         return await response.json();
     }
@@ -161,7 +161,7 @@ class PaypalPaymentMethod {
         let url = `${gateway}/v2/payment-session/${psGid}/mrn`;
         const config = {
             method: 'GET',
-            headers: { 'Content-Type': 'application/json', 'ps-client-secret': psSecret, 'x-api-key': this.apiKey },
+            headers: { 'Content-Type': 'application/json', 'ps-client-secret': psSecret },
         };
         const response = await fetch(url, config);
         const data = await response.json();
@@ -173,14 +173,14 @@ class PaypalPaymentMethod {
         let url = `${gateway}/v2/payment-session/${psGid}/action`;
         const config = {
             method: 'POST',
-            headers: { 'Content-Type': 'application/json', 'ps-client-secret': psSecret, 'x-api-key': this.apiKey },
+            headers: { 'Content-Type': 'application/json', 'ps-client-secret': psSecret },
             body: JSON.stringify({}),
         };
         const response = await fetch(url, config);
         const data = await response.json();
         return data?.entity;
     }
-    
+
     removeAllChildFromMount() {
         const mount = document.getElementById(this.mountId);
         if (mount) mount.innerHTML = '';
@@ -192,7 +192,7 @@ class PaypalPaymentMethod {
         this.removeAllChildFromMount();
         if (mount) mount.appendChild(loadingSpinner);
     }
-    
+
     showEligibilityIssue() {
         this.removeAllChildFromMount();
         if (!this.unMountOnError) {
@@ -204,7 +204,7 @@ class PaypalPaymentMethod {
     }
 }
 
-export class PaypalGooglePay extends PaypalPaymentMethod {
+export class SwirepayGooglePay extends PaypalPaymentMethod {
     static google_pay_sdk_url = "https://pay.google.com/gp/p/js/pay.js";
 
     constructor(config) {
@@ -214,7 +214,7 @@ export class PaypalGooglePay extends PaypalPaymentMethod {
         this.paypalGooglePayConfig = null;
         this.countryCallingCode = config.countryCallingCode;
         this.amount = null;
-        
+
         this.initGooglePay = this.initGooglePay.bind(this);
 
         if (document.readyState === "complete" || document.readyState === "interactive") {
@@ -264,7 +264,7 @@ export class PaypalGooglePay extends PaypalPaymentMethod {
 
         const googleIcon = document.createElement('img');
         // googleIcon.src = '/assets/imgs/GOOGLE_PAY.svg';
-        googleIcon.src = `data:image/svg+xml;utf8,${encodeURIComponent(googleSvgString)}`; 
+        googleIcon.src = `data:image/svg+xml;utf8,${encodeURIComponent(googleSvgString)}`;
         googleIcon.alt = 'Google Icon';
         googleIcon.style.height = '20px';
         googleIcon.style.width = 'auto';
@@ -287,88 +287,146 @@ export class PaypalGooglePay extends PaypalPaymentMethod {
         return button;
     }
 
-    async handleGooglePayButtonClick() {
-        if (!this.googlePayPaymentsClient) {
-            console.error('no paymentsClient');
-            return;
-        }
-        
-        if (window.swirepayPayableAmount) {
-             this.amount = window.swirepayPayableAmount;
-        } else {
-            alert("Payment Error: Amount not set");
-            return;
-        }
+    onPaymentAuthorized(paymentData) {
+        return new Promise(async (resolve) => {
+            try {
+                const value = await this.getPayPalClientToken();
+                const billingAddress = paymentData?.paymentMethodData?.info?.billingAddress;
+                const customerName = billingAddress?.name ?? null;
+                const customerEmail = paymentData?.email ?? null;
+                const customerPhone = this.getRobustPhoneNumber(this.countryCallingCode, billingAddress?.phoneNumber);
+                if (value) {
+                    let customerGid;
+                    const customerData = await this.findCustomer(customerName, customerEmail, customerPhone);
+                    if (customerData.entity.content[0]?.gid) {
+                        customerGid = customerData.entity.content[0].gid;
+                    } else {
+                        const newCustomer = await this.createCustomer(customerName, customerEmail, customerPhone);
+                        customerGid = newCustomer.entity?.gid;
+                    }
+                    const paymentMethod = {
+                        type: "WALLET",
+                        subType: "GOOGLE_PAY_US",
+                        googlePayUS: {
+                            apiVersionMinor: paymentData.apiVersionMinor,
+                            apiVersion: paymentData.apiVersion,
+                            paymentMethodDescription: paymentData.paymentMethodData.description,
+                            paymentMethodTokenizationDataType: paymentData.paymentMethodData.tokenizationData.type,
+                            paymentMethodTokenizationDataToken: paymentData.paymentMethodData.tokenizationData.token,
+                            paymentMethodType: paymentData.paymentMethodData.type,
+                            paymentMethodInfo: paymentData.paymentMethodData.info
+                        },
+                        customerGid: customerGid,
+                    }
+                    let result = await this.addPaymentMethod(paymentMethod);
+                    const gid = result?.entity?.gid;
+                    const postData = {
+                        amount: this.amount,
+                        captureMethod: 'AUTOMATIC',
+                        confirmMethod: 'AUTOMATIC',
+                        currencyCode: this.currencyDetail?.code,
+                        description: 'Online Payment',
+                        paymentMethodGid: gid,
+                        paymentMethodType: ['WALLET'],
+                        receiptEmail: customerEmail || null,
+                        receiptSms: customerPhone || null,
+                        statementDescriptor: 'Google Pay Payment',
+                    };
+                    const gateway = this.getEndpoints().gateway;
+                    const res = await fetch(`${gateway}/v1/payment-session`, {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json', 'x-api-key': this.apiKey },
+                        body: JSON.stringify(postData),
+                    });
+                    const resData = await res.json();
+
+                    const orderId = await this.getMrn(resData?.entity?.gid, resData?.entity?.psClientSecret);
+                    if (window?.paypalGoogle) {
+                        await window?.paypalGoogle?.Googlepay()?.confirmOrder({ orderId, paymentMethodData: paymentData?.paymentMethodData });
+                    }
+                    if (window?.paypal) {
+                        await window?.paypal?.Googlepay()?.confirmOrder({ orderId, paymentMethodData: paymentData?.paymentMethodData });
+                    }
+                    await this.action(resData?.entity?.gid, resData?.entity?.psClientSecret);
+                    resolve({ transactionState: "SUCCESS" });
+                    if (this.successCallback) await this.successCallback(resData?.entity);
+                }
+            } catch (err) {
+                resolve({ transactionState: "ERROR" });
+            }
+        });
+    }
+
+
+    getGooglePaymentsClient() {
+        const usageMode = this.test ? 'TEST' : 'PRODUCTION';
+        return new window.google.payments.api.PaymentsClient({
+            environment: usageMode,
+            paymentDataCallbacks: {
+                onPaymentAuthorized: this.onPaymentAuthorized.bind(this),
+            }
+        });
+    }
 
-        if (this.processStartCallback) this.processStartCallback();
 
-        const { paymentDataRequest } = this.constructGooglePayPaymentDataRequest();
+    async initGooglePay() {
         try {
-            const paymentData = await this.googlePayPaymentsClient?.loadPaymentData(paymentDataRequest);
-            const value = await this.getPayPalClientToken();
-            const billingAddress = paymentData?.paymentMethodData?.info?.billingAddress;
-            const customerName = billingAddress?.name ?? null;
-            const customerEmail = paymentData?.email ?? null;
-            const customerPhone = this.getRobustPhoneNumber(this.countryCallingCode, billingAddress?.phoneNumber);
-            
-            if (value) {
-                let customerGid;
-                const customerData = await this.findCustomer(customerName, customerEmail, customerPhone);
-                if (customerData.entity.content[0]?.gid) {
-                    customerGid = customerData.entity.content[0].gid;
-                } else {
-                    const newCustomer = await this.createCustomer(customerName, customerEmail, customerPhone);
-                    customerGid = newCustomer.entity?.gid;
-                }
-                const paymentMethod = {
-                    type: "WALLET",
-                    subType: "GOOGLE_PAY_US",
-                    googlePayUS: {
-                        apiVersionMinor: paymentData.apiVersionMinor,
-                        apiVersion: paymentData.apiVersion,
-                        paymentMethodDescription: paymentData.paymentMethodData.description,
-                        paymentMethodTokenizationDataType: paymentData.paymentMethodData.tokenizationData.type,
-                        paymentMethodTokenizationDataToken: paymentData.paymentMethodData.tokenizationData.token,
-                        paymentMethodType: paymentData.paymentMethodData.type,
-                        paymentMethodInfo: paymentData.paymentMethodData.info
-                    },
-                    customerGid: customerGid,
+            const token = await this.getPayPalClientToken();
+            const tokenJson = JSON.parse(atob(token));
+
+            // load PayPal SDK
+            await this.script_to_head({
+                id: 'paypalSDK-google',
+                src: `${PaypalPaymentMethod.paypal_sdk_url}?client-id=${tokenJson.clientId}&currency=${this.currencyDetail.code}&intent=${PaypalPaymentMethod.intent}&components=buttons,googlepay`,
+                "data-namespace": "paypalGoogle"
+            });
+
+            // load Google Pay SDK
+            await this.script_to_head({
+                id: 'googlePaySDK',
+                src: SwirepayGooglePay.google_pay_sdk_url,
+                async: true
+            });
+
+            const interval = setInterval(() => {
+                if (window.google?.payments?.api && window.paypalGoogle) {
+                    clearInterval(interval);
+                    this.setupGooglePay();
                 }
-                let result = await this.addPaymentMethod(paymentMethod);
-                const gid = result?.entity?.gid;
-                
-                const postData = {
-                    amount: this.amount,
-                    captureMethod: 'AUTOMATIC',
-                    confirmMethod: 'AUTOMATIC',
-                    currencyCode: this.currencyDetail?.code,
-                    description: 'Online Payment',
-                    paymentMethodGid: gid,
-                    paymentMethodType: ['WALLET'],
-                    receiptEmail: customerEmail || null,
-                    receiptSms: customerPhone || null,
-                    statementDescriptor: 'Google Pay Payment',
-                };
-                
-                const gateway = this.getEndpoints().gateway;
-                const res = await fetch(`${gateway}/v1/payment-session`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json', 'x-api-key': this.apiKey },
-                    body: JSON.stringify(postData),
-                });
-                const resData = await res.json();
-                
-                const orderId = await this.getMrn(resData?.entity?.gid, resData?.entity?.psClientSecret);
-                await window?.paypal?.Googlepay()?.confirmOrder({ orderId, paymentMethodData: paymentData?.paymentMethodData });
-                await this.action(resData?.entity?.gid, resData?.entity?.psClientSecret);
-                if (this.successCallback) await this.successCallback(resData?.entity);
-            }
+            }, 50);
+
         } catch (err) {
-            console.error('Google Pay Error:', err);
-            if (this.failCallback) await this.failCallback(err);
+            console.error(err);
+            this.showEligibilityIssue();
         }
     }
 
+    setupGooglePay() {
+        this.googlePayPaymentsClient = new window.google.payments.api.PaymentsClient({
+            environment: this.test ? "TEST" : "PRODUCTION",
+        });
+
+        // get PayPal googlepay config
+        window.paypalGoogle.Googlepay().config().then(cfg => {
+            this.paypalGooglePayConfig = cfg;
+
+            const { allowedPaymentMethods } = this.constructGooglePayPaymentDataRequest();
+
+            this.googlePayPaymentsClient.isReadyToPay({
+                apiVersion: cfg.apiVersion,
+                apiVersionMinor: cfg.apiVersionMinor,
+                allowedPaymentMethods
+            }).then(res => {
+                if (res.result && cfg.isEligible) {
+                    this.showGooglePayButton();
+                } else {
+                    this.showEligibilityIssue();
+                }
+            });
+
+        }).catch(() => this.showEligibilityIssue());
+    }
+
     showGooglePayButton() {
         const googlePayButton = this.GooglePayButton({
             onClick: () => this.handleGooglePayButtonClick(),
@@ -380,118 +438,64 @@ export class PaypalGooglePay extends PaypalPaymentMethod {
         if (mount) mount.appendChild(googlePayButton);
     }
 
-    getPaypalGooglePayConfig() {
-        const paymentsClient = this.getGooglePaymentsClient();
-        this.googlePayPaymentsClient = paymentsClient;
-        
-        this.paypalSDK?.Googlepay?.()?.config()?.then((currentPaypalGooglePayConfig) => {
-            this.paypalGooglePayConfig = currentPaypalGooglePayConfig;
-            const { allowedPaymentMethods, baseRequest } = this.constructGooglePayPaymentDataRequest();
-            
-            paymentsClient?.isReadyToPay({ ...baseRequest, allowedPaymentMethods })
-                ?.then((response) => {
-                    if (response.result && currentPaypalGooglePayConfig.isEligible) {
-                        this.showGooglePayButton();
-                        return;
-                    }
-                    this.showEligibilityIssue();
-                })?.catch((err) => { this.showEligibilityIssue(); });
-        })?.catch((err) => { this.showEligibilityIssue(); });
-    }
-
-    getGooglePaymentsClient() {
-        const usageMode = this.test ? 'TEST' : 'PRODUCTION';
-        return new window.google.payments.api.PaymentsClient({ environment: String(usageMode) });
-    }
-
     constructGooglePayPaymentDataRequest() {
-        const currentAmount = window.swirepayPayableAmount || 0; 
-        if (!this.paypalGooglePayConfig || !this.currencyDetail) return {};
+        const amount = window.swirepayPayableAmount || 0;
+        if (!this.paypalGooglePayConfig) return {};
+
+        const cfg = this.paypalGooglePayConfig;
+        const baseRequest = {
+            apiVersion: cfg.apiVersion,
+            apiVersionMinor: cfg.apiVersionMinor,
+        };
 
         const paymentDataRequest = {
-            apiVersion: this.paypalGooglePayConfig?.apiVersion,
-            apiVersionMinor: this.paypalGooglePayConfig?.apiVersionMinor,
-            emailRequired: true, 
-            merchantInfo: {
-                merchantName: 'Swirepay',
-                merchantId: this.paypalGooglePayConfig?.merchantInfo?.merchantId,
-            },
-            allowedPaymentMethods: [{
-                type: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.type,
-                parameters: {
-                    allowedAuthMethods: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.parameters?.allowedAuthMethods,
-                    allowedCardNetworks: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.parameters?.allowedCardNetworks,
-                    billingAddressRequired: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.parameters?.billingAddressRequired,
-                    billingAddressParameters: {
-                        format: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.parameters?.billingAddressParameters?.format,
-                        phoneNumberRequired: true,
-                    },
-                },
-                tokenizationSpecification: {
-                    type: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.tokenizationSpecification?.type,
-                    parameters: {
-                        gateway: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.tokenizationSpecification?.parameters?.gateway,
-                        gatewayMerchantId: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.tokenizationSpecification?.parameters?.gatewayMerchantId,
-                    },
-                },
-            }],
+            ...baseRequest,
+            merchantInfo: cfg.merchantInfo,
             transactionInfo: {
-                countryCode: this.currencyDetail?.countryAlpha2,
-                currencyCode: this.currencyDetail?.code,
-                totalPriceStatus: 'FINAL',
-                totalPrice: this.AmountDivideByHundred(currentAmount),
-                checkoutOption: 'COMPLETE_IMMEDIATE_PURCHASE',
-            }
-        };
-        return {
-            allowedPaymentMethods: this.paypalGooglePayConfig?.allowedPaymentMethods,
-            paymentDataRequest,
-            baseRequest: { apiVersion: this.paypalGooglePayConfig?.apiVersion, apiVersionMinor: this.paypalGooglePayConfig?.apiVersionMinor },
-            tokenizationSpecification: this.paypalGooglePayConfig?.allowedPaymentMethods?.[0]?.tokenizationSpecification,
+                countryCode: this.currencyDetail.countryAlpha2,
+                currencyCode: this.currencyDetail.code,
+                totalPriceStatus: "FINAL",
+                totalPrice: this.AmountDivideByHundred(amount),
+                checkoutOption: "COMPLETE_IMMEDIATE_PURCHASE",
+            },
+            allowedPaymentMethods: cfg.allowedPaymentMethods,
         };
-    }
 
-    async initGooglePay() {
-        if (!this.accountGid) return;
-        
-        this.showLoading();
-        try {
-            const data = await this.getPayPalClientToken();
-            const value = atob(data);
-            const value_json = JSON.parse(value);
-            
-            // Unified Request: buttons,googlepay,applepay
-            await this.script_to_head({
-                id: 'paypalSDK-google', 
-                src: this.test ? `${PaypalPaymentMethod.paypal_sdk_url}?client-id=${value_json?.clientId}&enable-funding=venmo&currency=${this.currencyDetail?.code}&intent=${PaypalPaymentMethod.intent}&buyer-country=${this.currencyDetail.countryAlpha2}&merchant-id=${value_json?.merchantId}&components=buttons,googlepay,applepay` : `${PaypalPaymentMethod.paypal_sdk_url}?client-id=${value_json?.clientId}&enable-funding=venmo&currency=${this.currencyDetail?.code}&intent=${PaypalPaymentMethod.intent}&merchant-id=${value_json?.merchantId}&components=buttons,googlepay,applepay`, // Added applepay
-                "data-client-token": value_json?.token?.client_token,
-                "data-namespace": "paypalGoogle",
-            });
+        return { baseRequest, paymentDataRequest, allowedPaymentMethods: cfg.allowedPaymentMethods };
+    }
 
-            await this.script_to_head({
-                id: 'googlePaySDK',
-                src: PaypalGooglePay.google_pay_sdk_url,
-                async: true,
-            });
 
-            const checkGooglePaySDKInterval = setInterval(() => {
-                if (window.google?.payments?.api && this.paypalSDK) {
-                    this.getPaypalGooglePayConfig();
-                    clearInterval(checkGooglePaySDKInterval);
-                }
-            }, 50);
+    async handleGooglePayButtonClick() {
+        if (!this.googlePayPaymentsClient) {
+            console.error('no paymentsClient');
+            return;
+        }
+        if (window.swirepayPayableAmount) {
+             this.amount = window.swirepayPayableAmount;
+        } else {
+            alert("Payment Error: Amount not set");
+            return;
+        }
+        if (this.processStartCallback) this.processStartCallback();
+        try {
+            const { paymentDataRequest } = this.constructGooglePayPaymentDataRequest();
+            paymentDataRequest.callbackIntents = ["PAYMENT_AUTHORIZATION"];
+            const paymentsClient = this.getGooglePaymentsClient();
+            await paymentsClient.loadPaymentData(paymentDataRequest);
         } catch (err) {
-            console.error(err);
-            this.showEligibilityIssue();
+            console.error("Google Pay Error:", err);
+            this.failCallback?.(err);
         }
     }
 }
 
-export class PaypalApplePay extends PaypalPaymentMethod {
+
+export class SwirepayApplePay extends PaypalPaymentMethod {
     constructor(config) {
         super({ ...config, namespace: 'paypalApple' });
         this.isApplePayEligible = false;
-        
+        this.shopName = config.shopName;
+
         this.checkAppleEligible = this.checkAppleEligible.bind(this);
         this.handleClick = this.handleClick.bind(this);
 
@@ -506,7 +510,7 @@ export class PaypalApplePay extends PaypalPaymentMethod {
     waitForPayPalComponent(componentName, timeout = 5000) {
         return new Promise((resolve, reject) => {
             const startTime = Date.now();
-            
+
             const check = () => {
                 // Check if paypal exists AND the specific component exists
                 if (this.paypalSDK && this.paypalSDK[componentName]) {
@@ -518,7 +522,7 @@ export class PaypalApplePay extends PaypalPaymentMethod {
                     setTimeout(check, 50);
                 }
             };
-            
+
             check();
         });
     }
@@ -533,7 +537,7 @@ export class PaypalApplePay extends PaypalPaymentMethod {
         this.showLoading();
         const enabled = await this.existsApplePayJsApi();
         if (!enabled || !this.accountGid) {
-            if(this.failCallback && !this.unMountOnError) this.failCallback('Payment method not supported...!');
+            if (this.failCallback && !this.unMountOnError) this.failCallback('Payment method not supported...!');
             this.showEligibilityIssue();
             return;
         }
@@ -542,17 +546,14 @@ export class PaypalApplePay extends PaypalPaymentMethod {
             const data = await this.getPayPalClientToken();
             const value = window.atob(data);
             const value_json = JSON.parse(value);
-            
+
             // Unified Request: buttons,googlepay,applepay
             await this.script_to_head({
-                id: 'paypalSDK-apple', 
+                id: 'paypalSDK-apple',
                 src: `${PaypalPaymentMethod.paypal_sdk_url}?client-id=${value_json?.clientId}&enable-funding=venmo&currency=${this.currencyDetail?.code}&intent=${PaypalPaymentMethod.intent}&merchant-id=${value_json?.merchantId}&components=buttons,googlepay,applepay`, // Added googlepay
-                "data-client-token": value_json?.token?.client_token,
+                // "data-client-token": value_json?.token?.client_token,
                 "data-namespace": "paypalApple",
             });
-
-
-            // confirm the paypal sdk has loaded in before proceeding (5secs time limit)
             try {
                 await this.waitForPayPalComponent('Applepay');
             } catch (waitError) {
@@ -596,8 +597,8 @@ export class PaypalApplePay extends PaypalPaymentMethod {
 
         const button = document.createElement('div');
         button.className = 'apple-pay-button';
-        button.onclick = this.handleClick; 
-        
+        button.onclick = this.handleClick;
+
         const mount = document.getElementById(this.mountId);
         this.removeAllChildFromMount();
         if (mount) mount.appendChild(button);
@@ -626,15 +627,15 @@ export class PaypalApplePay extends PaypalPaymentMethod {
 
         return new Promise((resolve, reject) => {
             const session = new window.ApplePaySession(4, paymentRequest);
-            
+
             session.oncancel = (e) => reject("Payment cancelled");
-            
+
             session.onvalidatemerchant = async (event) => {
                 try {
                     const applepay = this.paypalSDK.Applepay();
                     const payload = await applepay.validateMerchant({
                         validationUrl: event.validationURL,
-                        displayName: "My Shop",
+                        displayName: this.shopName,
                     });
                     session.completeMerchantValidation(payload.merchantSession);
                 } catch (err) {
@@ -688,7 +689,7 @@ export class PaypalApplePay extends PaypalPaymentMethod {
                     const gid = pmResult?.entity?.gid;
 
                     const postData = {
-                        amount: window.swirepayPayableAmount, 
+                        amount: window.swirepayPayableAmount,
                         captureMethod: 'AUTOMATIC',
                         confirmMethod: 'AUTOMATIC',
                         currencyCode: this.currencyDetail.code,
@@ -707,16 +708,16 @@ export class PaypalApplePay extends PaypalPaymentMethod {
                         body: JSON.stringify(postData),
                     });
                     const resData = await res.json();
-                    
+
                     const orderId = await this.getMrn(resData?.entity?.gid, resData?.entity?.psClientSecret);
                     await this.paypalSDK?.Applepay().confirmOrder({
                         orderId,
                         token: payment.token,
                         billingContact: payment.billingContact,
                     });
-                    
+
                     await this.action(resData?.entity?.gid, resData?.entity?.psClientSecret);
-                    
+
                     session.completePayment(window.ApplePaySession.STATUS_SUCCESS);
                     resolve({ orderId, ...resData });
                 } catch (err) {
@@ -748,10 +749,9 @@ export class PaypalApplePay extends PaypalPaymentMethod {
                 [{ label: 'Total', amount: payableAmount }],
                 'Total'
             ).then((result) => {
-                if(this.successCallback) this.successCallback(result);
-                // console.log("Payment success:", result);
+                if (this.successCallback) this.successCallback(result);
             }).catch((err) => {
-                if(this.failCallback) this.failCallback(err);
+                if (this.failCallback) this.failCallback(err);
                 console.error("Payment failed:", err);
             });
         }