@tap-payments/auth-jsconnect 2.0.67-test → 2.0.69-test

package/build/features/app/business/businessStore.js

@@ -61,7 +61,7 @@ import API from '../../../api';
 import { BusinessType, FlowsTypes } from '../../../@types';
 import { BUSINESS_FLOW_SUCCESS, BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
 import { convertNumbers2English, getEighteenYearsAgo, hasKey, sleep, isKW } from '../../../utils';
-import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
+import { handleNextScreenStep } from '../../../app/settings';
 export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse, brandInfo, boardResponse, countryIso2, board_id, board_info_id, steps, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted;
     var _a, _b, _c, _d, _e, _f, _g;
@@ -83,7 +83,6 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
             case 2:
                 leadResponse = _h.sent();
                 countryIso2 = (_a = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _a === void 0 ? void 0 : _a.country_code;
-                thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
                 board_id = (_b = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _b === void 0 ? void 0 : _b.board_id;
                 board_info_id = (_c = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _c === void 0 ? void 0 : _c.board_info_id;
                 if (!(!!board_id && !!board_info_id)) return [3, 4];
@@ -440,7 +439,6 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
                     business: { ar: params.entityLegalName, en: params.entityLegalName },
                     encryption_contract: ['license_number', 'business_type', 'license_type']
                 };
-                console.log(payload, 'payload', params.entityLegalName);
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = _h.sent();

package/build/features/app/connect/connectStore.js

@@ -939,14 +939,20 @@ export var connectSlice = createSlice({
             var isHasWebsite = (website === null || website === void 0 ? void 0 : website.length) > 0;
             var isHasTwitter = social === null || social === void 0 ? void 0 : social.find(function (s) { return s.includes('twitter.com'); });
             var isHasInstagram = social === null || social === void 0 ? void 0 : social.find(function (s) { return s.includes('instagram.com'); });
-            var websiteData = channels === null || channels === void 0 ? void 0 : channels.find(function (c) { return c.id.toLocaleLowerCase() === 'website'; });
-            var socialData = channels === null || channels === void 0 ? void 0 : channels.find(function (c) { var _a; return ((_a = c.name) === null || _a === void 0 ? void 0 : _a.en.toLocaleLowerCase()) === 'social'; });
-            if (isHasWebsite && (isHasTwitter || isHasInstagram))
-                selectedChannels = [websiteData, socialData];
-            else if (isHasTwitter || isHasInstagram)
-                selectedChannels = [socialData];
-            else if (isHasWebsite)
-                selectedChannels = [websiteData];
+            var websiteData = channels === null || channels === void 0 ? void 0 : channels.find(function (c) { var _a, _b, _c; return (_c = (_b = (_a = c.name) === null || _a === void 0 ? void 0 : _a.en) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === null || _c === void 0 ? void 0 : _c.includes('website'); });
+            var socialData = channels === null || channels === void 0 ? void 0 : channels.find(function (c) { var _a, _b, _c; return (_c = (_b = (_a = c.name) === null || _a === void 0 ? void 0 : _a.en) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === null || _c === void 0 ? void 0 : _c.includes('social'); });
+            if (isHasWebsite && (isHasTwitter || isHasInstagram)) {
+                if (websiteData)
+                    selectedChannels.push(websiteData);
+                if (socialData)
+                    selectedChannels.push(socialData);
+            }
+            else if ((isHasTwitter || isHasInstagram) && socialData) {
+                selectedChannels.push(socialData);
+            }
+            else if (isHasWebsite && websiteData) {
+                selectedChannels.push(websiteData);
+            }
             state.data.brandData.salesChannels = selectedChannels;
         })
             .addCase(retrieveChannels.rejected, function (state, action) {

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

@@ -15,23 +15,25 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import { useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { businessSelector, clearError, updateLeadBusinessType } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
-import { LicenseValidationSchema } from './validation';
+import { KWLicenseValidationSchema, LicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
+import { isKW } from '../../../../utils';
 var BusinessType = function (_a) {
     var _b = useAppSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var settingData = useAppSelector(settingsSelector).data;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var _c = React.useState(false), listActive = _c[0], setListActive = _c[1];
     var methods = useForm({
-        resolver: yupResolver(LicenseValidationSchema),
+        resolver: yupResolver(isKW(settingData.businessCountry.iso2) ? KWLicenseValidationSchema : LicenseValidationSchema),
         defaultValues: data.businessTypeData,
         mode: 'onChange'
     });

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

@@ -10,7 +10,6 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import Input from '../../../shared/Input';
@@ -18,6 +17,19 @@ import Collapse from '../../../../components/Collapse';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
+import { styled } from '@mui/material/styles';
+import Box from '@mui/material/Box';
+var BoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'column',
+        direction: theme.direction,
+        fontFamily: theme.typography.fontFamily,
+        overflow: 'hidden',
+        paddingBlockEnd: theme.spacing(2.5)
+    });
+});
 var EntityName = function (_a) {
     var _b;
     var show = _a.show;
@@ -34,6 +46,6 @@ var EntityName = function (_a) {
     var clearEntityName = function () {
         entityNameControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { pb: 2.5 } }, { children: _jsx(Input, { label: t('entity_legal_name_title'), onChange: handleChange, value: entityNameValue, endAdornment: (entityNameValue === null || entityNameValue === void 0 ? void 0 : entityNameValue.length) >= 3 ? _jsx(CheckIcon, {}) : entityNameValue && _jsx(ClearIcon, { onClick: clearEntityName }), placeholder: t('entity_legal_name_placeholder'), warningType: 'alert', warningMessage: error && t(error) }) })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(BoxStyled, { children: _jsx(Input, { label: t('entity_legal_name_title'), onChange: handleChange, value: entityNameValue, endAdornment: (entityNameValue === null || entityNameValue === void 0 ? void 0 : entityNameValue.length) >= 3 ? _jsx(CheckIcon, {}) : entityNameValue && _jsx(ClearIcon, { onClick: clearEntityName }), placeholder: t('entity_legal_name_placeholder'), warningType: 'alert', warningMessage: error && t(error) }) }) })));
 };
 export default EntityName;

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

@@ -1,5 +1,15 @@
 import * as yup from 'yup';
 export declare const LicenseValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    selectedLicense: any;
+    licenseNumber: 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, {
+    selectedLicense: any;
+    licenseNumber: 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, {
+    selectedLicense: any;
+    licenseNumber: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+}>>>;
+export declare const KWLicenseValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     selectedLicense: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     entityLegalName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;

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

@@ -12,6 +12,22 @@ var objectElements = {
     type: yup.string()
 };
 export var LicenseValidationSchema = yup.object().shape({
+    selectedLicense: yup.object().shape(objectElements).required(''),
+    licenseNumber: yup.string().test({
+        test: function (value) {
+            var selectedLicense = this.parent.selectedLicense;
+            var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+            var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+            if (length === 0)
+                return true;
+            if (isCR) {
+                return length === CR_NUMBER_LENGTH ? true : this.createError({ message: 'cr_max_length' });
+            }
+            return length === FL_NUMBER_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+        }
+    })
+});
+export var KWLicenseValidationSchema = yup.object().shape({
     selectedLicense: yup.object().shape(objectElements).required(''),
     licenseNumber: yup
         .string()

package/package.json

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