@tap-payments/auth-jsconnect 2.0.55 → 2.0.56

package/build/features/app/tax/taxStore.js

@@ -165,62 +165,66 @@ export var verifyTaxLeadOTP = createAsyncThunk('verifyTaxLeadOTP', function (par
         }
     });
 }); });
-export var updateTaxInfo = createAsyncThunk('updateTaxInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, tax, _b, id, data_status, documents, isTaxNumberNonEditable, isConfirmPolicyNonEditable, isDocumentsNonEditable, document, requestBody, data, documentBody, _c, documentBody, _d;
-    var _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, tax = _a.tax;
-                _b = ((_e = tax.data.verify.responseBody) === null || _e === void 0 ? void 0 : _e.entity) || {}, id = _b.id, data_status = _b.data_status, documents = _b.documents;
-                isTaxNumberNonEditable = hasNoneEditableValue(data_status, 'tax_number');
-                isConfirmPolicyNonEditable = hasNoneEditableValue(data_status, 'is_vat_acknowledged');
-                isDocumentsNonEditable = hasNoneEditableValue(data_status, 'documents');
-                document = getRecentDocumentBasedOnPurpose(documents, DocumentPurpose.TAX_DOCUMENT);
-                requestBody = {
-                    id: id,
-                    vat_id: isTaxNumberNonEditable ? undefined : params.vatId,
-                    step_name: TAX_STEP_NAMES.TAX_INFO,
-                    is_vat_acknowledged: isConfirmPolicyNonEditable ? undefined : params.confirmPolicy
-                };
-                return [4, API.entityService.updateEntityInfo(requestBody)];
-            case 1:
-                data = (_j.sent()).data;
-                if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
-                    throw new Error(data.errors[0].description);
-                if (!(!isDocumentsNonEditable && (params.documentId || []).length > 0)) return [3, 5];
-                if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 3];
-                documentBody = {
-                    id: document === null || document === void 0 ? void 0 : document.id,
-                    images: params.documentId
-                };
-                _c = data;
-                return [4, API.documentService.addFilesToExistingDocument(documentBody)];
-            case 2:
-                _c.documentData = _j.sent();
-                return [3, 5];
-            case 3:
-                documentBody = {
-                    entity_id: id || '',
-                    documents: [
-                        {
-                            type: DocumentPurpose.TAX_DOCUMENT,
-                            images: params.documentId
-                        }
-                    ]
-                };
-                _d = data;
-                return [4, API.documentService.updateDocumentInfo(documentBody)];
-            case 4:
-                _d.documentData = _j.sent();
-                _j.label = 5;
-            case 5:
-                thunkApi.dispatch(handleNextScreenStep());
-                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, requestBody);
-                return [2, { data: data, formData: params }];
-        }
+export var updateTaxInfo = createAsyncThunk('updateTaxInfo', function (_a, thunkApi) {
+    var formData = _a.formData, originalFormData = _a.originalFormData;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var _b, settings, tax, _c, id, data_status, documents, isTaxNumberNonEditable, isConfirmPolicyNonEditable, isDocumentsNonEditable, document, vatId, confirmPolicy, documentId, requestBody, data, documentBody, _d, documentBody, _e;
+        var _f, _g, _h, _j;
+        return __generator(this, function (_k) {
+            switch (_k.label) {
+                case 0:
+                    _b = thunkApi.getState(), settings = _b.settings, tax = _b.tax;
+                    _c = ((_f = tax.data.verify.responseBody) === null || _f === void 0 ? void 0 : _f.entity) || {}, id = _c.id, data_status = _c.data_status, documents = _c.documents;
+                    isTaxNumberNonEditable = hasNoneEditableValue(data_status, 'tax_number');
+                    isConfirmPolicyNonEditable = hasNoneEditableValue(data_status, 'is_vat_acknowledged');
+                    isDocumentsNonEditable = hasNoneEditableValue(data_status, 'documents');
+                    document = getRecentDocumentBasedOnPurpose(documents, DocumentPurpose.TAX_DOCUMENT);
+                    vatId = formData.vatId, confirmPolicy = formData.confirmPolicy, documentId = formData.documentId;
+                    requestBody = {
+                        id: id,
+                        vat_id: isTaxNumberNonEditable ? undefined : vatId,
+                        step_name: TAX_STEP_NAMES.TAX_INFO,
+                        is_vat_acknowledged: isConfirmPolicyNonEditable ? undefined : confirmPolicy
+                    };
+                    return [4, API.entityService.updateEntityInfo(requestBody)];
+                case 1:
+                    data = (_k.sent()).data;
+                    if ((_g = data.errors) === null || _g === void 0 ? void 0 : _g.length)
+                        throw new Error(data.errors[0].description);
+                    if (!(!isDocumentsNonEditable && (documentId || []).length > 0)) return [3, 5];
+                    if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 3];
+                    documentBody = {
+                        id: document === null || document === void 0 ? void 0 : document.id,
+                        images: documentId
+                    };
+                    _d = data;
+                    return [4, API.documentService.addFilesToExistingDocument(documentBody)];
+                case 2:
+                    _d.documentData = _k.sent();
+                    return [3, 5];
+                case 3:
+                    documentBody = {
+                        entity_id: id || '',
+                        documents: [
+                            {
+                                type: DocumentPurpose.TAX_DOCUMENT,
+                                images: documentId
+                            }
+                        ]
+                    };
+                    _e = data;
+                    return [4, API.documentService.updateDocumentInfo(documentBody)];
+                case 4:
+                    _e.documentData = _k.sent();
+                    _k.label = 5;
+                case 5:
+                    thunkApi.dispatch(handleNextScreenStep());
+                    (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, requestBody);
+                    return [2, { data: data, formData: originalFormData }];
+            }
+        });
     });
-}); });
+});
 export var updateLeadSuccess = createAsyncThunk('taxUpdateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, tax, _b, id, infoId, payload, data, boardInfoData, boardData;
     var _c, _d, _e, _f, _g;

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

@@ -16,7 +16,7 @@ import Beneficiary from './Beneficiary';
 import IBAN from './IBAN';
 import BankName from './BankName';
 import Button from '../../../shared/Button';
-import { useAppDispatch, useAppSelector, useFormReadOnly, useSetFromDefaultValues, useDataNoneEditable, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useFormReadOnly, useSetFromDefaultValues, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
 import { BankKWFLValidation, BankValidation } from './validation';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
@@ -29,7 +29,7 @@ import Form from '../../../../components/Form';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ConfirmPolicy from './ConfirmPolicy';
 import BankStatement from './BankStatement';
-import { getFileDetailsFromDocument, isKW, isStringMasked } from '../../../../utils';
+import { getFileDetailsFromDocument, isKW, isStringHasOneAsterisk } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column',
@@ -53,7 +53,7 @@ var BankDetails = function () {
     var isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     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 isIBANMasked = isStringMasked(iban);
+    var isIBANMasked = isStringHasOneAsterisk(iban);
     var methods = useForm({
         resolver: yupResolver(isKWCountry && isFL && !bankHasDocument ? BankKWFLValidation(isIBANMasked) : BankValidation(isIBANMasked)),
         defaultValues: {
@@ -67,9 +67,6 @@ var BankDetails = function () {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.bankData);
-    var onSubmit = function (data) {
-        dispatch(createBankAccount(data));
-    };
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var onBack = function () {
@@ -99,6 +96,10 @@ var BankDetails = function () {
         'is_acknowledged'
     ]);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
+    var onSubmit = function (data) {
+        dispatch(createBankAccount(getFelids(data)));
+    };
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Beneficiary, { readOnly: readOnly['beneficiaryName'] || noneEditable['beneficiary_name'] }), _jsx(IBAN, { fetchingIban: function (value) { return setIbanChecking(value); }, ibanChecking: ibanChecking, readOnly: readOnly['iban'] || noneEditable['iban'] }), _jsx(BankName, { readOnly: readOnly['bankName'] || noneEditable['bank_name'] }), _jsx(BankStatement, { required: isKWCountry && isFL && !bankHasDocument, defaultFiles: defaultBankFiles, readOnly: readOnly['bankStatementId'] || noneEditable['bank_statement_file_id'] }), _jsx(ConfirmPolicy, { readOnly: readOnly['confirmPolicy'] || noneEditable['is_acknowledged'] }), _jsx(ButtonStyled, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('confirm') }))] })) })) }));
 };
 export default BankDetails;

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

@@ -1,16 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
-import { bankSelector } from '../../../../features/app/bank/bankStore';
+import { bankSelector } from '../../../app/bank/bankStore';
 import { maskEmail } from '../../../../utils';
-import { useAppSelector } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 var ResetPasswordSuccess = function (_a) {
     var _b, _c;
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
     var data = useAppSelector(bankSelector).data;
     var email = (((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact) || {}).email;
     var maskedEmail = maskEmail(email);
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true }));
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }));
 };
 export default React.memo(ResetPasswordSuccess);

package/build/features/brand/screens/BrandActivities/BrandActivities.js

@@ -15,7 +15,7 @@ import { ScreenContainer } from '../../../shared/Containers';
 import { FormProvider, useForm } from 'react-hook-form';
 import Form from '../../../../components/Form';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { BrandActivitiesValidationSchema } from './validation';
 import Button from '../../../shared/Button';
@@ -70,8 +70,9 @@ var BrandActivities = function (_a) {
         'terms'
     ]);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var onSubmit = function (data) {
-        dispatch(updateBrandActivities(data));
+        dispatch(updateBrandActivities(getFelids(data)));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());

package/build/features/brand/screens/BrandActivities/ExpectedCustomers.js

@@ -33,7 +33,6 @@ import ExpandIcon from '../../../../components/ExpandIcon';
 import { ScreenContainer } from '../../../shared/Containers';
 import { CheckIconStyled, InputLabelStyled, NameContainer } from './CustomerBase';
 import { brandSelector, clearError } from '../../../app/brand/brandStore';
-import Search from '../../../shared/Search';
 import Input from '../../../shared/Input';
 var InputStyled = styled(Input)(function (_a) {
     var theme = _a.theme, readOnly = _a.readOnly;
@@ -94,17 +93,10 @@ var ExpectedCustomers = function (_a) {
             dispatch(clearError());
         onCloseList();
     };
-    var handleSearch = function (value) {
-        var _a;
-        var filteredList = (_a = response === null || response === void 0 ? void 0 : response.expectedCustomerSales) === null || _a === void 0 ? void 0 : _a.filter(function (customer) {
-            return customer.name.en.toLowerCase().startsWith(value.toLowerCase()) || customer.name.ar.toLowerCase().startsWith(value.toLowerCase());
-        });
-        setExpectedCustomersList(filteredList);
-    };
     var expectedCustomersValue = expectedCustomerControl.field.value;
     var expectedCustomersSelected = expectedCustomersValue;
-    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: readOnly, placeholder: t('choose_expected_sales'), value: isAr ? (_c = (_b = expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name) === null || _b === void 0 ? void 0 : _b.ar) !== null && _c !== void 0 ? _c : '' : (_e = (_d = expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name) === null || _d === void 0 ? void 0 : _d.en) !== null && _e !== void 0 ? _e : '', onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
-                                return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedCustomersValue === null || expectedCustomersValue === void 0 ? void 0 : expectedCustomersValue.id) }, { children: isAr ? item.name.ar : item.name.en })) }), item.id === (expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.id) && _jsx(CheckIconStyled, {})] }));
-                            } })] }))] }) })));
+    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: readOnly, placeholder: t('choose_expected_sales'), value: isAr ? (_c = (_b = expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name) === null || _b === void 0 ? void 0 : _b.ar) !== null && _c !== void 0 ? _c : '' : (_e = (_d = expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name) === null || _d === void 0 ? void 0 : _d.en) !== null && _e !== void 0 ? _e : '', onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedCustomersValue === null || expectedCustomersValue === void 0 ? void 0 : expectedCustomersValue.id) }, { children: isAr ? item.name.ar : item.name.en })) }), item.id === (expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.id) && _jsx(CheckIconStyled, {})] }));
+                        } }) }))] }) })));
 };
 export default ExpectedCustomers;

package/build/features/brand/screens/BrandInfo/BrandInfo.js

@@ -15,7 +15,7 @@ import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import Form from '../../../../components/Form';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { BrandValidationSchema } from './validation';
 import Button from '../../../shared/Button';
@@ -60,8 +60,13 @@ var BrandInfo = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.brandData, true);
+    var defaultBrandLogoFile = React.useMemo(function () { return logo_details && __assign(__assign({}, logo_details), { docId: '' }); }, [logo_details]);
+    var originalReadOnly = useFormReadOnly(methods, { brandLogoId: defaultBrandLogoFile });
+    var noneEditable = useDataNoneEditable(data_status, ['name', 'segment.type', 'segment.teams', 'channel_services']);
+    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var onSubmit = function (data) {
-        dispatch(updateBrand(data));
+        dispatch(updateBrand(getFelids(data)));
     };
     var onBack = function () {
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
@@ -87,10 +92,6 @@ var BrandInfo = function (_a) {
     var handleMenuClick = function (flag) {
         setListActive(flag);
     };
-    var defaultBrandLogoFile = React.useMemo(function () { return logo_details && __assign(__assign({}, logo_details), { docId: '' }); }, [logo_details]);
-    var originalReadOnly = useFormReadOnly(methods, { brandLogoId: defaultBrandLogoFile });
-    var noneEditable = useDataNoneEditable(data_status, ['name', 'segment.type', 'segment.teams', 'channel_services']);
-    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
     var isSegmentsListActive = listActive === ListType.SegmentsList;
     var isTeamSizeListActive = listActive === ListType.TeamSizeList;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, { readOnly: readOnly['brandName'] || noneEditable['name'], show: !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(BrandLogo, { defaultFile: defaultBrandLogoFile, readOnly: readOnly['brandLogoId'], show: !listActive }), _jsx(Segments, { readOnly: readOnly['segment'] || noneEditable['segment.type'], show: !isTeamSizeListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { readOnly: readOnly['teamSize'] || noneEditable['segment.teams'], show: !isSegmentsListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(SalesChannels, { readOnly: readOnly['salesChannels'] || noneEditable['channel_services'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') }))] }))] })) })) }));

package/build/features/brand/screens/ResetPasswordSuccess/ResetPasswordSuccess.js

@@ -1,16 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
-import { useAppSelector } from '../../../../hooks';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
 import { maskEmail } from '../../../../utils';
-import { brandSelector } from '../../../../features/app/brand/brandStore';
+import { brandSelector } from '../../../app/brand/brandStore';
 var ResetPasswordSuccess = function (_a) {
     var _b, _c;
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
     var data = useAppSelector(brandSelector).data;
     var email = (((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact) || {}).email;
     var maskedEmail = maskEmail(email);
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true }));
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }));
 };
 export default React.memo(ResetPasswordSuccess);

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

@@ -1,16 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation, Trans } from 'react-i18next';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
 import { businessSelector } from '../../../app/business/businessStore';
-import { useAppSelector } from '../../../../hooks';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
 import { maskEmail } from '../../../../utils';
 var ResetPasswordSuccess = function (_a) {
     var _b, _c;
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
     var data = useAppSelector(businessSelector).data;
     var email = (((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact) || {}).email;
     var maskedEmail = maskEmail(email);
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true }));
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }));
 };
 export default React.memo(ResetPasswordSuccess);

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

@@ -34,6 +34,7 @@ var ListType;
     ListType["SegmentsList"] = "SegmentsList";
     ListType["TeamSizeList"] = "TeamSizeList";
     ListType["BrandList"] = "BrandList";
+    ListType["BusinessList"] = "BusinessList";
 })(ListType || (ListType = {}));
 var Merchant = function (_a) {
     var _b, _c;
@@ -97,6 +98,6 @@ var Merchant = function (_a) {
     var isSegmentsListActive = listActive === ListType.SegmentsList;
     var isTeamSizeListActive = listActive === ListType.TeamSizeList;
     var isBrandListActive = listActive === ListType.BrandList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: !(isOtherBrand || isNewBrand) && !isTeamSizeListActive && !isSegmentsListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Segments, { show: !isTeamSizeListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentsListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: hasBrandList && !isTeamSizeListActive && !isSegmentsListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Segments, { show: !isTeamSizeListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentsListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

package/build/features/connect/screens/Merchant/validation.d.ts

@@ -11,6 +11,7 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>[] | undefined>;
     segment: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
@@ -23,6 +24,7 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>[] | undefined>;
     segment: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
@@ -35,4 +37,5 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>[] | undefined>;
     segment: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>>>;

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

@@ -129,6 +129,7 @@ export var MerchantValidationSchema = function (isNewBrand) {
         })
             .required('choose_atleast_one_channel'),
         segment: yup.object().required('alert_choose_segment'),
-        teamSize: yup.object().required('alert_choose_teamSize')
+        teamSize: yup.object().required('alert_choose_teamSize'),
+        brandName: yup.string().optional()
     });
 };

package/build/features/connectExpress/screens/CollectBusinessInfo/CollectBusinessInfo.js

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
 import { isSA } from '../../../../utils';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Form from '../../../../components/Form';
@@ -49,6 +49,9 @@ var CollectBusinessInfo = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.businessData);
+    var originalReadOnly = useFormReadOnly(methods);
+    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -64,13 +67,11 @@ var CollectBusinessInfo = function (_a) {
             licenseNumber: data.licenseNumber,
             termAndConditionChecked: data.termAndConditionChecked
         };
-        dispatch(updateLeadBusinessDataAsync(dataValues));
+        dispatch(updateLeadBusinessDataAsync(getFelids(dataValues)));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var originalReadOnly = useFormReadOnly(methods);
-    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking || isBrandNameAvailable == false;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, { readOnly: readOnly['brandName'], show: true, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(LicenseList, { readOnly: readOnly['selectedLicense'], onListOpen: function () {

package/build/features/connectExpress/screens/CollectIndividualInfo/CollectIndividualInfo.js

@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useFormErrorAndUpdateReadOnly, useFormReadOnly, useSetFromDefaultValues } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useExcludeReadOnlyFelids, useFormErrorAndUpdateReadOnly, useFormReadOnly, useSetFromDefaultValues } from '../../../../hooks';
 import { AuthForType } from '../../../../@types';
 import { useLanguage } from '../../../../hooks';
 import { isKW } from '../../../../utils';
@@ -56,12 +56,15 @@ var CollectIndividualInfo = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, individualData, true);
+    var originalReadOnly = useFormReadOnly(methods);
+    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     React.useEffect(function () {
         if (countryCode.iso2 !== methods.getValues('countryCode.iso2'))
             methods.setValue('countryCode', countryCode);
     }, [countryCode]);
     var onSubmit = function (formData) {
-        dispatch(updateLeadIndividualAsync(formData));
+        dispatch(updateLeadIndividualAsync(getFelids(formData)));
     };
     var onBack = function () {
         var _a;
@@ -81,8 +84,6 @@ var CollectIndividualInfo = function (_a) {
         if (isEmailAvailable === false)
             methods.setError('email', { message: 'tap_js_email_already_exist' });
     }, [responseData]);
-    var originalReadOnly = useFormReadOnly(methods);
-    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
     var isLeadEmailAvailable = (contact === null || contact === void 0 ? void 0 : contact.email) === methods.watch('email');
     var isEmailValid = typeof isEmailAvailable === 'undefined' ? isLeadEmailAvailable : isEmailAvailable;
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;

package/build/features/connectExpress/screens/CollectIndividualInfo/Email.js

@@ -67,9 +67,8 @@ var InputStyled = styled(Input)(function () { return ({
 }); });
 var cancelToken = null;
 var Email = function (_a) {
-    var _b;
+    var _b, _c, _d, _e;
     var show = _a.show, fetchingEmail = _a.fetchingEmail, emailChecking = _a.emailChecking, readOnly = _a.readOnly;
-    var _c = React.useState(''), storedEmail = _c[0], setStoredEmail = _c[1];
     var dispatch = useAppDispatch();
     var data = useAppSelector(connectExpressSelector).data;
     var t = useTranslation().t;
@@ -77,6 +76,7 @@ var Email = function (_a) {
     var emailControl = useController({ name: 'email', control: control });
     var emailValue = emailControl.field.value;
     var error = (_b = emailControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var email = (_e = (_d = (_c = data.responseData) === null || _c === void 0 ? void 0 : _c.leadData) === null || _d === void 0 ? void 0 : _d.contact) === null || _e === void 0 ? void 0 : _e.email;
     var checkEmail = debounce(function (value) { return __awaiter(void 0, void 0, void 0, function () {
         var onSuccess;
         return __generator(this, function (_a) {
@@ -92,15 +92,9 @@ var Email = function (_a) {
     var handleEmailChange = function (event) {
         emailControl.field.onChange(event.target.value);
     };
-    React.useEffect(function () {
-        var _a, _b, _c;
-        var email = (_c = (_b = (_a = data.responseData) === null || _a === void 0 ? void 0 : _a.leadData) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.email;
-        if (!!email)
-            setStoredEmail(email);
-    }, [data.responseData]);
     React.useEffect(function () {
         var isValid = emailValue && !error && emailValue.length > 3;
-        if (isValid && emailValue != storedEmail) {
+        if (isValid && emailValue != email) {
             fetchingEmail(true);
             checkEmail(emailValue);
         }

package/build/features/entity/screens/EntityCapital/EntityCapital.js

@@ -15,7 +15,7 @@ import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import Collapse from '@mui/material/Collapse';
-import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
 import { clearError, entitySelector, updateEntityCapital } from '../../../app/entity/entityStore';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { handlePrevScreenStep } from '../../../../app/settings';
@@ -58,8 +58,9 @@ var EntityCapital = function (_a) {
         'capital.shares.value'
     ]);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var onSubmit = function (data) {
-        dispatch(updateEntityCapital(data));
+        dispatch(updateEntityCapital(getFelids(data)));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());

package/build/features/entity/screens/EntityName/EntityName.js

@@ -15,7 +15,7 @@ import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { getFileDetailsFromDocument, isKW, isSA } from '../../../../utils';
 import { BusinessType, DocumentPurpose } from '../../../../@types';
@@ -83,8 +83,9 @@ var EntityName = function (_a) {
         'AOA_file_id'
     ]);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var onSubmit = function (data) {
-        dispatch(updateEntityName(data));
+        dispatch(updateEntityName(getFelids(data)));
     };
     var handleIssueDateOpenClose = function (flag) {
         setIssueAnchorEl(flag);

package/build/features/entity/screens/ResetPasswordSuccess/ResetPasswordSuccess.js

@@ -1,16 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
 import { maskEmail } from '../../../../utils';
-import { entitySelector } from '../../../../features/app/entity/entityStore';
-import { useAppSelector } from '../../../../hooks';
+import { entitySelector } from '../../../app/entity/entityStore';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
 var ResetPasswordSuccess = function (_a) {
     var _b, _c;
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
     var data = useAppSelector(entitySelector).data;
     var email = (((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact) || {}).email;
     var maskedEmail = maskEmail(email);
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true }));
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }));
 };
 export default React.memo(ResetPasswordSuccess);