@tap-payments/auth-jsconnect 2.8.44-test → 2.8.45-beta

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

@@ -46,9 +46,9 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var VerifyNumber = function (_a) {
-    var _b, _c;
+    var _b, _c, _d;
     var dispatch = useAppDispatch();
-    var _d = useAppSelector(bankSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var _e = useAppSelector(bankSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -56,8 +56,8 @@ var VerifyNumber = function (_a) {
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _e = React.useState(false), resendLoading = _e[0], setResendLoading = _e[1];
-    var phone = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to;
+    var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     React.useEffect(function () {
         if (error && methods.formState.isValid && phone)
             dispatch(clearError());
@@ -68,7 +68,7 @@ var VerifyNumber = function (_a) {
     var onSubmit = function (formData) {
         dispatch(verifyBankLeadOTP(deepCopy(formData)));
     };
-    var disabled = !methods.formState.isValid || !phone || resendLoading;
+    var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/features/board/Board.js

@@ -51,15 +51,11 @@ var Board = memo(function (_a) {
         });
     }, []);
     React.useEffect(function () {
-        if (settingLoading || !props.open)
-            return;
-        if (!data.isValidOperator) {
-            dispatch(handleCurrentActiveScreen('BOARD_OPERATOR_ERROR_STEP'));
-            return;
+        if (data.isValidOperator && props.open && !settingLoading) {
+            dispatch(createVerifyTokenBy(boardId));
+            if (props.mode === 'content')
+                dispatch(handleCurrentActiveScreen('BOARD_SUCCESS_FLOWS_BUTTONS_STEP'));
         }
-        dispatch(createVerifyTokenBy(boardId));
-        if (props.mode === 'content')
-            dispatch(handleCurrentActiveScreen('BOARD_SUCCESS_FLOWS_BUTTONS_STEP'));
     }, [data.isValidOperator, settingLoading]);
     var initialLoading = settingLoading || customLoading;
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ mode: props.mode, open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: !isTapDomain(props.merchantDomain), loaderColor: loaderColor, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: !isTapDomain(props.merchantDomain) }, { children: boardFeatureScreens.map(function (_a, index) {

package/build/features/board/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js

@@ -12,15 +12,16 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
 import { settingsSelector } from '../../../../app/settings';
-import { useAppSelector } from '../../../../hooks';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
 import { SCOPE_AUTH } from '../../../../constants';
 import { boardSelector } from '../../../app/board/boardStore';
 import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
 var SuccessWithFlowButtons = function () {
+    var dispatch = useAppDispatch();
     var _a = useAppSelector(boardSelector), data = _a.data, loading = _a.loading;
     var settingsData = useAppSelector(settingsSelector).data;
     var isScopeAuthentication = settingsData.appConfig.scope === SCOPE_AUTH;
-    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals, recipient = _b.recipient;
+    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals;
     var onClose = function () {
         var url = settingsData.appConfig.redirectUrl;
         if (!url)
@@ -29,6 +30,6 @@ var SuccessWithFlowButtons = function () {
         newUrl.searchParams.append('action', 'close');
         window.open("".concat(newUrl), '_self', '_blank');
     };
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: flows || [], onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient }));
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: flows || [], onClose: isScopeAuthentication ? onClose : undefined }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/features/brand/Brand.d.ts

@@ -2,7 +2,6 @@ import { LibConfig } from '../../@types';
 export interface BrandLibProps extends LibConfig {
     verifyToken?: string;
     configToken?: string;
-    loaderColor?: string;
 }
 export declare function BrandElement(props: BrandLibProps): import("react/jsx-runtime").JSX.Element;
 export declare function renderBrandLib(config: BrandLibProps, elementId: string): {

package/build/features/brand/Brand.js

@@ -36,7 +36,7 @@ import { brandFeatureScreens } from '../featuresScreens';
 import { brandSelector, verifyLeadToken } from '../app/brand/brandStore';
 import Background from '../shared/Background';
 var Brand = memo(function (_a) {
-    var verifyToken = _a.verifyToken, configToken = _a.configToken, loaderColor = _a.loaderColor, props = __rest(_a, ["verifyToken", "configToken", "loaderColor"]);
+    var verifyToken = _a.verifyToken, configToken = _a.configToken, props = __rest(_a, ["verifyToken", "configToken"]);
     var theme = useAppTheme().theme;
     var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
     var _c = useAppSelector(brandSelector), customLoading = _c.customLoading, loading = _c.loading, brandError = _c.error;
@@ -54,14 +54,11 @@ var Brand = memo(function (_a) {
         loadingScreenName: 'BRAND_LOADING_DATA_STEP',
         navigation: featureScreensNavigation,
         open: open,
-        mode: props.mode,
         internalToken: verifyToken,
-        settingLoading: settingLoading,
-        operatorErrorScreenName: 'BRAND_OPERATOR_ERROR_STEP',
-        isValidOperator: data.isValidOperator
+        settingLoading: settingLoading
     });
-    var initialLoading = verifyToken && props.mode !== 'content' ? settingLoading : settingLoading || customLoading;
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ mode: props.mode, open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, loaderColor: loaderColor, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat }, { children: _jsx(FeatureContainer, __assign({ mode: props.mode, isMaturityExpress: isMaturityExpress }, { children: brandFeatureScreens.map(function (_a, index) {
+    var initialLoading = verifyToken ? settingLoading : settingLoading || customLoading;
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: isMaturityExpress }, { children: brandFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

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

@@ -105,7 +105,7 @@ var BrandActivities = function (_a) {
     };
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     var isActivitiesListActive = listActive === ListType.ActivitiesList;
     var isCustomerBaseListActive = listActive === ListType.CustomerBaseList;
     var isExpectedCustomerListActive = listActive === ListType.ExpectedCustomerList;

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

@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { getCurrencyByCountryIso2, isExist } from '../../../../utils';
+import { isExist } from '../../../../utils';
 import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
 import SimpleList from '../../../../components/SimpleList';
@@ -68,7 +68,7 @@ var ExpectedSalesRange = function (_a) {
     var expectedSaleControl = useController({ name: 'expectedSale', control: control });
     var _g = useAppSelector(brandSelector), data = _g.data, error = _g.error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var brandActivities = data.brandActivities;
+    var brandActivities = data.brandActivities, currency = data.currency;
     var expectedSales = (brandActivities.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
     var countryCode = settingsData.businessCountry;
@@ -95,9 +95,6 @@ var ExpectedSalesRange = function (_a) {
     var handleCloseSubMenu = function () {
         setSubIndex('');
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     React.useEffect(function () {
         if ((expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales.length) > 0) {
             setExpectedSalesRangeList(expectedSales);
@@ -127,7 +124,7 @@ var ExpectedSalesRange = function (_a) {
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('expected_sales_monthly', {
-                            currency: getCurrency
+                            currency: t(currency)
                         }), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(InputStyled, { readOnly: readOnly, value: isAr ? (_b = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar) !== null && _b !== void 0 ? _b : '' : (_c = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) !== null && _c !== void 0 ? _c : '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)

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

@@ -88,6 +88,6 @@ var RefundPolicy = function (_a) {
             return;
         refundControl.field.onChange(checked);
     };
-    return (_jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly || isChecked }, { children: [_jsx(CheckboxStyled, { disabled: isChecked, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: refundChecked, onChange: handleRefundCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_refund_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_EN, target: '_blank', underline: 'always' }, { children: t('refund_policy_compliance') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }));
+    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: refundChecked, onChange: handleRefundCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_refund_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.REFUND_EN, target: '_blank', underline: 'always' }, { children: t('refund_policy_compliance') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
 };
 export default RefundPolicy;

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

@@ -88,6 +88,6 @@ var TAC = function (_a) {
             return;
         tacControl.field.onChange(checked);
     };
-    return (_jsxs(ScreenContainer, __assign({ sx: { mt: 2.75 } }, { children: [_jsxs(TACContainerStyled, __assign({ readOnly: readOnly || isChecked }, { children: [_jsx(CheckboxStyled, { disabled: isChecked, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })));
+    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.75 } }, { children: [_jsxs(TACContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })) })));
 };
 export default React.memo(TAC);

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

@@ -51,6 +51,6 @@ var TransactionPolicy = function (_a) {
             return;
         transactionControl.field.onChange(checked);
     };
-    return (_jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly || isChecked }, { children: [_jsx(CheckboxStyled, { disabled: isChecked, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: transactionChecked, onChange: handleTransactionCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_chargeback_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_EN, target: '_blank', underline: 'always' }, { children: t('chargeback_policy') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }));
+    return (_jsx(Collapse, __assign({ in: !isChecked }, { children: _jsxs(ScreenContainer, { children: [_jsxs(ContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: transactionChecked, onChange: handleTransactionCheckedChange }), _jsxs(TextStyled, { children: [t('agree_on_chargeback_policy'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TRANSACTION_EN, target: '_blank', underline: 'always' }, { children: t('chargeback_policy') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
 };
 export default TransactionPolicy;

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

@@ -80,7 +80,7 @@ var BrandInfo = function (_a) {
         if ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.response_code) === '5')
             methods.setError('brandName', { message: 'brand_name_already_exist' });
     }, [responseBody]);
-    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName;
+    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking || uploadingBrandLogo;
     var disableBack = settingsData.appConfig.mode === 'content';
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, { readOnly: readOnly['brandName'] || (noneEditable['name.en'] && noneEditable['name.ar']), brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking, isVerified: isBrandNameVerified }), _jsx(BrandLogo, { defaultFile: defaultBrandLogoFile, readOnly: readOnly['brandLogoId'], isVerified: dataVerified['logo'] }), _jsx(SalesChannels, { readOnly: readOnly['salesChannels'] || noneEditable['channel_services'] }), _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') }))] })) })) }));

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

@@ -90,7 +90,7 @@ var BrandInfo = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     var handleMenuClick = function (flag) {
         setListActive(flag);
     };

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

@@ -21,10 +21,10 @@ var SuccessWithFlowButtons = function () {
     var _a = useAppSelector(brandSelector), data = _a.data, loading = _a.loading;
     var settingsData = useAppSelector(settingsSelector).data;
     var isScopeAuthentication = settingsData.appConfig.scope === SCOPE_AUTH;
-    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals, recipient = _b.recipient;
+    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals;
     var onClose = function () {
         dispatch(onCloseCompleteBrand());
     };
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: flows || [], onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient }));
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: flows || [], onClose: isScopeAuthentication ? onClose : undefined }));
 };
 export default memo(SuccessWithFlowButtons);

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

@@ -72,7 +72,7 @@ var VerifyNumber = function (_a) {
     var onSubmit = function (formData) {
         dispatch(verifyBrandLeadOTP(deepCopy(formData)));
     };
-    var disabled = !methods.formState.isValid || !phone || resendLoading;
+    var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/features/business/Business.js

@@ -13,7 +13,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { memo, useEffect } from 'react';
 import { createRoot } from 'react-dom/client';
 import { useAppTheme, useAppDispatch, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener } from '../../hooks';
-import { handleCurrentActiveScreen, handleLanguage, settingsSelector } from '../../app/settings';
+import { handleLanguage, settingsSelector } from '../../app/settings';
 import { FeatureContainer } from '../shared/Containers';
 import { businessSelector, verifyLeadToken } from '../app/business/businessStore';
 import AnimationFlow from '../../components/AnimationFlow';
@@ -46,14 +46,9 @@ var Business = memo(function (props) {
         });
     };
     useEffect(function () {
-        if (settingLoading || !open)
-            return;
-        if (!data.isValidOperator) {
-            dispatch(handleCurrentActiveScreen('BUSINESS_OPERATOR_ERROR_STEP'));
-            return;
-        }
-        verifyToken();
-    }, [data.isValidOperator, settingLoading]);
+        if (!settingLoading && open)
+            verifyToken();
+    }, [settingLoading]);
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, dialogEdgeFormat: data.appConfig.dialogEdgeFormat }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: isMaturityExpress }, { children: businessFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;

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

@@ -72,7 +72,7 @@ var Activities = function () {
         anchorEl ? setAnchorEl(false) : setAnchorEl(true);
     };
     var isOperationStartDateVerified = dataVerified['operations.business_start_date'] && (operations === null || operations === void 0 ? void 0 : operations.business_start_date) === methods.watch('operationStartDate');
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(LicenseName, {}) })), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(ActivitiesList, { readOnly: readOnly['activities'] || noneEditable['activities'], onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } }) })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { isVerified: isOperationStartDateVerified, readOnly: readOnly['operationStartDate'] || noneEditable['operations.business_start_date'], onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default Activities;

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

@@ -99,7 +99,7 @@ var BusinessType = function (_a) {
     var hasEntityList = !!(entityLicenseList === null || entityLicenseList === void 0 ? void 0 : entityLicenseList.length);
     var showLicenseList = hasEntityList ? (isSACountry || isOtherCountry) && isOtherLicense(selectedLicenseEntity) : isSACountry || isOtherCountry;
     var showEntityList = isKWCountry ? hasEntityList && !isLicenseListActive && isCR : hasEntityList && !isLicenseListActive;
-    var disabled = !methods.formState.isValid || uploading || uploadingArticle;
+    var disabled = !methods.formState.isValid || !!error || uploading || uploadingArticle;
     var disableBack = !data.otpData.isNID;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(LicenseType, { show: !listActive && isKWCountry }), _jsx(EntityLicenseList, { show: showEntityList, onListOpen: function () { return handleMenuClick(ListType.EntityLicenseList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(LicenseList, { show: showLicenseList && !isEntityLicenseListActive, onListOpen: function () { return handleMenuClick(ListType.LicenseList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityName, { show: !isAnyListActive && isKWCountry && isCR }), _jsx(LicenseNumber, { show: isKWCountry ? !isAnyListActive && isCR : !isAnyListActive }), _jsx(LicenseCertificate, { show: !isAnyListActive && isKWCountry && isCR }), _jsx(Article, { show: !isAnyListActive && isKWCountry && isCR }), _jsx(Collapse, __assign({ in: !isAnyListActive, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };

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

@@ -62,7 +62,7 @@ var CivilID = function (_a) {
         if (error)
             dispatch(clearError());
     };
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: 7.5, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(CivilID);

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

@@ -127,7 +127,7 @@ var Customers = function (_a) {
     var whenNotSelectExpectedCustomers = !isCustomerLocationsListActive && !isExpectedSalesListActive;
     var whenNotSelectExpectedSales = !isCustomerLocationsListActive && !isExpectedCustomersListActive;
     var isAnyListSelected = !isExpectedCustomersListActive && !isCustomerLocationsListActive && !isExpectedSalesListActive;
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(CustomerLocations, { readOnly: readOnly['customerLocations'] || noneEditable['operations.customer_base_location'], show: whenNotSelectCustomersLocation, onListOpen: function () { return handleMenuClick(ListType.CustomerLocationsList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isCustomerLocationsVerified }), _jsx(ExpectedCustomers, { readOnly: readOnly['expectedCustomer'] || noneEditable['operations.customer_base'], show: whenNotSelectExpectedCustomers, onListOpen: function () { return handleMenuClick(ListType.ExpectedCustomersList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isExpectedCustomersVerified }), _jsx(ExpectedSales, { readOnly: readOnly['expectedSale'] || noneEditable['operations.sales_range'], show: whenNotSelectExpectedSales, onListOpen: function () { return handleMenuClick(ListType.ExpectedSalesList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isExpectedSalesRangeVerified }), _jsxs(Collapse, __assign({ in: isAnyListSelected }, { children: [_jsx(RefundPolicy, { readOnly: readOnly['refundPolicy'] || noneEditable['terms'] }), _jsx(TransactionPolicy, { readOnly: readOnly['transactionPolicy'] || noneEditable['terms'] }), _jsx(Box, __assign({ sx: { mt: 2 } }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] }))] })) })) }));
 };
 export default React.memo(Customers);

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

@@ -22,7 +22,7 @@ import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import { businessSelector, clearError } from '../../../app/business/businessStore';
-import { getCurrencyByCountryIso2, isExist } from '../../../../utils';
+import { isExist } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Search from '../../../shared/Search';
 import InputSelect from '../../../shared/InputSelect';
@@ -66,7 +66,7 @@ var ExpectedSalesRange = function (_a) {
     var expectedSaleControl = useController({ name: 'expectedSale', control: control });
     var _e = useAppSelector(businessSelector), data = _e.data, error = _e.error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var activitiesData = data.activitiesData;
+    var activitiesData = data.activitiesData, currency = data.currency;
     var expectedSales = (activitiesData.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
     var countryCode = settingsData.businessCountry;
@@ -121,11 +121,8 @@ var ExpectedSalesRange = function (_a) {
         if (item)
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_monthly', {
-                        currency: getCurrency
+                        currency: t(currency)
                     }) }), _jsx(InputStyled, { readOnly: readOnly, value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)

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

@@ -54,7 +54,7 @@ var IDBOD = function (_a) {
     var handleCollapseOpenClose = function (flag) {
         setCollapse(flag);
     };
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(ID, {}) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ loading: loading, disableBack: true, isAr: isAr, disabled: disabled, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(IDBOD);

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

@@ -82,7 +82,7 @@ var OTP = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     var idNumber = data.nidData.nid;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('opt_nid_sent_title', { provider: 'ABSHER' }), ' ', !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskID(idNumber || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };

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

@@ -16,7 +16,7 @@ import { businessSelector } from '../../../app/business/businessStore';
 import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
 var SuccessWithFlowButtons = function () {
     var data = useAppSelector(businessSelector).data;
-    var _a = data.verify.responseBody || {}, flows = _a.flows, entity = _a.entity, brand = _a.brand, bank = _a.bank_account, merchant = _a.merchant, user = _a.user, business = _a.business, board_id = _a.board_id, board_info_id = _a.board_info_id, name = _a.name, individuals = _a.individuals, recipient = _a.recipient;
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, individuals: individuals, boardInfoId: board_info_id, flows: flows || [], recipient: recipient }));
+    var _a = data.verify.responseBody || {}, flows = _a.flows, entity = _a.entity, brand = _a.brand, bank = _a.bank_account, merchant = _a.merchant, user = _a.user, business = _a.business, board_id = _a.board_id, board_info_id = _a.board_info_id, name = _a.name, individuals = _a.individuals;
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, individuals: individuals, boardInfoId: board_info_id, flows: flows || [] }));
 };
 export default memo(SuccessWithFlowButtons);

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

@@ -72,7 +72,7 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var disabled = !methods.formState.isValid || !phone || resendLoading;
+    var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

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

@@ -56,7 +56,7 @@ var BrandSegment = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(TeamSize, { show: true, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _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(BrandSegment);

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

@@ -81,8 +81,7 @@ var BusinessCountryScreen = function (_a) {
                         return [2];
                     countryCode = findCountryByIso2(settingsData.countries, iso2);
                     dispatch(handleSetCountryByIso2(iso2));
-                    if (settingsData.appConfig.mode !== 'popup')
-                        updateLocationUrlWithCountry(iso2);
+                    updateLocationUrlWithCountry(iso2);
                     if (!data.leadId) return [3, 2];
                     return [4, dispatch(updateBusinessCountry(iso2))];
                 case 1:

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

@@ -92,7 +92,7 @@ var CivilID = function (_a) {
     React.useEffect(function () {
         dispatch(resetStore());
     }, []);
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };
 export default React.memo(CivilID);

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

@@ -53,7 +53,6 @@ import { useController, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { removeAllOtherThanCharsNumbersAtAndDot } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
@@ -90,8 +89,7 @@ var Email = function (_a) {
         });
     }); }, 500);
     var handleEmailChange = function (event) {
-        var value = removeAllOtherThanCharsNumbersAtAndDot(event.target.value);
-        emailControl.field.onChange(value);
+        emailControl.field.onChange(event.target.value);
     };
     React.useEffect(function () {
         var isValid = emailValue && !error && emailValue.length > 3;

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

@@ -100,7 +100,7 @@ var Individual = function (_a) {
     }, [responseBody]);
     var isLeadEmailAvailable = (contact === null || contact === void 0 ? void 0 : contact.email) === methods.watch('email');
     var isEmailValid = typeof is_available === 'undefined' ? isLeadEmailAvailable : is_available;
-    var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email;
+    var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
     var disabled = emailErrChecks || emailChecking || !isEmailValid;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { show: !isMobile, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: settingsData.countries }), _jsx(Email, { show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };

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

@@ -60,9 +60,9 @@ var BrandList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
-    var getBrandName = function (brand) {
-        var _a, _b;
-        return (isAr ? (_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.en) || '';
+    var getBrandName = function (_a) {
+        var name = _a.name;
+        return (isAr ? name === null || name === void 0 ? void 0 : name.ar : name === null || name === void 0 ? void 0 : name.en) || '';
     };
     var getBrandId = function (item) {
         return item.id || '';

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

@@ -84,7 +84,7 @@ var Merchant = function (_a) {
         if (termAndConditionChecked === true)
             methods.setValue('termAndConditionChecked', termAndConditionChecked);
     }, [termAndConditionChecked]);
-    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName;
+    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking || ((_c = data.brandData.responseBody) === null || _c === void 0 ? void 0 : _c.response_code) === '5';
     var hasBrandList = (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0;
     var isOtherBrand = (brandListItem === null || brandListItem === void 0 ? void 0 : brandListItem.id) === 'other' && hasBrandList;

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

@@ -15,7 +15,7 @@ var SalesChannels = function (_a) {
     var channelList = (responseBody || {}).channel_list;
     var selectedBrandControl = getValues('selectedBrandItem');
     React.useEffect(function () {
-        if (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) {
+        if (selectedBrandItem.id) {
             setValue('selectedBrandItem', selectedBrandItem);
             var sales = mapSalesChannel(selectedBrandItem.channel_services || []);
             field.onChange(sales);

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

@@ -126,7 +126,7 @@ var Mobile = function (_a) {
     var isBusinessListActive = listType === ListType.BusinessList;
     var isCountryListActive = listType === ListType.CountryCodeList;
     var listActive = isBusinessListActive || isCountryListActive;
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     var title = t('join_our_community');
     var subTitle = t('ide_terms_and_conditions_description');
     return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid && !isOtherThanKWOrSACountry }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKWCountry ? (_jsx(MobileButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) }))] }));

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

@@ -101,7 +101,7 @@ var NID = function (_a) {
     React.useEffect(function () {
         dispatch(resetStore());
     }, []);
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
 };
 export default React.memo(NID);

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import GenericError from '../../../shared/GenericError';
+import GenericError from '../../../../features/shared/GenericError';
 var OperatorError = function (_a) {
     var t = useTranslation().t;
     return _jsx(GenericError, { error: t('operator_is_invalid'), errorTitle: t('oops') });

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

@@ -29,7 +29,6 @@ import BrandList from './BrandList';
 import EntityList from './EntityList';
 import LicenseNumber from './LicenseNumber';
 import EntityLegalName from './EntityLegalName';
-import LicenseType from './EntityLicenseType';
 var ListType;
 (function (ListType) {
     ListType["BrandList"] = "BrandList";
@@ -65,8 +64,7 @@ var AuthenticationList = function (_a) {
     var dispatch = useAppDispatch();
     var onSubmit = function (formData) {
         if (isAddEntity) {
-            var licenseNumber = formData.licenseNumber, legalName = formData.legalName, brandInfo_1 = formData.brandInfo, licenseType = formData.licenseType;
-            var data_1 = { licenseNumber: licenseNumber, legalName: legalName, brandInfo: brandInfo_1, licenseType: licenseType };
+            var data_1 = { licenseNumber: formData.licenseNumber, legalName: formData.legalName, brandInfo: formData.brandInfo };
             dispatch(createEntity(deepCopy(data_1)));
             return;
         }
@@ -78,7 +76,6 @@ var AuthenticationList = function (_a) {
             setIsAddEntity(false);
             methods.setValue('licenseNumber', '');
             methods.setValue('legalName', '');
-            methods.setValue('licenseType', '');
             methods.setValue('entityInfo', undefined, { shouldValidate: true });
             return;
         }
@@ -99,6 +96,6 @@ var AuthenticationList = function (_a) {
     };
     var isBrandList = listActive === ListType.BrandList;
     var isEntityList = listActive === ListType.EntityList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isAddEntity && !isEntityList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList, handleAddEntity: function (flag) { return setIsAddEntity(flag); }, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: isAddEntity && !isBrandList && !isEntityList }, { children: [_jsx(EntityLegalName, {}), _jsx(LicenseType, {}), _jsx(LicenseNumber, {})] })), _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: isAddEntity ? t('create_new_entity') : t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isAddEntity && !isEntityList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList, handleAddEntity: function (flag) { return setIsAddEntity(flag); }, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: isAddEntity && !isBrandList && !isEntityList }, { children: [_jsx(EntityLegalName, {}), _jsx(LicenseNumber, {})] })), _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: isAddEntity ? t('create_new_entity') : t('next') })) }))] })) })) }));
 };
 export default React.memo(AuthenticationList);