@tap-payments/auth-jsconnect 2.0.54 → 2.0.55

package/build/features/tax/Tax.js

@@ -33,7 +33,6 @@ import { findOrCreateElementAndInject } from '../../utils';
 import { FeatureContainer } from '../shared/Containers';
 import { TAX_SCREENS_NAVIGATION } from '../../constants';
 import { taxFeatureScreens } from '../featuresScreens';
-import CustomFooter from '../shared/Footer';
 import { taxSelector, verifyLeadToken } from '../app/tax/taxStore';
 import Background from '../shared/Background';
 var Tax = memo(function (_a) {
@@ -44,7 +43,7 @@ var Tax = memo(function (_a) {
     useAppConfig(__assign(__assign({ navigation: TAX_SCREENS_NAVIGATION }, props), { disableSettingFetching: !!verifyToken }));
     useErrorListener(taxError || error);
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation;
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;
     useVerifyToken({
         verify: verifyLeadToken,
         loadingScreenName: 'TAX_LOADING_DATA_STEP',
@@ -54,11 +53,11 @@ var Tax = memo(function (_a) {
         settingLoading: 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', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: taxFeatureScreens.map(function (_a, index) {
+    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) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
-                    }) }) })) })) })));
+                    }) })) })) })) })));
 });
 export function TaxElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Tax, __assign({}, props)) })));

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

@@ -17,12 +17,12 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { styled } from '@mui/material/styles';
 import Form from '../../../../components/Form';
 import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
-import { handleCurrentActiveScreen, settingsSelector } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { DocumentPurpose } from '../../../../@types';
 import { getFileDetailsFromDocument, isSA } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
-import { taxSelector, updateTaxInfo } from '../../../app/tax/taxStore';
+import { retrieveBoardStatus, taxSelector, updateTaxInfo } from '../../../app/tax/taxStore';
 import { Validation } from './validation';
 import VATId from './VATId';
 import ConfirmPolicy from './ConfirmPolicy';
@@ -36,9 +36,9 @@ var FormStyled = styled(Form)(function () { return ({
 var TaxDetails = function () {
     var dispatch = useAppDispatch();
     var _a = useAppSelector(taxSelector), data = _a.data, loading = _a.loading, error = _a.error, uploading = _a.uploading;
-    var entity = (data.verify.responseBody || {}).entity;
+    var _b = data.verify.responseBody || {}, entity = _b.entity, flows = _b.flows;
     var settingsData = useAppSelector(settingsSelector).data;
-    var _b = data.taxData, vatId = _b.vatId, confirmPolicy = _b.confirmPolicy, documentId = _b.documentId;
+    var _c = data.taxData, vatId = _c.vatId, confirmPolicy = _c.confirmPolicy, documentId = _c.documentId;
     var methods = useForm({
         resolver: yupResolver(Validation()),
         defaultValues: {
@@ -60,8 +60,12 @@ var TaxDetails = function () {
         dispatch(updateTaxInfo(data));
     };
     var onBack = function () {
-        dispatch(handleCurrentActiveScreen('TAX_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+        if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
+            dispatch(handlePrevScreenStep());
+            return;
+        }
+        dispatch(retrieveBoardStatus());
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(VATId, { readOnly: readOnly['vatId'] || noneEditable['tax_number'] }), _jsx(TaxDocument, { show: isSACountry, defaultFiles: defaultTaxFiles, readOnly: readOnly['documentId'] || noneEditable['documents'] }), _jsx(ConfirmPolicy, { readOnly: readOnly['documentId'] || noneEditable['is_vat_acknowledged'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: !methods.formState.isValid || uploading, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(VATId, { readOnly: readOnly['vatId'] || noneEditable['tax_number'] }), _jsx(TaxDocument, { show: isSACountry, defaultFiles: defaultTaxFiles, readOnly: readOnly['documentId'] || noneEditable['documents'] }), _jsx(ConfirmPolicy, { readOnly: readOnly['documentId'] || noneEditable['is_vat_acknowledged'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid || uploading, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default TaxDetails;

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

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
@@ -28,7 +17,6 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
-import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
@@ -58,20 +46,19 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var VerifyNumber = function (_a) {
-    var _b, _c, _d;
+    var _b, _c, _d, _e;
     var dispatch = useAppDispatch();
-    var _e = useAppSelector(taxSelector), data = _e.data, loading = _e.loading, error = _e.error;
-    var _f = data.otpData, responseBody = _f.responseBody, defaultValues = __rest(_f, ["responseBody"]);
+    var _f = useAppSelector(taxSelector), data = _f.data, loading = _f.loading, error = _f.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
-        defaultValues: defaultValues,
+        defaultValues: data.otpData,
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.otpData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _g = React.useState(false), resendLoading = _g[0], setResendLoading = _g[1];
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.user.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
+    var phone = (_e = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.user) === null || _c === void 0 ? void 0 : _c.contact) === null || _d === void 0 ? void 0 : _d.phone) === null || _e === void 0 ? void 0 : _e.number;
     React.useEffect(function () {
         if (error && methods.formState.isValid && phone)
             dispatch(clearError());
@@ -82,10 +69,7 @@ var VerifyNumber = function (_a) {
     var onSubmit = function (formData) {
         dispatch(verifyTaxLeadOTP(formData));
     };
-    var onBack = function () {
-        dispatch(handlePrevScreenStep());
-    };
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/hooks/useAppConfig.js

@@ -21,14 +21,16 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { useEffect } from 'react';
-import { handleActiveFlowScreens, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin, fetchAppSettingsSync, handelBoardMaturity } from '../app/settings';
+import { handleActiveFlowScreens, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin, fetchAppSettingsSync, handelBoardMaturity, settingsSelector } from '../app/settings';
 import { useAppDispatch } from './useAppDispatch';
+import { useAppSelector } from './useAppSelector';
 import { axiosInstance } from '../api';
 import { isTapDomain, removeRequestHeaders } from '../utils';
 import { ENDPOINT_PATHS } from '../constants';
 export var useAppConfig = function (_a) {
     var appInfo = _a.appInfo, navigation = _a.navigation, publicKey = _a.publicKey, disableCountries = _a.disableCountries, disableLocale = _a.disableLocale, disableSettingFetching = _a.disableSettingFetching, maturity = _a.maturity, boardMaturity = _a.boardMaturity, rest = __rest(_a, ["appInfo", "navigation", "publicKey", "disableCountries", "disableLocale", "disableSettingFetching", "maturity", "boardMaturity"]);
     var dispatch = useAppDispatch();
+    var data = useAppSelector(settingsSelector).data;
     var setBaseUrl = function () {
         var isProd = publicKey.includes('pk_live');
         if (isProd) {
@@ -58,7 +60,8 @@ export var useAppConfig = function (_a) {
         setAppConfig();
         if (typeof boardMaturity === 'boolean')
             dispatch(handelBoardMaturity(boardMaturity));
-        dispatch(handleLanguage(rest.language));
+        if (!data.isMaturityExpress)
+            dispatch(handleLanguage(rest.language));
         if (!disableSettingFetching)
             dispatch(fetchAppSettingsSync({ disableCountries: disableCountries, disableLocale: disableLocale, mdn: rest.merchantDomain, maturity: maturity }));
     }, []);

package/build/utils/string.d.ts

@@ -1,4 +1,4 @@
-import { DeviceInfo, User } from '../@types';
+import { DeviceInfo, License, User } from '../@types';
 export declare const maskPhone: (str?: string) => string;
 export declare const shortenString: (str: string, length: number) => string;
 export declare const maskID: (str: string) => string;
@@ -70,3 +70,4 @@ export declare const getUserNameObject: (name: string) => {
 };
 export declare const getFileType: (type: string) => "" | "image/jpeg" | "image/png" | "image/jpg" | "application/pdf";
 export declare const isStringMasked: (value: string) => boolean;
+export declare const isOtherLicense: (item?: License) => boolean;

package/build/utils/string.js

@@ -301,3 +301,8 @@ export var getFileType = function (type) {
 export var isStringMasked = function (value) {
     return value.includes('*') ? true : false;
 };
+export var isOtherLicense = function (item) {
+    var _a;
+    var number = (_a = item === null || item === void 0 ? void 0 : item.license) === null || _a === void 0 ? void 0 : _a.number;
+    return number === 'other_fl' || number === 'other_cr' || number === 'other_entity';
+};

package/package.json

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