@tap-payments/auth-jsconnect 2.0.17 → 2.0.19

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/constants/validation.d.ts

@@ -5,7 +5,7 @@ export declare const MAX_IBAN_VALUE = 34;
 export declare const FL_NUMBER_LENGTH = 8;
 export declare const CR_NUMBER_LENGTH = 10;
 export declare const SAUDI_NUMBER_LENGTH = 9;
-export declare const MAX_FILE_SIZE = 1000000;
+export declare const MAX_FILE_SIZE = 5000000;
 export declare const VALID_FILE_FORMATS: string[];
 export declare const REGEX_FULL_NAME: RegExp;
 export declare const REGEX_WEBSITE: RegExp;

package/build/constants/validation.js

@@ -5,7 +5,7 @@ export var MAX_IBAN_VALUE = 34;
 export var FL_NUMBER_LENGTH = 8;
 export var CR_NUMBER_LENGTH = 10;
 export var SAUDI_NUMBER_LENGTH = 9;
-export var MAX_FILE_SIZE = 1000000;
+export var MAX_FILE_SIZE = 5000000;
 export var VALID_FILE_FORMATS = ['image/jpeg', 'image/png', 'image/jpg', 'application/pdf'];
 export var REGEX_FULL_NAME = /^([a-zA-Z]{2,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,})$/g;
 export var REGEX_WEBSITE = /^[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,63}(:[0-9]{1,5})?(\/.*)?$/;

package/build/features/app/bank/bankStore.js

@@ -213,10 +213,10 @@ export var checkIbanBank = createAsyncThunk('checkIbanBank', function (_a) {
                         iban_number: iban,
                         encryption_contract: ['iban_number']
                     };
+                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
                     return [4, API.availabilityServices.checkIbanBank(payload, { cancelToken: cancelToken })];
                 case 1:
                     data = (_b.sent()).data;
-                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
                     return [2, { data: data }];
             }
         });
@@ -399,6 +399,7 @@ export var bankSlice = createSlice({
             state.data.bankData.responseBody = data;
         })
             .addCase(createBankAccount.rejected, function (state, action) {
+            state.loading = false;
             state.error = action.error.message;
         })
             .addCase(checkIbanBank.pending, function (state) {

package/build/features/app/business/businessStore.d.ts

@@ -37,10 +37,8 @@ export declare const retrieveBoardDetails: import("@reduxjs/toolkit").AsyncThunk
 export declare const updateLeadBusinessType: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: BusinessTypeFormValues;
+    accountData: any;
 }, BusinessTypeFormValues, {}>;
-export declare const createAccount: import("@reduxjs/toolkit").AsyncThunk<{
-    data: any;
-}, void, {}>;
 export declare const updateActivitiesInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: {

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

@@ -97,7 +97,7 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                 steps = (_c = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _c === void 0 ? void 0 : _c.steps;
                 brandID = (_e = (_d = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _d === void 0 ? void 0 : _d.brand) === null || _e === void 0 ? void 0 : _e.id;
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
-                hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO);
+                hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO) && hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM);
                 hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
                 hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
                 if (!hasBusinessCompleted) return [3, 6];
@@ -200,7 +200,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, { otp: params.otp });
                 steps = responseBody === null || responseBody === void 0 ? void 0 : responseBody.steps;
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
-                hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO);
+                hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO) && hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM);
                 hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
                 hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
                 if (!isNID) return [3, 3];
@@ -338,10 +338,10 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveBoardDetails', funct
     });
 }); });
 export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, payload, data;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, business, payload, data, accountBody, accountData;
+    var _b, _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 payload = {
@@ -354,24 +354,9 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = _g.sent();
-                return [4, thunkApi.dispatch(createAccount())];
-            case 2:
-                _g.sent();
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
-                return [2, { data: data, formData: params }];
-        }
-    });
-}); });
-export var createAccount = createAsyncThunk('createAccount', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, requestBody, data;
-    var _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
-                requestBody = {
-                    lead_id: (_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.id,
+                data = _h.sent();
+                accountBody = {
+                    lead_id: (_e = business.data.verify.responseBody) === null || _e === void 0 ? void 0 : _e.id,
                     notify: {
                         email: false,
                         phone: false
@@ -380,17 +365,15 @@ export var createAccount = createAsyncThunk('createAccount', function (params, t
                     is_acknowledged: true,
                     step_name: BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM
                 };
-                return [4, API.accountService.createAccount(requestBody)];
-            case 1:
-                data = _e.sent();
-                if (!!data.errors) return [3, 3];
-                return [4, thunkApi.dispatch(retrieveChannels())];
+                return [4, API.accountService.createAccount(accountBody)];
             case 2:
-                _e.sent();
+                accountData = _h.sent();
+                return [4, thunkApi.dispatch(retrieveChannels())];
+            case 3:
+                _h.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 }];
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
+                return [2, { data: data, formData: params, accountData: accountData }];
         }
     });
 }); });
@@ -837,10 +820,14 @@ export var businessSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, data = _b.data, formData = _b.formData;
+            var _b = action.payload, data = _b.data, formData = _b.formData, accountData = _b.accountData;
             state.data.businessTypeData = __assign(__assign({}, state.data.businessTypeData), formData);
             var entity = data.entity, entity_activities = data.entity_activities;
             var issuingDate = (_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.issuing_date;
+            if ((accountData === null || accountData === void 0 ? void 0 : accountData.status) === 'ALREADY_TAKEN') {
+                state.error = 'signup_user_exists_error';
+                return;
+            }
             if (!!issuingDate) {
                 var formattedDate = moment(issuingDate).format('YYYY-MM-DD');
                 state.data.activitiesData.operationStartDate = convertNumbers2English(formattedDate);
@@ -849,30 +836,12 @@ export var businessSlice = createSlice({
             var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
             if (!!selectedActivity)
                 state.data.activitiesData.activities = [selectedActivity];
-            state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activities: activities });
+            state.data.businessTypeData.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activities: activities }), accountData);
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { entity: entity });
         })
             .addCase(updateLeadBusinessType.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
-        })
-            .addCase(createAccount.pending, function (state) {
-            state.loading = true;
-            state.error = null;
-        })
-            .addCase(createAccount.fulfilled, function (state, action) {
-            state.loading = false;
-            state.error = null;
-            var data = action.payload.data;
-            if ((data === null || data === void 0 ? void 0 : data.status) === 'ALREADY_TAKEN') {
-                state.error = 'signup_user_exists_error';
-                return;
-            }
-            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), data);
-        })
-            .addCase(createAccount.rejected, function (state, action) {
-            state.loading = false;
-            state.error = action.error.message;
         })
             .addCase(updateActivitiesInfo.pending, function (state) {
             state.loading = true;

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

@@ -391,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/BankDetails/BankDetails.js

@@ -23,7 +23,7 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useLanguage } from '../../../../hooks';
 import { styled } from '@mui/material/styles';
-import { bankSelector, createBankAccount } from '../../../app/bank/bankStore';
+import { bankSelector, clearError, createBankAccount } from '../../../app/bank/bankStore';
 import Form from '../../../../components/Form';
 import { handleCurrentActiveScreen } from '../../../../app/settings';
 import ConfirmPolicy from './ConfirmPolicy';
@@ -56,7 +56,11 @@ var BankDetails = function () {
     var onBack = function () {
         dispatch(handleCurrentActiveScreen('BANK_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
     };
-    var disabled = ibanChecking || !methods.formState.isValid;
+    var disabled = ibanChecking || !methods.formState.isValid || !!error;
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid, methods.watch('bankStatementFile')]);
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Beneficiary, {}), _jsx(IBAN, { fetchingIban: function (value) { return setIbanChecking(value); }, ibanChecking: ibanChecking }), _jsx(BankName, {}), _jsx(BankStatement, {}), _jsx(ConfirmPolicy, {}), _jsx(ButtonStyled, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('confirm') }))] })) })) }));
 };
 export default BankDetails;

package/build/features/bank/screens/BankDetails/BankStatement.js

@@ -1,9 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { styled } from '@mui/material/styles';
-import { ScreenContainer } from '../../../../features/shared/Containers';
+import { ScreenContainer } from '../../../shared/Containers';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import UploadFile from '../../../../features/shared/UploadFile';
+import { useAppSelector } from '../../../../hooks';
+import { bankSelector } from '../../../app/bank/bankStore';
+import UploadFile from '../../../shared/UploadFile';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -15,6 +17,7 @@ var BankStatement = function () {
     var t = useTranslation().t;
     var control = useFormContext().control;
     var bankStatementFileControl = useController({ name: 'bankStatementFile', control: control });
+    var loading = useAppSelector(bankSelector).loading;
     var error = (_a = bankStatementFileControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
     var handleBankStatementChange = function (file) {
         bankStatementFileControl.field.onChange(file);
@@ -22,6 +25,6 @@ var BankStatement = function () {
     var handleReset = function () {
         bankStatementFileControl.field.onChange(null);
     };
-    return (_jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_bank_statement'), dragTitle: t('drag_and_drop'), uploadTitle: t('title_upload_file'), onFileUploaded: handleBankStatementChange, isSubmitting: bankStatementFileControl.formState.isSubmitted, onReset: handleReset, error: error && t(error) }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_bank_statement'), dragTitle: t('drag_and_drop'), uploadTitle: t('title_upload_file'), onFileUploaded: handleBankStatementChange, isSubmitting: loading, onReset: handleReset, error: error && t(error) }) }));
 };
 export default BankStatement;

package/build/features/bank/screens/BankDetails/validation.js

@@ -1,4 +1,4 @@
-import { REGEX_BENEFICIARY_NAME, VALID_FILE_FORMATS } from '../../../../constants';
+import { REGEX_BENEFICIARY_NAME, MAX_FILE_SIZE, VALID_FILE_FORMATS } from '../../../../constants';
 import * as yup from 'yup';
 export var BankValidation = yup.object().shape({
     iban: yup
@@ -18,7 +18,9 @@ export var BankValidation = yup.object().shape({
         .test({
         test: function (value) {
             if (!!value)
-                return VALID_FILE_FORMATS.includes(value === null || value === void 0 ? void 0 : value.type) ? true : this.createError({ message: 'alert_file_upload' });
+                return VALID_FILE_FORMATS.includes(value === null || value === void 0 ? void 0 : value.type) && (value === null || value === void 0 ? void 0 : value.size) < MAX_FILE_SIZE
+                    ? true
+                    : this.createError({ message: 'alert_file_upload' });
             return true;
         }
     })

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/Customers/RefundPolicy.d.ts

@@ -24,7 +24,7 @@ export declare const TextStyled: import("@emotion/styled").StyledComponent<impor
 export declare const LinkStyled: import("@emotion/styled").StyledComponent<Omit<import("@mui/material/Link").LinkBaseProps, "classes"> & {
     children?: React.ReactNode;
     classes?: Partial<import("@mui/material/Link").LinkClasses> | undefined;
-    color?: import("@mui/system/styleFunctionSx").ResponsiveStyleValue<string[] | import("csstype").Property.Color | undefined> | ((theme: import("@mui/material/styles").Theme) => import("@mui/system/styleFunctionSx").ResponsiveStyleValue<string[] | import("csstype").Property.Color | undefined>);
+    color?: import("@mui/system/styleFunctionSx").ResponsiveStyleValue<import("csstype").Property.Color | import("csstype").Property.Color[] | undefined> | ((theme: import("@mui/material/styles").Theme) => import("@mui/system/styleFunctionSx").ResponsiveStyleValue<import("csstype").Property.Color | import("csstype").Property.Color[] | undefined>);
     sx?: import("@mui/material/styles").SxProps<import("@mui/material/styles").Theme> | undefined;
     TypographyClasses?: (Partial<import("@mui/material").TypographyClasses> & Partial<import("@mui/material/styles").ClassNameMap<never>>) | undefined;
     underline?: "none" | "always" | "hover" | undefined;

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/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/shared/Button/Button.d.ts

@@ -7,5 +7,6 @@ export interface CustomButtonProps extends ButtonProps {
     disableNextIcon?: boolean;
     onBackClicked?: () => void;
     error?: string;
+    hideError?: boolean;
 }
-export default function CustomButton({ children, disabled, isAr, loading, disableBack, onBackClicked, error, disableNextIcon, ...props }: CustomButtonProps): JSX.Element;
+export default function CustomButton({ children, disabled, isAr, loading, disableBack, onBackClicked, error, hideError, disableNextIcon, ...props }: CustomButtonProps): JSX.Element;

package/build/features/shared/Button/Button.js

@@ -83,7 +83,7 @@ var BackButtonStyled = styled(Button, { shouldForwardProp: function (prop) { ret
     });
 });
 export default function CustomButton(_a) {
-    var children = _a.children, disabled = _a.disabled, isAr = _a.isAr, loading = _a.loading, disableBack = _a.disableBack, onBackClicked = _a.onBackClicked, error = _a.error, disableNextIcon = _a.disableNextIcon, props = __rest(_a, ["children", "disabled", "isAr", "loading", "disableBack", "onBackClicked", "error", "disableNextIcon"]);
+    var children = _a.children, disabled = _a.disabled, isAr = _a.isAr, loading = _a.loading, disableBack = _a.disableBack, onBackClicked = _a.onBackClicked, error = _a.error, hideError = _a.hideError, disableNextIcon = _a.disableNextIcon, props = __rest(_a, ["children", "disabled", "isAr", "loading", "disableBack", "onBackClicked", "error", "hideError", "disableNextIcon"]);
     var _b = React.useState(false), btnLoading = _b[0], setBtnLoading = _b[1];
     var isBackEnabled = !disableBack && !btnLoading;
     React.useEffect(function () {
@@ -95,7 +95,7 @@ export default function CustomButton(_a) {
     React.useEffect(function () {
         setBtnLoading(false);
     }, []);
-    return (_jsxs(Fragment, { children: [_jsx(Collapse, __assign({ in: !!error }, { children: _jsx(Warning, __assign({ sx: { mb: 1 }, warningType: 'error' }, { children: error })) })), _jsxs(ButtonBoxStyled, { children: [isBackEnabled && (_jsx(BackButtonStyled, __assign({ onClick: function () { return onBackClicked === null || onBackClicked === void 0 ? void 0 : onBackClicked(); }, isAr: isAr, type: 'reset', startIcon: _jsx(BackIconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props))), _jsx(ButtonStyled, __assign({ disabled: disabled, isLoading: btnLoading, type: !btnLoading ? 'submit' : 'button', isBack: isBackEnabled, endIcon: btnLoading === false
+    return (_jsxs(Fragment, { children: [_jsx(Collapse, __assign({ in: !!error && !hideError }, { children: _jsx(Warning, __assign({ sx: { mb: 1 }, warningType: 'error' }, { children: error })) })), _jsxs(ButtonBoxStyled, { children: [isBackEnabled && (_jsx(BackButtonStyled, __assign({ onClick: function () { return onBackClicked === null || onBackClicked === void 0 ? void 0 : onBackClicked(); }, isAr: isAr, type: 'reset', startIcon: _jsx(BackIconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props))), _jsx(ButtonStyled, __assign({ disabled: disabled, isLoading: btnLoading, type: !btnLoading ? 'submit' : 'button', isBack: isBackEnabled, endIcon: btnLoading === false
                             ? !disableNextIcon && _jsx(IconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW })
                             : undefined }, props, { children: !btnLoading ? (_jsxs(Text, __assign({ sx: { marginInlineEnd: isBackEnabled ? '-24px' : '-15px' } }, { children: [" ", children] }))) : (_jsx(Loader, { innerColor: 'white', outerColor: 'white', size: 15, toggleAnimation: !!loading })) }))] })] }));
 }

package/build/features/shared/Button/SuccessButton.js

@@ -82,5 +82,5 @@ export default function SuccessButton(_a) {
     React.useEffect(function () {
         setBtnLoading(false);
     }, []);
-    return (_jsx(ButtonBoxStyled, { children: _jsx(ButtonStyled, __assign({ isAr: isAr, loading: btnLoading, disabled: disabled, type: 'button', variant: btnLoading ? 'contained' : 'outlined' }, props, { children: children })) }));
+    return (_jsx(ButtonBoxStyled, { children: _jsx(ButtonStyled, __assign({ isAr: isAr, loading: btnLoading, disabled: disabled, type: 'button', variant: btnLoading ? 'contained' : 'outlined', error: error, hideError: true }, props, { children: children })) }));
 }

package/build/features/shared/UploadFile/UploadFile.js

@@ -36,16 +36,15 @@ var LabelContainerStyled = styled(Box)(function (_a) {
 });
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({ direction: theme.direction }, theme.typography.subtitle2), { color: theme.palette.primary.main, fontWeight: theme.typography.fontWeightBold, background: theme.palette.background.default, padding: theme.spacing(1.5, 2.5, 1.5), width: '85%' }));
+    return (__assign(__assign({ direction: theme.direction }, theme.typography.subtitle2), { color: theme.palette.primary.main, fontWeight: theme.typography.fontWeightBold, background: theme.palette.background.default, padding: theme.spacing(1.5, 2.5, 1.5), width: '85%', wordBreak: 'break-all' }));
 });
 var UploadBoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.caption), { background: theme.palette.primary.main, color: theme.palette.common.white, fontWeight: theme.typography.fontWeightRegular, padding: theme.spacing(0.75, 1.75, 0), cursor: 'pointer', width: '15%', display: 'flex', justifyContent: 'center' }));
+    return (__assign(__assign({}, theme.typography.caption), { background: theme.palette.primary.main, color: theme.palette.common.white, fontWeight: theme.typography.fontWeightRegular, cursor: 'pointer', width: '15%', display: 'flex', justifyContent: 'center', alignItems: 'center' }));
 });
 var ClearIconStyled = styled(ClearIcon)(function (_a) {
     var theme = _a.theme;
     return ({
-        marginBlockStart: theme.spacing(0.25),
         width: theme.spacing(3),
         height: theme.spacing(3),
         cursor: 'pointer',

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.17",
+	"version": "2.0.19",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",