@tap-payments/auth-jsconnect 2.0.71-test → 2.0.75-test

package/build/features/app/entity/entityStore.js

@@ -172,8 +172,8 @@ export var updateEntityInfo = createAsyncThunk('updateEntityInfo', function (par
                 requestBody = {
                     id: (_c = (_b = entity.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.id,
                     activities: (_d = (params.activities || [])) === null || _d === void 0 ? void 0 : _d.map(function (_a) {
-                        var en = _a.en;
-                        return en;
+                        var id = _a.id;
+                        return ({ id: id });
                     }),
                     license_name: params.licenseName,
                     license_number: params.licenseNumber,
@@ -313,7 +313,7 @@ export var entitySlice = createSlice({
             var activities = (entity === null || entity === void 0 ? void 0 : entity.activities) || [];
             var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
                 var _a;
-                return (_a = brand === null || brand === void 0 ? void 0 : brand.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { var _a; return ((_a = activity.en) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === value.toLowerCase(); });
+                return (_a = brand === null || brand === void 0 ? void 0 : brand.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return value.id === activity.id; });
             });
             state.data.entityData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [activities === null || activities === void 0 ? void 0 : activities[0]];
             state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities, selectedActivities: (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [activities === null || activities === void 0 ? void 0 : activities[0]] });

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

@@ -20,7 +20,6 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useTranslation } from 'react-i18next';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import Button from '../../../shared/Button';
-import SalesChannels from './SalesChannels';
 import { ScreenContainer } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
 import OperationStartDate from './OperationStartDate';
@@ -53,10 +52,6 @@ var Activities = function () {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    React.useEffect(function () {
-        var salesChannels = activitiesData.salesChannels;
-        methods.setValue('salesChannels', salesChannels);
-    }, [activitiesData.salesChannels]);
     React.useEffect(function () {
         var activities = activitiesData.activities;
         methods.setValue('activities', activities);
@@ -73,6 +68,6 @@ var Activities = function () {
         anchorEl ? setAnchorEl(false) : setAnchorEl(true);
     };
     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, {}) })), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(ActivitiesList, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(SalesChannels, {}) }))] })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { 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') })) }))] })) })) }));
+    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, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } }) })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { 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/Activities/ActivitiesList.js

@@ -105,9 +105,9 @@ var ActivitiesList = function (_a) {
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
     var onSelectItem = function (item) {
-        var isActivityExists = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.en === (item === null || item === void 0 ? void 0 : item.en); });
+        var isActivityExists = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.id === item.id; });
         if (isActivityExists) {
-            var updatedIdList = controlValue === null || controlValue === void 0 ? void 0 : controlValue.filter(function (activity) { return activity.en !== (item === null || item === void 0 ? void 0 : item.en); });
+            var updatedIdList = controlValue === null || controlValue === void 0 ? void 0 : controlValue.filter(function (activity) { return activity.id !== (item === null || item === void 0 ? void 0 : item.id); });
             if (updatedIdList.length >= 1)
                 activitiesControl.field.onChange(updatedIdList);
             return;
@@ -115,17 +115,18 @@ var ActivitiesList = function (_a) {
         activitiesControl.field.onChange(__spreadArray(__spreadArray([], controlValue, true), [item], false));
     };
     var getSelectedActivities = function () {
-        var _a, _b;
         if ((controlValue === null || controlValue === void 0 ? void 0 : controlValue.length) > 1) {
             return (controlValue === null || controlValue === void 0 ? void 0 : controlValue.length) + ' ' + t('activities_selected');
         }
-        return isAr ? (_a = controlValue[0]) === null || _a === void 0 ? void 0 : _a.ar : (_b = controlValue[0]) === null || _b === void 0 ? void 0 : _b.en;
+        var item = controlValue[0];
+        return isAr ? item === null || item === void 0 ? void 0 : item.name.ar : item === null || item === void 0 ? void 0 : item.name.en;
     };
     var getSelectedActivityFlag = function (item) {
-        return controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.en === (item === null || item === void 0 ? void 0 : item.en); });
+        return controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.id === item.id; });
     };
     return (_jsx(Collapse, __assign({ in: (activitiesMenuList === null || activitiesMenuList === void 0 ? void 0 : activitiesMenuList.length) > 0 }, { children: _jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t(isCR ? 'activities' : 'category'), " ", _jsx(MandatoryStyled, { children: "*" })] }), _jsxs(Box, { children: [_jsx(InputStyled, { readOnly: true, value: getSelectedActivities(), placeholder: isCR ? t('choose_activities') : t('category_name'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: activitiesMenuList, onSelectItem: onSelectItem, renderItem: function (item) {
-                                    return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.en) === getSelectedActivityFlag(item) }, { children: isAr ? item === null || item === void 0 ? void 0 : item.ar : item === null || item === void 0 ? void 0 : item.en })) })), getSelectedActivityFlag(item) && _jsx(CheckIconStyled, {})] }));
+                                    var _a, _b, _c;
+                                    return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: item.id === ((_a = getSelectedActivityFlag(item)) === null || _a === void 0 ? void 0 : _a.id) }, { children: isAr ? (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = item === null || item === void 0 ? void 0 : item.name) === null || _c === void 0 ? void 0 : _c.en })) })), getSelectedActivityFlag(item) && _jsx(CheckIconStyled, {})] }));
                                 } }) }))] })] }) })));
 };
 export default ActivitiesList;

package/build/features/business/screens/Activities/SalesChannels.d.ts

@@ -1,5 +1,2 @@
 import * as React from 'react';
 export declare const MandatoryStyled: import("@emotion/styled").StyledComponent<import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
-export declare const CollapseStyled: import("@emotion/styled").StyledComponent<import("../../../../components/Collapse").CollapseProps & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
-declare const SalesChannels: () => JSX.Element;
-export default SalesChannels;

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

@@ -9,104 +9,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import * as React from 'react';
-import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
-import { useTranslation } from 'react-i18next';
-import { useController, useFormContext } from 'react-hook-form';
-import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
-import Text from '../../../../components/Text';
-import { businessSelector, clearError } from '../../../app/business/businessStore';
-import CheckBox from '../../../../components/CheckBox';
-import Warning from '../../../../components/Warning';
-import Collapse from '../../../../components/Collapse';
-import { ScreenContainer } from '../../../shared/Containers';
-var InputLabelStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign({ margin: theme.spacing(2.5, 2.5, 0.5, 2.5), color: alpha(theme.palette.text.primary, 0.4) }, theme.typography.caption));
-});
-var ContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        display: 'flex',
-        flexDirection: 'row',
-        alignItems: 'center',
-        padding: theme.spacing(0, 0.5, 0, 0.5),
-        height: theme.spacing(3.625),
-        marginBlockEnd: theme.spacing(0.2)
-    });
-});
-var TextStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.4), fontWeight: theme.typography.fontWeightLight, whiteSpace: 'pre' }, theme.typography.body2), { marginBlockStart: theme.spacing(1.75) }));
-});
-var CheckBoxStyled = styled(CheckBox)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        marginInlineEnd: theme.spacing(-1),
-        '& .MuiSvgIcon-root': {
-            fontSize: 30
-        },
-        '&.Mui-checked': {
-            color: theme.palette.text.primary,
-            borderRadius: theme.spacing(2.5)
-        }
-    });
-});
 export var MandatoryStyled = styled('span')(function (_a) {
     var theme = _a.theme;
     return (__assign(__assign({ color: alpha(theme.palette.error.light, 0.4) }, theme.typography.h6), { fontWeight: theme.typography.fontWeightLight, verticalAlign: 'sub' }));
 });
-export var CollapseStyled = styled(Collapse)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        marginBlockStart: theme.spacing(2)
-    });
-});
-var SalesChannels = function () {
-    var _a;
-    var _b = React.useState([]), channelsMenuList = _b[0], setChannelsMenuList = _b[1];
-    var t = useTranslation().t;
-    var isAr = useLanguage().isAr;
-    var control = useFormContext().control;
-    var dispatch = useAppDispatch();
-    var channelsControl = useController({ name: 'salesChannels', control: control });
-    var channelsChecked = channelsControl.field.value;
-    var warningMessage = (_a = channelsControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
-    var _c = useAppSelector(businessSelector), data = _c.data, error = _c.error;
-    var channelList = (data.businessTypeData.responseBody || {}).channelList;
-    var salesChannels = (data.activitiesData || {}).salesChannels;
-    React.useEffect(function () {
-        if ((channelList === null || channelList === void 0 ? void 0 : channelList.length) > 0) {
-            setChannelsMenuList(channelList);
-        }
-    }, [channelList]);
-    var handleSalesChannelChange = function (event, checked) {
-        var selected = channelsMenuList.find(function (channel) { return channel.id === event.target.id; });
-        var isExists = channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.find(function (channel) { return channel.id === (selected === null || selected === void 0 ? void 0 : selected.id); });
-        if (isExists) {
-            var updatedIdList = channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.filter(function (channel) { return channel.id !== (selected === null || selected === void 0 ? void 0 : selected.id); });
-            channelsControl.field.onChange(updatedIdList);
-            return;
-        }
-        channelsControl.field.onChange(__spreadArray(__spreadArray([], channelsChecked, true), [selected], false));
-        if (error)
-            dispatch(clearError());
-    };
-    var getSelectedChannelsFlag = function (item) {
-        if (channelsChecked)
-            return !!(channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.find(function (channel) { return channel.id === (item === null || item === void 0 ? void 0 : item.id); }));
-    };
-    return (_jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('channel_of_service'), " ", _jsx(MandatoryStyled, { children: "*" })] }), channelsMenuList.map(function (channel) { return (_jsxs(ContainerStyled, { children: [_jsx(CheckBoxStyled, { id: channel.id, disableRipple: true, disableFocusRipple: true, focusRipple: false, disabled: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.find(function (c) { return c.id === (channel === null || channel === void 0 ? void 0 : channel.id); })) ? true : false, checked: getSelectedChannelsFlag(channel), onChange: handleSalesChannelChange }), _jsxs(TextStyled, { children: [isAr ? channel.name.ar : channel.name.en, " "] })] }, channel.id)); }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(warningMessage) })) }))] }));
-};
-export default SalesChannels;

package/build/features/business/screens/Activities/validation.d.ts

@@ -16,23 +16,6 @@ export declare const ActivitiesValidationSchema: yup.ObjectSchema<import("yup/li
         ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     }>>[] | undefined>;
-    salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>[] | undefined>;
     operationStartDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     activities: yup.ArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -51,23 +34,6 @@ export declare const ActivitiesValidationSchema: yup.ObjectSchema<import("yup/li
         ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     }>>[] | undefined>;
-    salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>[] | undefined>;
     operationStartDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     activities: yup.ArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -86,22 +52,5 @@ export declare const ActivitiesValidationSchema: yup.ObjectSchema<import("yup/li
         ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     }>>[] | undefined>;
-    salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        name_ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    }>>[] | undefined>;
     operationStartDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>>;

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

@@ -4,14 +4,5 @@ export var ActivitiesValidationSchema = yup.object().shape({
         ar: yup.string(),
         en: yup.string()
     })),
-    salesChannels: yup
-        .array()
-        .min(1, 'choose_atleast_one_channel')
-        .of(yup.object().shape({
-        id: yup.string(),
-        name_en: yup.string(),
-        name_ar: yup.string()
-    }))
-        .required('choose_atleast_one_channel'),
     operationStartDate: yup.string().required('choose_any_business_date')
 });

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

@@ -85,7 +85,15 @@ var Merchant = function (_a) {
             setUserType(ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND);
             methods.clearErrors();
             setTimeout(function () {
-                var sites = { website: '', twitter: '', instagram: '' };
+                var sites = {
+                    website: '',
+                    twitter: '',
+                    instagram: '',
+                    apple_store: '',
+                    play_store: '',
+                    call_center: '',
+                    physical_store: ''
+                };
                 methods.setValue('brandName', '', { shouldValidate: true });
                 methods.setValue('links', sites);
                 methods.setValue('salesChannels', []);

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

@@ -22,7 +22,7 @@ import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
 import { isKW } from '../../../../utils';
@@ -94,6 +94,9 @@ var Mobile = function (_a) {
             methods.setValue('countryCode', data.mobileData.countryCode);
         }
     }, [data.mobileData]);
+    React.useEffect(function () {
+        dispatch(resetOTPScreen());
+    }, []);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());

package/build/features/entity/screens/EntityInfoConfirm/ActivitiesList.js

@@ -111,10 +111,10 @@ var ActivitiesList = function (_a) {
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
     var onSelectItem = function (item) {
-        var isActivityExists = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.en === (item === null || item === void 0 ? void 0 : item.en); });
-        var storedActivity = storedActivities === null || storedActivities === void 0 ? void 0 : storedActivities.find(function (activity) { return activity.en === (item === null || item === void 0 ? void 0 : item.en); });
+        var isActivityExists = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.id === (item === null || item === void 0 ? void 0 : item.id); });
+        var storedActivity = storedActivities === null || storedActivities === void 0 ? void 0 : storedActivities.find(function (activity) { return activity.id === (item === null || item === void 0 ? void 0 : item.id); });
         if (isActivityExists && !storedActivity) {
-            var updatedIdList = controlValue === null || controlValue === void 0 ? void 0 : controlValue.filter(function (activity) { return activity.en !== (item === null || item === void 0 ? void 0 : item.en); });
+            var updatedIdList = controlValue === null || controlValue === void 0 ? void 0 : controlValue.filter(function (activity) { return activity.id !== (item === null || item === void 0 ? void 0 : item.id); });
             if (updatedIdList.length >= 1)
                 activitiesControl.field.onChange(updatedIdList);
             return;
@@ -130,10 +130,11 @@ var ActivitiesList = function (_a) {
         return isAr ? (_a = controlValue[0]) === null || _a === void 0 ? void 0 : _a.ar : (_b = controlValue[0]) === null || _b === void 0 ? void 0 : _b.en;
     };
     var getSelectedActivityFlag = function (item) {
-        return controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.en === (item === null || item === void 0 ? void 0 : item.en); });
+        return controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.id === (item === null || item === void 0 ? void 0 : item.id); });
     };
     return (_jsx(Collapse, __assign({ in: (activitiesMenuList === null || activitiesMenuList === void 0 ? void 0 : activitiesMenuList.length) > 0 }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t(isCR ? 'activities' : 'category') }), _jsxs(Box, { children: [_jsx(InputStyled, { readOnly: true, value: getSelectedActivities(), placeholder: isCR ? t('choose_activities') : t('category_name'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: activitiesMenuList, onSelectItem: onSelectItem, renderItem: function (item) {
-                                    return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.en) === getSelectedActivityFlag(item) }, { children: isAr ? item === null || item === void 0 ? void 0 : item.ar : item === null || item === void 0 ? void 0 : item.en })) })), getSelectedActivityFlag(item) && _jsx(CheckIconStyled, {})] }));
+                                    var _a;
+                                    return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === ((_a = getSelectedActivityFlag(item)) === null || _a === void 0 ? void 0 : _a.id) }, { children: isAr ? item === null || item === void 0 ? void 0 : item.name.ar : item === null || item === void 0 ? void 0 : item.name.en })) })), getSelectedActivityFlag(item) && _jsx(CheckIconStyled, {})] }));
                                 } }) }))] })] }) })));
 };
 export default ActivitiesList;

package/package.json

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