@tap-payments/auth-jsconnect 2.1.42-test → 2.1.44-test

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

@@ -21,12 +21,13 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { connectSelector } from '../../../app/connect/connectStore';
 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 { useAppSelector, useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -52,7 +53,9 @@ var BrandList = function (_a) {
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
+    var data = useAppSelector(connectSelector).data;
+    var _c = data.individualData.responseBody || {}, segments_list = _c.segments_list, team_size_list = _c.team_size_list;
+    var _d = useFormContext(), control = _d.control, setValue = _d.setValue;
     var selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
     var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
@@ -84,6 +87,16 @@ var BrandList = function (_a) {
             setValue('salesChannels', [], { shouldValidate: true });
             setValue('brandName', '');
         }
+        setValue('segment', segments_list.find(function (_a) {
+            var _b;
+            var id = _a.id;
+            return ((_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.type) === id;
+        }), { shouldValidate: true });
+        setValue('teamSize', team_size_list.find(function (_a) {
+            var _b;
+            var id = _a.id;
+            return ((_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === id;
+        }), { shouldValidate: true });
         onCloseBrandList();
     };
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: list, onSelectItem: onSelectItem, renderItem: function (item) {

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

@@ -10,6 +10,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import TeamSize from '../../../connect/screens/Merchant/TeamSize';
 import * as React from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -27,34 +28,47 @@ import BrandName from './BrandName';
 import TAC from './TAC';
 import BrandList from './BrandList';
 import SalesChannels from './SalesChannels';
+import Segments from './Segments';
+var ListType;
+(function (ListType) {
+    ListType["SegmentsList"] = "SegmentsList";
+    ListType["TeamSizeList"] = "TeamSizeList";
+    ListType["BrandList"] = "BrandList";
+})(ListType || (ListType = {}));
 var Merchant = function (_a) {
     var _b;
     var _c = React.useState(false), brandNameChecking = _c[0], setBrandNameChecking = _c[1];
-    var _d = React.useState(false), isBrandListOpen = _d[0], setIsBrandListOpen = _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;
+    var _d = React.useState(false), isRequiredNewBrand = _d[0], setIsRequiredNewBrand = _d[1];
+    var _e = useAppSelector(connectSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _f = data.brandData, brandName = _f.brandName, selectedBrandItem = _f.selectedBrandItem, termAndConditionChecked = _f.termAndConditionChecked, responseBody = _f.responseBody, salesChannels = _f.salesChannels, segment = _f.segment, teamSize = _f.teamSize;
     var brandList = (responseBody || {}).brand_list;
+    var _g = React.useState(), listActive = _g[0], setListActive = _g[1];
     var methods = useForm({
         resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand)),
         defaultValues: {
             brandName: brandName,
             selectedBrandItem: selectedBrandItem,
             termAndConditionChecked: termAndConditionChecked,
-            salesChannels: salesChannels
+            salesChannels: salesChannels,
+            segment: segment,
+            teamSize: teamSize
         },
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var brandListItem = methods.watch('selectedBrandItem');
+    var brandListItem = methods.getValues('selectedBrandItem');
     var onSubmit = function (formData) {
         dispatch(updateLeadBrand(__assign(__assign({}, formData), { isNewBrand: isRequiredNewBrand })));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
     };
+    React.useEffect(function () {
+        methods.setValue('segment', segment);
+        methods.setValue('teamSize', teamSize);
+    }, [segment, teamSize]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -67,7 +81,7 @@ var Merchant = function (_a) {
         if (termAndConditionChecked === true)
             methods.setValue('termAndConditionChecked', termAndConditionChecked);
     }, [termAndConditionChecked]);
-    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
+    var brandErrChecks = !!Object.entries(methods.formState.errors).length || !!error;
     var disabled = brandErrChecks || brandNameChecking || ((_b = data.brandData.responseBody) === null || _b === void 0 ? void 0 : _b.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;
@@ -75,6 +89,12 @@ var Merchant = function (_a) {
     React.useEffect(function () {
         setIsRequiredNewBrand(isOtherBrand || isNewBrand);
     }, [isOtherBrand, isNewBrand]);
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: !(isOtherBrand || isNewBrand), list: brandList, onListOpen: function () { return setIsBrandListOpen(true); }, onListClose: function () { return setIsBrandListOpen(false); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !isBrandListOpen, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !isBrandListOpen }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !isBrandListOpen }), _jsx(Collapse, __assign({ in: !isBrandListOpen, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    var handleMenuClick = function (flag) {
+        setListActive(flag);
+    };
+    var isSegmentsListActive = listActive === ListType.SegmentsList;
+    var isTeamSizeListActive = listActive === ListType.TeamSizeList;
+    var isBrandListActive = listActive === ListType.BrandList;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: !(isOtherBrand || isNewBrand) && !isTeamSizeListActive && !isSegmentsListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Segments, { show: !isTeamSizeListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentsListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+interface SegmentsProps {
+    show: boolean;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const Segments: ({ show, onListOpen, onListClose }: SegmentsProps) => JSX.Element;
+export default Segments;

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

@@ -0,0 +1,74 @@
+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);
+};
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { connectSelector } from '../../../app/connect/connectStore';
+import Collapse from '../../../../components/Collapse';
+import { ScreenContainer } from '../../../../features/shared/Containers';
+import Input from '../../../../features/shared/Input';
+import { useAppSelector, useLanguage } from '../../../../hooks';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import SimpleList from '../../../../components/SimpleList';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Text from '../../../../components/Text';
+import CheckIcon from '@mui/icons-material/Check';
+var IncomeText = 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, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+});
+var CheckIconStyled = styled(CheckIcon)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        color: theme.palette.success.main,
+        display: 'flex',
+        alignItems: 'flex-end'
+    });
+});
+var Segments = function (_a) {
+    var _b, _c, _d, _e;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var _f = React.useState([]), segmentList = _f[0], setSegmentList = _f[1];
+    var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var data = useAppSelector(connectSelector).data;
+    var control = useFormContext().control;
+    var segmentsList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.segments_list) || [];
+    var segmentControl = useController({ control: control, name: 'segment' });
+    var segment = segmentControl.field.value;
+    var error = (_c = segmentControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
+    React.useEffect(function () {
+        if ((segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.length) > 0) {
+            setSegmentList(segmentsList);
+        }
+    }, [segmentsList]);
+    var onOpenList = function (event) {
+        setAnchorEl(event.currentTarget);
+        onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
+    };
+    var onCloseList = function () {
+        setAnchorEl(null);
+        onListClose === null || onListClose === void 0 ? void 0 : onListClose();
+    };
+    var onSelectItem = function (segment) {
+        onCloseList();
+        segmentControl.field.onChange(segment);
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(Input, { required: true, label: t('segment_title'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            var _a, _b;
+                            return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (segment === null || segment === void 0 ? void 0 : segment.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (segment === null || segment === void 0 ? void 0 : segment.id) && _jsx(CheckIconStyled, {})] }));
+                        } }) }))] })) })));
+};
+export default Segments;

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+interface TeamSizeProps {
+    show: boolean;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const TeamSize: ({ show, onListOpen, onListClose }: TeamSizeProps) => JSX.Element;
+export default TeamSize;

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

@@ -0,0 +1,74 @@
+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);
+};
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { connectSelector } from '../../../app/connect/connectStore';
+import Box from '@mui/material/Box';
+import Collapse from '../../../../components/Collapse';
+import { ScreenContainer } from '../../../../features/shared/Containers';
+import Input from '../../../../features/shared/Input';
+import { useAppSelector, useLanguage } from '../../../../hooks';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import SimpleList from '../../../../components/SimpleList';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import { styled } from '@mui/material/styles';
+import Text from '../../../../components/Text';
+import CheckIcon from '@mui/icons-material/Check';
+var IncomeText = 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, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+});
+var CheckIconStyled = styled(CheckIcon)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        color: theme.palette.success.main,
+        display: 'flex',
+        alignItems: 'flex-end'
+    });
+});
+var TeamSize = function (_a) {
+    var _b, _c, _d, _e;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var _f = React.useState([]), teamSizeList = _f[0], setTeamSizeList = _f[1];
+    var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var data = useAppSelector(connectSelector).data;
+    var control = useFormContext().control;
+    var teamSizesList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.team_size_list) || [];
+    var teamSizeControl = useController({ control: control, name: 'teamSize' });
+    var teamSize = teamSizeControl.field.value;
+    var error = (_c = teamSizeControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
+    React.useEffect(function () {
+        if ((teamSizesList === null || teamSizesList === void 0 ? void 0 : teamSizesList.length) > 0) {
+            setTeamSizeList(teamSizesList);
+        }
+    }, [teamSizesList]);
+    var onOpenList = function (event) {
+        setAnchorEl(event.currentTarget);
+        onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
+    };
+    var onCloseList = function () {
+        setAnchorEl(null);
+        onListClose === null || onListClose === void 0 ? void 0 : onListClose();
+    };
+    var onSelectItem = function (teamSize) {
+        onCloseList();
+        teamSizeControl.field.onChange(teamSize);
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(Input, { required: true, label: t('team_size_title'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_team_size'), value: (isAr ? (_d = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en', 'name.ar'], list: teamSizeList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            var _a, _b;
+                            return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (teamSize === null || teamSize === void 0 ? void 0 : teamSize.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (teamSize === null || teamSize === void 0 ? void 0 : teamSize.id) && _jsx(CheckIconStyled, {})] }));
+                        } }) }))] })) })));
+};
+export default TeamSize;

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

@@ -9,6 +9,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>;
+    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>>;
 }>, 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>;
@@ -19,6 +21,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>;
+    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>>;
 }>>, 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>;
@@ -29,4 +33,6 @@ 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>;
+    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>>;
 }>>>;

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

@@ -86,6 +86,8 @@ export var MerchantValidationSchema = function (isNewBrand) {
             })
                 .required('enter_brand_name_english_chars_numbers_space'),
             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'),
             salesChannels: yup
                 .array()
                 .min(1, 'choose_atleast_one_channel')
@@ -125,6 +127,8 @@ export var MerchantValidationSchema = function (isNewBrand) {
                 return this.createError({ message: result });
             }
         })
-            .required('choose_atleast_one_channel')
+            .required('choose_atleast_one_channel'),
+        segment: yup.object().required('alert_choose_segment'),
+        teamSize: yup.object().required('alert_choose_teamSize')
     });
 };

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

@@ -48,14 +48,27 @@ var AdditionalIndividualInfo = function (_a) {
     var settingsData = useAppSelector(settingsSelector).data;
     var countries = settingsData.countries;
     var user = (data.verify.responseBody || {}).user;
+    var _c = data.individualData, occupation = _c.occupation, sourceIncome = _c.sourceIncome, monthlyIncome = _c.monthlyIncome, employerName = _c.employerName, employerLocation = _c.employerLocation, isPEP = _c.isPEP, isInfluencer = _c.isInfluencer, civilID = _c.civilID, signatureFileId = _c.signatureFileId, civilIDUploading = _c.civilIDUploading, signatureFileUploading = _c.signatureFileUploading;
     var methods = useForm({
         resolver: yupResolver(IndividualInfoValidationSchema),
-        defaultValues: data.individualData,
+        defaultValues: {
+            occupation: occupation,
+            sourceIncome: sourceIncome,
+            monthlyIncome: monthlyIncome,
+            employerName: employerName,
+            employerLocation: employerLocation,
+            isPEP: isPEP,
+            isInfluencer: isInfluencer,
+            civilID: civilID,
+            signatureFileId: signatureFileId,
+            civilIDUploading: civilIDUploading,
+            signatureFileUploading: signatureFileUploading
+        },
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.individualData, true);
-    var _c = React.useState(), listActive = _c[0], setListActive = _c[1];
-    var _d = React.useState(false), employerFieldsActive = _d[0], setEmployerFieldsActive = _d[1];
+    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    var _e = React.useState(false), employerFieldsActive = _e[0], setEmployerFieldsActive = _e[1];
     React.useEffect(function () {
         var _a, _b;
         if (((_b = (_a = methods.getValues('sourceIncome')) === null || _a === void 0 ? void 0 : _a.name.en) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'salary')
@@ -76,7 +89,8 @@ var AdditionalIndividualInfo = function (_a) {
     var isEmployerLocationListActive = listActive === ListType.EmployerLocationList;
     var isMonthlyIncomeListActive = listActive === ListType.MonthlyIncomeList;
     var isOccupationListActive = listActive === ListType.OccupationList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Occupation, { onListOpen: function () { return handleMenuClick(ListType.OccupationList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isSourceOfIncomeListActive }), _jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isOccupationListActive }), _jsx(MonthlyIncome, { show: !isEmployerLocationListActive && !isSourceOfIncomeListActive && !isOccupationListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EmployerName, { show: false }), _jsx(EmployerLocation, { show: !isSourceOfIncomeListActive && employerFieldsActive && !isMonthlyIncomeListActive && !isOccupationListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.EmployerLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: [_jsx(CivilIDFile, {}), _jsx(SignatureFile, { show: user === null || user === void 0 ? void 0 : user.is_authorized })] })), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    var disabled = !methods.formState.isValid || civilIDUploading || signatureFileUploading;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Occupation, { onListOpen: function () { return handleMenuClick(ListType.OccupationList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isSourceOfIncomeListActive }), _jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isOccupationListActive }), _jsx(MonthlyIncome, { show: !isEmployerLocationListActive && !isSourceOfIncomeListActive && !isOccupationListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EmployerName, { show: false }), _jsx(EmployerLocation, { show: !isSourceOfIncomeListActive && employerFieldsActive && !isMonthlyIncomeListActive && !isOccupationListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.EmployerLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: [_jsx(CivilIDFile, {}), _jsx(SignatureFile, { show: user === null || user === void 0 ? void 0 : user.is_authorized })] })), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(AdditionalIndividualInfo);
 AdditionalIndividualInfo.defaultProps = {};

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

@@ -1,14 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from 'react';
 import { ScreenContainer } from '../../../../features/shared/Containers';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { individualSelector, uploadCivilIdFile } from '../../../../features/app/individual/individualStore';
-import { MAX_FILE_SIZE, VALID_FILE_FORMATS } from '../../../../constants';
-import UploadFile from '../../../../features/shared/UploadFile';
-import { maskFileName } from '../../../../utils';
+import { civilIDUploadingStatus, individualSelector } from '../../../app/individual/individualStore';
+import UploadMultipleFile from '../../../shared/UploadMultipleFile';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -16,66 +13,18 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
     });
 });
 var CivilIDFile = function () {
-    var _a, _b;
-    var _c = React.useState(0), progress = _c[0], setProgress = _c[1];
+    var _a;
     var t = useTranslation().t;
-    var _d = useFormContext(), control = _d.control, setError = _d.setError, clearErrors = _d.clearErrors, setValue = _d.setValue;
-    var civilIDFileControl = useController({ name: 'civilIDFile', control: control });
-    var civilIDFileIdControl = useController({ name: 'civilID', control: control });
-    var _e = useAppSelector(individualSelector), data = _e.data, loading = _e.loading, sysError = _e.error;
-    var _f = data.attachmentsData, civilIDUploading = _f.civilIDUploading, civilIDFile = _f.civilIDFile, civilID = _f.civilID;
     var dispatch = useAppDispatch();
-    var civilIDValue = civilIDFileControl.field.value;
-    var error = ((_a = civilIDFileControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message) || ((_b = civilIDFileIdControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message);
-    var handleCivilIDChange = function (files) {
-        var _a;
-        var file = files === null || files === void 0 ? void 0 : files[0];
-        if (!VALID_FILE_FORMATS.includes(file === null || file === void 0 ? void 0 : file.type)) {
-            setError('civilIDFile', { message: 'file_not_supported_alert' });
-        }
-        else if ((file === null || file === void 0 ? void 0 : file.size) > MAX_FILE_SIZE) {
-            setError('civilIDFile', { message: 'file_size_alert' });
-        }
-        else {
-            civilIDFileControl.field.onChange(file);
-            dispatch(uploadCivilIdFile({
-                file: file,
-                onProgress: function (value) {
-                    setProgress(value);
-                },
-                title: (_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant_id
-            }));
-        }
+    var control = useFormContext().control;
+    var civilIDFileIdControl = useController({ name: 'civilID', control: control });
+    var _b = useAppSelector(individualSelector), loading = _b.loading, data = _b.data;
+    var handleCivilIDChange = function (ids) {
+        civilIDFileIdControl.field.onChange(ids);
     };
-    var handleReset = function () {
-        civilIDFileControl.field.onChange(null);
-        civilIDFileIdControl.field.onChange('');
-        setProgress(0);
+    var handleReset = function (ids) {
+        civilIDFileIdControl.field.onChange(ids);
     };
-    React.useEffect(function () {
-        if (!!civilIDFile) {
-            setValue('civilIDFile', civilIDFile);
-            setValue('civilID', civilID);
-        }
-    }, [civilIDFile, civilID]);
-    React.useEffect(function () {
-        if (sysError === 'file_upload_error') {
-            setError('civilIDFileId', { message: sysError });
-            civilIDFileControl.field.onChange(null);
-            setProgress(0);
-        }
-    }, [sysError]);
-    React.useEffect(function () {
-        if ((civilIDFileControl.formState.isValid || !!civilIDValue) && error != 'file_upload_error')
-            clearErrors();
-    }, [civilIDFileControl.formState.isValid, civilIDValue]);
-    React.useEffect(function () {
-        if (!!civilIDFile) {
-            civilIDFileControl.field.onChange(civilIDFile);
-            civilIDFileIdControl.field.onChange(civilID);
-        }
-    }, []);
-    var fileName = civilIDValue ? maskFileName(civilIDValue === null || civilIDValue === void 0 ? void 0 : civilIDValue.name) : '';
-    return (_jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isFileUploaded: !civilIDUploading && !!civilIDValue, isSubmitting: loading, isUploading: civilIDUploading, progress: progress, onReset: handleReset, initialFileName: fileName, error: error && t(error) }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, fileTitle: (_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant_id, purpose: 'identity_document', fileUploadingStatus: function (uploading) { return dispatch(civilIDUploadingStatus(uploading)); } }) }));
 };
 export default CivilIDFile;

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

@@ -10,17 +10,14 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from 'react';
-import { ScreenContainer } from '../../../../features/shared/Containers';
-import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
+import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { individualSelector, uploadSignatureFile } from '../../../../features/app/individual/individualStore';
-import { MAX_FILE_SIZE, VALID_FILE_FORMATS } from '../../../../constants';
-import UploadFile from '../../../../features/shared/UploadFile';
+import UploadMultipleFile from '../../../shared/UploadMultipleFile';
+import { ScreenContainer } from '../../../shared/Containers';
+import { individualSelector, signatureFileUploadingStatus } from '../../../app/individual/individualStore';
 import Collapse from '../../../../components/Collapse';
-import { maskFileName } from '../../../../utils';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -28,63 +25,18 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
     });
 });
 var SignatureFile = function (_a) {
-    var _b, _c;
     var show = _a.show;
-    var _d = React.useState(0), progress = _d[0], setProgress = _d[1];
     var t = useTranslation().t;
-    var _e = useFormContext(), control = _e.control, setError = _e.setError, clearErrors = _e.clearErrors, setValue = _e.setValue;
-    var signatureFileControl = useController({ name: 'signatureFile', control: control });
+    var control = useFormContext().control;
     var signatureFileIdControl = useController({ name: 'signatureFileId', control: control });
-    var _f = useAppSelector(individualSelector), data = _f.data, loading = _f.loading, sysError = _f.error;
-    var _g = data.attachmentsData, signatureFileUploading = _g.signatureFileUploading, signatureFile = _g.signatureFile, signatureFileId = _g.signatureFileId;
+    var loading = useAppSelector(individualSelector).loading;
     var dispatch = useAppDispatch();
-    var signatureValue = signatureFileControl.field.value;
-    var error = ((_b = signatureFileControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message) || ((_c = signatureFileIdControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message);
-    var handleSignatureChange = function (files) {
-        var file = files === null || files === void 0 ? void 0 : files[0];
-        if (!VALID_FILE_FORMATS.includes(file === null || file === void 0 ? void 0 : file.type)) {
-            setError('signatureFile', { message: 'file_not_supported_alert' });
-        }
-        else if ((file === null || file === void 0 ? void 0 : file.size) > MAX_FILE_SIZE) {
-            setError('signatureFile', { message: 'file_size_alert' });
-        }
-        else {
-            signatureFileControl.field.onChange(file);
-            dispatch(uploadSignatureFile({
-                file: file,
-                onProgress: function (value) {
-                    setProgress(value);
-                }
-            }));
-        }
+    var handleSignatureChange = function (ids) {
+        signatureFileIdControl.field.onChange(ids);
     };
-    var handleReset = function () {
-        signatureFileControl.field.onChange(null);
-        signatureFileIdControl.field.onChange('');
-        setProgress(0);
+    var handleReset = function (ids) {
+        signatureFileIdControl.field.onChange(ids);
     };
-    React.useEffect(function () {
-        if (sysError === 'file_upload_error') {
-            setError('signatureFileId', { message: sysError });
-            signatureFileControl.field.onChange(null);
-            setProgress(0);
-        }
-    }, [sysError]);
-    React.useEffect(function () {
-        if ((signatureFileControl.formState.isValid || !!signatureValue) && error != 'file_upload_error')
-            clearErrors();
-    }, [signatureFileControl.formState.isValid, signatureValue]);
-    React.useEffect(function () {
-        if (!!signatureFile) {
-            setValue('signatureFile', signatureFile);
-            setValue('signatureFileId', signatureFileId);
-        }
-    }, [signatureFile, signatureFileId]);
-    React.useEffect(function () {
-        if (!!signatureValue)
-            signatureFileControl.field.onChange(signatureFile);
-    }, []);
-    var fileName = signatureValue ? maskFileName(signatureValue === null || signatureValue === void 0 ? void 0 : signatureValue.name) : '';
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_signature_file'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_signature'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_signature_file'), onFileUploaded: handleSignatureChange, isFileUploaded: !signatureFileUploading && !!signatureValue, isSubmitting: loading, initialFileName: fileName, isUploading: signatureFileUploading, progress: progress, onReset: handleReset, error: error && t(error) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_signature_file'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_signature'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_signature_file'), onFileUploaded: handleSignatureChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, purpose: 'customer_signature', fileTitle: 'Merchant Signature', fileUploadingStatus: function (uploading) { return dispatch(signatureFileUploadingStatus(uploading)); } }) }) })));
 };
 export default SignatureFile;