@tap-payments/auth-jsconnect 1.0.22 → 1.0.23

package/build/@types/app.d.ts

@@ -107,16 +107,7 @@ export interface SourceOfIncome {
     nameEn: string;
 }
 export interface AppInfo {
-    identifier: string;
     name: string;
-    version: string;
-    requirer?: string;
-    requirer_version?: string;
-    app_locale?: string;
-    sdk_version?: string;
-    requirer_sim_network_name?: string;
-    requirer_sim_country_iso?: string;
-    universal_id?: string;
 }
 export interface OSDetails {
     name: string;

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

@@ -47,11 +47,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import moment from 'moment-hijri';
 import { handleNextScreenStep } from '../../../app/settings';
 import API from '../../../api';
 import { CONNECT_STEP_NAMES, IDENTIFICATION_TYPE } from '../../../constants';
 import { defaultCountry } from '../../../constants/dummy';
-import { getIndividualName } from '../../../utils';
+import { convertNumbers2English, getIndividualName } from '../../../utils';
 export var getCountries = createAsyncThunk('getCountries', function () { return __awaiter(void 0, void 0, void 0, function () {
     var countriesBody, BusinessCountries, list, countries, filterBusinessCountries;
     return __generator(this, function (_a) {
@@ -100,17 +101,21 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
     });
 }); });
 export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, identification_id_type, requestBody, data;
+    var _a, settings, connect, identification_id_type, birthDate, requestBody, data;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
+                birthDate = params.dob;
+                if (identification_id_type === IDENTIFICATION_TYPE.NID) {
+                    birthDate = convertNumbers2English(moment(birthDate, 'YYYY-MM-DD').format('iYYYY/iMM/iDD')).split('/').join('-');
+                }
                 requestBody = {
                     user_credentail: {
                         identification_id: params.nid,
                         identification_id_type: identification_id_type,
-                        date_of_birth: params.dob,
+                        date_of_birth: birthDate,
                         country_code: connect.data.mobileData.businessCountry.iso2
                     },
                     device_info: settings.data.deviceInfo,
@@ -326,11 +331,6 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
                 return [4, API.leadService.updateLead(payload, { headers: headers })];
             case 1:
                 data = (_e.sent()).data;
-                if (!data.errors) {
-                    console.log('success');
-                    alert('Account created successfully, please check your email');
-                    alert("It's a fake message, plz wait us to integrate with the backend. <A.Sharkawy>");
-                }
                 return [2, { response: data, formData: params }];
         }
     });

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

@@ -12,6 +12,11 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
         marginBlockEnd: theme.spacing(3)
     });
 });
+var InputStyled = styled(Input)(function () { return ({
+    '& .MuiInputBase-input': {
+        cursor: 'default'
+    }
+}); });
 var BankName = function () {
     var _a;
     var t = useTranslation().t;
@@ -22,6 +27,6 @@ var BankName = function () {
     var clearValue = function () {
         bankNameControl.field.onChange('');
     };
-    return (_jsx(FeatureStyled, { children: _jsx(Input, { label: t('enter_bank_name'), placeholder: t('enter_bank_name_placeholder'), value: bankNameValue, required: true, endAdornment: !hasError && bankNameValue ? _jsx(CheckIcon, {}) : bankNameValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('enter_bank_name'), placeholder: t('enter_bank_name_placeholder'), value: bankNameValue, required: true, readOnly: true, endAdornment: !hasError && bankNameValue ? _jsx(CheckIcon, {}) : bankNameValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
 };
 export default BankName;

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

@@ -31,7 +31,8 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var Activities = function () {
-    var _a = React.useState(false), collapse = _a[0], setCollapse = _a[1];
+    var _a = React.useState(false), anchorEl = _a[0], setAnchorEl = _a[1];
+    var _b = React.useState(false), collapse = _b[0], setCollapse = _b[1];
     var dispatch = useAppDispatch();
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
@@ -55,6 +56,9 @@ var Activities = function () {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Collapse, __assign({ in: !collapse }, { children: [!!ACTIVITIES && _jsx(ActivitiesList, {}), _jsx(SalesChannels, {})] })), _jsx(OperationStartDate, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid }, { children: t('next') })) }))] })) })) }));
+    var handleMenuClick = function () {
+        anchorEl ? setAnchorEl(false) : setAnchorEl(true);
+    };
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Collapse, __assign({ in: !collapse }, { children: [!!ACTIVITIES && (_jsx(ActivitiesList, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(SalesChannels, {}) }))] })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid }, { children: t('next') })) }))] })) })) }));
 };
 export default Activities;

package/build/features/business/screens/Activities/ActivitiesList.d.ts

@@ -20,7 +20,7 @@ export declare const InputStyled: import("@emotion/styled").StyledComponent<Pick
 export declare const CheckIconStyled: import("@emotion/styled").StyledComponent<{
     children?: React.ReactNode;
     classes?: Partial<import("@mui/material").SvgIconClasses> | undefined;
-    color?: "inherit" | "disabled" | "error" | "success" | "primary" | "secondary" | "action" | "info" | "warning" | undefined;
+    color?: "inherit" | "disabled" | "error" | "primary" | "secondary" | "action" | "info" | "success" | "warning" | undefined;
     fontSize?: "small" | "inherit" | "medium" | "large" | undefined;
     htmlColor?: string | undefined;
     inheritViewBox?: boolean | undefined;

package/build/features/business/screens/Customers/CustomerLocations.d.ts

@@ -35,7 +35,7 @@ export declare const NameContainer: import("@emotion/styled").StyledComponent<im
 export declare const CheckIconStyled: import("@emotion/styled").StyledComponent<{
     children?: React.ReactNode;
     classes?: Partial<import("@mui/material").SvgIconClasses> | undefined;
-    color?: "inherit" | "disabled" | "error" | "success" | "primary" | "secondary" | "action" | "info" | "warning" | undefined;
+    color?: "inherit" | "disabled" | "error" | "primary" | "secondary" | "action" | "info" | "success" | "warning" | undefined;
     fontSize?: "small" | "inherit" | "medium" | "large" | undefined;
     htmlColor?: string | undefined;
     inheritViewBox?: boolean | undefined;
@@ -49,7 +49,7 @@ export declare const CheckIconStyled: import("@emotion/styled").StyledComponent<
 export declare const RemainingCheck: import("@emotion/styled").StyledComponent<{
     children?: React.ReactNode;
     classes?: Partial<import("@mui/material").SvgIconClasses> | undefined;
-    color?: "inherit" | "disabled" | "error" | "success" | "primary" | "secondary" | "action" | "info" | "warning" | undefined;
+    color?: "inherit" | "disabled" | "error" | "primary" | "secondary" | "action" | "info" | "success" | "warning" | undefined;
     fontSize?: "small" | "inherit" | "medium" | "large" | undefined;
     htmlColor?: string | undefined;
     inheritViewBox?: boolean | undefined;
@@ -61,6 +61,7 @@ export declare const RemainingCheck: import("@emotion/styled").StyledComponent<{
     ref?: ((instance: SVGSVGElement | null) => void) | React.RefObject<SVGSVGElement> | null | undefined;
 }, keyof import("@mui/material/OverridableComponent").CommonProps | "color" | "fontSize" | "shapeRendering" | "children" | "sx" | "htmlColor" | "inheritViewBox" | "titleAccess" | "viewBox"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
 interface CustomerLocationsProps {
+    show: boolean;
     onListOpen?: () => void;
     onListClose?: () => void;
 }

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

@@ -101,8 +101,8 @@ var customerLocations = function (_a) {
     };
     var customerLocationsValue = customerLocationsControl.field.value;
     var customerLocationSelected = customerLocationsValue[customerLocationsValue.length - 1];
-    return (_jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('select_customer_base') }), _jsx(InputStyled, { readOnly: true, value: isAr ? customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.nameAR : customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.name, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: customerLocationsList, placeholder: 'choose_customer_base', onSelectItem: onSelectItem, renderItem: function (item) {
-                        return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (customerLocationsValue === null || customerLocationsValue === void 0 ? void 0 : customerLocationsValue.id) }, { children: isAr ? item.nameAR : item.name })) })), item.id === (customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.id) && _jsx(CheckIconStyled, {}), checkRemainingCondition(item) && item.id != (customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.id) && _jsx(RemainingCheck, {})] }));
-                    } }) }))] }));
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('select_customer_base') }), _jsx(InputStyled, { readOnly: true, value: isAr ? customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.nameAR : customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.name, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: customerLocationsList, placeholder: 'choose_customer_base', onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (customerLocationsValue === null || customerLocationsValue === void 0 ? void 0 : customerLocationsValue.id) }, { children: isAr ? item.nameAR : item.name })) })), item.id === (customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.id) && _jsx(CheckIconStyled, {}), checkRemainingCondition(item) && item.id != (customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.id) && _jsx(RemainingCheck, {})] }));
+                        } }) }))] }) })));
 };
 export default React.memo(customerLocations);

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

@@ -29,11 +29,19 @@ import { CUSTOMER_LOCATIONS, EXPECTED_CUSTOMERS, EXPECTED_SALES_RANGE } from '..
 import RefundPolicy from './RefundPolicy';
 import TransactionPolicy from './TransactionPolicy';
 import { ScreenContainer } from '../../../shared/Containers';
+import Collapse from '../../../../components/Collapse';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
 }); });
+var ListType;
+(function (ListType) {
+    ListType["CustomerLocationsList"] = "CustomerLocationsList";
+    ListType["ExpectedCustomersList"] = "ExpectedCustomersList";
+    ListType["ExpectedSalesList"] = "ExpectedSalesList";
+})(ListType || (ListType = {}));
 var Customers = function (_a) {
+    var _b = React.useState(), listActive = _b[0], setListActive = _b[1];
     var dispatch = useAppDispatch();
     var methods = useForm({
         resolver: yupResolver(CustomerInfoValidation),
@@ -55,6 +63,16 @@ var Customers = function (_a) {
     };
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(CustomerLocations, {}), _jsx(ExpectedCustomers, {}), _jsx(ExpectedSales, {}), _jsx(RefundPolicy, {}), _jsx(TransactionPolicy, {}), _jsx(Box, __assign({ sx: { mt: 2 } }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: !methods.formState.isValid, isAr: isAr }, { children: t('next') })) }))] })) })) }));
+    var handleMenuClick = function (flag) {
+        setListActive(flag);
+    };
+    var isCustomerLocationsListActive = listActive === ListType.CustomerLocationsList;
+    var isExpectedCustomersListActive = listActive === ListType.ExpectedCustomersList;
+    var isExpectedSalesListActive = listActive === ListType.ExpectedSalesList;
+    var whenNotSelectCustomersLocation = !isExpectedCustomersListActive && !isExpectedSalesListActive;
+    var whenNotSelectExpectedCustomers = !isCustomerLocationsListActive && !isExpectedSalesListActive;
+    var whenNotSelectExpectedSales = !isCustomerLocationsListActive && !isExpectedCustomersListActive;
+    var isAnyListSelected = !isExpectedCustomersListActive && !isCustomerLocationsListActive && !isExpectedSalesListActive;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(CustomerLocations, { show: whenNotSelectCustomersLocation, onListOpen: function () { return handleMenuClick(ListType.CustomerLocationsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpectedCustomers, { show: whenNotSelectExpectedCustomers, onListOpen: function () { return handleMenuClick(ListType.ExpectedCustomersList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpectedSales, { show: whenNotSelectExpectedSales, onListOpen: function () { return handleMenuClick(ListType.ExpectedSalesList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: isAnyListSelected }, { children: [_jsx(RefundPolicy, {}), _jsx(TransactionPolicy, {}), _jsx(Box, __assign({ sx: { mt: 2 } }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: !methods.formState.isValid, isAr: isAr }, { children: t('next') })) }))] }))] })) })) }));
 };
 export default React.memo(Customers);

package/build/features/business/screens/Customers/ExpectedCustomers.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 interface ExpectedCustomersProps {
+    show: boolean;
     onListOpen?: () => void;
     onListClose?: () => void;
 }

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

@@ -67,8 +67,8 @@ var ExpectedCustomers = function (_a) {
     };
     var expectedCustomersValue = expectedCustomersControl.field.value;
     var expectedCustomersSelected = expectedCustomersValue;
-    return (_jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: true, value: isAr ? expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.nameAR : expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
-                        return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedCustomersValue === null || expectedCustomersValue === void 0 ? void 0 : expectedCustomersValue.id) }, { children: isAr ? item.nameAR : item.name })) }), item.id === (expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.id) && _jsx(CheckIconStyled, {})] }));
-                    } }) }))] }));
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: true, value: isAr ? expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.nameAR : expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedCustomersValue === null || expectedCustomersValue === void 0 ? void 0 : expectedCustomersValue.id) }, { children: isAr ? item.nameAR : item.name })) }), item.id === (expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.id) && _jsx(CheckIconStyled, {})] }));
+                        } }) }))] }) })));
 };
 export default ExpectedCustomers;

package/build/features/business/screens/Customers/ExpectedSalesRange.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 interface ExpectedSalesRangeProps {
+    show: boolean;
     onListOpen?: () => void;
     onListClose?: () => void;
 }

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

@@ -68,8 +68,8 @@ var ExpectedSalesRange = function (_a) {
     };
     var expectedSalesRangeValue = expectedSalesRangeControl.field.value || expectedSalesRangeList;
     var expectedSalesRangeSelected = expectedSalesRangeValue;
-    return (_jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_yearly') }), _jsx(InputStyled, { readOnly: true, value: isAr ? expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.nameAR : expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.name, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedSalesRangeList, onSelectItem: onSelectItem, renderItem: function (item) {
-                        return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.id) }, { children: isAr ? item.nameAR : item.name })) }), item.id === (expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.id) && _jsx(CheckIconStyled, {})] }));
-                    } }) }))] }));
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_yearly') }), _jsx(InputStyled, { readOnly: true, value: isAr ? expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.nameAR : expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.name, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedSalesRangeList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.id) }, { children: isAr ? item.nameAR : item.name })) }), item.id === (expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.id) && _jsx(CheckIconStyled, {})] }));
+                        } }) }))] }) })));
 };
 export default ExpectedSalesRange;

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

@@ -67,7 +67,7 @@ var VerifyNumber = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var loading = false;
-    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'), _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(code, " ").concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: !methods.formState.isValid, type: 'submit', isAr: isAr, loading: loading }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: !methods.formState.isValid, type: 'submit', isAr: isAr, loading: loading }, { children: t('next') }))] })) })) }));
 };
 VerifyNumber.defaultProps = {
     phone: '564656085',

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

@@ -29,17 +29,21 @@ var Email = function (_a) {
     var t = useTranslation().t;
     var control = useFormContext().control;
     var emailControl = useController({ name: 'email', control: control });
+    var emailValue = emailControl.field.value;
+    var error = (_b = emailControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     var checkEmail = debounce(function (value) {
         dispatch(checkEmailAvailability(value));
     }, 500);
     var handleEmailChange = function (event) {
         var value = keepEmailCharacters(event.target.value);
         emailControl.field.onChange(value);
-        if (!!value)
-            checkEmail(value);
     };
-    var emailValue = emailControl.field.value;
-    var error = (_b = emailControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    React.useEffect(function () {
+        var isValid = emailValue && !error && emailValue.length > 3;
+        if (isValid) {
+            checkEmail(emailValue);
+        }
+    }, [emailValue, error]);
     var clearNumber = function () {
         emailControl.field.onChange('');
     };

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

@@ -34,11 +34,13 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var Individual = function (_a) {
-    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(((_b = data.individualData.countryCode) === null || _b === void 0 ? void 0 : _b.digits) || 9), mobileLength = _g[0], setMobileLength = _g[1];
+    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 dispatch = useAppDispatch();
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
     var isAbsher = (_c = data.otpData) === null || _c === void 0 ? void 0 : _c.isAbsher;
     var methods = useForm({
         resolver: yupResolver(isAbsher ? IndividualMobileValidation(mobileLength) : IndividualValidation()),
@@ -57,15 +59,16 @@ var Individual = function (_a) {
     }, [methods.formState.isValid]);
     React.useEffect(function () {
         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)
+        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]);
-    var t = useTranslation().t;
-    var isAr = useLanguage().isAr;
-    var disabled = !methods.formState.isValid || !!methods.formState.errors.email || !!error || searchActive;
+        if (searchActive)
+            methods.setError('email', { message: 'checking...' });
+    }, [(_d = data.individualData) === null || _d === void 0 ? void 0 : _d.responseBody, searchActive]);
     var handleMenuListClick = function () {
         listActive ? setListActive(false) : setListActive(true);
     };
+    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);
     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);

package/build/features/connect/screens/NID/DOB.js

@@ -10,11 +10,14 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ScreenContainer } from '../../../shared/Containers';
-import DatePicker from '../../../../components/DatePicker';
+import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
+import { useAppDispatch } from '../../../../hooks';
+import { ScreenContainer } from '../../../shared/Containers';
+import DatePicker from '../../../../components/DatePicker';
 import { alpha, styled } from '@mui/material/styles';
+import { clearError, connectSelector } from '../../../app/connect/connectStore';
 import Text from '../../../../components/Text';
 var InputLabelStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
@@ -25,9 +28,16 @@ var DOB = function (_a) {
     var onDateClicked = _a.onDateClicked;
     var t = useTranslation().t;
     var control = useFormContext().control;
+    var dispatch = useAppDispatch();
     var dobControl = useController({ control: control, name: 'dob' });
+    var error = useSelector(connectSelector).error;
     var handleBirthDateChange = function (data) {
         dobControl.field.onChange(data);
+        handleClearError();
+    };
+    var handleClearError = function () {
+        if (error)
+            dispatch(clearError());
     };
     var dateValue = (_b = dobControl === null || dobControl === void 0 ? void 0 : dobControl.field) === null || _b === void 0 ? void 0 : _b.value;
     return (_jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, __assign({ sx: { p: function (_a) {

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

@@ -43,8 +43,7 @@ var NID = function (_a) {
         mode: 'onChange'
     });
     React.useEffect(function () {
-        if (error)
-            dispatch(clearError());
+        handleClearError();
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
         dispatch(createNIDAuth(__assign(__assign({}, data), { isResend: false })));
@@ -55,6 +54,10 @@ var NID = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
+    var handleClearError = function () {
+        if (error)
+            dispatch(clearError());
+    };
     var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Box, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }) }))] })) })) }));
 };

package/build/features/connect/screens/NID/validation.js

@@ -4,7 +4,6 @@ export var NIDValidationSchema = yup.object().shape({
     nid: yup
         .string()
         .matches(/^(1|2)([0-9]{1,})$/g, 'signup_invalid_national_id_format')
-        .min(8, 'signup_invalid_national_id_format')
-        .max(10, 'signup_invalid_national_id_format')
+        .min(10, 'signup_invalid_national_id')
         .required('signup_invalid_national_id')
 });

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

@@ -7,8 +7,13 @@ import { updateLeadSuccess } from '../../../app/connect/connectStore';
 var ThankYou = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var onSuccess = function () {
+    React.useEffect(function () {
         dispatch(updateLeadSuccess());
+    }, []);
+    var onSuccess = function () {
+        console.log('success');
+        alert('Account created successfully, please check your email');
+        alert("It's a fake message, plz wait us to integrate with the backend. <A.Sharkawy>");
     };
     return _jsx(SuccessScreen, { title: t('ide_successfully_verified_message'), onSuccess: onSuccess });
 };

package/build/utils/string.d.ts

@@ -6,3 +6,4 @@ export declare const getIndividualName: (name: string) => {
     middle: string;
     last: string;
 } | undefined;
+export declare const convertNumbers2English: (str: string) => string;

package/build/utils/string.js

@@ -37,3 +37,6 @@ export var getIndividualName = function (name) {
     }
     return { first: first, middle: middle, last: last };
 };
+export var convertNumbers2English = function (str) {
+    return str.replace(/[٠-٩]/g, function (d) { return '٠١٢٣٤٥٦٧٨٩'.indexOf(d); });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "1.0.22",
+	"version": "1.0.23",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",
@@ -58,6 +58,7 @@
 		"fork-ts-checker-webpack-plugin": "^7.2.12",
 		"html-loader": "^3.1.2",
 		"html-webpack-plugin": "^5.5.0",
+		"@types/moment-hijri": "^2.1.0",
 		"husky": "^8.0.1",
 		"lint-staged": "^13.0.3",
 		"mini-css-extract-plugin": "^2.6.1",
@@ -87,6 +88,7 @@
 		"i18next-browser-languagedetector": "^6.1.4",
 		"i18next-http-backend": "^1.4.1",
 		"lodash-es": "^4.17.21",
+		"moment-hijri": "~2.1.2",
 		"react": "^18.2.0",
 		"react-calendar": "~3.7.0",
 		"react-dom": "^18.2.0",