@paydock/client-sdk 1.123.2-beta → 1.123.8

package/bundles/index.cjs

@@ -954,7 +954,7 @@ SDK.headerKeys = Object.freeze({
   version: 'x-sdk-version',
   type: 'x-sdk-type'
 });
-SDK._version = 'v1.123.2-beta';
+SDK._version = 'v1.123.8';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -4235,11 +4235,11 @@ function createNewrelicConfig() {
   var gateway = 'bam.nr-data.net';
   var params = {
     enabled: 'true',
-    accountId: '974691',
-    agentId: '1386157150',
-    applicationId: '1386157150',
-    licenseKey: '4848a32285',
-    trustKey: '974691'
+    accountId: '',
+    agentId: '',
+    applicationId: '',
+    licenseKey: '',
+    trustKey: ''
   };
   var disabled = function disabled() {
     return {
@@ -13201,10 +13201,13 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
       var _a, _b, _c;
       if (((_a = this.meta) === null || _a === void 0 ? void 0 : _a.style) && _typeof$1((_b = this.meta) === null || _b === void 0 ? void 0 : _b.style) === 'object') {
         var metaStyles = JSON.parse(JSON.stringify((_c = this.meta) === null || _c === void 0 ? void 0 : _c.style));
-        if ('google' in metaStyles)
+        if ('google' in metaStyles) {
           // biome-ignore lint/performance/noDelete: <explanation>
           metaStyles === null || metaStyles === void 0 ? true : delete metaStyles.google; // to offer backward compatibility
-        if ('apple' in metaStyles) return metaStyles === null || metaStyles === void 0 ? void 0 : metaStyles.apple;
+        }
+        if ('apple' in metaStyles) {
+          return metaStyles === null || metaStyles === void 0 ? void 0 : metaStyles.apple;
+        }
         return metaStyles; // to offer backward compatibility
       }
       return null;
@@ -13215,10 +13218,13 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
       var _a, _b, _c, _d;
       if (((_a = this.meta) === null || _a === void 0 ? void 0 : _a.raw_data_initialization) && ((_b = this.meta) === null || _b === void 0 ? void 0 : _b.raw_data_initialization) && _typeof$1((_c = this.meta) === null || _c === void 0 ? void 0 : _c.raw_data_initialization) === 'object') {
         var metaRawDataInit = JSON.parse(JSON.stringify((_d = this.meta) === null || _d === void 0 ? void 0 : _d.raw_data_initialization));
-        if ('google' in metaRawDataInit)
+        if ('google' in metaRawDataInit) {
           // biome-ignore lint/performance/noDelete: <explanation>
           metaRawDataInit === null || metaRawDataInit === void 0 ? true : delete metaRawDataInit.google; // to offer backward compatibility
-        if ('apple' in metaRawDataInit) return metaRawDataInit === null || metaRawDataInit === void 0 ? void 0 : metaRawDataInit.apple;
+        }
+        if ('apple' in metaRawDataInit) {
+          return metaRawDataInit === null || metaRawDataInit === void 0 ? void 0 : metaRawDataInit.apple;
+        }
         return metaRawDataInit; // to offer backward compatibility
       }
       return null;
@@ -13246,28 +13252,16 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
         });
         return;
       }
+      if (customElements === null || customElements === void 0 ? void 0 : customElements.get('apple-pay-button')) {
+        this.onScriptLoaded(container);
+        return;
+      }
       var applePayScript = document.createElement('script');
       applePayScript.src = "https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js";
       applePayScript.type = "text/javascript";
       applePayScript.crossOrigin = 'anonymous';
       applePayScript.onload = function () {
-        _this2.checkAvailability().then(function (available) {
-          var _a;
-          if (!available) {
-            _this2.eventEmitter.emit(WALLET_EVENT.UNAVAILABLE, {
-              wallet: WALLET_TYPE.APPLE
-            });
-            return;
-          }
-          // Store default shipping option
-          if (_this2.isShippingRequired() && _this2.hasShippingOptions()) {
-            _this2.selectedShippingOption = (_a = _this2.meta) === null || _a === void 0 ? void 0 : _a.shipping_options[0];
-            _this2.latestShippingData.shippingMethod = _this2.formatShippingOptions([_this2.selectedShippingOption])[0];
-          }
-          _this2.mount(container);
-        })["catch"](function (err) {
-          return console.error("Error checking ApplePay availability", err);
-        });
+        _this2.onScriptLoaded(container);
       };
       applePayScript.onerror = function (err) {
         console.error("AppleWalletService: Error loading ApplePay script", err);
@@ -13278,15 +13272,43 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
       };
       document.head.appendChild(applePayScript);
     }
+  }, {
+    key: "onScriptLoaded",
+    value: function onScriptLoaded(container) {
+      var _this3 = this;
+      this.checkAvailability().then(function (available) {
+        var _a;
+        if (!available) {
+          _this3.eventEmitter.emit(WALLET_EVENT.UNAVAILABLE, {
+            wallet: WALLET_TYPE.APPLE
+          });
+          return;
+        }
+        // Store default shipping option
+        if (_this3.isShippingRequired() && _this3.hasShippingOptions()) {
+          _this3.selectedShippingOption = (_a = _this3.meta) === null || _a === void 0 ? void 0 : _a.shipping_options[0];
+          _this3.latestShippingData.shippingMethod = _this3.formatShippingOptions([_this3.selectedShippingOption])[0];
+        }
+        _this3.mount(container);
+      })["catch"](function (err) {
+        return console.error("Error checking ApplePay availability", err);
+      });
+    }
   }, {
     key: "update",
     value: function update(data) {
       var _a, _b, _c;
-      if (!this.latestShippingChangePromiseResolve || !this.latestShippingChangePromiseReject) return;
-      if (!data.success || !data.body) return this.latestShippingChangePromiseReject();
+      if (!this.latestShippingChangePromiseResolve || !this.latestShippingChangePromiseReject) {
+        return;
+      }
+      if (!data.success || !data.body) {
+        return this.latestShippingChangePromiseReject();
+      }
       var newAmount = (_a = data === null || data === void 0 ? void 0 : data.body) === null || _a === void 0 ? void 0 : _a.amount;
       var newShippingOptions = (_b = data === null || data === void 0 ? void 0 : data.body) === null || _b === void 0 ? void 0 : _b.shipping_options;
-      if (newAmount) this.meta.amount = newAmount;
+      if (newAmount) {
+        this.meta.amount = newAmount;
+      }
       if (newShippingOptions) {
         this.meta.shipping_options = newShippingOptions;
         this.selectedShippingOption = newShippingOptions ? newShippingOptions[0] : undefined;
@@ -13306,17 +13328,17 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
   }, {
     key: "checkAvailability",
     value: function checkAvailability() {
-      var _this3 = this;
+      var _this4 = this;
       return new Promise(function (resolve, _reject) {
         var _a;
         if (!window.ApplePaySession || !ApplePaySession) {
           resolve(false);
         }
         var formattedCapabilities = DEFAULT_APPLE_PAY_CAPABILITIES$1;
-        if (((_a = _this3.meta.apple_pay_capabilities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-          formattedCapabilities = _this3.formatCapabilities(_this3.meta.apple_pay_capabilities);
+        if (((_a = _this4.meta.apple_pay_capabilities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+          formattedCapabilities = _this4.formatCapabilities(_this4.meta.apple_pay_capabilities);
         }
-        ApplePaySession.applePayCapabilities(_this3.getMerchantId()).then(function (capabilities) {
+        ApplePaySession.applePayCapabilities(_this4.getMerchantId()).then(function (capabilities) {
           var canMakePayment = formattedCapabilities.includes(capabilities === null || capabilities === void 0 ? void 0 : capabilities.paymentCredentialStatus);
           resolve(canMakePayment);
         })["catch"](function (_err) {
@@ -13364,11 +13386,17 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
       var _a;
       var rawDataInitialization = this.getMetaRawDataInitialization();
       if (rawDataInitialization && _typeof$1(rawDataInitialization) === 'object') {
-        if (_typeof$1(rawDataInitialization.total) === 'object') rawDataInitialization.total.amount = this.meta.amount.toString();else rawDataInitialization.total = {
-          label: ((_a = this.meta) === null || _a === void 0 ? void 0 : _a.amount_label) || '',
-          amount: this.meta.amount.toString()
-        };
-        if (this.isShippingRequired() && this.hasShippingOptions()) rawDataInitialization.shippingMethods = this.formatShippingOptions(this.meta.shipping_options);
+        if (_typeof$1(rawDataInitialization.total) === 'object') {
+          rawDataInitialization.total.amount = this.meta.amount.toString();
+        } else {
+          rawDataInitialization.total = {
+            label: ((_a = this.meta) === null || _a === void 0 ? void 0 : _a.amount_label) || '',
+            amount: this.meta.amount.toString()
+          };
+        }
+        if (this.isShippingRequired() && this.hasShippingOptions()) {
+          rawDataInitialization.shippingMethods = this.formatShippingOptions(this.meta.shipping_options);
+        }
       }
       return rawDataInitialization || _extends(_extends(_extends({
         countryCode: this.meta.country.toUpperCase(),
@@ -13392,22 +13420,22 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
   }, {
     key: "getMerchantSession",
     value: function getMerchantSession() {
-      var _this4 = this;
+      var _this5 = this;
       return new Promise(function (resolve, reject) {
-        return _this4.eventEmitter.emit(WALLET_EVENT.CALLBACK, {
+        return _this5.eventEmitter.emit(WALLET_EVENT.CALLBACK, {
           data: _extends({
             request_type: "CREATE_SESSION",
             wallet_type: WALLET_TYPE.APPLE,
             session_id: window.location.hostname
-          }, _this4.isShippingRequired() && {
-            request_shipping: _this4.meta.request_shipping
+          }, _this5.isShippingRequired() && {
+            request_shipping: _this5.meta.request_shipping
           }),
           onSuccess: function onSuccess(res) {
             return resolve(res);
           },
           onError: function onError(message) {
             console.error('Error generating order id', message);
-            _this4.eventEmitter.emit(WALLET_EVENT.PAYMENT_ERROR, {
+            _this5.eventEmitter.emit(WALLET_EVENT.PAYMENT_ERROR, {
               message: message
             });
             reject(message);
@@ -13418,10 +13446,10 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
   }, {
     key: "handleMerchantOnButtonClickEvent",
     value: function handleMerchantOnButtonClickEvent() {
-      var _this5 = this;
+      var _this6 = this;
       return new Promise(function (resolve, reject) {
         var merchantResult;
-        _this5.eventEmitter.emit(WALLET_EVENT.BUTTON_CLICK, {
+        _this6.eventEmitter.emit(WALLET_EVENT.BUTTON_CLICK, {
           attachResult: function attachResult(value) {
             merchantResult = value;
           }
@@ -19289,17 +19317,13 @@ var ApplePayWalletButtonExpress = /*#__PURE__*/function (_BaseWalletButton) {
     _classCallCheck(this, ApplePayWalletButtonExpress);
     _this = _callSuper(this, ApplePayWalletButtonExpress, [selector, publicKeyOrAccessToken, gatewayId, meta, ['amount_label', 'country']]);
     _this.onApplePayButtonClicked = function () {
-      return _this.handleMerchantOnExpressButtonClickEvent().then(function () {
-        _this.paymentSession = new ApplePaySession(14, _this.createRequest());
-        _this.paymentSession.onvalidatemerchant = _this.onValidateMerchant;
-        _this.paymentSession.onpaymentauthorized = _this.onPaymentAuthorized;
-        _this.paymentSession.oncancel = _this.onCancelPayment;
-        _this.paymentSession.onshippingmethodselected = _this.onApplePayShippingMethodUpdate;
-        _this.paymentSession.onshippingcontactselected = _this.onApplePayShippingContactUpdate;
-        _this.paymentSession.begin();
-      })["catch"](function () {
-        _this.handleCheckoutClose();
-      });
+      _this.paymentSession = new ApplePaySession(14, _this.createRequest());
+      _this.paymentSession.onvalidatemerchant = _this.onValidateMerchant;
+      _this.paymentSession.onpaymentauthorized = _this.onPaymentAuthorized;
+      _this.paymentSession.oncancel = _this.onCancelPayment;
+      _this.paymentSession.onshippingmethodselected = _this.onApplePayShippingMethodUpdate;
+      _this.paymentSession.onshippingcontactselected = _this.onApplePayShippingContactUpdate;
+      _this.paymentSession.begin();
     };
     _this.onValidateMerchant = function (event) {
       _this.handleMerchantOnExpressButtonClickEvent().then(function () {
@@ -19425,22 +19449,18 @@ var ApplePayWalletButtonExpress = /*#__PURE__*/function (_BaseWalletButton) {
     key: "load",
     value: function load() {
       var _this4 = this;
-      if (!window.Promise) return this.handleOnUnavailable();
+      if (!window.Promise) {
+        return this.handleOnUnavailable();
+      }
+      if (customElements === null || customElements === void 0 ? void 0 : customElements.get('apple-pay-button')) {
+        return this.onScriptLoaded();
+      }
       var applePayScript = document.createElement('script');
       applePayScript.src = "https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js";
       applePayScript.type = "text/javascript";
       applePayScript.crossOrigin = 'anonymous';
       applePayScript.onload = function () {
-        _this4.getGatewayWalletConfig().then(function (config) {
-          if (!config || config.type !== 'MasterCard' || !config.credentials || !config.credentials.apple || !config.credentials.apple.merchant) throw new Error('Invalid configuration');
-          return _this4.checkAvailability(config);
-        }).then(function (available) {
-          if (!available) return _this4.handleOnUnavailable();
-          return _this4.mount();
-        })["catch"](function (err) {
-          if (err) _this4.handleOnError(err);
-          _this4.handleOnUnavailable();
-        });
+        _this4.onScriptLoaded();
       };
       applePayScript.onerror = function (err) {
         console.error("ApplePayWalletButtonExpress: Error loading ApplePay script", err);
@@ -19449,6 +19469,27 @@ var ApplePayWalletButtonExpress = /*#__PURE__*/function (_BaseWalletButton) {
       };
       document.head.appendChild(applePayScript);
     }
+  }, {
+    key: "onScriptLoaded",
+    value: function onScriptLoaded() {
+      var _this5 = this;
+      this.getGatewayWalletConfig().then(function (config) {
+        if (!config || config.type !== 'MasterCard' || !config.credentials || !config.credentials.apple || !config.credentials.apple.merchant) {
+          throw new Error('Invalid configuration');
+        }
+        return _this5.checkAvailability(config);
+      }).then(function (available) {
+        if (!available) {
+          return _this5.handleOnUnavailable();
+        }
+        return _this5.mount();
+      })["catch"](function (err) {
+        if (err) {
+          _this5.handleOnError(err);
+        }
+        _this5.handleOnUnavailable();
+      });
+    }
     /**
      * Call this method if updating the originally-provided meta object after order information changed.
      * For example, if the order amount has changed from the time where the button was originally rendered.
@@ -19466,15 +19507,15 @@ var ApplePayWalletButtonExpress = /*#__PURE__*/function (_BaseWalletButton) {
   }, {
     key: "checkAvailability",
     value: function checkAvailability(config) {
-      var _this5 = this;
+      var _this6 = this;
       return new Promise(function (resolve, _reject) {
         var _a;
         if (!window.ApplePaySession || !ApplePaySession) {
           resolve(false);
         }
         var formattedCapabilities = DEFAULT_APPLE_PAY_CAPABILITIES;
-        if (((_a = _this5.meta.apple_pay_capabilities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-          formattedCapabilities = _this5.formatCapabilities(_this5.meta.apple_pay_capabilities);
+        if (((_a = _this6.meta.apple_pay_capabilities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+          formattedCapabilities = _this6.formatCapabilities(_this6.meta.apple_pay_capabilities);
         }
         ApplePaySession.applePayCapabilities(config.credentials[WALLET_TYPE.APPLE].merchant).then(function (capabilities) {
           var canMakePayment = formattedCapabilities.includes(capabilities === null || capabilities === void 0 ? void 0 : capabilities.paymentCredentialStatus);

package/bundles/index.cjs.d.ts

@@ -4269,6 +4269,7 @@ declare class ApplePayWalletButtonExpress extends BaseWalletButton<ApplePayWalle
      *  button.load();
      */
     load(): void;
+    private onScriptLoaded;
     /**
      * Call this method if updating the originally-provided meta object after order information changed.
      * For example, if the order amount has changed from the time where the button was originally rendered.

package/bundles/index.mjs

@@ -952,7 +952,7 @@ SDK.headerKeys = Object.freeze({
   version: 'x-sdk-version',
   type: 'x-sdk-type'
 });
-SDK._version = 'v1.123.2-beta';
+SDK._version = 'v1.123.8';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -4233,11 +4233,11 @@ function createNewrelicConfig() {
   var gateway = 'bam.nr-data.net';
   var params = {
     enabled: 'true',
-    accountId: '974691',
-    agentId: '1386157150',
-    applicationId: '1386157150',
-    licenseKey: '4848a32285',
-    trustKey: '974691'
+    accountId: '',
+    agentId: '',
+    applicationId: '',
+    licenseKey: '',
+    trustKey: ''
   };
   var disabled = function disabled() {
     return {
@@ -13199,10 +13199,13 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
       var _a, _b, _c;
       if (((_a = this.meta) === null || _a === void 0 ? void 0 : _a.style) && _typeof$1((_b = this.meta) === null || _b === void 0 ? void 0 : _b.style) === 'object') {
         var metaStyles = JSON.parse(JSON.stringify((_c = this.meta) === null || _c === void 0 ? void 0 : _c.style));
-        if ('google' in metaStyles)
+        if ('google' in metaStyles) {
           // biome-ignore lint/performance/noDelete: <explanation>
           metaStyles === null || metaStyles === void 0 ? true : delete metaStyles.google; // to offer backward compatibility
-        if ('apple' in metaStyles) return metaStyles === null || metaStyles === void 0 ? void 0 : metaStyles.apple;
+        }
+        if ('apple' in metaStyles) {
+          return metaStyles === null || metaStyles === void 0 ? void 0 : metaStyles.apple;
+        }
         return metaStyles; // to offer backward compatibility
       }
       return null;
@@ -13213,10 +13216,13 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
       var _a, _b, _c, _d;
       if (((_a = this.meta) === null || _a === void 0 ? void 0 : _a.raw_data_initialization) && ((_b = this.meta) === null || _b === void 0 ? void 0 : _b.raw_data_initialization) && _typeof$1((_c = this.meta) === null || _c === void 0 ? void 0 : _c.raw_data_initialization) === 'object') {
         var metaRawDataInit = JSON.parse(JSON.stringify((_d = this.meta) === null || _d === void 0 ? void 0 : _d.raw_data_initialization));
-        if ('google' in metaRawDataInit)
+        if ('google' in metaRawDataInit) {
           // biome-ignore lint/performance/noDelete: <explanation>
           metaRawDataInit === null || metaRawDataInit === void 0 ? true : delete metaRawDataInit.google; // to offer backward compatibility
-        if ('apple' in metaRawDataInit) return metaRawDataInit === null || metaRawDataInit === void 0 ? void 0 : metaRawDataInit.apple;
+        }
+        if ('apple' in metaRawDataInit) {
+          return metaRawDataInit === null || metaRawDataInit === void 0 ? void 0 : metaRawDataInit.apple;
+        }
         return metaRawDataInit; // to offer backward compatibility
       }
       return null;
@@ -13244,28 +13250,16 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
         });
         return;
       }
+      if (customElements === null || customElements === void 0 ? void 0 : customElements.get('apple-pay-button')) {
+        this.onScriptLoaded(container);
+        return;
+      }
       var applePayScript = document.createElement('script');
       applePayScript.src = "https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js";
       applePayScript.type = "text/javascript";
       applePayScript.crossOrigin = 'anonymous';
       applePayScript.onload = function () {
-        _this2.checkAvailability().then(function (available) {
-          var _a;
-          if (!available) {
-            _this2.eventEmitter.emit(WALLET_EVENT.UNAVAILABLE, {
-              wallet: WALLET_TYPE.APPLE
-            });
-            return;
-          }
-          // Store default shipping option
-          if (_this2.isShippingRequired() && _this2.hasShippingOptions()) {
-            _this2.selectedShippingOption = (_a = _this2.meta) === null || _a === void 0 ? void 0 : _a.shipping_options[0];
-            _this2.latestShippingData.shippingMethod = _this2.formatShippingOptions([_this2.selectedShippingOption])[0];
-          }
-          _this2.mount(container);
-        })["catch"](function (err) {
-          return console.error("Error checking ApplePay availability", err);
-        });
+        _this2.onScriptLoaded(container);
       };
       applePayScript.onerror = function (err) {
         console.error("AppleWalletService: Error loading ApplePay script", err);
@@ -13276,15 +13270,43 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
       };
       document.head.appendChild(applePayScript);
     }
+  }, {
+    key: "onScriptLoaded",
+    value: function onScriptLoaded(container) {
+      var _this3 = this;
+      this.checkAvailability().then(function (available) {
+        var _a;
+        if (!available) {
+          _this3.eventEmitter.emit(WALLET_EVENT.UNAVAILABLE, {
+            wallet: WALLET_TYPE.APPLE
+          });
+          return;
+        }
+        // Store default shipping option
+        if (_this3.isShippingRequired() && _this3.hasShippingOptions()) {
+          _this3.selectedShippingOption = (_a = _this3.meta) === null || _a === void 0 ? void 0 : _a.shipping_options[0];
+          _this3.latestShippingData.shippingMethod = _this3.formatShippingOptions([_this3.selectedShippingOption])[0];
+        }
+        _this3.mount(container);
+      })["catch"](function (err) {
+        return console.error("Error checking ApplePay availability", err);
+      });
+    }
   }, {
     key: "update",
     value: function update(data) {
       var _a, _b, _c;
-      if (!this.latestShippingChangePromiseResolve || !this.latestShippingChangePromiseReject) return;
-      if (!data.success || !data.body) return this.latestShippingChangePromiseReject();
+      if (!this.latestShippingChangePromiseResolve || !this.latestShippingChangePromiseReject) {
+        return;
+      }
+      if (!data.success || !data.body) {
+        return this.latestShippingChangePromiseReject();
+      }
       var newAmount = (_a = data === null || data === void 0 ? void 0 : data.body) === null || _a === void 0 ? void 0 : _a.amount;
       var newShippingOptions = (_b = data === null || data === void 0 ? void 0 : data.body) === null || _b === void 0 ? void 0 : _b.shipping_options;
-      if (newAmount) this.meta.amount = newAmount;
+      if (newAmount) {
+        this.meta.amount = newAmount;
+      }
       if (newShippingOptions) {
         this.meta.shipping_options = newShippingOptions;
         this.selectedShippingOption = newShippingOptions ? newShippingOptions[0] : undefined;
@@ -13304,17 +13326,17 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
   }, {
     key: "checkAvailability",
     value: function checkAvailability() {
-      var _this3 = this;
+      var _this4 = this;
       return new Promise(function (resolve, _reject) {
         var _a;
         if (!window.ApplePaySession || !ApplePaySession) {
           resolve(false);
         }
         var formattedCapabilities = DEFAULT_APPLE_PAY_CAPABILITIES$1;
-        if (((_a = _this3.meta.apple_pay_capabilities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-          formattedCapabilities = _this3.formatCapabilities(_this3.meta.apple_pay_capabilities);
+        if (((_a = _this4.meta.apple_pay_capabilities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+          formattedCapabilities = _this4.formatCapabilities(_this4.meta.apple_pay_capabilities);
         }
-        ApplePaySession.applePayCapabilities(_this3.getMerchantId()).then(function (capabilities) {
+        ApplePaySession.applePayCapabilities(_this4.getMerchantId()).then(function (capabilities) {
           var canMakePayment = formattedCapabilities.includes(capabilities === null || capabilities === void 0 ? void 0 : capabilities.paymentCredentialStatus);
           resolve(canMakePayment);
         })["catch"](function (_err) {
@@ -13362,11 +13384,17 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
       var _a;
       var rawDataInitialization = this.getMetaRawDataInitialization();
       if (rawDataInitialization && _typeof$1(rawDataInitialization) === 'object') {
-        if (_typeof$1(rawDataInitialization.total) === 'object') rawDataInitialization.total.amount = this.meta.amount.toString();else rawDataInitialization.total = {
-          label: ((_a = this.meta) === null || _a === void 0 ? void 0 : _a.amount_label) || '',
-          amount: this.meta.amount.toString()
-        };
-        if (this.isShippingRequired() && this.hasShippingOptions()) rawDataInitialization.shippingMethods = this.formatShippingOptions(this.meta.shipping_options);
+        if (_typeof$1(rawDataInitialization.total) === 'object') {
+          rawDataInitialization.total.amount = this.meta.amount.toString();
+        } else {
+          rawDataInitialization.total = {
+            label: ((_a = this.meta) === null || _a === void 0 ? void 0 : _a.amount_label) || '',
+            amount: this.meta.amount.toString()
+          };
+        }
+        if (this.isShippingRequired() && this.hasShippingOptions()) {
+          rawDataInitialization.shippingMethods = this.formatShippingOptions(this.meta.shipping_options);
+        }
       }
       return rawDataInitialization || _extends(_extends(_extends({
         countryCode: this.meta.country.toUpperCase(),
@@ -13390,22 +13418,22 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
   }, {
     key: "getMerchantSession",
     value: function getMerchantSession() {
-      var _this4 = this;
+      var _this5 = this;
       return new Promise(function (resolve, reject) {
-        return _this4.eventEmitter.emit(WALLET_EVENT.CALLBACK, {
+        return _this5.eventEmitter.emit(WALLET_EVENT.CALLBACK, {
           data: _extends({
             request_type: "CREATE_SESSION",
             wallet_type: WALLET_TYPE.APPLE,
             session_id: window.location.hostname
-          }, _this4.isShippingRequired() && {
-            request_shipping: _this4.meta.request_shipping
+          }, _this5.isShippingRequired() && {
+            request_shipping: _this5.meta.request_shipping
           }),
           onSuccess: function onSuccess(res) {
             return resolve(res);
           },
           onError: function onError(message) {
             console.error('Error generating order id', message);
-            _this4.eventEmitter.emit(WALLET_EVENT.PAYMENT_ERROR, {
+            _this5.eventEmitter.emit(WALLET_EVENT.PAYMENT_ERROR, {
               message: message
             });
             reject(message);
@@ -13416,10 +13444,10 @@ var AppleWalletService = /*#__PURE__*/function (_WalletService) {
   }, {
     key: "handleMerchantOnButtonClickEvent",
     value: function handleMerchantOnButtonClickEvent() {
-      var _this5 = this;
+      var _this6 = this;
       return new Promise(function (resolve, reject) {
         var merchantResult;
-        _this5.eventEmitter.emit(WALLET_EVENT.BUTTON_CLICK, {
+        _this6.eventEmitter.emit(WALLET_EVENT.BUTTON_CLICK, {
           attachResult: function attachResult(value) {
             merchantResult = value;
           }
@@ -19287,17 +19315,13 @@ var ApplePayWalletButtonExpress = /*#__PURE__*/function (_BaseWalletButton) {
     _classCallCheck(this, ApplePayWalletButtonExpress);
     _this = _callSuper(this, ApplePayWalletButtonExpress, [selector, publicKeyOrAccessToken, gatewayId, meta, ['amount_label', 'country']]);
     _this.onApplePayButtonClicked = function () {
-      return _this.handleMerchantOnExpressButtonClickEvent().then(function () {
-        _this.paymentSession = new ApplePaySession(14, _this.createRequest());
-        _this.paymentSession.onvalidatemerchant = _this.onValidateMerchant;
-        _this.paymentSession.onpaymentauthorized = _this.onPaymentAuthorized;
-        _this.paymentSession.oncancel = _this.onCancelPayment;
-        _this.paymentSession.onshippingmethodselected = _this.onApplePayShippingMethodUpdate;
-        _this.paymentSession.onshippingcontactselected = _this.onApplePayShippingContactUpdate;
-        _this.paymentSession.begin();
-      })["catch"](function () {
-        _this.handleCheckoutClose();
-      });
+      _this.paymentSession = new ApplePaySession(14, _this.createRequest());
+      _this.paymentSession.onvalidatemerchant = _this.onValidateMerchant;
+      _this.paymentSession.onpaymentauthorized = _this.onPaymentAuthorized;
+      _this.paymentSession.oncancel = _this.onCancelPayment;
+      _this.paymentSession.onshippingmethodselected = _this.onApplePayShippingMethodUpdate;
+      _this.paymentSession.onshippingcontactselected = _this.onApplePayShippingContactUpdate;
+      _this.paymentSession.begin();
     };
     _this.onValidateMerchant = function (event) {
       _this.handleMerchantOnExpressButtonClickEvent().then(function () {
@@ -19423,22 +19447,18 @@ var ApplePayWalletButtonExpress = /*#__PURE__*/function (_BaseWalletButton) {
     key: "load",
     value: function load() {
       var _this4 = this;
-      if (!window.Promise) return this.handleOnUnavailable();
+      if (!window.Promise) {
+        return this.handleOnUnavailable();
+      }
+      if (customElements === null || customElements === void 0 ? void 0 : customElements.get('apple-pay-button')) {
+        return this.onScriptLoaded();
+      }
       var applePayScript = document.createElement('script');
       applePayScript.src = "https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js";
       applePayScript.type = "text/javascript";
       applePayScript.crossOrigin = 'anonymous';
       applePayScript.onload = function () {
-        _this4.getGatewayWalletConfig().then(function (config) {
-          if (!config || config.type !== 'MasterCard' || !config.credentials || !config.credentials.apple || !config.credentials.apple.merchant) throw new Error('Invalid configuration');
-          return _this4.checkAvailability(config);
-        }).then(function (available) {
-          if (!available) return _this4.handleOnUnavailable();
-          return _this4.mount();
-        })["catch"](function (err) {
-          if (err) _this4.handleOnError(err);
-          _this4.handleOnUnavailable();
-        });
+        _this4.onScriptLoaded();
       };
       applePayScript.onerror = function (err) {
         console.error("ApplePayWalletButtonExpress: Error loading ApplePay script", err);
@@ -19447,6 +19467,27 @@ var ApplePayWalletButtonExpress = /*#__PURE__*/function (_BaseWalletButton) {
       };
       document.head.appendChild(applePayScript);
     }
+  }, {
+    key: "onScriptLoaded",
+    value: function onScriptLoaded() {
+      var _this5 = this;
+      this.getGatewayWalletConfig().then(function (config) {
+        if (!config || config.type !== 'MasterCard' || !config.credentials || !config.credentials.apple || !config.credentials.apple.merchant) {
+          throw new Error('Invalid configuration');
+        }
+        return _this5.checkAvailability(config);
+      }).then(function (available) {
+        if (!available) {
+          return _this5.handleOnUnavailable();
+        }
+        return _this5.mount();
+      })["catch"](function (err) {
+        if (err) {
+          _this5.handleOnError(err);
+        }
+        _this5.handleOnUnavailable();
+      });
+    }
     /**
      * Call this method if updating the originally-provided meta object after order information changed.
      * For example, if the order amount has changed from the time where the button was originally rendered.
@@ -19464,15 +19505,15 @@ var ApplePayWalletButtonExpress = /*#__PURE__*/function (_BaseWalletButton) {
   }, {
     key: "checkAvailability",
     value: function checkAvailability(config) {
-      var _this5 = this;
+      var _this6 = this;
       return new Promise(function (resolve, _reject) {
         var _a;
         if (!window.ApplePaySession || !ApplePaySession) {
           resolve(false);
         }
         var formattedCapabilities = DEFAULT_APPLE_PAY_CAPABILITIES;
-        if (((_a = _this5.meta.apple_pay_capabilities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-          formattedCapabilities = _this5.formatCapabilities(_this5.meta.apple_pay_capabilities);
+        if (((_a = _this6.meta.apple_pay_capabilities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+          formattedCapabilities = _this6.formatCapabilities(_this6.meta.apple_pay_capabilities);
         }
         ApplePaySession.applePayCapabilities(config.credentials[WALLET_TYPE.APPLE].merchant).then(function (capabilities) {
           var canMakePayment = formattedCapabilities.includes(capabilities === null || capabilities === void 0 ? void 0 : capabilities.paymentCredentialStatus);