@tap-payments/auth-jsconnect 2.6.3-test → 2.6.5-test

package/build/features/tax/Tax.js

@@ -36,11 +36,11 @@ import { taxFeatureScreens } from '../featuresScreens';
 import { taxSelector, verifyLeadToken } from '../app/tax/taxStore';
 import Background from '../shared/Background';
 var Tax = memo(function (_a) {
-    var verifyToken = _a.verifyToken, props = __rest(_a, ["verifyToken"]);
+    var configToken = _a.configToken, verifyToken = _a.verifyToken, props = __rest(_a, ["configToken", "verifyToken"]);
     var theme = useAppTheme().theme;
-    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
+    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading, internalLoading = _b.internalLoading;
     var _c = useAppSelector(taxSelector), customLoading = _c.customLoading, taxError = _c.error, loading = _c.loading;
-    useAppConfig(__assign(__assign({ navigation: TAX_SCREENS_NAVIGATION }, props), { disableSettingFetching: !!verifyToken }));
+    useAppConfig(__assign(__assign({ configToken: configToken, navigation: TAX_SCREENS_NAVIGATION }, props), { disableSettingFetching: !!verifyToken }));
     useErrorListener(taxError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;
@@ -55,7 +55,7 @@ var Tax = memo(function (_a) {
         navigation: featureScreensNavigation,
         open: open,
         internalToken: verifyToken,
-        settingLoading: settingLoading
+        settingLoading: configToken ? internalLoading : settingLoading
     });
     var initialLoading = verifyToken ? settingLoading : settingLoading || customLoading;
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, open: open, error: error, loading: initialLoading, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: isMaturityExpress }, { children: taxFeatureScreens.map(function (_a, index) {

package/build/features/tax/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js

@@ -11,12 +11,21 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
-import { useAppSelector } from '../../../../hooks';
-import { taxSelector } from '../../../app/tax/taxStore';
+import { settingsSelector } from '../../../../app/settings';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
+import { SCOPE_AUTH } from '../../../../constants';
+import { onCloseCompleteTax, taxSelector } from '../../../app/tax/taxStore';
 import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
 var SuccessWithFlowButtons = function () {
-    var data = useAppSelector(taxSelector).data;
-    var _a = data.verify.responseBody || {}, flows = _a.flows, entity = _a.entity, brand = _a.brand, bank = _a.bank_account, merchant = _a.merchant, user = _a.user, business = _a.business, board_id = _a.board_id, board_info_id = _a.board_info_id, name = _a.name, individuals = _a.individuals;
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: flows || [] }));
+    var dispatch = useAppDispatch();
+    var _a = useAppSelector(taxSelector), data = _a.data, loading = _a.loading;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var isScopeAuthentication = settingsData.appConfig.scope === SCOPE_AUTH;
+    var redirectUrl = settingsData.appConfig.redirectUrl;
+    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals;
+    var onClose = function () {
+        dispatch(onCloseCompleteTax());
+    };
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: flows || [], onClose: isScopeAuthentication && redirectUrl ? onClose : undefined }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/hooks/useAppConfig.js

@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { useEffect } from 'react';
-import { handleActiveFlowScreens, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin, fetchAppSettingsSync, handelBoardMaturity, settingsSelector } from '../app/settings';
+import { handleActiveFlowScreens, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin, fetchAppSettingsSync, handelBoardMaturity, settingsSelector, updateInternalLoading } from '../app/settings';
 import { useAppDispatch } from './useAppDispatch';
 import { useAppSelector } from './useAppSelector';
 import { isTapDomain, removeRequestHeaders, setBaseUrl } from '../utils';
@@ -43,8 +43,9 @@ export var useAppConfig = function (_a) {
     useEffect(function () {
         if (rest.open === false)
             return;
-        if (!disableSettingFetching)
+        if (!disableSettingFetching && !configToken)
             removeRequestHeaders();
+        dispatch(updateInternalLoading(true));
         checkDomain();
         setBaseUrl(publicKey);
         setAppConfig();
@@ -52,7 +53,7 @@ export var useAppConfig = function (_a) {
             dispatch(handelBoardMaturity(boardMaturity));
         if (!data.isMaturityExpress)
             dispatch(handleLanguage(rest.language));
-        if (!disableSettingFetching)
+        if (!disableSettingFetching || configToken)
             dispatch(fetchAppSettingsSync({
                 disableCountries: disableCountries,
                 disableLocale: disableLocale,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.6.3-test",
+	"version": "2.6.5-test",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",