@tap-payments/apple-pay-button 0.0.72-development → 0.0.74-development

package/build/hooks/useApplePay.js

@@ -54,11 +54,10 @@ import { getApplePayPaymentMethod, getDefaultThemeMode } from '../utils';
 import appService, { getAxiosGlobalHeaders, setAxiosGlobalHeaders } from '../api';
 import { ChargeCode, mapingInterface } from '@tap-payments/acceptance-sdk';
 export var useApplePay = function (_a) {
-    var _b;
+    var _b, _c;
     var buttonProps = _a.buttonProps;
-    var _c = useState(), applePayRequestData = _c[0], setApplePayRequestData = _c[1];
-    var _d = useState(), applePayRequestConfiguration = _d[0], setApplePayRequestConfiguration = _d[1];
-    var _e = useState(), paymentMethodIdentifier = _e[0], setPaymentMethodIdentifier = _e[1];
+    var _d = useState(), applePayRequestData = _d[0], setApplePayRequestData = _d[1];
+    var _e = useState(), applePayRequestConfiguration = _e[0], setApplePayRequestConfiguration = _e[1];
     var _f = useState(), profileData = _f[0], setProfile = _f[1];
     var _g = useState(false), disabled = _g[0], setDisabled = _g[1];
     var _h = useState(false), initialLoading = _h[0], setInitialLoading = _h[1];
@@ -66,9 +65,6 @@ export var useApplePay = function (_a) {
     var _k = useState(false), success = _k[0], setSuccess = _k[1];
     var _l = useState(false), loading = _l[0], setLoading = _l[1];
     var _m = useState(false), isRounded = _m[0], setIsRounded = _m[1];
-    var domainValidator = useMemo(function () {
-        return (paymentMethodIdentifier !== null && paymentMethodIdentifier !== void 0 ? paymentMethodIdentifier : '').toLowerCase().includes('knet') ? 'knet' : 'tap';
-    }, [paymentMethodIdentifier]);
     var mappedProps = __assign(__assign({}, buttonProps), { interface: mapingInterface(buttonProps.interface) });
     var 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, transaction = mappedProps.transaction, post = mappedProps.post, redirect = mappedProps.redirect;
     var isIframeIntegration = buttonProps.integration === 'iframe';
@@ -164,7 +160,6 @@ export var useApplePay = function (_a) {
                     setProfile(data);
                     applePayPreparedData = prepareApplePayRequest(__assign(__assign({}, data), { order: order, acceptance: acceptance, customer: customer }));
                     setApplePayRequestData(applePayPreparedData.applePaySessionRequest);
-                    setPaymentMethodIdentifier(applePayPreparedData.paymentMethod.identifier);
                     onOrderCreated === null || onOrderCreated === void 0 ? void 0 : onOrderCreated((_l = (_k = data.payment_options) === null || _k === void 0 ? void 0 : _k.order) === null || _l === void 0 ? void 0 : _l.id);
                     setApplePayRequestConfiguration({
                         BASE_URL: MW_BASE_URL,
@@ -183,6 +178,14 @@ export var useApplePay = function (_a) {
             }
         });
     }); };
+    var isTapIdentifier = function (id) { return (id.toLowerCase().includes('knet') ? 'knet' : 'tap'); };
+    var domainValidator = useMemo(function () {
+        var _a, _b, _c;
+        if (merchant.identifier)
+            return isTapIdentifier(merchant.identifier);
+        var identifier = (_c = (_b = getApplePayPaymentMethod(((_a = profileData === null || profileData === void 0 ? void 0 : profileData.payment_options) === null || _a === void 0 ? void 0 : _a.payment_methods) || [])) === null || _b === void 0 ? void 0 : _b.identifier) !== null && _c !== void 0 ? _c : '';
+        return isTapIdentifier(identifier);
+    }, [(_c = profileData === null || profileData === void 0 ? void 0 : profileData.payment_options) === null || _c === void 0 ? void 0 : _c.payment_methods, merchant === null || merchant === void 0 ? void 0 : merchant.identifier]);
     var onApplePayButtonClicked = function () { return __awaiter(void 0, void 0, void 0, function () {
         var ApplePaySession, session_1;
         var _a;

package/package.json

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