@tap-payments/apple-pay-button 0.0.60-development → 0.0.62-development

package/build/hooks/useApplePay.js

@@ -129,16 +129,16 @@ export var useApplePay = function (_a) {
     }, [mappedProps]);
     var initialize = function (metaData) { return __awaiter(void 0, void 0, void 0, function () {
         var merchantProfile, payment_options, headers_1, data, err_1;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        return __generator(this, function (_m) {
-            switch (_m.label) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        return __generator(this, function (_o) {
+            switch (_o.label) {
                 case 0:
                     setLoading(true);
                     appService.setEnv(environment);
                     appService.setBaseUrl();
-                    _m.label = 1;
+                    _o.label = 1;
                 case 1:
-                    _m.trys.push([1, 7, 8, 9]);
+                    _o.trys.push([1, 7, 8, 9]);
                     if (metaData) {
                         merchantProfile = metaData.merchant, payment_options = metaData.payment_options, headers_1 = metaData.headers;
                         setAxiosGlobalHeaders(__assign({}, headers_1));
@@ -148,7 +148,7 @@ export var useApplePay = function (_a) {
                     if (!headers) return [3, 3];
                     return [4, appService.setHttpHeaders(__assign(__assign({}, headers), { authorization: operator.publicKey }))];
                 case 2:
-                    _m.sent();
+                    _o.sent();
                     return [3, 5];
                 case 3: return [4, appService.setBrowserHeaders({
                         locale: interfaceObj === null || interfaceObj === void 0 ? void 0 : interfaceObj.locale,
@@ -156,8 +156,8 @@ export var useApplePay = function (_a) {
                         pk: operator.publicKey
                     })];
                 case 4:
-                    _m.sent();
-                    _m.label = 5;
+                    _o.sent();
+                    _o.label = 5;
                 case 5: return [4, appService.checkoutProfile({
                         supported_payment_methods: ['APPLE_PAY'],
                         supported_currencies: [order.currency],
@@ -189,7 +189,7 @@ export var useApplePay = function (_a) {
                             ] })
                     })];
                 case 6:
-                    data = _m.sent();
+                    data = _o.sent();
                     if (debug)
                         console.log('merchant configuration: ', data);
                     setProfile(data);
@@ -198,11 +198,11 @@ export var useApplePay = function (_a) {
                     setApplePayRequestConfiguration({
                         BASE_URL: appService.getBaseUrl(),
                         headers: getAxiosGlobalHeaders(),
-                        merchant: data.merchant
+                        merchant: __assign(__assign({}, data.merchant), { id: merchant.id || ((_m = data.merchant) === null || _m === void 0 ? void 0 : _m.id) })
                     });
                     return [3, 9];
                 case 7:
-                    err_1 = _m.sent();
+                    err_1 = _o.sent();
                     onError === null || onError === void 0 ? void 0 : onError(err_1.errors || err_1);
                     console.log('error in initialize', err_1);
                     return [3, 9];
@@ -253,9 +253,9 @@ export var useApplePay = function (_a) {
                             case 1:
                                 _a.trys.push([1, 3, , 4]);
                                 if (debug) {
-                                    console.info("creating merchant session for merchantData: ".concat(JSON.stringify(profileData.merchant), " and validationURL: ").concat(event.validationURL, " and merchant.domain: ").concat(window.location.origin));
+                                    console.info("creating merchant session for merchantData: ".concat(JSON.stringify(profileData.merchant), " and validationURL: ").concat(event.validationURL, " and merchant.domain: ").concat(window.location.hostname));
                                 }
-                                return [4, appService.appleSession(__assign(__assign({}, profileData.merchant), { id: merchant.id }), event.validationURL, window.location.origin)];
+                                return [4, appService.appleSession(__assign(__assign({}, profileData.merchant), { id: merchant.id || profileData.merchant.id }), event.validationURL, window.location.hostname)];
                             case 2:
                                 merchantSession = _a.sent();
                                 if (debug)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/apple-pay-button",
-	"version": "0.0.60-development",
+	"version": "0.0.62-development",
 	"description": "Apple Pay Button React Component",
 	"main": "build/index.js",
 	"module": "build/index.js",