@tap-payments/auth-jsconnect 2.3.78-test → 2.3.83-test

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/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/connect/screens/Merchant/BusinessList.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { BusinessInfo } from '../../../../@types';
+interface BusinessListProps {
+    show: boolean;
+    list: Array<BusinessInfo>;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BusinessListProps) => JSX.Element>;
+export default _default;

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

@@ -0,0 +1,82 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useFormContext, useController } from 'react-hook-form';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import { useLanguage } from '../../../../hooks';
+import SimpleList from '../../../../components/SimpleList';
+import Text from '../../../../components/Text';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import Collapse from '../../../../components/Collapse';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import Input from '../../../shared/Input';
+import CheckIcon from '../../../shared/CheckIcon';
+var InputStyled = styled(Input)(function () { return ({
+    '& .MuiInputBase-input': {
+        cursor: 'pointer'
+    }
+}); });
+var BusinessContainer = styled(Box)(function () { return ({
+    display: 'flex'
+}); });
+var BusinessNameText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
+});
+var BusinessList = function (_a) {
+    var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
+    var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var control = useFormContext().control;
+    var businessControl = useController({ control: control, name: 'business' });
+    var business = businessControl.field.value;
+    var onOpenBusinessList = function (event) {
+        var _a;
+        setAnchorEl(event.currentTarget);
+        (_a = rest.onListOpen) === null || _a === void 0 ? void 0 : _a.call(rest);
+    };
+    var onCloseBusinessList = function () {
+        var _a;
+        setAnchorEl(null);
+        (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
+    };
+    var getBusinessName = function (business) {
+        var _a, _b;
+        return (isAr ? (_a = business === null || business === void 0 ? void 0 : business.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = business === null || business === void 0 ? void 0 : business.name) === null || _b === void 0 ? void 0 : _b.en) || '';
+    };
+    var getBusinessId = function (item) {
+        return (item === null || item === void 0 ? void 0 : item.id) || '';
+    };
+    var onSelectItem = function (business) {
+        businessControl.field.onChange(business);
+        onCloseBusinessList();
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputStyled, { label: t('select_business_label'), onClick: !!anchorEl ? onCloseBusinessList : onOpenBusinessList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_business'), value: t(getBusinessName(business)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', searchValuePath: ['id', 'name.ar', 'name.en'], list: list, onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(BusinessContainer, { children: _jsx(BusinessNameText, __assign({ isSelected: getBusinessId(item) === getBusinessId(business) }, { children: t(getBusinessName(item)) })) }), getBusinessId(item) === getBusinessId(business) && _jsx(CheckIcon, {})] }));
+                        } }) }))] })) })));
+};
+export default React.memo(BusinessList);

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

@@ -29,29 +29,33 @@ import TAC from './TAC';
 import BrandList from './BrandList';
 import SalesChannels from './SalesChannels';
 import Segments from './Segments';
+import BusinessList from './BusinessList';
 var ListType;
 (function (ListType) {
     ListType["SegmentsList"] = "SegmentsList";
     ListType["TeamSizeList"] = "TeamSizeList";
     ListType["BrandList"] = "BrandList";
+    ListType["BusinessList"] = "BusinessList";
 })(ListType || (ListType = {}));
 var Merchant = function (_a) {
     var _b, _c;
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
     var _e = React.useState(false), isRequiredNewBrand = _e[0], setIsRequiredNewBrand = _e[1];
     var _f = useAppSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error;
-    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels, segment = _g.segment, teamSize = _g.teamSize;
-    var brandList = (responseBody || {}).brand_list;
-    var _h = React.useState(), listActive = _h[0], setListActive = _h[1];
+    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels, segment = _g.segment, teamSize = _g.teamSize, business = _g.business;
+    var _h = responseBody || {}, brandList = _h.brand_list, businessList = _h.business_list;
+    var _j = React.useState(), listActive = _j[0], setListActive = _j[1];
+    var hasBusinessList = (businessList === null || businessList === void 0 ? void 0 : businessList.length) > 0;
     var methods = useForm({
-        resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand)),
+        resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand, hasBusinessList)),
         defaultValues: {
             brandName: brandName || ((_b = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.name) === null || _b === void 0 ? void 0 : _b.en),
             selectedBrandItem: selectedBrandItem,
             termAndConditionChecked: termAndConditionChecked,
             salesChannels: salesChannels,
             segment: segment,
-            teamSize: teamSize
+            teamSize: teamSize,
+            business: business
         },
         mode: 'onChange'
     });
@@ -97,6 +101,7 @@ 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: (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && !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') })) }))] })) })) }));
+    var isBusinessListActive = listActive === ListType.BusinessList;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: hasBrandList && !isTeamSizeListActive && !isSegmentsListActive && !isBusinessListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BusinessList, { show: hasBusinessList && (isOtherBrand || isNewBrand) && !isTeamSizeListActive && !isSegmentsListActive && !isBrandListActive, list: businessList, onListOpen: function () { return handleMenuClick(ListType.BusinessList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Segments, { show: !isTeamSizeListActive && !isBrandListActive && !isBusinessListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentsListActive && !isBrandListActive && !isBusinessListActive, 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

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const MerchantValidationSchema: (isNewBrand?: boolean, hasBusinessList?: boolean) => yup.ObjectSchema<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>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -9,8 +9,10 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
+    business: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     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>;
@@ -21,8 +23,10 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
+    business: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     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>;
@@ -33,6 +37,8 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
+    business: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     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

@@ -69,8 +69,9 @@ var validationSalesChannels = function (channels) {
     }
     return true;
 };
-export var MerchantValidationSchema = function (isNewBrand) {
+export var MerchantValidationSchema = function (isNewBrand, hasBusinessList) {
     if (isNewBrand === void 0) { isNewBrand = true; }
+    if (hasBusinessList === void 0) { hasBusinessList = false; }
     if (isNewBrand)
         return yup.object().shape({
             brandName: yup
@@ -88,6 +89,7 @@ export var MerchantValidationSchema = function (isNewBrand) {
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
             segment: yup.object().required('alert_choose_segment'),
             teamSize: yup.object().required('alert_choose_teamSize'),
+            business: hasBusinessList ? yup.object().required('alert_choose_business') : yup.object().optional(),
             salesChannels: yup
                 .array()
                 .min(1, 'choose_atleast_one_channel')
@@ -128,7 +130,9 @@ export var MerchantValidationSchema = function (isNewBrand) {
             }
         })
             .required('choose_atleast_one_channel'),
+        business: yup.object().optional(),
         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/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/tax/screens/TaxDetails/TaxDetails.js

@@ -16,7 +16,7 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { styled } from '@mui/material/styles';
 import Form from '../../../../components/Form';
-import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
+import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { DocumentPurpose } from '../../../../@types';
 import { getFileDetailsFromDocument, isSA } from '../../../../utils';
@@ -53,11 +53,12 @@ var TaxDetails = function () {
     var originalReadOnly = useFormReadOnly(methods, { documentId: defaultTaxFiles });
     var noneEditable = useDataNoneEditable(entity === null || entity === void 0 ? void 0 : entity.data_status, ['tax_number', 'documents', 'is_vat_acknowledged']);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var onSubmit = function (data) {
-        dispatch(updateTaxInfo(data));
+        dispatch(updateTaxInfo(getFelids(data)));
     };
     var onBack = function () {
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
@@ -66,6 +67,6 @@ var TaxDetails = function () {
         }
         dispatch(retrieveBoardStatus());
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(VATId, { readOnly: readOnly['vatId'] || noneEditable['tax_number'] }), _jsx(TaxDocument, { show: isSACountry, defaultFiles: defaultTaxFiles, readOnly: readOnly['documentId'] || noneEditable['documents'] }), _jsx(ConfirmPolicy, { readOnly: readOnly['documentId'] || noneEditable['is_vat_acknowledged'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid || uploading, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(VATId, { readOnly: readOnly['vatId'] || noneEditable['tax_number'] }), _jsx(TaxDocument, { show: isSACountry, defaultFiles: defaultTaxFiles, readOnly: readOnly['documentId'] || noneEditable['documents'] }), _jsx(ConfirmPolicy, { readOnly: readOnly['confirmPolicy'] || noneEditable['is_vat_acknowledged'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid || uploading, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default TaxDetails;

package/package.json

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