@tap-payments/auth-jsconnect 2.1.61-test → 2.1.62-test

package/build/@types/form.d.ts

@@ -115,4 +115,5 @@ export declare type BusinessDataFormValues = {
     brandName: string;
     licenseNumber: string;
     selectedLicense?: License;
+    termAndConditionChecked?: boolean;
 };

package/build/assets/locales/ar.json

@@ -360,5 +360,6 @@
     "creating_account_description": "This might take a moment...",
     "uploaded_file": "file",
     "prepare_data_title": "Preparing your data",
-    "prepare_data_description": "This might take a moment..."
+    "prepare_data_description": "This might take a moment...",
+    "oops": "Oops"
 }

package/build/assets/locales/en.json

@@ -389,5 +389,6 @@
     "creating_account_description": "This might take a moment...",
     "uploaded_file": "file",
     "prepare_data_title": "Preparing your data",
-    "prepare_data_description": "This might take a moment..."
+    "prepare_data_description": "This might take a moment...",
+    "oops": "Oops"
 }

package/build/constants/assets.d.ts

@@ -37,6 +37,7 @@ export declare const ICONS_NAMES: {
     TAP_LOGO_TEXT_AR: string;
     TAP_LOGO_TEXT_EN: string;
     PACI_VERIFY_ICON: string;
+    EXPRESS_ERROR_ICON: string;
     TAP_EN: string;
     TAP_AR: string;
     ID_IMAGE: string;

package/build/constants/assets.js

@@ -37,6 +37,7 @@ export var ICONS_NAMES = {
     TAP_LOGO_TEXT_AR: ICONS_FULL_PATH + '/tap-white-text-ar' + ICONS_EXTENSION,
     TAP_LOGO_TEXT_EN: ICONS_FULL_PATH + '/tap-white-text-en' + ICONS_EXTENSION,
     PACI_VERIFY_ICON: ICONS_FULL_PATH + '/PACI_verify_icon' + '.png',
+    EXPRESS_ERROR_ICON: ICONS_FULL_PATH + '/EXPRESS_error_icon' + '.svg',
     TAP_EN: 'https://tap-connecet.b-cdn.net/imgs/tapEN' + ICONS_EXTENSION,
     TAP_AR: 'https://tap-connecet.b-cdn.net/imgs/tapAR' + ICONS_EXTENSION,
     ID_IMAGE: 'https://villageofwarwick.org/wp-content/uploads/2020/02/ICON99-512-1.png',

package/build/features/app/connectExpress/connectExpressStore.d.ts

@@ -78,6 +78,7 @@ interface ResponseData {
 }
 export interface ConnectExpressData {
     isLeadIdPassed: boolean;
+    showBoard: boolean;
     postURL: string;
     mobileData: MobileFormValues;
     nidData: NIDFormValues;
@@ -95,6 +96,7 @@ export interface ConnectExpressState extends SharedState<ConnectExpressData & Re
 }
 export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectExpressState, {
     setLeadId(state: ConnectExpressState, action: ActionState<string>): void;
+    setShowBoard(state: ConnectExpressState, action: ActionState<boolean>): void;
     setIsLeadIdPassed: (state: ConnectExpressState, action: ActionState<boolean>) => void;
     clearError: (state: ConnectExpressState) => void;
     setError(state: ConnectExpressState, action: ActionState<string>): void;
@@ -107,7 +109,7 @@ export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectExpre
     resetStore: (state: ConnectExpressState) => void;
     resetIndividualScreen: (state: ConnectExpressState) => void;
 }, "connectExpress/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setIsLeadIdPassed: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPValue: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setPostUrl: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setIsLeadIdPassed: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPValue: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setPostUrl: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setShowBoard: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("redux").Reducer<ConnectExpressState, import("redux").AnyAction>;
 export default _default;
 export declare const connectExpressSelector: (state: RootState) => ConnectExpressState;

package/build/features/app/connectExpress/connectExpressStore.js

@@ -235,13 +235,13 @@ export var createCivilIdAuthAsync = createAsyncThunk('connectExpress/createCivil
     });
 }); });
 export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileOtpAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, otpData, _c, auth_token, device_token, service_name, payload, data, isSaudi, next;
+    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, mobileData, _c, auth_token, device_token, service_name, payload, data, isSaudi, next;
     var _d, _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
-                _b = connectExpress.data || {}, responseData = _b.responseData, leadId = _b.leadId, isLeadIdPassed = _b.isLeadIdPassed, otpData = _b.otpData;
+                _b = connectExpress.data || {}, responseData = _b.responseData, leadId = _b.leadId, isLeadIdPassed = _b.isLeadIdPassed, mobileData = _b.mobileData;
                 if (!(responseData === null || responseData === void 0 ? void 0 : responseData.authData))
                     throw new Error('Auth data is missing');
                 _c = responseData.authData, auth_token = _c.auth_token, device_token = _c.device_token, service_name = _c.service_name;
@@ -253,7 +253,7 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                     device_token: device_token,
                     service_name: service_name,
                     sign_in: false,
-                    terms: ['general'],
+                    terms: isLeadIdPassed && mobileData.termAndConditionChecked ? ['general'] : undefined,
                     step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE,
                     encryption_contract: ['data']
                 };
@@ -272,13 +272,13 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
     });
 }); });
 export var verifyNIDOtpAsync = createAsyncThunk('connectExpress/verifyNIDOtpAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, _b, responseData, leadId, _c, auth_token, device_token, service_name, payload, data, stepName, needToCollectMoreInfo, creatingAccount;
+    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, nidData, _c, auth_token, device_token, service_name, payload, data, stepName, needToCollectMoreInfo, creatingAccount;
     var _d, _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
-                _b = connectExpress.data || {}, responseData = _b.responseData, leadId = _b.leadId;
+                _b = connectExpress.data || {}, responseData = _b.responseData, leadId = _b.leadId, isLeadIdPassed = _b.isLeadIdPassed, nidData = _b.nidData;
                 if (!(responseData === null || responseData === void 0 ? void 0 : responseData.authData))
                     throw new Error('Auth data is missing');
                 _c = responseData.authData, auth_token = _c.auth_token, device_token = _c.device_token, service_name = _c.service_name;
@@ -290,7 +290,7 @@ export var verifyNIDOtpAsync = createAsyncThunk('connectExpress/verifyNIDOtpAsyn
                     device_token: device_token,
                     service_name: service_name || 'ABSHER',
                     sign_in: false,
-                    terms: ['general'],
+                    terms: isLeadIdPassed && nidData.termAndConditionChecked ? ['general'] : undefined,
                     step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_NID,
                     encryption_contract: ['data']
                 };
@@ -571,15 +571,16 @@ export var updateLeadIndividualAsync = createAsyncThunk('connectExpress/updateLe
     });
 }); });
 export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDataAsync ', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, isNonSA, isFL, id, brandNameBody, payload, data;
-    var _b, _c, _d, _e, _f;
+    var _a, settings, connectExpress, isNonSA, isFL, _b, responseData, isLeadIdPassed, id, brandNameBody, payload, data;
+    var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
                 isNonSA = !isSA(settings.data.businessCountry.iso2);
-                isFL = ((_b = params.selectedLicense) === null || _b === void 0 ? void 0 : _b.type) === BusinessType.FL;
-                id = (((_c = connectExpress.data.responseData) === null || _c === void 0 ? void 0 : _c.leadData) || {}).id;
+                isFL = ((_c = params.selectedLicense) === null || _c === void 0 ? void 0 : _c.type) === BusinessType.FL;
+                _b = connectExpress.data, responseData = _b.responseData, isLeadIdPassed = _b.isLeadIdPassed;
+                id = ((responseData === null || responseData === void 0 ? void 0 : responseData.leadData) || {}).id;
                 brandNameBody = {
                     name: {
                         en: params.brandName,
@@ -594,6 +595,7 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
                     license_type: isFL ? 'freelance' : 'commercial_registration',
                     business_type: (_d = params.selectedLicense) === null || _d === void 0 ? void 0 : _d.type,
                     is_acknowledged: true,
+                    terms_conditions_accepted: !isLeadIdPassed ? params.termAndConditionChecked : undefined,
                     step_name: CONNECT_EXPRESS_STEP_NAMES.UPDATE_LEAD_BRAND_BUSINESS,
                     encryption_contract: ['license_number', 'business_type', 'license_type']
                 };
@@ -611,16 +613,19 @@ var initialState = {
     loading: false,
     customLoading: false,
     data: {
+        showBoard: true,
         isLeadIdPassed: false,
         postURL: '',
         flowName: FlowsTypes.CONNECT_EXPRESS,
         mobileData: {
             countryCode: defaultCountry,
-            mobile: ''
+            mobile: '',
+            termAndConditionChecked: false
         },
         nidData: {
             nid: '',
-            dob: getEighteenYearsAgo()
+            dob: getEighteenYearsAgo(),
+            termAndConditionChecked: false
         },
         civilIdData: {
             civilId: ''
@@ -637,7 +642,8 @@ var initialState = {
         },
         businessData: {
             brandName: '',
-            licenseNumber: ''
+            licenseNumber: '',
+            termAndConditionChecked: false
         }
     }
 };
@@ -648,6 +654,9 @@ export var connectSlice = createSlice({
         setLeadId: function (state, action) {
             state.data.leadId = action.payload;
         },
+        setShowBoard: function (state, action) {
+            state.data.showBoard = action.payload;
+        },
         setIsLeadIdPassed: function (state, action) {
             state.data.isLeadIdPassed = action.payload;
         },
@@ -966,6 +975,6 @@ export var connectSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setPostUrl = _a.setPostUrl, setLeadId = _a.setLeadId, resetIndividualScreen = _a.resetIndividualScreen;
+export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setPostUrl = _a.setPostUrl, setLeadId = _a.setLeadId, setShowBoard = _a.setShowBoard, resetIndividualScreen = _a.resetIndividualScreen;
 export default connectSlice.reducer;
 export var connectExpressSelector = function (state) { return state.connectExpress; };

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

@@ -1,7 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
+import { useAppSelector } from '../../../../hooks';
 import DataLoading from '../../../shared/DataLoading';
+import { bankSelector } from '../../../app/bank/bankStore';
 export var PrepareDataLoading = function () {
-    return _jsx(DataLoading, {});
+    var error = useAppSelector(bankSelector).error;
+    return _jsx(DataLoading, { error: error });
 };
 export default memo(PrepareDataLoading);

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

@@ -1,7 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
+import { useAppSelector } from '../../../../hooks';
 import DataLoading from '../../../shared/DataLoading';
+import { brandSelector } from '../../../app/brand/brandStore';
 export var PrepareDataLoading = function () {
-    return _jsx(DataLoading, {});
+    var error = useAppSelector(brandSelector).error;
+    return _jsx(DataLoading, { error: error });
 };
 export default memo(PrepareDataLoading);

package/build/features/connectExpress/ConnectExpress.d.ts

@@ -3,6 +3,7 @@ import { LibConfig } from '../../@types';
 export interface ConnectExpressLibProps extends LibConfig {
     leadId?: string;
     postURL: string;
+    showBoard?: boolean;
 }
 export declare function ConnectExpressLib(props: ConnectExpressLibProps): JSX.Element;
 export declare function renderConnectExpressLib(config: ConnectExpressLibProps, elementId: string): {

package/build/features/connectExpress/ConnectExpress.js

@@ -27,7 +27,7 @@ import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepSta
 import { handleCurrentActiveScreen, settingsSelector } from '../../app/settings';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
-import { connectExpressSelector, setIsLeadIdPassed, setPostUrl, setLeadId, retrieveLeadIdentityByIdAsync } from '../app/connectExpress/connectExpressStore';
+import { connectExpressSelector, setIsLeadIdPassed, setPostUrl, setLeadId, retrieveLeadIdentityByIdAsync, setShowBoard } from '../app/connectExpress/connectExpressStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
 import { reactElement, isKW } from '../../utils';
@@ -36,7 +36,7 @@ import { connectExpressFeatureScreens } from '../featuresScreens';
 import CustomFooter from '../shared/Footer';
 import Background from '../shared/Background';
 var ConnectExpress = memo(function (_a) {
-    var leadId = _a.leadId, postURL = _a.postURL, props = __rest(_a, ["leadId", "postURL"]);
+    var leadId = _a.leadId, postURL = _a.postURL, showBoard = _a.showBoard, props = __rest(_a, ["leadId", "postURL", "showBoard"]);
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
@@ -49,6 +49,8 @@ var ConnectExpress = memo(function (_a) {
         if (!postURL)
             throw new Error('postURL is required and you ave to pass it in the lib configuration!');
         dispatch(setPostUrl(postURL));
+        if (typeof showBoard === 'boolean')
+            dispatch(setShowBoard(showBoard));
     }, []);
     React.useEffect(function () {
         if (data.isValidOperator && props.open && !settingLoading && leadId) {

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

@@ -25,12 +25,13 @@ import Button from '../../../shared/Button';
 import { KWBusinessDataSchema, BusinessDataSchema } from './validation';
 import LicenseList from './LicenseList';
 import BrandName from './BrandName';
+import TAC from './TAC';
 var CollectBusinessInfo = function (_a) {
     var _b = useAppSelector(connectExpressSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var responseData = data.responseData, businessData = data.businessData;
+    var responseData = data.responseData, businessData = data.businessData, isLeadIdPassed = data.isLeadIdPassed;
     var isBrandNameAvailable = (responseData || {}).isBrandNameAvailable;
-    var selectedLicense = businessData.selectedLicense, licenseNumber = businessData.licenseNumber, brandName = businessData.brandName;
+    var selectedLicense = businessData.selectedLicense, licenseNumber = businessData.licenseNumber, brandName = businessData.brandName, termAndConditionChecked = businessData.termAndConditionChecked;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
@@ -38,11 +39,12 @@ var CollectBusinessInfo = function (_a) {
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
     var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var methods = useForm({
-        resolver: yupResolver(!isSACountry ? KWBusinessDataSchema : BusinessDataSchema),
+        resolver: yupResolver(!isSACountry ? KWBusinessDataSchema(isLeadIdPassed) : BusinessDataSchema(isLeadIdPassed)),
         defaultValues: {
             brandName: brandName,
             selectedLicense: selectedLicense,
-            licenseNumber: licenseNumber
+            licenseNumber: licenseNumber,
+            termAndConditionChecked: termAndConditionChecked
         },
         mode: 'onChange'
     });
@@ -59,7 +61,8 @@ var CollectBusinessInfo = function (_a) {
         var dataValues = {
             brandName: data.brandName,
             selectedLicense: data.selectedLicense,
-            licenseNumber: data.licenseNumber
+            licenseNumber: data.licenseNumber,
+            termAndConditionChecked: data.termAndConditionChecked
         };
         dispatch(updateLeadBusinessDataAsync(dataValues));
     };
@@ -72,6 +75,6 @@ var CollectBusinessInfo = function (_a) {
                             setListActive(true);
                         }, onListClose: function () {
                             setListActive(false);
-                        } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+                        } }), _jsx(TAC, { show: !isLeadIdPassed }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(CollectBusinessInfo);

package/build/features/connectExpress/screens/CollectBusinessInfo/TAC.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+interface TACProps {
+    show: boolean;
+}
+declare const _default: React.MemoExoticComponent<({ show }: TACProps) => JSX.Element>;
+export default _default;

package/build/features/connectExpress/screens/CollectBusinessInfo/TAC.js

@@ -0,0 +1,83 @@
+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, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import Box from '@mui/material/Box';
+import { styled, alpha } from '@mui/material/styles';
+import Link from '@mui/material/Link';
+import { settingsSelector } from '../../../../app/settings';
+import { EXTERNAL_LINKS, TAP_WEBSITE } from '../../../../constants';
+import { useLanguage, useAppSelector } from '../../../../hooks';
+import CheckBox from '../../../../components/CheckBox';
+import Text from '../../../../components/Text';
+import Warning from '../../../../components/Warning';
+import Collapse from '../../../../components/Collapse';
+import { ScreenContainer } from '../../../shared/Containers';
+var TACContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'row',
+        alignItems: 'center',
+        paddingInlineStart: theme.spacing(2.5)
+    });
+});
+var TextStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign({ color: alpha(theme.palette.text.primary, 0.4), fontWeight: theme.typography.fontWeightLight, whiteSpace: 'pre-line', height: 'fit-content' }, theme.typography.body2));
+});
+var LinkStyled = styled(Link)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        color: theme.palette.primary.main,
+        fontWeight: theme.typography.fontWeightMedium,
+        letterSpacing: theme.spacing(0)
+    });
+});
+var CheckboxStyled = styled(CheckBox)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        margin: theme.spacing(0),
+        padding: theme.spacing(0),
+        marginInlineEnd: theme.spacing(1.5),
+        color: theme.palette.primary.main,
+        '& .MuiSvgIcon-root': {
+            fontSize: theme.spacing(3.75)
+        },
+        '&.Mui-checked': {
+            color: theme.palette.text.primary,
+            borderRadius: theme.spacing(2.5)
+        }
+    });
+});
+var CollapseStyled = styled(Collapse)(function () { return ({
+    width: '100%'
+}); });
+var TAC = function (_a) {
+    var _b;
+    var show = _a.show;
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var control = useFormContext().control;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var tacControl = useController({ control: control, name: 'termAndConditionChecked' });
+    var tacChecked = tacControl.field.value;
+    var warningMessage = (_b = tacControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var countryCode = settingsData.businessCountry.iso2.toLowerCase();
+    var handleTACCheckedChange = function (event, checked) {
+        tacControl.field.onChange(checked);
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: [_jsxs(TACContainerStyled, { 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/connectExpress/screens/CollectBusinessInfo/validation.d.ts

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const BusinessDataSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const BusinessDataSchema: (isLeadIdPassed: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     selectedLicense: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
@@ -12,7 +12,7 @@ export declare const BusinessDataSchema: yup.ObjectSchema<import("yup/lib/object
     selectedLicense: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>>;
-export declare const KWBusinessDataSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const KWBusinessDataSchema: (isLeadIdPassed: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     selectedLicense: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;

package/build/features/connectExpress/screens/CollectBusinessInfo/validation.js

@@ -11,69 +11,145 @@ var objectElements = {
     }),
     type: yup.string()
 };
-export var BusinessDataSchema = yup.object().shape({
-    brandName: yup
-        .string()
-        .test({
-        test: function (value) {
-            if ((value === null || value === void 0 ? void 0 : value.length) === 0)
-                return true;
-            if (value && value.length >= 3 && (value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)))
-                return true;
-            return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
-        }
-    })
-        .required('enter_brand_name_english_chars_numbers_space'),
-    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_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
+export var BusinessDataSchema = function (isLeadIdPassed) {
+    if (!isLeadIdPassed) {
+        return yup.object().shape({
+            brandName: yup
+                .string()
+                .test({
+                test: function (value) {
+                    if ((value === null || value === void 0 ? void 0 : value.length) === 0)
+                        return true;
+                    if (value && value.length >= 3 && (value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)))
+                        return true;
+                    return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
+                }
+            })
+                .required('enter_brand_name_english_chars_numbers_space'),
+            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_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
+                    }
+                    return length > FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+                }
+            })
+                .required(''),
+            termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond')
+        });
+    }
+    return yup.object().shape({
+        brandName: yup
+            .string()
+            .test({
+            test: function (value) {
+                if ((value === null || value === void 0 ? void 0 : value.length) === 0)
+                    return true;
+                if (value && value.length >= 3 && (value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)))
+                    return true;
+                return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
             }
-            return length > FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
-        }
-    })
-        .required('')
-});
-export var KWBusinessDataSchema = yup.object().shape({
-    brandName: yup
-        .string()
-        .test({
-        test: function (value) {
-            if ((value === null || value === void 0 ? void 0 : value.length) === 0)
-                return true;
-            if (value && value.length >= 3 && (value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)))
-                return true;
-            return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
-        }
-    })
-        .required('enter_brand_name_english_chars_numbers_space'),
-    selectedLicense: yup.object().shape(objectElements).required(''),
-    licenseNumber: yup
-        .string()
-        .when('selectedLicense', function (selectedLicense) {
-        var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
-        if (!isCR) {
-            return yup.string().optional();
-        }
-        return yup
+        })
+            .required('enter_brand_name_english_chars_numbers_space'),
+        selectedLicense: yup.object().shape(objectElements).required(''),
+        licenseNumber: yup
             .string()
-            .required('')
             .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;
-                return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_kw_max_length' });
+                if (isCR) {
+                    return length > CR_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
+                }
+                return length > FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
             }
+        })
+            .required('')
+    });
+};
+export var KWBusinessDataSchema = function (isLeadIdPassed) {
+    if (!isLeadIdPassed) {
+        return yup.object().shape({
+            brandName: yup
+                .string()
+                .test({
+                test: function (value) {
+                    if ((value === null || value === void 0 ? void 0 : value.length) === 0)
+                        return true;
+                    if (value && value.length >= 3 && (value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)))
+                        return true;
+                    return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
+                }
+            })
+                .required('enter_brand_name_english_chars_numbers_space'),
+            selectedLicense: yup.object().shape(objectElements).required(''),
+            licenseNumber: yup
+                .string()
+                .when('selectedLicense', function (selectedLicense) {
+                var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                if (!isCR) {
+                    return yup.string().optional();
+                }
+                return yup
+                    .string()
+                    .required('')
+                    .test({
+                    test: function (value) {
+                        var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                        if (length === 0)
+                            return true;
+                        return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_kw_max_length' });
+                    }
+                });
+            })
+                .required(''),
+            termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond')
         });
-    })
-        .required('')
-});
+    }
+    return yup.object().shape({
+        brandName: yup
+            .string()
+            .test({
+            test: function (value) {
+                if ((value === null || value === void 0 ? void 0 : value.length) === 0)
+                    return true;
+                if (value && value.length >= 3 && (value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)))
+                    return true;
+                return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
+            }
+        })
+            .required('enter_brand_name_english_chars_numbers_space'),
+        selectedLicense: yup.object().shape(objectElements).required(''),
+        licenseNumber: yup
+            .string()
+            .when('selectedLicense', function (selectedLicense) {
+            var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+            if (!isCR) {
+                return yup.string().optional();
+            }
+            return yup
+                .string()
+                .required('')
+                .test({
+                test: function (value) {
+                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (length === 0)
+                        return true;
+                    return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_kw_max_length' });
+                }
+            });
+        })
+            .required('')
+    });
+};