@tap-payments/auth-jsconnect 2.6.98-test → 2.6.101-test

package/build/features/bank/Bank.js

@@ -38,9 +38,9 @@ import Background from '../shared/Background';
 var Bank = memo(function (_a) {
     var verifyToken = _a.verifyToken, configToken = _a.configToken, loaderColor = _a.loaderColor, props = __rest(_a, ["verifyToken", "configToken", "loaderColor"]);
     var theme = useAppTheme().theme;
-    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading, internalLoading = _b.internalLoading;
+    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
     var _c = useAppSelector(bankSelector), customLoading = _c.customLoading, loading = _c.loading, bankError = _c.error;
-    useAppConfig(__assign(__assign({ configToken: configToken, navigation: BANK_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken }));
+    useAppConfig(__assign(__assign({ navigation: BANK_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken || !!configToken }));
     useErrorListener(bankError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;
@@ -56,7 +56,7 @@ var Bank = memo(function (_a) {
         open: open,
         mode: props.mode,
         internalToken: verifyToken,
-        settingLoading: configToken ? internalLoading : settingLoading
+        settingLoading: settingLoading
     });
     var initialLoading = verifyToken && props.mode !== 'content' ? settingLoading : settingLoading || customLoading;
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ mode: props.mode, open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, loaderColor: loaderColor, isMaturityExpress: isMaturityExpress, type: props.mode === 'content' ? 'CONTENT' : undefined }, { children: _jsx(FeatureContainer, __assign({ mode: props.mode, isMaturityExpress: isMaturityExpress }, { children: bankFeatureScreens.map(function (_a, index) {

package/build/features/brand/Brand.js

@@ -38,9 +38,9 @@ import Background from '../shared/Background';
 var Brand = memo(function (_a) {
     var verifyToken = _a.verifyToken, configToken = _a.configToken, loaderColor = _a.loaderColor, props = __rest(_a, ["verifyToken", "configToken", "loaderColor"]);
     var theme = useAppTheme().theme;
-    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading, internalLoading = _b.internalLoading;
+    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
     var _c = useAppSelector(brandSelector), customLoading = _c.customLoading, loading = _c.loading, brandError = _c.error;
-    useAppConfig(__assign(__assign({ configToken: configToken, navigation: BRAND_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken }));
+    useAppConfig(__assign(__assign({ navigation: BRAND_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken || !!configToken }));
     useErrorListener(brandError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;
@@ -56,7 +56,7 @@ var Brand = memo(function (_a) {
         open: open,
         mode: props.mode,
         internalToken: verifyToken,
-        settingLoading: configToken ? internalLoading : settingLoading
+        settingLoading: settingLoading
     });
     var initialLoading = verifyToken && props.mode !== 'content' ? settingLoading : settingLoading || customLoading;
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ mode: props.mode, open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, loaderColor: loaderColor, type: props.mode === 'content' ? 'CONTENT' : undefined }, { children: _jsx(FeatureContainer, __assign({ mode: props.mode, isMaturityExpress: isMaturityExpress }, { children: brandFeatureScreens.map(function (_a, index) {

package/build/features/connectExpress/screens/AuthenticationList/EntityList.js

@@ -81,6 +81,7 @@ var EntityList = function (_a) {
             if (filteredEntityList.length) {
                 setValue('entityInfo', filteredEntityList[0], { shouldValidate: true });
                 setValue('licenseNumber', '');
+                setValue('licenseType', '');
                 setValue('legalName', '');
                 handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(false);
             }

package/build/features/entity/Entity.js

@@ -38,9 +38,9 @@ import Background from '../shared/Background';
 var Entity = memo(function (_a) {
     var configToken = _a.configToken, verifyToken = _a.verifyToken, loaderColor = _a.loaderColor, props = __rest(_a, ["configToken", "verifyToken", "loaderColor"]);
     var theme = useAppTheme().theme;
-    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading, internalLoading = _b.internalLoading;
+    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
     var _c = useAppSelector(entitySelector), customLoading = _c.customLoading, entityError = _c.error, loading = _c.loading;
-    useAppConfig(__assign(__assign({ configToken: configToken, navigation: ENTITY_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken }));
+    useAppConfig(__assign(__assign({ navigation: ENTITY_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken || !!configToken }));
     useErrorListener(entityError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;
@@ -51,7 +51,7 @@ var Entity = memo(function (_a) {
         open: open,
         mode: props.mode,
         internalToken: verifyToken,
-        settingLoading: configToken ? internalLoading : settingLoading
+        settingLoading: settingLoading
     });
     React.useEffect(function () {
         sendPageView({

package/build/features/featuresScreens.js

@@ -36,6 +36,8 @@ import AuthOTPScreen from './auth/screens/OTP';
 import PreparingDataScreen from './auth/screens/PreparingData';
 import AccountNotFoundScreen from './auth/screens/AccountNotFound';
 import AuthAuthenticationListScreen from './auth/screens/AuthenticationList';
+import AuthMerchantScreen from './auth/screens/AuthMerchant';
+import AuthAccountCreatedLoaderScreen from './auth/screens/AccountCreatedLoader';
 import CustomersPage from './business/screens/Customers';
 import IDBODPage from './business/screens/IDBOD';
 import BusinessVerifyPage from './business/screens/Verify';
@@ -253,6 +255,14 @@ export var authFeatureScreens = [
     {
         name: 'AUTH_AUTHENTICATION_LIST_STEP',
         element: AuthAuthenticationListScreen
+    },
+    {
+        name: 'AUTH_MERCHANT_LIST_STEP',
+        element: AuthMerchantScreen
+    },
+    {
+        name: 'AUTH_ACCOUNT_CREATED_STEP',
+        element: AuthAccountCreatedLoaderScreen
     }
 ];
 export var businessFeatureScreens = [

package/build/features/individual/Individual.js

@@ -38,9 +38,9 @@ import Background from '../shared/Background';
 var Individual = memo(function (_a) {
     var configToken = _a.configToken, verifyToken = _a.verifyToken, loaderColor = _a.loaderColor, props = __rest(_a, ["configToken", "verifyToken", "loaderColor"]);
     var theme = useAppTheme().theme;
-    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading, internalLoading = _b.internalLoading;
+    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
     var _c = useAppSelector(individualSelector), customLoading = _c.customLoading, individualError = _c.error, loading = _c.loading;
-    useAppConfig(__assign(__assign({ configToken: configToken, navigation: INDIVIDUAL_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken }));
+    useAppConfig(__assign(__assign({ navigation: INDIVIDUAL_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken || !!configToken }));
     useErrorListener(individualError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;
@@ -51,7 +51,7 @@ var Individual = memo(function (_a) {
         open: open,
         mode: props.mode,
         internalToken: verifyToken,
-        settingLoading: configToken ? internalLoading : settingLoading
+        settingLoading: settingLoading
     });
     React.useEffect(function () {
         sendPageView({

package/build/features/password/Password.js

@@ -41,7 +41,7 @@ var Password = memo(function (_a) {
     var dispatch = useAppDispatch();
     var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
     var _c = useAppSelector(passwordSelector), customLoading = _c.customLoading, passwordError = _c.error, loading = _c.loading;
-    useAppConfig(__assign({ configToken: configToken, navigation: PASSWORD_SCREENS_NAVIGATION }, props));
+    useAppConfig(__assign({ navigation: PASSWORD_SCREENS_NAVIGATION, disableSettingFetching: props.mode === 'content' ? false : !!verifyToken || !!configToken }, props));
     useErrorListener(passwordError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;

package/build/features/tax/Tax.js

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

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, updateInternalLoading } from '../app/settings';
+import { handleActiveFlowScreens, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin, fetchAppSettingsSync, handelBoardMaturity, settingsSelector } from '../app/settings';
 import { useAppDispatch } from './useAppDispatch';
 import { useAppSelector } from './useAppSelector';
 import { isConnectTapDomain, removeRequestHeaders, setBaseUrl } from '../utils';
@@ -47,7 +47,6 @@ export var useAppConfig = function (_a) {
             return;
         if (!disableSettingFetching && !configToken)
             removeRequestHeaders();
-        dispatch(updateInternalLoading(true));
         checkDomain();
         setBaseUrl(publicKey);
         setAppConfig();
@@ -55,7 +54,7 @@ export var useAppConfig = function (_a) {
             dispatch(handelBoardMaturity(boardMaturity));
         if (!data.isMaturityExpress)
             dispatch(handleLanguage(rest.language));
-        if (!disableSettingFetching || configToken)
+        if (!disableSettingFetching)
             dispatch(fetchAppSettingsSync({
                 disableCountries: disableCountries,
                 disableLocale: disableLocale,

package/build/utils/locale.js

@@ -1,7 +1,8 @@
 import { initReactI18next } from 'react-i18next';
 import i18n from '../i18n';
 export var updateLocale = function (locale, country) {
-    var data = locale['SA'] || locale[country.toUpperCase()] || locale['default'];
+    var _a;
+    var data = (_a = locale[country.toUpperCase()]) !== null && _a !== void 0 ? _a : (locale['SA'] || locale['default']);
     if (i18n.isInitialized) {
         i18n.removeResourceBundle('*', 'translation');
         i18n.addResourceBundle('en', 'translation', data.en.translation);

package/package.json

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

package/build/features/auth/screens/AuthenticationList/MerchantList.js

@@ -1,110 +0,0 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import * as React from 'react';
-import { useTranslation } from 'react-i18next';
-import { useController, useFormContext } from 'react-hook-form';
-import { styled } from '@mui/material/styles';
-import Box from '@mui/material/Box';
-import CircularProgress from '@mui/material/CircularProgress';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import Collapse from '../../../../components/Collapse';
-import Text from '../../../../components/Text';
-import SimpleList from '../../../../components/SimpleList';
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import InputSelect from '../../../shared/InputSelect';
-import { getMerchantList, authSelector } from '../../../app/auth/authStore';
-import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
-import CheckIcon from '../../../shared/CheckIcon';
-var MerchantContainer = styled(Box)(function () { return ({
-    display: 'flex'
-}); });
-var MerchantNameText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
-    var theme = _a.theme, isSelected = _a.isSelected;
-    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25) }));
-});
-var MerchantList = React.forwardRef(function (_a, ref) {
-    var _b;
-    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose, readOnly = _a.readOnly, isVerified = _a.isVerified;
-    var _c = React.useState([]), list = _c[0], setList = _c[1];
-    var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
-    var t = useTranslation().t;
-    var dispatch = useAppDispatch();
-    var _e = useFormContext(), control = _e.control, watch = _e.watch, setValue = _e.setValue;
-    var _f = useAppSelector(authSelector), data = _f.data, merchantLoading = _f.merchantLoading;
-    var merchantList = (data.responseData || {}).merchantList;
-    var merchantInfoControl = useController({ control: control, name: 'merchantInfo' });
-    var entityInfo = watch('entityInfo');
-    var brandInfo = watch('brandInfo');
-    var merchantValue = merchantInfoControl.field.value;
-    var error = (_b = merchantInfoControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    React.useEffect(function () {
-        if ((merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0) {
-            var list_1 = __spreadArray([], merchantList, true);
-            setList(list_1);
-        }
-    }, [merchantList]);
-    React.useEffect(function () {
-        var _a, _b;
-        if (!entityInfo)
-            return;
-        if (merchantLoading)
-            return;
-        var brandInfoId = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id;
-        var entityId = (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0 ? (_a = merchantList[0]) === null || _a === void 0 ? void 0 : _a.business_entity_id : '';
-        var brandId = (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0 ? (_b = merchantList[0]) === null || _b === void 0 ? void 0 : _b.brand_id : '';
-        var id = (entityInfo || {}).id;
-        if (!id)
-            return;
-        if ((entityId && id && entityId !== id) || (brandId && brandInfoId && brandId !== brandInfoId)) {
-            setValue('merchantInfo', undefined);
-            dispatch(getMerchantList({ entityId: id, brandId: brandInfoId }));
-            return;
-        }
-        if (!(merchantList === null || merchantList === void 0 ? void 0 : merchantList.length)) {
-            dispatch(getMerchantList({ entityId: id, brandId: brandInfoId }));
-        }
-    }, [entityInfo, merchantList, brandInfo]);
-    var onOpenMerchantSelect = function (event) {
-        if (readOnly)
-            return;
-        setAnchorEl(event.currentTarget);
-        onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
-    };
-    var onCloseMerchantSelect = function () {
-        setAnchorEl(null);
-        onListClose === null || onListClose === void 0 ? void 0 : onListClose();
-        setList(merchantList);
-    };
-    var onSelectItem = function (merchant) {
-        onCloseMerchantSelect();
-        merchantInfoControl.field.onChange(merchant);
-    };
-    var getName = function (merchant) {
-        if (!merchant)
-            return '';
-        return merchant.display_name;
-    };
-    return (_jsx(Collapse, __assign({ in: show && (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 1 }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mt: 2.5 } }, { children: [_jsx(InputSelect, { label: t('select_merchant_label'), readOnly: readOnly, placeholder: t('select_merchant_placeholder'), value: getName(merchantValue) || '', warningMessage: error && t(error), onClick: merchantLoading ? undefined : !!anchorEl ? function () { return onCloseMerchantSelect(); } : onOpenMerchantSelect, endAdornment: merchantLoading ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : (_jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified })) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { list: list || [], onSelectItem: onSelectItem, renderItem: function (item) {
-                            return (_jsxs(_Fragment, { children: [_jsx(MerchantContainer, { children: _jsx(MerchantNameText, __assign({ isSelected: item.id === (merchantValue === null || merchantValue === void 0 ? void 0 : merchantValue.id) }, { children: getName(item) })) }), item.id === (merchantValue === null || merchantValue === void 0 ? void 0 : merchantValue.id) && _jsx(CheckIcon, { isVerified: isVerified })] }));
-                        } }) }))] })) })));
-});
-export default React.memo(MerchantList);