@tap-payments/auth-jsconnect 1.0.35 → 1.0.38

package/build/components/AnimationFlow/BottomSheet.js

@@ -24,12 +24,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { BottomSheet } from 'react-spring-bottom-sheet';
 import { styled } from '@mui/material/styles';
+import { useWindowSize } from '../../hooks';
 import 'react-spring-bottom-sheet/dist/style.css';
 var BottomSheetStyled = styled(BottomSheet)(function (_a) {
     var theme = _a.theme;
     return ({
         '[data-rsbs-header]:before': {
-            width: '80px'
+            width: '75px',
+            height: '5px'
         },
         '[data-rsbs-overlay]': {
             backgroundColor: theme.palette.background.paper
@@ -51,9 +53,31 @@ var BottomSheetStyled = styled(BottomSheet)(function (_a) {
 });
 var BottomSheetComponent = function (_a) {
     var open = _a.open, children = _a.children, rest = __rest(_a, ["open", "children"]);
+    var height = useWindowSize().height;
+    var getMinHeight = function (maxHeight) {
+        if (height < 500)
+            return maxHeight * 0.95;
+        if (height >= 500 && height < 550)
+            return maxHeight * 0.93;
+        if (height >= 550 && height < 600)
+            return maxHeight * 0.87;
+        if (height >= 600 && height < 650)
+            return maxHeight * 0.8;
+        if (height >= 650 && height < 700)
+            return maxHeight * 0.75;
+        if (height >= 700 && height < 750)
+            return maxHeight * 0.7;
+        if (height >= 750 && height < 800)
+            return maxHeight * 0.65;
+        if (height >= 800 && height < 850)
+            return maxHeight * 0.6;
+        if (height >= 850 && height < 900)
+            return maxHeight * 0.57;
+        return maxHeight * 0.5;
+    };
     return (_jsx(BottomSheetStyled, __assign({ open: open, snapPoints: function (_a) {
             var maxHeight = _a.maxHeight;
-            return [maxHeight * 0.9];
+            return [getMinHeight(maxHeight), maxHeight * 0.95];
         } }, rest, { children: children })));
 };
 export default React.memo(BottomSheetComponent);

package/build/components/OTPTimer/OTPTimer.js

@@ -30,7 +30,9 @@ var OTPTimerStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         paddingInline: theme.spacing(2.5),
-        justifyContent: 'flex-end'
+        justifyContent: 'flex-end',
+        maxWidth: 'fit-content',
+        marginLeft: 'auto'
     });
 });
 var OTPTimerTextStyled = styled(Text)(function (_a) {
@@ -53,7 +55,7 @@ var OTPTimerComponent = function (_a) {
         return function () { return clearInterval(interval); };
     }, [timeValue]);
     var resetTimer = function () {
-        if (onResetClick) {
+        if (onResetClick && timeValue == 0) {
             onResetClick();
             seTimeValue(timeInSeconds || 60);
         }

package/build/constants/app.js

@@ -45,7 +45,7 @@ export var CONNECT_SCREENS_NAVIGATION = [
     {
         name: 'CONNECT_MERCHANT_INFO_STEP',
         next: 'CONNECT_THANK_YOU_STEP',
-        prev: 'CONNECT_INDIVIDUAL_STEP',
+        prev: ['CONNECT_INDIVIDUAL_STEP', 'CONNECT_PASSWORD_STEP'],
         order: 4
     },
     {

package/build/constants/validation.d.ts

@@ -6,3 +6,4 @@ export declare const FL_NUMBER_LENGTH = 8;
 export declare const CR_NUMBER_LENGTH = 10;
 export declare const SAUDI_NUMBER_LENGTH = 9;
 export declare const REGEX_FULL_NAME: RegExp;
+export declare const REGEX_WEBSITE: RegExp;

package/build/constants/validation.js

@@ -6,3 +6,4 @@ export var FL_NUMBER_LENGTH = 8;
 export var CR_NUMBER_LENGTH = 10;
 export var SAUDI_NUMBER_LENGTH = 9;
 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/business/businessStore.d.ts

@@ -1,7 +1,7 @@
 import { RootState } from '../../../app/store';
 import { ActivitiesFormValues, BusinessInfoFormValues, CustomersFormValues, BusinessTypeFormValues, CountryCode, CRLicense, FLLicense, NIDFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
-    businessCountry: any;
+    businessCountry: undefined;
     countries: any;
 }, void, {}>;
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{

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

@@ -55,7 +55,7 @@ import i18n from '../../../i18n';
 import { convertNumbers2English, removeRequestHeaders } from '../../../utils';
 import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
 export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, countriesBody, list, businessCountry;
+    var settings, countriesBody, businessCountry, list;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -63,11 +63,17 @@ export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi
                 return [4, API.countryService.getAllCountries()];
             case 1:
                 countriesBody = (_a.sent()).data;
-                list = countriesBody.list;
-                businessCountry = list.find(function (item) {
-                    return [item.iso2, item.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
+                businessCountry = undefined;
+                list = (countriesBody.list || []).map(function (country) {
+                    if ([country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase())) {
+                        businessCountry = country;
+                    }
+                    if (country.iso2 === 'SA') {
+                        country.digits = 9;
+                    }
+                    return country;
                 });
-                return [2, { businessCountry: businessCountry, countries: list || [] }];
+                return [2, { businessCountry: businessCountry, countries: list }];
         }
     });
 }); });
@@ -121,8 +127,6 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 if (!data.errors) {
                     (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
                     if (isNID) {
-                        thunkApi.dispatch(retrieveFLInfos());
-                        thunkApi.dispatch(retrieveCRInfos());
                         thunkApi.dispatch(handleNextScreenStep());
                     }
                     else {
@@ -147,7 +151,7 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 headers = {
-                    lead_id: ((_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
+                    lead_id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
                     device_identifier: (_d = (_c = settings.data.deviceInfo) === null || _c === void 0 ? void 0 : _c.browser) === null || _d === void 0 ? void 0 : _d.browser_id
                 };
                 requestBody = {
@@ -169,32 +173,32 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
         }
     });
 }); });
-export var retrieveCRInfos = createAsyncThunk('retrieveCRInfos', function (_a, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveCRInfos = createAsyncThunk('retrieveCRInfos', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var business, leadId, data;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 business = thunkApi.getState().business;
-                leadId = (_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id;
+                leadId = (_a = business.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.id;
                 return [4, API.leadService.retrieveCRInfos(leadId)];
             case 1:
-                data = (_c.sent()).data;
+                data = (_b.sent()).data;
                 return [2, { data: data }];
         }
     });
 }); });
-export var retrieveFLInfos = createAsyncThunk('retrieveFLInfos', function (_a, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveFLInfos = createAsyncThunk('retrieveFLInfos', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var business, leadId, data;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 business = thunkApi.getState().business;
-                leadId = (_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id;
+                leadId = (_a = business.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.id;
                 return [4, API.leadService.retrieveFLInfos(leadId)];
             case 1:
-                data = (_c.sent()).data;
+                data = (_b.sent()).data;
                 return [2, { data: data }];
         }
     });
@@ -479,8 +483,10 @@ export var businessSlice = createSlice({
             var data = action.payload.data;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (!description) {
-                state.data.crInfos = data;
-                state.data.businessTypeData.businessType = BusinessType.CR;
+                if (Array.isArray(data)) {
+                    state.data.crInfos = data;
+                    state.data.businessTypeData.businessType = BusinessType.CR;
+                }
             }
         })
             .addCase(retrieveCRInfos.rejected, function (state, action) {
@@ -522,8 +528,9 @@ export var businessSlice = createSlice({
             }
             state.data.businessTypeData = formData;
             state.data.businessInfo.brandName = i18n.dir() === 'rtl' ? (_c = (_b = data === null || data === void 0 ? void 0 : data.brand) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.ar : (_e = (_d = data === null || data === void 0 ? void 0 : data.brand) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.en;
-            state.data.businessInfo.licenseNumber = (data === null || data === void 0 ? void 0 : data.freelancer_number) || (data === null || data === void 0 ? void 0 : data.cr_number);
+            state.data.businessInfo.licenseNumber = data === null || data === void 0 ? void 0 : data.freelancer_number;
             if (formData.businessType === BusinessType.CR) {
+                state.data.businessInfo.licenseNumber = data === null || data === void 0 ? void 0 : data.cr_number;
                 state.data.businessInfo.legalName = (_f = data === null || data === void 0 ? void 0 : data.license) === null || _f === void 0 ? void 0 : _f.crName;
                 state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_g = data === null || data === void 0 ? void 0 : data.license) === null || _g === void 0 ? void 0 : _g.issueDate, 'iYYYY/iMM/iDD').format('YYYY-MM-DD'));
                 var activities = (_j = (_h = data === null || data === void 0 ? void 0 : data.license) === null || _h === void 0 ? void 0 : _h.activities) === null || _j === void 0 ? void 0 : _j.isic;
@@ -548,6 +555,7 @@ export var businessSlice = createSlice({
         })
             .addCase(createAccount.fulfilled, function (state, action) {
             var _a, _b;
+            state.loading = false;
             state.error = null;
             var _c = action.payload, data = _c.data, channelsData = _c.channelsData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = channelsData === null || channelsData === void 0 ? void 0 : channelsData.errors) === null || _b === void 0 ? void 0 : _b[0]) || {}).description;
@@ -574,6 +582,7 @@ export var businessSlice = createSlice({
         })
             .addCase(updateActivitiesInfo.fulfilled, function (state, action) {
             var _a;
+            state.loading = false;
             state.error = null;
             var _b = action.payload, data = _b.data, formData = _b.formData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;

package/build/features/app/connect/connectStore.d.ts

@@ -1,7 +1,7 @@
 import { RootState } from '../../../app/store';
 import { ResponseData, CountryCode, MobileFormValues, NIDFormValues, OTPFormValues, IndividualFormValues, SharedState, BrandFormValues, PasswordFormValues } from '../../../@types';
 export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
-    businessCountry: any;
+    businessCountry: undefined;
     countries: any;
 }, void, {}>;
 export declare const createMobileAuth: import("@reduxjs/toolkit").AsyncThunk<{

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

@@ -53,7 +53,7 @@ import { CONNECT_STEP_NAMES, IDENTIFICATION_TYPE } from '../../../constants';
 import { defaultCountry } from '../../../constants';
 import { getIndividualName, getClientEmailUrl, capitalizeTheFirstLetterOfEachWord, removeRequestHeaders } from '../../../utils';
 export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, countriesBody, list, businessCountry;
+    var settings, countriesBody, businessCountry, list;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -61,11 +61,17 @@ export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi
                 return [4, API.countryService.getAllCountries()];
             case 1:
                 countriesBody = (_a.sent()).data;
-                list = countriesBody.list;
-                businessCountry = list.find(function (item) {
-                    return [item.iso2, item.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
+                businessCountry = undefined;
+                list = (countriesBody.list || []).map(function (country) {
+                    if ([country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase())) {
+                        businessCountry = country;
+                    }
+                    if (country.iso2 === 'SA') {
+                        country.digits = 9;
+                    }
+                    return country;
                 });
-                return [2, { businessCountry: businessCountry, countries: list || [] }];
+                return [2, { businessCountry: businessCountry, countries: list }];
         }
     });
 }); });
@@ -437,22 +443,18 @@ export var connectSlice = createSlice({
             state.loading = false;
         },
         resetMobileScreen: function (state) {
-            state.data.mobileData = __assign(__assign({}, state.data.mobileData), initialState.data.mobileData);
         },
         resetNIDScreen: function (state) {
-            state.data.nidData = __assign(__assign({}, state.data.nidData), initialState.data.nidData);
         },
         resetOTPScreen: function (state) {
-            state.data.otpData = __assign(__assign({}, state.data.otpData), initialState.data.otpData);
+            state.data.otpData.otp = '';
         },
         resetPasswordScreen: function (state) {
-            state.data.passwordData = initialState.data.passwordData;
         },
         resetIndividualScreen: function (state) {
             state.data.individualData = initialState.data.individualData;
         },
         resetMerchantScreen: function (state) {
-            state.data.brandData = initialState.data.brandData;
         }
     },
     extraReducers: function (builder) {
@@ -528,8 +530,12 @@ export var connectSlice = createSlice({
             if (!!leadResponse && !leadError) {
                 var name_1 = leadResponse.name, contact = leadResponse.contact;
                 var email = (contact || {}).email;
+                var firstName = (name_1 === null || name_1 === void 0 ? void 0 : name_1.first) + ' ';
+                var middleName = !!(name_1 === null || name_1 === void 0 ? void 0 : name_1.middle) ? (name_1 === null || name_1 === void 0 ? void 0 : name_1.middle) + ' ' : '';
+                var thirdName = !!(name_1 === null || name_1 === void 0 ? void 0 : name_1.third) ? (name_1 === null || name_1 === void 0 ? void 0 : name_1.third) + ' ' : '';
+                var lastName = !!(name_1 === null || name_1 === void 0 ? void 0 : name_1.last) ? name_1 === null || name_1 === void 0 ? void 0 : name_1.middle : '';
                 if (!!name_1) {
-                    var capitalizedName = capitalizeTheFirstLetterOfEachWord((name_1 === null || name_1 === void 0 ? void 0 : name_1.first) + ' ' + (name_1 === null || name_1 === void 0 ? void 0 : name_1.middle) + ' ' + (name_1 === null || name_1 === void 0 ? void 0 : name_1.third) + ' ' + (name_1 === null || name_1 === void 0 ? void 0 : name_1.last));
+                    var capitalizedName = capitalizeTheFirstLetterOfEachWord(firstName + middleName + thirdName + lastName);
                     state.data.individualData.name = capitalizedName;
                 }
                 if (!!email)

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

@@ -15,32 +15,19 @@ import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
-import Box from '@mui/material/Box';
-import { styled } from '@mui/material/styles';
 import { useAppDispatch } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import { useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { businessSelector, clearError, updateLeadBusinessType } from '../../../app/business/businessStore';
+import { businessSelector, clearError, retrieveCRInfos, retrieveFLInfos, updateLeadBusinessType } from '../../../app/business/businessStore';
 import { BusinessType as BusinessTypeEnum } from '../../../../@types';
 import Button from '../../../shared/Button';
 import { CRValidationSchema, FLValidationSchema } from './validation';
 import SelectType from './SelectType';
 import FreelanceLicense from './FreelanceLicense';
 import CompanyLicense from './CompanyLicense';
-var InputsContainerStyled = styled(Box)(function (_a) {
-    var _b;
-    var theme = _a.theme, listActive = _a.listActive;
-    return (_b = {
-            paddingBottom: theme.spacing(listActive ? 0 : 5)
-        },
-        _b[theme.transitions.create(['padding-bottom'])] = {
-            duration: theme.transitions.duration.standard
-        },
-        _b);
-});
 var BusinessType = function (_a) {
     var _b = React.useState(false), isCR = _b[0], setIsCR = _b[1];
     var _c = useSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
@@ -54,8 +41,13 @@ var BusinessType = function (_a) {
         defaultValues: data.businessTypeData,
         mode: 'onChange'
     });
+    React.useEffect(function () {
+        dispatch(retrieveFLInfos());
+        dispatch(retrieveCRInfos());
+    }, []);
     React.useEffect(function () {
         var businessType = businessTypeData.businessType;
+        methods.setValue('businessType', businessType);
         if (businessType === BusinessTypeEnum.CR)
             setIsCR(true);
     }, [businessTypeData.businessType]);
@@ -73,14 +65,15 @@ var BusinessType = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(InputsContainerStyled, __assign({ listActive: listActive }, { children: [_jsx(SelectType, { show: !listActive, onSwitchToCR: function () { return setIsCR(true); }, onSwitchToFL: function () { return setIsCR(false); } }), _jsx(CompanyLicense, { show: isCR, list: data.crInfos, onListOpen: function () {
-                                    setListActive(true);
-                                }, onListClose: function () {
-                                    setListActive(false);
-                                } }), _jsx(FreelanceLicense, { show: !isCR, list: data.flInfos, onListOpen: function () {
-                                    setListActive(true);
-                                }, onListClose: function () {
-                                    setListActive(false);
-                                } })] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    var disableBack = !data.otpData.isNID;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(SelectType, { show: !listActive, onSwitchToCR: function () { return setIsCR(true); }, onSwitchToFL: function () { return setIsCR(false); } }), _jsx(CompanyLicense, { show: isCR, list: data.crInfos, onListOpen: function () {
+                            setListActive(true);
+                        }, onListClose: function () {
+                            setListActive(false);
+                        } }), _jsx(FreelanceLicense, { show: !isCR, list: data.flInfos, onListOpen: function () {
+                            setListActive(true);
+                        }, onListClose: function () {
+                            setListActive(false);
+                        } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(BusinessType);

package/build/features/business/screens/BusinessType/CompanyLicense.js

@@ -20,6 +20,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+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';
@@ -54,9 +63,9 @@ var LicenseNameText = styled(Text, { shouldForwardProp: function (prop) { return
 });
 var CompanyLicense = function (_a) {
     var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
-    var licenseList = React.useState(list)[0];
-    var _b = React.useState(), selectedLicense = _b[0], setSelectedLicense = _b[1];
-    var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
+    var _b = React.useState(list), licenseList = _b[0], setLicenseList = _b[1];
+    var _c = React.useState(), selectedLicense = _c[0], setSelectedLicense = _c[1];
+    var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var setValue = useFormContext().setValue;
@@ -71,12 +80,17 @@ var CompanyLicense = function (_a) {
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
     React.useEffect(function () {
-        var first = list[0];
-        if (first) {
-            setSelectedLicense(first);
-            setValue('crNumber', getLicenseNumber(first), { shouldValidate: true });
-            if (!list.find(function (item) { return isOtherLicense(item); }))
-                list.push(OTHER_CR_LICENSE);
+        var array = list;
+        if ((array === null || array === void 0 ? void 0 : array.length) > 0) {
+            var hasOther = array === null || array === void 0 ? void 0 : array.find(function (item) { return isOtherLicense(item); });
+            var first = array[0];
+            if (first) {
+                setSelectedLicense(first);
+                setValue('crNumber', getLicenseNumber(first), { shouldValidate: true });
+                if (!hasOther)
+                    array = __spreadArray(__spreadArray([], array, true), [OTHER_CR_LICENSE], false);
+                setLicenseList(array);
+            }
         }
     }, [show, list]);
     var getLicenseNumber = function (item) {

package/build/features/business/screens/BusinessType/FreelanceLicense.js

@@ -20,6 +20,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+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';
@@ -54,9 +63,9 @@ var LicenseNameText = styled(Text, { shouldForwardProp: function (prop) { return
 });
 var FreelanceLicense = function (_a) {
     var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
-    var licenseList = React.useState(list)[0];
-    var _b = React.useState(), selectedLicense = _b[0], setSelectedLicense = _b[1];
-    var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
+    var _b = React.useState(list), licenseList = _b[0], setLicenseList = _b[1];
+    var _c = React.useState(), selectedLicense = _c[0], setSelectedLicense = _c[1];
+    var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var setValue = useFormContext().setValue;
@@ -71,12 +80,17 @@ var FreelanceLicense = function (_a) {
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
     React.useEffect(function () {
-        var first = list[0];
-        if (!!first) {
-            setSelectedLicense(first);
-            setValue('flNumber', getLicenseNumber(first), { shouldValidate: true });
-            if (!list.find(function (item) { return isOtherLicense(item); }))
-                list.push(OTHER_FL_LICENSE);
+        var array = list;
+        if ((array === null || array === void 0 ? void 0 : array.length) > 0) {
+            var hasOther = array === null || array === void 0 ? void 0 : array.find(function (item) { return isOtherLicense(item); });
+            var first = array[0];
+            if (!!first) {
+                setSelectedLicense(first);
+                setValue('flNumber', getLicenseNumber(first), { shouldValidate: true });
+                if (!hasOther)
+                    array = __spreadArray(__spreadArray([], array, true), [OTHER_FL_LICENSE], false);
+                setLicenseList(array);
+            }
         }
     }, [show, list]);
     var getLicenseNumber = function (item) {

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

@@ -37,8 +37,8 @@ var Confirm = function () {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var data = useSelector(businessSelector).data;
-    var _a = data.businessInfo, licenseNumber = _a.licenseNumber, brandName = _a.brandName, legalName = _a.legalName;
+    var _a = useSelector(businessSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var _b = data.businessInfo, licenseNumber = _b.licenseNumber, brandName = _b.brandName, legalName = _b.legalName;
     var isCR = data.businessTypeData.businessType === BusinessTypeEnum.CR;
     var onSubmit = function () {
         dispatch(createAccount());
@@ -50,6 +50,7 @@ var Confirm = function () {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputStyled, { label: t(isCR ? 'signup_business_cr_info_title' : 'signup_business_fl_info_title'), value: licenseNumber, disabled: true }), _jsx(InputStyled, { label: t('signup_brand_name_label'), value: brandName, disabled: true }), _jsx(InputStyled, { label: t('signup_legal_name_label'), value: legalName, disabled: true }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr }, { children: t('confirm') }))] })) })) }));
+    var disabled = !methods.formState.isValid || !!error;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputStyled, { label: t(isCR ? 'signup_business_cr_info_title' : 'signup_business_fl_info_title'), value: licenseNumber, disabled: true }), _jsx(InputStyled, { label: t('signup_brand_name_label'), value: brandName, disabled: true }), _jsx(InputStyled, { sx: { marginBlockEnd: 0 }, label: t('signup_legal_name_label'), value: legalName, disabled: true }), _jsx(Button, __assign({ disabled: disabled, loading: loading, error: t(error || ''), onBackClicked: function () { return onBack(); }, isAr: isAr }, { children: t('confirm') }))] })) })) }));
 };
 export default React.memo(Confirm);

package/build/features/business/screens/OTP/OTPInput.js

@@ -25,8 +25,7 @@ var BoxStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         flexDirection: 'column',
-        fontFamily: theme.typography.fontFamily,
-        marginBottom: theme.spacing(5)
+        fontFamily: theme.typography.fontFamily
     });
 });
 var OTPInput = function (_a) {

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

@@ -22,8 +22,7 @@ var BoxStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         flexDirection: 'column',
-        fontFamily: theme.typography.fontFamily,
-        marginBottom: theme.spacing(5)
+        fontFamily: theme.typography.fontFamily
     });
 });
 var OTPInput = function (_a) {

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

@@ -68,8 +68,8 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var disabled = !methods.formState.isValid || !!error;
-    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) || '';
-    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, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, type: 'submit', isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    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;
+    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, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, type: 'submit', isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/features/connect/screens/Individual/Email.js

@@ -21,6 +21,15 @@ import { checkEmailAvailability } from '../../../app/connect/connectStore';
 import { useAppDispatch } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 import Collapse from '../../../../components/Collapse';
+import { styled } from '@mui/material/styles';
+var InputStyled = styled(Input)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        input: {
+            textTransform: 'lowercase'
+        }
+    });
+});
 var Email = function (_a) {
     var _b;
     var show = _a.show;
@@ -45,6 +54,6 @@ var Email = function (_a) {
     var clearNumber = function () {
         emailControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { label: t('signup_email_lable'), value: emailValue, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: !error && emailValue ? _jsx(CheckIcon, {}) : emailValue && _jsx(ClearIcon, { onClick: clearNumber }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: !error && emailValue ? _jsx(CheckIcon, {}) : emailValue && _jsx(ClearIcon, { onClick: clearNumber }) }) }) })));
 };
 export default React.memo(Email);

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

@@ -34,14 +34,14 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var Individual = function (_a) {
-    var _b, _c, _d, _e;
-    var _f = React.useState(false), listActive = _f[0], setListActive = _f[1];
-    var _g = useSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error, searchActive = _g.searchActive;
-    var _h = React.useState(((_b = data.individualData.countryCode) === null || _b === void 0 ? void 0 : _b.digits) || 9), mobileLength = _h[0], setMobileLength = _h[1];
+    var _b, _c, _d;
+    var _e = React.useState(false), listActive = _e[0], setListActive = _e[1];
+    var _f = useSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error, searchActive = _f.searchActive;
+    var _g = React.useState(data.individualData.countryCode.digits), mobileLength = _g[0], setMobileLength = _g[1];
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var isAbsher = (_c = data.otpData) === null || _c === void 0 ? void 0 : _c.isAbsher;
+    var isAbsher = (_b = data.otpData) === null || _b === void 0 ? void 0 : _b.isAbsher;
     var individualData = data.individualData;
     var methods = useForm({
         resolver: yupResolver(isAbsher ? IndividualMobileValidation(mobileLength) : IndividualValidation()),
@@ -57,12 +57,10 @@ var Individual = function (_a) {
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
-    }, [methods.formState.isValid]);
-    React.useEffect(function () {
         return function () {
             dispatch(resetIndividualScreen());
         };
-    }, []);
+    }, [methods.formState.isValid]);
     React.useEffect(function () {
         var name = individualData.name, email = individualData.email, mobile = individualData.mobile, countryCode = individualData.countryCode;
         if (!!name)
@@ -81,9 +79,9 @@ var Individual = function (_a) {
         var _a, _b;
         if (((_b = (_a = data.individualData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.is_available) === false)
             methods.setError('email', { message: 'tap_js_email_already_exist' });
-    }, [(_d = data.individualData) === null || _d === void 0 ? void 0 : _d.responseBody]);
+    }, [(_c = data.individualData) === null || _c === void 0 ? void 0 : _c.responseBody]);
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
-    var disabled = emailErrChecks || searchActive || !((_e = data.individualData.responseBody) === null || _e === void 0 ? void 0 : _e.is_available);
+    var disabled = emailErrChecks || searchActive || !((_d = data.individualData.responseBody) === null || _d === void 0 ? void 0 : _d.is_available);
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { setMobileLength: setMobileLength, show: isAbsher, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Individual);