@tap-payments/auth-jsconnect 2.1.77-test → 2.1.79-test

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

@@ -42,18 +42,19 @@ var ButtonStyled = styled(Button)(function (_a) {
     });
 });
 var BankDetails = function () {
-    var _a, _b, _c, _d, _e, _f, _g;
-    var _h = React.useState(false), ibanChecking = _h[0], setIbanChecking = _h[1];
+    var _a, _b, _c;
+    var _d = React.useState(false), ibanChecking = _d[0], setIbanChecking = _d[1];
     var dispatch = useAppDispatch();
-    var _j = useAppSelector(bankSelector), data = _j.data, loading = _j.loading, error = _j.error;
+    var _e = useAppSelector(bankSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var _k = data.bankData, iban = _k.iban, beneficiaryName = _k.beneficiaryName, bankName = _k.bankName, bankStatementId = _k.bankStatementId, bankStatementUploading = _k.uploading, confirmPolicy = _k.confirmPolicy;
+    var _f = data.bankData, iban = _f.iban, beneficiaryName = _f.beneficiaryName, bankName = _f.bankName, bankStatementId = _f.bankStatementId, bankStatementUploading = _f.uploading, confirmPolicy = _f.confirmPolicy;
     var verify = data.verify;
+    var _g = verify.responseBody || {}, bank_account = _g.bank_account, entity = _g.entity;
     var isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
-    var isFL = ((_c = (_b = (_a = verify.responseBody) === null || _a === void 0 ? void 0 : _a.entity) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === BusinessType.FL ? true : false;
-    var bankHasDocument = ((_g = (_f = (_e = (_d = verify.responseBody) === null || _d === void 0 ? void 0 : _d.bank_account) === null || _e === void 0 ? void 0 : _e.document) === null || _f === void 0 ? void 0 : _f.file_details) === null || _g === void 0 ? void 0 : _g.length) > 0;
+    var isFL = ((_a = entity === null || entity === void 0 ? void 0 : entity.type) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === BusinessType.FL ? true : false;
+    var bankHasDocument = ((_c = (_b = bank_account === null || bank_account === void 0 ? void 0 : bank_account.document) === null || _b === void 0 ? void 0 : _b.file_details) === null || _c === void 0 ? void 0 : _c.length) > 0;
     var methods = useForm({
-        resolver: yupResolver(isKWCountry && isFL && !bankHasDocument ? BankKWFLValidation : BankValidation),
+        resolver: yupResolver(isKWCountry && isFL && !bankHasDocument ? BankKWFLValidation(bank_account) : BankValidation(bank_account)),
         defaultValues: {
             iban: iban,
             beneficiaryName: beneficiaryName,

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

@@ -11,17 +11,18 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
-import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
-import ClearIcon from '../../../shared/ClearIcon';
-import CheckIcon from '../../../shared/CheckIcon';
-import { bankSelector } from '../../../app/bank/bankStore';
 import { useAppSelector } from '../../../../hooks';
 import { removeAllOtherThanAlphabetAndSpace } from '../../../../utils';
+import { FieldType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
+import { ScreenContainer } from '../../../shared/Containers';
+import Input from '../../../shared/Input';
+import ClearIcon from '../../../shared/ClearIcon';
+import CheckIcon from '../../../shared/CheckIcon';
+import { bankSelector } from '../../../app/bank/bankStore';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -34,13 +35,15 @@ var InputStyled = styled(Input)(function () { return ({
     }
 }); });
 var BankName = function () {
-    var _a, _b;
+    var _a, _b, _c;
     var t = useTranslation().t;
-    var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
+    var _d = useFormContext(), setValue = _d.setValue, control = _d.control;
     var data = useAppSelector(bankSelector).data;
     var bankNameControl = useController({ name: 'bankName', control: control });
     var bankNameValue = bankNameControl.field.value;
     var hasError = !!((_a = bankNameControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message);
+    var bank_account = (data.verify.responseBody || {}).bank_account;
+    var isNonEditable = ((_b = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _b === void 0 ? void 0 : _b.bank_name) === FieldType.NON_EDITABLE;
     var clearValue = function () {
         bankNameControl.field.onChange('');
     };
@@ -49,12 +52,12 @@ var BankName = function () {
         var bankName = (_a = data.bankData.responseBody) === null || _a === void 0 ? void 0 : _a.bank_name;
         if (bankName && !bankNameValue)
             setValue('bankName', bankName);
-    }, [(_b = data.bankData.responseBody) === null || _b === void 0 ? void 0 : _b.bank_name]);
+    }, [(_c = data.bankData.responseBody) === null || _c === void 0 ? void 0 : _c.bank_name]);
     var handleBankChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanAlphabetAndSpace(target.value);
         bankNameControl.field.onChange(value);
     };
-    return (_jsx(Collapse, __assign({ in: !!bankNameValue }, { children: _jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('enter_bank_name'), placeholder: t('enter_bank_name_placeholder'), onChange: handleBankChange, value: bankNameValue, required: true, readOnly: true, endAdornment: !hasError && bankNameValue ? _jsx(CheckIcon, {}) : bankNameValue && _jsx(ClearIcon, { onClick: clearValue }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: !!bankNameValue }, { children: _jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('enter_bank_name'), placeholder: t('enter_bank_name_placeholder'), onChange: handleBankChange, value: bankNameValue, required: true, disabled: isNonEditable, endAdornment: !hasError && bankNameValue ? _jsx(CheckIcon, {}) : bankNameValue && _jsx(ClearIcon, { onClick: clearValue }) }) }) })));
 };
 export default BankName;

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

@@ -4,35 +4,34 @@ import Input from '../../../shared/Input';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
-import { ScreenContainer } from '../../../shared/Containers';
-import { bankSelector } from '../../../app/bank/bankStore';
 import { useAppSelector } from '../../../../hooks';
+import { FieldType } from '../../../../@types';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
+import { ScreenContainer } from '../../../shared/Containers';
+import { bankSelector } from '../../../app/bank/bankStore';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
         marginBlockEnd: theme.spacing(3)
     });
 });
-var InputStyled = styled(Input)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        input: {
-            textTransform: 'capitalize'
-        }
-    });
-});
+var InputStyled = styled(Input)(function () { return ({
+    input: {
+        textTransform: 'capitalize'
+    }
+}); });
 var Beneficiary = function () {
-    var _a, _b;
+    var _a, _b, _c;
     var t = useTranslation().t;
-    var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
+    var _d = useFormContext(), setValue = _d.setValue, control = _d.control;
     var data = useAppSelector(bankSelector).data;
     var beneficiaryControl = useController({ name: 'beneficiaryName', control: control });
     var beneficiaryValue = beneficiaryControl.field.value;
     var hasError = (_a = beneficiaryControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
     var error = (_b = beneficiaryControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     var bank_account = (data.verify.responseBody || {}).bank_account;
+    var isNonEditable = ((_c = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _c === void 0 ? void 0 : _c.beneficiary_name) === FieldType.NON_EDITABLE;
     React.useEffect(function () {
         var beneficiary_name = (bank_account || {}).beneficiary_name;
         if (beneficiary_name)
@@ -45,6 +44,6 @@ var Beneficiary = function () {
     var clearValue = function () {
         beneficiaryControl.field.onChange('');
     };
-    return (_jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('beneficiary_name'), onChange: handleBeneficiaryChange, value: beneficiaryValue, placeholder: t('beneficiary_name'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: !hasError && beneficiaryValue ? _jsx(CheckIcon, {}) : beneficiaryValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('beneficiary_name'), onChange: handleBeneficiaryChange, disabled: isNonEditable, value: beneficiaryValue, placeholder: t('beneficiary_name'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: !hasError && beneficiaryValue ? _jsx(CheckIcon, {}) : beneficiaryValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
 };
 export default Beneficiary;

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

@@ -36,22 +36,23 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import Input from '../../../shared/Input';
+import { debounce } from 'lodash-es';
 import { useTranslation } from 'react-i18next';
+import axios from 'axios';
 import { useController, useFormContext } from 'react-hook-form';
-import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
 import { styled } from '@mui/material';
+import CircularProgress from '@mui/material/CircularProgress';
+import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
+import { settingsSelector } from '../../../../app/settings';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
+import { FieldType } from '../../../../@types';
 import { MAX_IBAN_VALUE } from '../../../../constants';
 import { ScreenContainer } from '../../../shared/Containers';
-import { debounce } from 'lodash-es';
 import { checkIbanBank } from '../../../app/bank/bankStore';
-import { useAppDispatch } from '../../../../hooks';
-import axios from 'axios';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
-import CircularProgress from '@mui/material/CircularProgress';
-import { settingsSelector } from '../../../../app/settings';
-import { useAppSelector } from '../../../../hooks';
+import Input from '../../../shared/Input';
+import { bankSelector } from '../../../app/bank/bankStore';
 var InputStyled = styled(Input)(function () { return ({
     input: {
         textTransform: 'uppercase'
@@ -59,15 +60,18 @@ var InputStyled = styled(Input)(function () { return ({
 }); });
 var cancelToken = null;
 var IBAN = function (_a) {
-    var _b;
+    var _b, _c;
     var fetchingIban = _a.fetchingIban, ibanChecking = _a.ibanChecking;
     var dispatch = useAppDispatch();
     var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(bankSelector).data;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var ibanControl = useController({ name: 'iban', control: control });
     var ibanValue = ibanControl.field.value;
     var error = (_b = ibanControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var bank_account = (data.verify.responseBody || {}).bank_account;
+    var isNonEditable = ((_c = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _c === void 0 ? void 0 : _c.iban) === FieldType.NON_EDITABLE;
     var checkBank = debounce(function (value) { return __awaiter(void 0, void 0, void 0, function () {
         var onSuccess;
         return __generator(this, function (_a) {
@@ -95,6 +99,6 @@ var IBAN = function (_a) {
     var clearValue = function () {
         ibanControl.field.onChange('');
     };
-    return (_jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('enter_iban'), inputProps: { maxLength: MAX_IBAN_VALUE }, onChange: handleIbanChange, value: ibanValue, placeholder: t('iban_input_placeholder', { countrycode: settingsData.businessCountry.iso2.toUpperCase() }), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: ibanChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && ibanValue ? (_jsx(CheckIcon, {})) : (ibanValue && _jsx(ClearIcon, { onClick: clearValue })) }) }));
+    return (_jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('enter_iban'), inputProps: { maxLength: MAX_IBAN_VALUE }, onChange: handleIbanChange, value: ibanValue, placeholder: t('iban_input_placeholder', { countrycode: settingsData.businessCountry.iso2.toUpperCase() }), warningType: 'alert', warningMessage: error && t(error), required: true, disabled: isNonEditable, endAdornment: ibanChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && ibanValue ? (_jsx(CheckIcon, {})) : (ibanValue && _jsx(ClearIcon, { onClick: clearValue })) }) }));
 };
 export default IBAN;

package/build/features/bank/screens/BankDetails/validation.d.ts

@@ -1,39 +1,39 @@
 import * as yup from 'yup';
-export declare const BankValidation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+export declare const BankValidation: (bankAccount: any) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>>;
-export declare const BankKWFLValidation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+export declare const BankKWFLValidation: (bankAccount: any) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    iban: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    beneficiaryName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     bankStatementId: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>>;

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

@@ -1,16 +1,35 @@
-import { REGEX_ALPHANUMERIC, REGEX_IBAN } from '../../../../constants';
 import * as yup from 'yup';
-export var BankValidation = yup.object().shape({
-    iban: yup.string().matches(REGEX_IBAN, 'invalid_iban_format').min(15, 'invalid_iban_format').max(34, 'invalid_iban_format').required('alert_iban'),
-    bankName: yup.string().optional(),
-    beneficiaryName: yup.string().matches(REGEX_ALPHANUMERIC, 'beneficiary_name_invalid').required('beneficiary_name_required'),
-    bankStatementId: yup.array().optional(),
-    confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
-});
-export var BankKWFLValidation = yup.object().shape({
-    iban: yup.string().matches(REGEX_IBAN, 'invalid_iban_format').min(15, 'invalid_iban_format').max(34, 'invalid_iban_format').required('alert_iban'),
-    bankName: yup.string().optional(),
-    beneficiaryName: yup.string().matches(REGEX_ALPHANUMERIC, 'beneficiary_name_invalid').required('beneficiary_name_required'),
-    bankStatementId: yup.array().min(1, 'bank_statement_required').required('bank_statement_required'),
-    confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
-});
+import { FieldType } from '../../../../@types';
+import { REGEX_ALPHANUMERIC, REGEX_IBAN } from '../../../../constants';
+export var BankValidation = function (bankAccount) {
+    var _a = bankAccount || {}, iban = _a.iban, beneficiary_name = _a.beneficiary_name, data_status = _a.data_status;
+    var isIBANOptional = !iban && (data_status === null || data_status === void 0 ? void 0 : data_status.iban) === FieldType.NON_EDITABLE;
+    var isBeneficiaryNameOptional = !beneficiary_name && (data_status === null || data_status === void 0 ? void 0 : data_status.beneficiary_name) === FieldType.NON_EDITABLE;
+    return yup.object().shape({
+        iban: isIBANOptional
+            ? yup.string().optional()
+            : yup.string().matches(REGEX_IBAN, 'invalid_iban_format').min(15, 'invalid_iban_format').max(34, 'invalid_iban_format').required('alert_iban'),
+        bankName: yup.string().optional(),
+        beneficiaryName: isBeneficiaryNameOptional
+            ? yup.string().optional()
+            : yup.string().matches(REGEX_ALPHANUMERIC, 'beneficiary_name_invalid').required('beneficiary_name_required'),
+        bankStatementId: yup.array().optional(),
+        confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
+    });
+};
+export var BankKWFLValidation = function (bankAccount) {
+    var _a = bankAccount || {}, iban = _a.iban, beneficiary_name = _a.beneficiary_name, data_status = _a.data_status;
+    var isIBANOptional = !iban && (data_status === null || data_status === void 0 ? void 0 : data_status.iban) === FieldType.NON_EDITABLE;
+    var isBeneficiaryNameOptional = !beneficiary_name && (data_status === null || data_status === void 0 ? void 0 : data_status.beneficiary_name) === FieldType.NON_EDITABLE;
+    return yup.object().shape({
+        iban: isIBANOptional
+            ? yup.string().optional()
+            : yup.string().matches(REGEX_IBAN, 'invalid_iban_format').min(15, 'invalid_iban_format').max(34, 'invalid_iban_format').required('alert_iban'),
+        bankName: yup.string().optional(),
+        beneficiaryName: isBeneficiaryNameOptional
+            ? yup.string().optional()
+            : yup.string().matches(REGEX_ALPHANUMERIC, 'beneficiary_name_invalid').required('beneficiary_name_required'),
+        bankStatementId: yup.array().min(1, 'bank_statement_required').required('bank_statement_required'),
+        confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
+    });
+};

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

@@ -88,14 +88,14 @@ var BrandList = function (_a) {
             setValue('brandName', '');
         }
         setValue('segment', segments_list.find(function (_a) {
-            var _b;
+            var _b, _c;
             var id = _a.id;
-            return ((_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.type) === id;
+            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.id) === id;
         }), { shouldValidate: true });
         setValue('teamSize', team_size_list.find(function (_a) {
-            var _b;
+            var _b, _c;
             var id = _a.id;
-            return ((_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === id;
+            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
         }), { shouldValidate: true });
         onCloseBrandList();
     };

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

@@ -64,7 +64,7 @@ var AdditionalIndividualInfo = function (_a) {
     var isAuthorizedUser = user === null || user === void 0 ? void 0 : user.is_authorized;
     var _c = data.individualData, occupation = _c.occupation, sourceIncome = _c.sourceIncome, monthlyIncome = _c.monthlyIncome, employerName = _c.employerName, employerLocation = _c.employerLocation, isPEP = _c.isPEP, isInfluencer = _c.isInfluencer, civilID = _c.civilID, signatureFileId = _c.signatureFileId, civilIDUploading = _c.civilIDUploading, signatureFileUploading = _c.signatureFileUploading;
     var methods = useForm({
-        resolver: yupResolver(IndividualInfoValidationSchema(isAuthorizedUser, user === null || user === void 0 ? void 0 : user.type, user === null || user === void 0 ? void 0 : user.data_status)),
+        resolver: yupResolver(IndividualInfoValidationSchema(isAuthorizedUser, user)),
         defaultValues: {
             occupation: occupation,
             sourceIncome: sourceIncome,

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

@@ -13,18 +13,17 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
     });
 });
 var CivilIDFile = function () {
-    var _a;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var control = useFormContext().control;
     var civilIDFileIdControl = useController({ name: 'civilID', control: control });
-    var _b = useAppSelector(individualSelector), loading = _b.loading, data = _b.data;
+    var loading = useAppSelector(individualSelector).loading;
     var handleCivilIDChange = function (ids) {
         civilIDFileIdControl.field.onChange(ids);
     };
     var handleReset = function (ids) {
         civilIDFileIdControl.field.onChange(ids);
     };
-    return (_jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, fileTitle: (_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant_id, purpose: 'identity_document', fileUploadingStatus: function (uploading) { return dispatch(civilIDUploadingStatus(uploading)); } }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, purpose: 'identity_document', fileUploadingStatus: function (uploading) { return dispatch(civilIDUploadingStatus(uploading)); } }) }));
 };
 export default CivilIDFile;

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

@@ -75,7 +75,7 @@ var EmployerLocation = React.forwardRef(function (_a, ref) {
     };
     var location = employerLocationControl.field.value;
     var error = (_b = employerLocationControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('tap_js_employer_address_city'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_employee_location'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['idd_prefix', 'capital', 'name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('tap_js_employer_address_city'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_employee_location'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });

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

@@ -34,8 +34,8 @@ var ShareValue = function (_a) {
     var shareValueControl = useController({ control: control, name: 'shareValue' });
     var shareValueValue = shareValueControl.field.value;
     var error = (_b = shareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { label: t('capital_share_value_label', {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { label: t('share_value_label', {
                     currency: t(findCurrencyByIso2(countryCode))
-                }), onChange: handleChange, value: shareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_share_value_hint'), warningType: 'alert', warningMessage: error && t(error) }) })) })));
+                }), onChange: handleChange, value: shareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('share_value_hint'), warningType: 'alert', warningMessage: error && t(error) }) })) })));
 };
 export default React.memo(ShareValue);

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

@@ -37,6 +37,6 @@ var SignatureFile = function (_a) {
     var handleReset = function (ids) {
         signatureFileIdControl.field.onChange(ids);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_signature_file'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_signature'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_signature_file'), onFileUploaded: handleSignatureChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, purpose: 'customer_signature', fileTitle: 'Merchant Signature', fileUploadingStatus: function (uploading) { return dispatch(signatureFileUploadingStatus(uploading)); } }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_signature_file'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_signature'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_signature_file'), onFileUploaded: handleSignatureChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, purpose: 'customer_signature', fileUploadingStatus: function (uploading) { return dispatch(signatureFileUploadingStatus(uploading)); } }) }) })));
 };
 export default SignatureFile;

package/build/features/individual/screens/AdditionalIndividualInfo/validation.d.ts

@@ -1,7 +1,7 @@
 import * as yup from 'yup';
 import { ObjectShape } from 'yup/lib/object';
-import { IndividualType } from '../../../../@types';
-export declare const IndividualInfoValidationSchema: (isAuthorizedUser: boolean, type: IndividualType, dataStatus: any) => yup.ObjectSchema<import("yup/lib/object").Assign<ObjectShape, {
+import { User } from '../../../../@types';
+export declare const IndividualInfoValidationSchema: (isAuthorizedUser: boolean, user: User) => yup.ObjectSchema<import("yup/lib/object").Assign<ObjectShape, {
     occupation: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     sourceIncome: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;

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

@@ -1,10 +1,11 @@
 import * as yup from 'yup';
 import { IndividualType, FieldType } from '../../../../@types';
-export var IndividualInfoValidationSchema = function (isAuthorizedUser, type, dataStatus) {
-    var isOccupationOptional = (dataStatus === null || dataStatus === void 0 ? void 0 : dataStatus.occupation) === FieldType.NON_EDITABLE;
-    var isSourceIncomeOptional = (dataStatus === null || dataStatus === void 0 ? void 0 : dataStatus.source_of_income) === FieldType.NON_EDITABLE;
-    var isPEPOptional = (dataStatus === null || dataStatus === void 0 ? void 0 : dataStatus.is_relative_PEP) === FieldType.NON_EDITABLE;
-    var isInfluencerOptional = (dataStatus === null || dataStatus === void 0 ? void 0 : dataStatus.is_influencer) === FieldType.NON_EDITABLE;
+export var IndividualInfoValidationSchema = function (isAuthorizedUser, user) {
+    var _a = user || {}, type = _a.type, data_status = _a.data_status, occupation = _a.occupation, source_income = _a.source_income, is_relative_PEP = _a.is_relative_PEP, is_influencer = _a.is_influencer;
+    var isOccupationOptional = !occupation && (data_status === null || data_status === void 0 ? void 0 : data_status.occupation) === FieldType.NON_EDITABLE;
+    var isSourceIncomeOptional = !source_income && (data_status === null || data_status === void 0 ? void 0 : data_status.source_of_income) === FieldType.NON_EDITABLE;
+    var isPEPOptional = is_relative_PEP === undefined && (data_status === null || data_status === void 0 ? void 0 : data_status.is_relative_PEP) === FieldType.NON_EDITABLE;
+    var isInfluencerOptional = is_influencer === undefined && (data_status === null || data_status === void 0 ? void 0 : data_status.is_influencer) === FieldType.NON_EDITABLE;
     return yup.object().shape({
         occupation: type === IndividualType.USER && !isOccupationOptional ? yup.object().required('alert_choose_occupation') : yup.object().optional(),
         sourceIncome: type === IndividualType.USER && !isSourceIncomeOptional ? yup.object().required('choose_any_source_of_income') : yup.object().optional(),

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

@@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Text from '../../../../components/Text';
 import Button from '../../../../components/Button';
 import Collapse from '../../../../components/Collapse';
@@ -48,9 +48,8 @@ export var SubTitleStyled = styled(Text)(function (_a) {
 });
 var IndividualList = function () {
     var dispatch = useAppDispatch();
-    var isAr = useLanguage().isAr;
     var t = useTranslation().t;
-    var _a = useAppSelector(individualSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var error = useAppSelector(individualSelector).error;
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };

package/build/features/individual/screens/IndividualPersonalInfo/BirthCity.js

@@ -25,14 +25,15 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import CheckIcon from '@mui/icons-material/Check';
-import { useAppSelector } from '../../../../hooks';
+import CircularProgress from '@mui/material/CircularProgress';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Text from '../../../../components/Text';
 import SimpleList from '../../../../components/SimpleList';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
-import { individualSelector } from '../../../app/individual/individualStore';
+import { getCityList, individualSelector } from '../../../app/individual/individualStore';
 var CountryItemContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -54,16 +55,33 @@ var BirthCity = React.forwardRef(function (_a, ref) {
     var _c = React.useState([]), locationCities = _c[0], setCities = _c[1];
     var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
     var t = useTranslation().t;
-    var control = useFormContext().control;
-    var data = useAppSelector(individualSelector).data;
+    var dispatch = useAppDispatch();
+    var _e = useFormContext(), control = _e.control, getValues = _e.getValues, setValue = _e.setValue;
+    var _f = useAppSelector(individualSelector), data = _f.data, cityLoading = _f.cityLoading;
     var cityList = (data.verify.responseBody || {}).cityList;
     var placeOfBirthCityControl = useController({ control: control, name: 'placeOfBirthCity' });
+    var birthCountry = getValues('placeOfBirthCountry');
     React.useEffect(function () {
+        var _a;
         if ((cityList === null || cityList === void 0 ? void 0 : cityList.length) > 0) {
+            var listCountry = (_a = cityList[0]) === null || _a === void 0 ? void 0 : _a.country;
+            if (cityValue && listCountry !== cityValue.country)
+                setValue('placeOfBirthCity', undefined);
             var list = __spreadArray([], cityList, true);
             setCities(list);
         }
     }, [cityList]);
+    React.useEffect(function () {
+        var _a, _b;
+        var user = (data.verify.responseBody || {}).user;
+        var listCountry = (cityList === null || cityList === void 0 ? void 0 : cityList.length) > 0 ? (_a = cityList[0]) === null || _a === void 0 ? void 0 : _a.country : (_b = user === null || user === void 0 ? void 0 : user.birth) === null || _b === void 0 ? void 0 : _b.country;
+        var iso2 = (birthCountry || {}).iso2;
+        if (!listCountry || !iso2)
+            return;
+        if (listCountry !== iso2) {
+            dispatch(getCityList(iso2));
+        }
+    }, [birthCountry]);
     var onOpenCitySelect = function (event) {
         setAnchorEl(event.currentTarget);
         onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
@@ -83,7 +101,7 @@ var BirthCity = React.forwardRef(function (_a, ref) {
     };
     var cityValue = placeOfBirthCityControl.field.value;
     var error = (_b = placeOfBirthCityControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_birth_city_label'), readOnly: true, placeholder: t('choose_place_birth_city'), value: getName(cityValue) || '', warningMessage: error && t(error), onClick: !!anchorEl ? function () { return onCloseCitySelect(); } : onOpenCitySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en'], list: locationCities, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_birth_city_label'), readOnly: true, placeholder: t('choose_place_birth_city'), value: getName(cityValue) || '', warningMessage: error && t(error), onClick: cityLoading ? undefined : !!anchorEl ? function () { return onCloseCitySelect(); } : onOpenCitySelect, endAdornment: cityLoading ? _jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } }) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en'], list: locationCities, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: item.id === (cityValue === null || cityValue === void 0 ? void 0 : cityValue.id) }, { children: getName(item) })) }), item.id === (cityValue === null || cityValue === void 0 ? void 0 : cityValue.id) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });

package/build/features/individual/screens/IndividualPersonalInfo/BirthCountry.js

@@ -75,7 +75,7 @@ var BirthCountry = React.forwardRef(function (_a, ref) {
     };
     var location = placeOfBirthCountryControl.field.value;
     var error = (_b = placeOfBirthCountryControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_of_birth_country_label'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_place_of_birth_country'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['idd_prefix', 'capital', 'name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_of_birth_country_label'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_place_of_birth_country'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });

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

@@ -22,7 +22,7 @@ import { IndividualType } from '../../../../@types';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
-import { individualSelector, updateIndividualPersonalInfo } from '../../../app/individual/individualStore';
+import { clearError, individualSelector, updateIndividualPersonalInfo } from '../../../app/individual/individualStore';
 import Button from '../../../shared/Button';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { IndividualInfoValidationSchema } from './validation';
@@ -56,7 +56,7 @@ var IndividualPersonalInfo = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error, cityLoading = _b.cityLoading;
     var settingsData = useAppSelector(settingsSelector).data;
     var countries = settingsData.countries;
     var verify = data.verify, individualPersonalData = data.individualPersonalData;
@@ -87,7 +87,13 @@ var IndividualPersonalInfo = function (_a) {
     var onSubmit = function (data) {
         dispatch(updateIndividualPersonalInfo(data));
     };
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
     var onBack = function () {
+        if (error)
+            dispatch(clearError());
         dispatch(handleCurrentActiveScreen('INDIVIDUAL_LIST_STEP'));
     };
     var handleMenuClick = function (flag) {
@@ -114,7 +120,7 @@ var IndividualPersonalInfo = function (_a) {
             return t('type_board_member');
         return t('type_user');
     };
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || cityLoading;
     var showField = !listActive && !dobActive && !expiryDateActive;
     var isIssuedCountryListActive = listActive === ListType.IssuedCountryList;
     var isBirthCountryListActive = listActive === ListType.BirthCountryList;

package/build/features/individual/screens/IndividualPersonalInfo/IssuedCountry.js

@@ -81,7 +81,7 @@ var IssuedCountry = React.forwardRef(function (_a, ref) {
     };
     var location = issuedCountryControl.field.value;
     var error = (_d = issuedCountryControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('issued_country_label'), readOnly: true, disabled: disabled, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: disabled ? _jsx(_Fragment, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_issued_country'), value: (isAr ? (_e = location === null || location === void 0 ? void 0 : location.name) === null || _e === void 0 ? void 0 : _e.arabic : (_f = location === null || location === void 0 ? void 0 : location.name) === null || _f === void 0 ? void 0 : _f.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['idd_prefix', 'capital', 'name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('issued_country_label'), readOnly: true, disabled: disabled, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: disabled ? _jsx(_Fragment, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_issued_country'), value: (isAr ? (_e = location === null || location === void 0 ? void 0 : location.name) === null || _e === void 0 ? void 0 : _e.arabic : (_f = location === null || location === void 0 ? void 0 : location.name) === null || _f === void 0 ? void 0 : _f.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });