@tap-payments/auth-jsconnect 1.0.70 → 1.0.71

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

@@ -529,7 +529,7 @@ export var businessSlice = createSlice({
             var _a, _b;
             if ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend)
                 state.customLoading = true;
-            if ((_b = action.meta.arg) === null || _b === void 0 ? void 0 : _b.isResend)
+            if (!((_b = action.meta.arg) === null || _b === void 0 ? void 0 : _b.isResend))
                 state.loading = true;
             state.error = null;
         })

package/build/features/app/individual/individualStore.d.ts

@@ -1,5 +1,9 @@
 import { RootState } from '../../../app/store';
-import { IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { CountryCode, IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
+    businessCountry: any;
+    countries: any;
+}, void, {}>;
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     leadData: any;
@@ -24,6 +28,8 @@ declare type VerifyData = {
     token: string;
 };
 export interface IndividualData {
+    businessCountry: CountryCode;
+    countries: Array<CountryCode>;
     verify: ResponseData & VerifyData;
     otpData: OTPFormValues & ResponseData;
     individualData: IndividualExtraFormValues & ResponseData;

package/build/features/app/individual/individualStore.js

@@ -50,7 +50,23 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { removeRequestHeaders } from '../../../utils';
 import { handleNextScreenStep } from '../../../app/settings';
-import { INDIVIDUAl_STEP_NAMES } from '../../../constants';
+import { defaultCountry, INDIVIDUAl_STEP_NAMES } from '../../../constants';
+export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, countriesBody, businessCountry;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
+                return [4, API.countryService.getAllCountries()];
+            case 1:
+                countriesBody = (_a.sent()).data;
+                businessCountry = (countriesBody.list || []).find(function (country) {
+                    return [country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
+                });
+                return [2, { businessCountry: businessCountry, countries: countriesBody.list }];
+        }
+    });
+}); });
 export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse;
     return __generator(this, function (_a) {
@@ -177,8 +193,9 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
 var initialState = {
     error: null,
     loading: false,
-    customLoading: false,
     data: {
+        countries: [],
+        businessCountry: defaultCountry,
         verify: {
             token: ''
         },
@@ -211,6 +228,23 @@ export var individualSlice = createSlice({
     },
     extraReducers: function (builder) {
         builder
+            .addCase(getCountries.fulfilled, function (state, action) {
+            state.error = null;
+            state.customLoading = false;
+            var _a = action.payload, countries = _a.countries, businessCountry = _a.businessCountry;
+            state.data.countries = countries
+                .slice()
+                .sort(function (cOne, cTwo) { return cOne.name.english.localeCompare(cTwo.name.english); });
+            state.data.businessCountry = businessCountry || defaultCountry;
+        })
+            .addCase(getCountries.pending, function (state) {
+            state.error = null;
+            state.customLoading = true;
+        })
+            .addCase(getCountries.rejected, function (state, action) {
+            state.error = action.error.message;
+            state.customLoading = false;
+        })
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;
             state.customLoading = true;
@@ -258,6 +292,7 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(retrieveDataList.fulfilled, function (state, action) {
+            var _a, _b;
             state.loading = false;
             state.error = null;
             var sourceIncome = action.payload;
@@ -266,6 +301,10 @@ export var individualSlice = createSlice({
             var selectedSourceIncome = sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome[0];
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
+            var location = (_b = (_a = state.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.entity) === null || _b === void 0 ? void 0 : _b.country;
+            if (!!location) {
+                state.data.individualData.employerLocation = state.data.countries.find(function (country) { return country.iso2 === location; });
+            }
         })
             .addCase(retrieveDataList.rejected, function (state, action) {
             state.loading = false;

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

@@ -13,13 +13,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
@@ -50,7 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var VerifyNumber = function (_a) {
     var _b, _c, _d;
     var dispatch = useAppDispatch();
-    var _e = useSelector(bankSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _e = useAppSelector(bankSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -73,6 +72,6 @@ var VerifyNumber = function (_a) {
     };
     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') }))] })) })) }));
+    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, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

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

@@ -11,11 +11,10 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { styled } from '@mui/material/styles';
 import ActivitiesList from './ActivitiesList';
 import { useForm, FormProvider } from 'react-hook-form';
-import { useAppDispatch, useLanguage } from '../../../../hooks';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import Form from '../../../../components/Form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useTranslation } from 'react-i18next';
@@ -37,7 +36,7 @@ var Activities = function () {
     var dispatch = useAppDispatch();
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
-    var _c = useSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _c = useAppSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
     var activitiesData = data.activitiesData;
     var methods = useForm({
         resolver: yupResolver(ActivitiesValidationSchema),

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

@@ -31,14 +31,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
 import Text from '../../../../components/Text';
 import Input from '../../../../components/Input';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import { BusinessType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import SimpleList from '../../../../components/SimpleList';
@@ -83,7 +82,7 @@ var ActivitiesList = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
-    var data = useSelector(businessSelector).data;
+    var data = useAppSelector(businessSelector).data;
     var activitiesControl = useController({ name: 'activities', control: control });
     var controlValue = activitiesControl.field.value;
     var businessTypeData = data.businessTypeData;

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

@@ -20,12 +20,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 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 } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import Text from '../../../../components/Text';
 import { businessSelector } from '../../../app/business/businessStore';
 import CheckBox from '../../../../components/CheckBox';
@@ -83,7 +82,7 @@ var SalesChannels = function () {
     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 = useSelector(businessSelector).data;
+    var data = useAppSelector(businessSelector).data;
     var channelList = (data.businessTypeData.responseBody || {}).channelList;
     React.useEffect(function () {
         if ((channelList === null || channelList === void 0 ? void 0 : channelList.length) > 0) {

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

@@ -11,11 +11,10 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
@@ -26,7 +25,7 @@ import Button from '../../../shared/Button';
 import { LicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
 var BusinessType = function (_a) {
-    var _b = useSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _b = useAppSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();

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

@@ -22,12 +22,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch, useLanguage } from '../../../../hooks';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { BusinessType } from '../../../../@types';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
@@ -56,7 +55,7 @@ var LicenseNameText = styled(Text, { shouldForwardProp: function (prop) { return
 });
 var LicenseList = function (_a) {
     var rest = __rest(_a, []);
-    var _b = useSelector(businessSelector), data = _b.data, error = _b.error;
+    var _b = useAppSelector(businessSelector), data = _b.data, error = _b.error;
     var businessTypeData = data.businessTypeData;
     var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
     var t = useTranslation().t;

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

@@ -22,7 +22,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
@@ -34,7 +33,7 @@ import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../../components/Input';
 import SimpleList from '../../../../components/SimpleList';
 import { ScreenContainer } from '../../../shared/Containers';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import { businessSelector } from '../../../app/business/businessStore';
 export var InputLabelStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
@@ -80,7 +79,7 @@ var customerLocations = function (_a) {
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
     var customerLocationsControl = useController({ name: 'customerLocations', control: control });
-    var data = useSelector(businessSelector).data;
+    var data = useAppSelector(businessSelector).data;
     var activitiesData = data.activitiesData;
     var response = activitiesData.responseBody;
     var onOpenList = function (event) {

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

@@ -11,13 +11,12 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Box from '@mui/material/Box/Box';
-import { useSelector } from 'react-redux';
 import { styled } from '@mui/material/styles';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { CustomerInfoValidation } from './validation';
 import Form from '../../../../components/Form';
@@ -44,7 +43,7 @@ var ListType;
 var Customers = function (_a) {
     var _b = React.useState(), listActive = _b[0], setListActive = _b[1];
     var dispatch = useAppDispatch();
-    var _c = useSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _c = useAppSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
     var customerData = data.customersData;
     var methods = useForm({
         resolver: yupResolver(CustomerInfoValidation),

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

@@ -22,12 +22,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 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 } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import SimpleList from '../../../../components/SimpleList';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
@@ -52,7 +51,7 @@ var ExpectedCustomers = function (_a) {
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
     var expectedCustomerControl = useController({ name: 'expectedCustomer', control: control });
-    var data = useSelector(businessSelector).data;
+    var data = useAppSelector(businessSelector).data;
     var activitiesData = data.activitiesData;
     var response = activitiesData.responseBody;
     var onOpenList = function (event) {

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

@@ -26,13 +26,12 @@ 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 } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import SimpleList from '../../../../components/SimpleList';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import { ScreenContainer } from '../../../shared/Containers';
 import { InputLabelStyled, CheckIconStyled, InputStyled, NameContainer } from './CustomerLocations';
-import { useSelector } from 'react-redux';
 import { businessSelector } from '../../../../features/app/business/businessStore';
 var ListItemContainer = styled(Box)(function () { return ({
     display: 'flex'
@@ -48,7 +47,7 @@ var ExpectedSalesRange = function (_a) {
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
     var expectedSalesRangeControl = useController({ name: 'expectedSalesRange', control: control });
-    var data = useSelector(businessSelector).data;
+    var data = useAppSelector(businessSelector).data;
     var activitiesData = data.activitiesData;
     var response = activitiesData.responseBody;
     var onOpenList = function (event) {

package/build/features/business/screens/IDBOD/DOB.js

@@ -13,10 +13,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { styled, alpha } from '@mui/material/styles';
 import Text from '../../../../components/Text';
 import DatePicker from '../../../../components/DatePicker';
 import { ScreenContainer } from '../../../shared/Containers';
+import { businessSelector, clearError } from '../../../app/business/businessStore';
 var InputLabelStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.4) }, theme.typography.caption), { cursor: 'pointer' }));
@@ -26,8 +28,12 @@ var BOD = 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 = useAppSelector(businessSelector).error;
     var handleBirthDateChange = function (data) {
+        if (error)
+            dispatch(clearError());
         dobControl.field.onChange(data);
     };
     var dateValue = (_b = dobControl === null || dobControl === void 0 ? void 0 : dobControl.field) === null || _b === void 0 ? void 0 : _b.value;

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

@@ -11,13 +11,11 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch, useLanguage } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -35,7 +33,7 @@ var IDBOD = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var _c = useSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _c = useAppSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
     var methods = useForm({
         resolver: yupResolver(NIDValidationSchema),
         defaultValues: data.nidData,
@@ -51,10 +49,7 @@ var IDBOD = function (_a) {
     var handleCollapseOpenClose = function (flag) {
         setCollapse(flag);
     };
-    var onBack = function () {
-        dispatch(handlePrevScreenStep());
-    };
     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(ID, {}) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ loading: loading, disableBack: true, isAr: isAr, disabled: disabled, onBackClicked: function () { return onBack(); }, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(ID, {}) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ loading: loading, disableBack: true, isAr: isAr, disabled: disabled, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(IDBOD);

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

@@ -11,8 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -48,7 +47,7 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var OTP = function (_a) {
-    var _b = useSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _b = useAppSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var dispatch = useAppDispatch();
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
@@ -72,7 +71,7 @@ var OTP = function (_a) {
     };
     var disabled = !methods.formState.isValid || !!error;
     var idNumber = data.nidData.nid;
-    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('opt_nid_sent_title', { provider: 'ABSHER' }), ' ', !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskID(idNumber || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, type: 'submit', isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('opt_nid_sent_title', { provider: 'ABSHER' }), ' ', !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskID(idNumber || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 OTP.defaultProps = {};
 export default React.memo(OTP);

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

@@ -11,7 +11,6 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { useController, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import Box from '@mui/material/Box/Box';
@@ -19,7 +18,7 @@ import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
 import { businessSelector, updateLeadIdentity } from '../../../app/business/businessStore';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -33,7 +32,7 @@ var OTPInput = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
-    var data = useSelector(businessSelector).data;
+    var data = useAppSelector(businessSelector).data;
     var nidData = data.nidData;
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);

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

@@ -11,9 +11,8 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
@@ -50,7 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var VerifyNumber = function (_a) {
     var _b, _c, _d;
     var dispatch = useAppDispatch();
-    var _e = useSelector(businessSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _e = useAppSelector(businessSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -73,6 +72,6 @@ var VerifyNumber = function (_a) {
     };
     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') }))] })) })) }));
+    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, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

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

@@ -10,7 +10,6 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useSelector } from 'react-redux';
 import { styled } from '@mui/material/styles';
 import Email from './Email';
 import Name from './Name';
@@ -18,7 +17,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { IndividualValidation, IndividualMobileValidation } from './validation';
 import Form from '../../../../components/Form';
@@ -37,7 +36,7 @@ var Individual = function (_a) {
     var _b, _c, _d;
     var _e = React.useState(false), listActive = _e[0], setListActive = _e[1];
     var _f = React.useState(false), emailChecking = _f[0], setEmailChecking = _f[1];
-    var _g = useSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error;
+    var _g = useAppSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;

package/build/features/connect/screens/Merchant/BrandName.js

@@ -47,7 +47,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
@@ -65,7 +64,7 @@ import Collapse from '../../../../components/Collapse';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
 import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -108,7 +107,7 @@ var BrandName = function (_a) {
     var brandControl = useController({ control: control, name: 'brandName' });
     var brandNameValue = brandControl.field.value;
     var error = (_b = brandControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var data = useSelector(connectSelector).data;
+    var data = useAppSelector(connectSelector).data;
     var checkBrand = debounce(function (value) { return __awaiter(void 0, void 0, void 0, function () {
         var onSuccess;
         return __generator(this, function (_a) {

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

@@ -11,12 +11,11 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -33,7 +32,7 @@ var Merchant = function (_a) {
     var _e = React.useState(false), brandNameChecking = _e[0], setBrandNameChecking = _e[1];
     var _f = React.useState(ValidationOptions.NEW_USER), userType = _f[0], setUserType = _f[1];
     var _g = React.useState(false), listActive = _g[0], setListActive = _g[1];
-    var _h = useSelector(connectSelector), data = _h.data, loading = _h.loading, error = _h.error;
+    var _h = useAppSelector(connectSelector), data = _h.data, loading = _h.loading, error = _h.error;
     var isNewUser = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.new_user;
     var isAbsher = data.otpData.isAbsher;
     var brandList = ((_c = data.brandData.responseBody) === null || _c === void 0 ? void 0 : _c.brands) || [];

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

@@ -11,7 +11,6 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import Box from '@mui/material/Box';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -20,7 +19,7 @@ import { styled, alpha } from '@mui/material/styles';
 import Collapse from '../../../../components/Collapse';
 import Form from '../../../../components/Form';
 import Button, { AbsherButton } from '../../../shared/Button';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { clearError, connectSelector, createMobileAuth } from '../../../app/connect/connectStore';
@@ -73,8 +72,8 @@ var ListType;
     ListType["CountryCodeList"] = "CountryCodeList";
 })(ListType || (ListType = {}));
 var Mobile = function (_a) {
-    var settingsStore = useSelector(settingsSelector);
-    var _b = useSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var settingsStore = useAppSelector(settingsSelector);
+    var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var _c = React.useState(), listType = _c[0], setListType = _c[1];
     var dispatch = useAppDispatch();
     var methods = useForm({

package/build/features/connect/screens/Mobile/MobileNumber.js

@@ -31,11 +31,12 @@ import Collapse from '../../../../components/Collapse';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import { connectSelector } from '../../../app/connect/connectStore';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
 import { removeAllCharsFromNumber } from '../../../../utils';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import Search from '../../../shared/Search';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -80,6 +81,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _g = useFormContext(), control = _g.control, setValue = _g.setValue;
+    var loading = useAppSelector(connectSelector).loading;
     var phoneControl = useController({ name: 'mobile', control: control });
     var countryCodeControl = useController({ name: 'countryCode', control: control });
     var countryCodeValue = countryCodeControl.field.value;
@@ -130,7 +132,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         });
         setCountries(filteredCountries);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(Input, { sx: { direction: 'ltr' }, inputProps: { maxLength: requiredLen }, type: 'tel', onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(Input, { sx: { direction: 'ltr' }, inputProps: { maxLength: requiredLen }, type: 'tel', required: true, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                             } })] }))] })) })));
 });

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

@@ -10,10 +10,9 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { ScreenContainer } from '../../../shared/Containers';
 import DatePicker from '../../../../components/DatePicker';
 import { alpha, styled } from '@mui/material/styles';
@@ -30,7 +29,7 @@ var DOB = function (_a) {
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
     var dobControl = useController({ control: control, name: 'dob' });
-    var error = useSelector(connectSelector).error;
+    var error = useAppSelector(connectSelector).error;
     var handleBirthDateChange = function (data) {
         dobControl.field.onChange(data);
         handleClearError();

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

@@ -11,13 +11,12 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { alpha, styled } from '@mui/material/styles';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDValidationSchema } from './validation';
-import { useAppDispatch, useLanguage } from '../../../../hooks';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { clearError, connectSelector, createNIDAuth } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
@@ -62,8 +61,8 @@ var NID = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var _c = useSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
-    var settingsStore = useSelector(settingsSelector);
+    var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var settingsStore = useAppSelector(settingsSelector);
     var methods = useForm({
         resolver: yupResolver(NIDValidationSchema),
         defaultValues: data.nidData,

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

@@ -10,7 +10,6 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useSelector } from 'react-redux';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import * as React from 'react';
@@ -19,7 +18,7 @@ import Text from '../../../../components/Text';
 import { clearError, connectSelector, resetOTPScreen, verifyAuth } from '../../../app/connect/connectStore';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
 import { useForm, FormProvider } from 'react-hook-form';
@@ -50,7 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var OTP = function () {
     var _a;
     var dispatch = useAppDispatch();
-    var _b = useSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,

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

@@ -11,7 +11,6 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { useController, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import Box from '@mui/material/Box/Box';
@@ -19,7 +18,7 @@ import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
 import { connectSelector, createMobileAuth, createNIDAuth } from '../../../app/connect/connectStore';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -33,7 +32,7 @@ var OTPInput = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
-    var data = useSelector(connectSelector).data;
+    var data = useAppSelector(connectSelector).data;
     var mobileData = data.mobileData;
     var nidData = data.nidData;
     var isAbsher = data.otpData.isAbsher;

package/build/features/individual/Individual.js

@@ -21,7 +21,7 @@ import { getParameterByName, reactElement } from '../../utils';
 import { FeatureContainer } from '../shared/Containers';
 import { INDIVIDUAL_SCREENS_NAVIGATION } from '../../constants';
 import { individualFeatureScreens } from '../featuresScreens';
-import { individualSelector, verifyLeadToken } from '../app/individual/individualStore';
+import { getCountries, individualSelector, verifyLeadToken } from '../app/individual/individualStore';
 import CustomFooter from '../shared/Footer';
 var Individual = memo(function (props) {
     var open = React.useState(true)[0];
@@ -42,6 +42,9 @@ var Individual = memo(function (props) {
         if (!loading)
             verifyToken();
     }, [loading]);
+    useEffect(function () {
+        dispatch(getCountries());
+    }, []);
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: individualFeatureScreens.map(function (_a, index) {
                     var Element = _a.element, name = _a.name;
                     var isActive = activeScreen.name === name;

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

@@ -15,7 +15,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useForm, FormProvider } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { styled } from '@mui/material/styles';
 import Form from '../../../../components/Form';
@@ -30,8 +30,6 @@ import MonthlyIncome from './MonthlyIncome';
 import EmployerName from './EmployerName';
 import EmployerLocation from './EmployerLocation';
 import SourceOfIncome from './SourceOfIncome';
-import { countriesCode } from '../../../../constants';
-import { useSelector } from 'react-redux';
 import { individualSelector, updateIndividualInfo } from '../../../app/individual/individualStore';
 var InputsContainerStyled = styled(Box)(function (_a) {
     var _b;
@@ -59,7 +57,7 @@ var AdditionalIndividualInfo = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _b = useSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var methods = useForm({
         resolver: yupResolver(IndividualInfoValidationSchema),
         defaultValues: data.individualData,
@@ -75,13 +73,18 @@ var AdditionalIndividualInfo = function (_a) {
             setEmployerFieldsActive(false);
         }
     }, [methods.watch('sourceIncome')]);
+    React.useEffect(function () {
+        if (data.individualData.employerLocation) {
+            methods.setValue('employerLocation', data.individualData.employerLocation);
+        }
+    }, [data.individualData.employerLocation]);
     var onSubmit = function (data) {
         dispatch(updateIndividualInfo(data));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(InputsContainerStyled, __assign({ listActive: listActive }, { children: [_jsx(SourceOfIncome, { show: !listActive }), _jsx(MonthlyIncome, { show: !listActive }), _jsx(EmployerName, { show: !listActive && employerFieldsActive }), _jsx(EmployerLocation, { show: employerFieldsActive, countries: countriesCode, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(ButtonStyled, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(InputsContainerStyled, __assign({ listActive: listActive }, { children: [_jsx(SourceOfIncome, { show: !listActive }), _jsx(MonthlyIncome, { show: !listActive }), _jsx(EmployerName, { show: !listActive && employerFieldsActive }), _jsx(EmployerLocation, { show: employerFieldsActive, countries: data.countries, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(ButtonStyled, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(AdditionalIndividualInfo);
 AdditionalIndividualInfo.defaultProps = {};

package/build/features/individual/screens/AdditionalIndividualInfo/EmployerName.js

@@ -20,14 +20,11 @@ import CheckIcon from '../../../shared/CheckIcon';
 import Collapse from '../../../../components/Collapse';
 import ClearIcon from '../../../shared/ClearIcon';
 import { styled } from '@mui/material/styles';
-var InputStyled = styled(Input)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        input: {
-            textTransform: 'capitalize'
-        }
-    });
-});
+var InputStyled = styled(Input)(function () { return ({
+    input: {
+        textTransform: 'capitalize'
+    }
+}); });
 var EmployerName = function (_a) {
     var _b;
     var show = _a.show;

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

@@ -13,13 +13,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
@@ -50,7 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var VerifyNumber = function (_a) {
     var _b, _c, _d;
     var dispatch = useAppDispatch();
-    var _e = useSelector(individualSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _e = useAppSelector(individualSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -73,6 +72,6 @@ var VerifyNumber = function (_a) {
     };
     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') }))] })) })) }));
+    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, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

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

@@ -13,13 +13,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
@@ -50,7 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var VerifyNumber = function (_a) {
     var _b, _c, _d;
     var dispatch = useAppDispatch();
-    var _e = useSelector(passwordSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _e = useAppSelector(passwordSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -73,6 +72,6 @@ var VerifyNumber = function (_a) {
     };
     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') }))] })) })) }));
+    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, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/features/shared/Footer/Footer.js

@@ -1,16 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { LanguageMode } from '../../../@types';
-import { useAppDispatch, useLanguage } from '../../../hooks';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../hooks';
 import { handleLanguage } from '../../../app/settings';
 import Footer from '../../../components/Footer';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { connectSelector } from '../../app/connect/connectStore';
 export default function CustomFooter() {
     var isEn = useLanguage().isEn;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _a = useSelector(connectSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var _a = useAppSelector(connectSelector), data = _a.data, loading = _a.loading, error = _a.error;
     var handleChangeLanguage = function () {
         var language = isEn ? LanguageMode.AR : LanguageMode.EN;
         dispatch(handleLanguage(language));

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

@@ -12,7 +12,7 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
-import { useAppDispatch, useLanguage } from '../../../../hooks';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import { useForm, FormProvider } from 'react-hook-form';
@@ -21,14 +21,13 @@ import { Validation } from './validation';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { taxSelector, updateTaxInfo } from '../../../app/tax/taxStore';
 import VATId from './VATId';
-import { useSelector } from 'react-redux';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
 }); });
 var TaxDetails = function () {
     var dispatch = useAppDispatch();
-    var _a = useSelector(taxSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var _a = useAppSelector(taxSelector), data = _a.data, loading = _a.loading, error = _a.error;
     var methods = useForm({
         resolver: yupResolver(Validation),
         defaultValues: data.taxData,

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

@@ -13,13 +13,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { useLanguage } from '../../../../hooks';
+import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
@@ -50,7 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var VerifyNumber = function (_a) {
     var _b, _c, _d;
     var dispatch = useAppDispatch();
-    var _e = useSelector(taxSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _e = useAppSelector(taxSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -73,6 +72,6 @@ var VerifyNumber = function (_a) {
     };
     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') }))] })) })) }));
+    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, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/package.json

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