@tap-payments/apple-pay-button 0.0.59-development → 0.0.61-development

package/build/hooks/useApplePay.js

@@ -52,20 +52,20 @@ import { ApplePayVersion } from '../constants';
 import { Scope } from '../@types/enums';
 import { prepareApplePayRequest } from '../utils/config';
 import { useMerchantApplePay } from './useMerchantApplePay';
-import { getApplePayPaymentMethod, getDefaultThemeMode, getDefaultValues, getFullThemeMode } from '../utils';
+import { getApplePayPaymentMethod, getDefaultLocale, getDefaultThemeMode, getDefaultValues, getFullThemeMode } from '../utils';
 export var useApplePay = function (_a) {
-    var _b, _c, _d, _e, _f;
+    var _b, _c, _d, _e;
     var buttonProps = _a.buttonProps;
-    var _g = useState(), applePayRequestData = _g[0], setApplePayRequestData = _g[1];
-    var _h = useState(), applePayRequestConfiguration = _h[0], setApplePayRequestConfiguration = _h[1];
-    var _j = useState(), profileData = _j[0], setProfile = _j[1];
-    var _k = useState(false), disabled = _k[0], setDisabled = _k[1];
-    var _l = useState(null), tapTheme = _l[0], setTapTheme = _l[1];
-    var _m = useState(), tapLocalization = _m[0], setTapLocalization = _m[1];
-    var _o = useState(false), error = _o[0], setError = _o[1];
-    var _p = useState(false), success = _p[0], setSuccess = _p[1];
-    var _q = useState(false), loading = _q[0], setLoading = _q[1];
-    var _r = useState(false), isRounded = _r[0], setIsRounded = _r[1];
+    var _f = useState(), applePayRequestData = _f[0], setApplePayRequestData = _f[1];
+    var _g = useState(), applePayRequestConfiguration = _g[0], setApplePayRequestConfiguration = _g[1];
+    var _h = useState(), profileData = _h[0], setProfile = _h[1];
+    var _j = useState(false), disabled = _j[0], setDisabled = _j[1];
+    var _k = useState(null), tapTheme = _k[0], setTapTheme = _k[1];
+    var _l = useState(), tapLocalization = _l[0], setTapLocalization = _l[1];
+    var _m = useState(false), error = _m[0], setError = _m[1];
+    var _o = useState(false), success = _o[0], setSuccess = _o[1];
+    var _p = useState(false), loading = _p[0], setLoading = _p[1];
+    var _q = useState(false), isRounded = _q[0], setIsRounded = _q[1];
     var mappedProps = getDefaultValues(buttonProps);
     var environment = mappedProps.environment, interfaceObj = mappedProps.interface, merchant = mappedProps.merchant, customer = mappedProps.customer, acceptance = mappedProps.acceptance, scope = mappedProps.scope, debug = mappedProps.debug, onError = mappedProps.onError, onSuccess = mappedProps.onSuccess, onCancel = mappedProps.onCancel, onReady = mappedProps.onReady, metaData = mappedProps.metaData, headers = mappedProps.headers, operator = mappedProps.operator, order = mappedProps.order, onOrderCreated = mappedProps.onOrderCreated, integration = mappedProps.integration, transaction = mappedProps.transaction, post = mappedProps.post, redirect = mappedProps.redirect;
     var isIframeIntegration = buttonProps.integration === 'iframe';
@@ -86,8 +86,8 @@ export var useApplePay = function (_a) {
         setSuccess: setSuccess,
         setIsRounded: setIsRounded
     });
-    var lang = (_c = (_b = mappedProps.interface) === null || _b === void 0 ? void 0 : _b.locale) !== null && _c !== void 0 ? _c : 'en';
-    var theme = getDefaultThemeMode((_d = mappedProps.interface) === null || _d === void 0 ? void 0 : _d.theme);
+    var lang = getDefaultLocale((_b = mappedProps.interface) === null || _b === void 0 ? void 0 : _b.locale);
+    var theme = getDefaultThemeMode((_c = mappedProps.interface) === null || _c === void 0 ? void 0 : _c.theme);
     var applePayPaymentMethodOptions = useMemo(function () {
         if (!profileData)
             return null;
@@ -120,8 +120,8 @@ export var useApplePay = function (_a) {
         applePayPaymentMethodOptions,
         lang,
         profileData === null || profileData === void 0 ? void 0 : profileData.payment_options.payment_methods,
-        (_e = buttonProps.interface) === null || _e === void 0 ? void 0 : _e.colorStyle,
-        (_f = buttonProps.interface) === null || _f === void 0 ? void 0 : _f.theme
+        (_d = buttonProps.interface) === null || _d === void 0 ? void 0 : _d.colorStyle,
+        (_e = buttonProps.interface) === null || _e === void 0 ? void 0 : _e.theme
     ]);
     var showLoader = useMemo(function () {
         var _a;
@@ -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];
@@ -255,7 +255,7 @@ export var useApplePay = function (_a) {
                                 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));
                                 }
-                                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.origin)];
                             case 2:
                                 merchantSession = _a.sent();
                                 if (debug)

package/package.json

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