@tap-payments/auth-jsconnect 2.0.16 → 2.0.18

package/build/api/availabilityServices.d.ts

@@ -5,6 +5,7 @@ export declare type CheckEmailBody = {
 };
 export declare type CheckBrandBody = {
     profile_name: string;
+    country_code: string;
     encryption_contract: Array<string>;
 };
 export declare type CheckIBanBody = {

package/build/features/app/business/businessStore.js

@@ -383,14 +383,12 @@ export var createAccount = createAsyncThunk('createAccount', function (params, t
                 return [4, API.accountService.createAccount(requestBody)];
             case 1:
                 data = _e.sent();
-                if (!!data.errors) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveChannels())];
             case 2:
                 _e.sent();
                 thunkApi.dispatch(handleNextScreenStep());
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
-                _e.label = 3;
-            case 3: return [2, { data: data }];
+                return [2, { data: data }];
         }
     });
 }); });

package/build/features/app/connect/connectStore.js

@@ -362,6 +362,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = _q.sent();
+                thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
                 (_p = (_o = settings.data.appConfig).onStepCompleted) === null || _p === void 0 ? void 0 : _p.call(_o, settings.data.activeScreen.name, params);
                 return [2, { response: data, formData: params }];
@@ -390,20 +391,23 @@ export var checkEmailAvailability = createAsyncThunk('checkEmailAvailability', f
         });
     });
 });
-export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailability', function (_a) {
+export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailability', function (_a, thunkApi) {
     var cancelToken = _a.cancelToken, name = _a.name, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {
-        var requestBody, data;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var settings, requestBody, data;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
+                    settings = thunkApi.getState().settings;
                     requestBody = {
                         profile_name: name,
+                        country_code: (_b = settings.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2,
                         encryption_contract: ['profile_name']
                     };
                     return [4, API.availabilityServices.checkBrand(requestBody, { cancelToken: cancelToken })];
                 case 1:
-                    data = (_b.sent()).data;
+                    data = (_c.sent()).data;
                     onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
                     if (!data.errors)
                         return [2, { response: data, formData: { name: name } }];

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

@@ -58,8 +58,9 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     React.useEffect(function () {
-        if (error)
+        if (error && methods.formState.isValid && phone)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -71,7 +72,6 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     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') }))] })) })) }));
 };

package/build/features/business/screens/Activities/OperationStartDate.js

@@ -5,13 +5,19 @@ import { useController, useFormContext } from 'react-hook-form';
 import DatePicker from '../../../../components/DatePicker';
 import { ScreenContainer } from '../../../shared/Containers';
 import { MandatoryStyled } from './SalesChannels';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { businessSelector, clearError } from '../../../app/business/businessStore';
 var OperationStartDate = function (_a) {
     var _b;
     var onDateClicked = _a.onDateClicked;
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
     var control = useFormContext().control;
+    var error = useAppSelector(businessSelector).error;
     var oDateControl = useController({ control: control, name: 'operationStartDate' });
     var handleOperationStartDateChange = function (data) {
+        if (error)
+            dispatch(clearError());
         oDateControl.field.onChange(data);
     };
     var dateValue = (_b = oDateControl === null || oDateControl === void 0 ? void 0 : oDateControl.field) === null || _b === void 0 ? void 0 : _b.value;

package/build/features/business/screens/Activities/SalesChannels.js

@@ -24,9 +24,9 @@ import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { useLanguage, useAppSelector } from '../../../../hooks';
+import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
 import Text from '../../../../components/Text';
-import { businessSelector } from '../../../app/business/businessStore';
+import { businessSelector, clearError } from '../../../app/business/businessStore';
 import CheckBox from '../../../../components/CheckBox';
 import Warning from '../../../../components/Warning';
 import Collapse from '../../../../components/Collapse';
@@ -79,10 +79,11 @@ var SalesChannels = function () {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
+    var dispatch = useAppDispatch();
     var channelsControl = useController({ name: 'salesChannels', control: control });
     var channelsChecked = channelsControl.field.value;
     var warningMessage = (_a = channelsControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
-    var data = useAppSelector(businessSelector).data;
+    var _c = useAppSelector(businessSelector), data = _c.data, error = _c.error;
     var channelList = (data.businessTypeData.responseBody || {}).channelList;
     React.useEffect(function () {
         if ((channelList === null || channelList === void 0 ? void 0 : channelList.length) > 0) {
@@ -98,6 +99,8 @@ var SalesChannels = function () {
             return;
         }
         channelsControl.field.onChange(__spreadArray(__spreadArray([], channelsChecked, true), [selected], false));
+        if (error)
+            dispatch(clearError());
     };
     var getSelectedChannelsFlag = function (item) {
         if (channelsChecked)

package/build/features/business/screens/Customers/CustomerLocations.js

@@ -33,8 +33,8 @@ import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../../components/Input';
 import SimpleList from '../../../../components/SimpleList';
 import { ScreenContainer } from '../../../shared/Containers';
-import { useLanguage, useAppSelector } from '../../../../hooks';
-import { businessSelector } from '../../../app/business/businessStore';
+import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
+import { businessSelector, clearError } from '../../../app/business/businessStore';
 export var InputLabelStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return (__assign({ margin: theme.spacing(2.5, 2.5, 1.5, 2.5), color: alpha(theme.palette.text.primary, 0.4) }, theme.typography.caption));
@@ -78,8 +78,9 @@ var customerLocations = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
+    var dispatch = useAppDispatch();
     var customerLocationsControl = useController({ name: 'customerLocations', control: control });
-    var data = useAppSelector(businessSelector).data;
+    var _d = useAppSelector(businessSelector), data = _d.data, error = _d.error;
     var activitiesData = data.activitiesData;
     var response = activitiesData.responseBody;
     var onOpenList = function (event) {
@@ -106,6 +107,8 @@ var customerLocations = function (_a) {
     var onSelectItem = function (customerLocations) {
         onCloseList();
         var remaining = customerLocationsList.filter(function (location) { return location.id <= customerLocations.id; });
+        if (error)
+            dispatch(clearError());
         customerLocationsControl.field.onChange(remaining);
     };
     var customerLocationsValue = customerLocationsControl.field.value;

package/build/features/business/screens/Customers/ExpectedCustomers.js

@@ -26,13 +26,13 @@ import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { useLanguage, useAppSelector } from '../../../../hooks';
+import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
 import SimpleList from '../../../../components/SimpleList';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import { ScreenContainer } from '../../../shared/Containers';
 import { CheckIconStyled, InputLabelStyled, InputStyled, NameContainer } from './CustomerLocations';
-import { businessSelector } from '../../../app/business/businessStore';
+import { businessSelector, clearError } from '../../../app/business/businessStore';
 var ListItemContainer = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -49,9 +49,10 @@ var ExpectedCustomers = function (_a) {
     var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
     var control = useFormContext().control;
     var expectedCustomerControl = useController({ name: 'expectedCustomer', control: control });
-    var data = useAppSelector(businessSelector).data;
+    var _d = useAppSelector(businessSelector), data = _d.data, error = _d.error;
     var activitiesData = data.activitiesData;
     var response = activitiesData.responseBody;
     var onOpenList = function (event) {
@@ -72,6 +73,8 @@ var ExpectedCustomers = function (_a) {
     }, [response === null || response === void 0 ? void 0 : response.expectedCustomerSales]);
     var onSelectItem = function (expectedCustomers) {
         expectedCustomerControl.field.onChange(expectedCustomers);
+        if (error)
+            dispatch(clearError());
         onCloseList();
     };
     var expectedCustomersValue = expectedCustomerControl.field.value;

package/build/features/business/screens/Customers/ExpectedSalesRange.js

@@ -15,11 +15,11 @@ import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { useLanguage, useAppSelector } from '../../../../hooks';
+import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
 import SimpleList from '../../../../components/SimpleList';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
-import { businessSelector } from '../../../../features/app/business/businessStore';
+import { businessSelector, clearError } from '../../../app/business/businessStore';
 import { isExist } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import { InputLabelStyled, CheckIconStyled, InputStyled, NameContainer } from './CustomerLocations';
@@ -51,8 +51,9 @@ var ExpectedSalesRange = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
+    var dispatch = useAppDispatch();
     var expectedSaleControl = useController({ name: 'expectedSale', control: control });
-    var data = useAppSelector(businessSelector).data;
+    var _e = useAppSelector(businessSelector), data = _e.data, error = _e.error;
     var activitiesData = data.activitiesData;
     var expectedSales = (activitiesData.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
@@ -81,6 +82,8 @@ var ExpectedSalesRange = function (_a) {
     }, [expectedSales]);
     var onSelectItem = function (expectedSalesRange) {
         handleCloseMainMenu();
+        if (error)
+            dispatch(clearError());
         expectedSaleControl.field.onChange(expectedSalesRange);
     };
     React.useEffect(function () {

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

@@ -58,8 +58,9 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     React.useEffect(function () {
-        if (error && methods.formState.isValid)
+        if (error && methods.formState.isValid && phone)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -71,7 +72,6 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     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') }))] })) })) }));
 };

package/build/features/connect/screens/ThankYou/ThankYou.js

@@ -2,14 +2,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import SuccessScreen from '../../../shared/SuccessScreen';
-import { useAppDispatch } from '../../../../hooks';
-import { updateLeadSuccess } from '../../../app/connect/connectStore';
 var ThankYou = function (_a) {
     var t = useTranslation().t;
-    var dispatch = useAppDispatch();
-    React.useEffect(function () {
-        dispatch(updateLeadSuccess());
-    }, []);
     return (_jsx(SuccessScreen, { title: t("connect_completed_title"), description: t("connect_completed_description"), showEmailProviders: true }));
 };
 export default React.memo(ThankYou);

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

@@ -58,8 +58,9 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     React.useEffect(function () {
-        if (error)
+        if (error && methods.formState.isValid && phone)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -71,7 +72,6 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     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') }))] })) })) }));
 };

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

@@ -58,8 +58,9 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     React.useEffect(function () {
-        if (error)
+        if (error && methods.formState.isValid && phone)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -71,7 +72,6 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     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 || resendLoading, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };

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

@@ -58,8 +58,9 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[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;
     React.useEffect(function () {
-        if (error)
+        if (error && methods.formState.isValid && phone)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -71,7 +72,6 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    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 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') }))] })) })) }));
 };

package/package.json

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