@tap-payments/auth-jsconnect 2.0.68-test → 2.0.70-test

package/build/api/auth.d.ts

@@ -22,6 +22,7 @@ export declare type CreateAuthBody = {
     auth_type?: number;
     email_url?: string;
     sign_in?: boolean;
+    is_lead?: boolean;
     step_name?: string;
     encryption_contract: Array<string>;
     lang?: LanguageMode;
@@ -33,7 +34,7 @@ export declare type VerifyAuthBody = {
     device_token: string;
     step_name: string;
     service_name: string;
-    new_user: boolean;
+    new_user?: boolean;
     sign_in: boolean;
     encryption_contract: Array<string>;
     remember_me?: boolean;

package/build/features/app/connect/connectStore.d.ts

@@ -22,6 +22,7 @@ export declare const resendOTPNID: import("@reduxjs/toolkit").AsyncThunk<any, vo
 export declare const verifyAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: OTPFormValues;
+    leadData: any;
 }, OTPFormValues, {}>;
 interface verifyPACIParams {
     onSuccess?: () => void | Promise<void>;

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

@@ -76,6 +76,7 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
                         code: params.countryCode.idd_prefix.toString()
                     },
                     sign_in: false,
+                    is_lead: true,
                     step_name: CONNECT_STEP_NAMES.CREATE_AUTH_MOBILE,
                     encryption_contract: ['user_credentail.phone', 'user_credentail.code']
                 };
@@ -104,6 +105,7 @@ export var createCivilIdAuth = createAsyncThunk('createCivilIdAuth', function (p
                         country_code: 'KW'
                     },
                     sign_in: false,
+                    is_lead: true,
                     step_name: CONNECT_STEP_NAMES.CREATE_AUTH_CIVIL_ID,
                     encryption_contract: ['user_credentail.identification_id']
                 };
@@ -132,6 +134,7 @@ export var resendOTPMobile = createAsyncThunk('resendOTPMobile', function (param
                         code: countryCode.idd_prefix.toString()
                     },
                     sign_in: false,
+                    is_lead: true,
                     step_name: CONNECT_STEP_NAMES.CREATE_AUTH_MOBILE,
                     encryption_contract: ['user_credentail.phone', 'user_credentail.code']
                 };
@@ -159,6 +162,7 @@ export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, t
                         country_code: settings.data.businessCountry.iso2
                     },
                     sign_in: false,
+                    is_lead: true,
                     step_name: CONNECT_STEP_NAMES.CREATE_AUTH_NID,
                     encryption_contract: [
                         'user_credentail.country_code',
@@ -194,6 +198,7 @@ export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thu
                         country_code: settings.data.businessCountry.iso2
                     },
                     sign_in: false,
+                    is_lead: true,
                     step_name: CONNECT_STEP_NAMES.CREATE_AUTH_NID,
                     encryption_contract: [
                         'user_credentail.country_code',
@@ -210,7 +215,7 @@ export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thu
     });
 }); });
 export var verifyAuth = createAsyncThunk('verifyAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connect, settings, isAbsher, _b, mobileData, nidData, responseBody, payload, data, params_1, params_2;
+    var _a, connect, settings, isAbsher, _b, mobileData, nidData, responseBody, individualInfo, payload, data, leadData, isNewUser, params_1;
     var _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
@@ -219,13 +224,13 @@ export var verifyAuth = createAsyncThunk('verifyAuth', function (params, thunkAp
                 isAbsher = connect.data.otpData.isAbsher;
                 _b = connect.data, mobileData = _b.mobileData, nidData = _b.nidData;
                 responseBody = (isAbsher ? nidData : mobileData).responseBody;
+                individualInfo = undefined;
                 payload = {
                     data: params.otp,
                     auth_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.auth_token,
                     auth_type: responseBody === null || responseBody === void 0 ? void 0 : responseBody.auth_type,
                     device_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.device_token,
                     service_name: responseBody === null || responseBody === void 0 ? void 0 : responseBody.service_name,
-                    new_user: responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user,
                     sign_in: responseBody === null || responseBody === void 0 ? void 0 : responseBody.sign_in,
                     remember_me: responseBody === null || responseBody === void 0 ? void 0 : responseBody.remember_me,
                     scopes: responseBody === null || responseBody === void 0 ? void 0 : responseBody.scopes,
@@ -237,42 +242,43 @@ export var verifyAuth = createAsyncThunk('verifyAuth', function (params, thunkAp
                 data = (_e.sent()).data;
                 if (!!data.errors) return [3, 5];
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
-                if (!(responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user)) return [3, 2];
-                params_1 = {
-                    leadId: data === null || data === void 0 ? void 0 : data.lead_id,
-                    stepName: 'CONNECT_INDIVIDUAL_STEP'
-                };
-                thunkApi.dispatch(retrieveLead(params_1));
-                return [3, 5];
-            case 2: return [4, thunkApi.dispatch(retrieveBrandList(data === null || data === void 0 ? void 0 : data.individual_id))];
+                return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.lead_id)];
+            case 2:
+                leadData = (_e.sent()).data;
+                individualInfo = leadData;
+                isNewUser = leadData === null || leadData === void 0 ? void 0 : leadData.is_new_individual;
+                return [4, thunkApi.dispatch(retrieveBrandList(individualInfo === null || individualInfo === void 0 ? void 0 : individualInfo.individual_id))];
             case 3:
                 _e.sent();
                 return [4, thunkApi.dispatch(retrieveChannels())];
             case 4:
                 _e.sent();
                 if (!(data === null || data === void 0 ? void 0 : data.lead_id)) {
-                    params_2 = {
+                    params_1 = {
                         individualId: data === null || data === void 0 ? void 0 : data.individual_id,
                         stepName: 'CONNECT_MERCHANT_INFO_STEP'
                     };
-                    thunkApi.dispatch(createLead(params_2));
+                    thunkApi.dispatch(createLead(params_1));
                 }
                 else {
-                    thunkApi.dispatch(handleNextScreenStep('CONNECT_MERCHANT_INFO_STEP'));
+                    isNewUser
+                        ? thunkApi.dispatch(handleNextScreenStep('CONNECT_INDIVIDUAL_STEP'))
+                        : thunkApi.dispatch(handleNextScreenStep('CONNECT_MERCHANT_INFO_STEP'));
                 }
                 _e.label = 5;
-            case 5: return [2, { response: data, formData: params }];
+            case 5: return [2, { response: data, formData: params, leadData: individualInfo }];
         }
     });
 }); });
 export var verifyPACI = createAsyncThunk('verifyPACI', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, responseBody, expiry, interval, maxCalls, response, count, data, isSuccess, leadBody, leadBody;
+    var _a, settings, connect, responseBody, leadBody, expiry, interval, maxCalls, response, count, data, isSuccess, leadBody_1, leadBody_2;
     var _b, _c, _d, _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 responseBody = connect.data.civilIdData.responseBody;
+                leadBody = connect.data.otpData.responseBody;
                 expiry = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.expiry) || 120;
                 interval = 3;
                 maxCalls = Math.floor(expiry / interval);
@@ -288,7 +294,7 @@ export var verifyPACI = createAsyncThunk('verifyPACI', function (params, thunkAp
             case 2:
                 data = _f.sent();
                 response = data;
-                if (count === 1 && (responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) === false) {
+                if (count === 1 && (leadBody === null || leadBody === void 0 ? void 0 : leadBody.is_new_individual) === false) {
                     thunkApi.dispatch(retrieveBrandList(data === null || data === void 0 ? void 0 : data.individual_id));
                     thunkApi.dispatch(retrieveChannels());
                 }
@@ -297,19 +303,19 @@ export var verifyPACI = createAsyncThunk('verifyPACI', function (params, thunkAp
                 return [4, ((_c = params === null || params === void 0 ? void 0 : params.onSuccess) === null || _c === void 0 ? void 0 : _c.call(params))];
             case 3:
                 _f.sent();
-                if ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) && (data === null || data === void 0 ? void 0 : data.lead_id)) {
-                    leadBody = {
+                if ((leadBody === null || leadBody === void 0 ? void 0 : leadBody.is_new_individual) && (data === null || data === void 0 ? void 0 : data.lead_id)) {
+                    leadBody_1 = {
                         leadId: data === null || data === void 0 ? void 0 : data.lead_id,
                         stepName: 'CONNECT_INDIVIDUAL_STEP'
                     };
-                    thunkApi.dispatch(retrieveLead(leadBody));
+                    thunkApi.dispatch(retrieveLead(leadBody_1));
                 }
                 else if (!(data === null || data === void 0 ? void 0 : data.lead_id) && (data === null || data === void 0 ? void 0 : data.individual_id)) {
-                    leadBody = {
+                    leadBody_2 = {
                         individualId: data === null || data === void 0 ? void 0 : data.individual_id,
                         stepName: 'CONNECT_MERCHANT_INFO_STEP'
                     };
-                    thunkApi.dispatch(createLead(leadBody));
+                    thunkApi.dispatch(createLead(leadBody_2));
                 }
                 else
                     thunkApi.dispatch(handleNextScreenStep('CONNECT_MERCHANT_INFO_STEP'));
@@ -432,7 +438,7 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
     });
 }); });
 export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, instagram, twitter, _b, mobileData, nidData, otpData, brandData, isAbsher, responseBody, isExistingUser, isOther, brand, payload, data;
+    var _a, settings, connect, instagram, twitter, _b, otpData, brandData, isAbsher, responseBody, isExistingUser, isOther, brand, payload, data;
     var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     return __generator(this, function (_q) {
         switch (_q.label) {
@@ -440,10 +446,10 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 instagram = !!((_c = params.links) === null || _c === void 0 ? void 0 : _c.instagram) ? "".concat(INSTAGRAM_URL, "/").concat((_d = params.links) === null || _d === void 0 ? void 0 : _d.instagram) : '';
                 twitter = !!((_e = params.links) === null || _e === void 0 ? void 0 : _e.twitter) ? "".concat(TWITTER_URL, "/").concat((_f = params.links) === null || _f === void 0 ? void 0 : _f.twitter) : '';
-                _b = connect.data, mobileData = _b.mobileData, nidData = _b.nidData, otpData = _b.otpData, brandData = _b.brandData;
+                _b = connect.data, otpData = _b.otpData, brandData = _b.brandData;
                 isAbsher = otpData.isAbsher;
-                responseBody = (isAbsher ? nidData : mobileData).responseBody;
-                isExistingUser = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) === false;
+                responseBody = otpData.responseBody;
+                isExistingUser = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.is_new_individual) === false;
                 isOther = !!((_g = params.selectedBrandItem) === null || _g === void 0 ? void 0 : _g.id) ? ((_h = params.selectedBrandItem) === null || _h === void 0 ? void 0 : _h.id) === 'other' : true;
                 brand = __assign({ name: {
                         en: params.brandName,
@@ -526,16 +532,15 @@ export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailabi
     });
 });
 export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, _b, mobileData, nidData, otpData, brandData, isAbsher, responseBody, isExistingUser, leadId, payload, data;
+    var _a, settings, connect, _b, otpData, brandData, responseBody, isExistingUser, leadId, payload, data;
     var _c, _d, _e, _f, _g, _h;
     return __generator(this, function (_j) {
         switch (_j.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
-                _b = connect.data, mobileData = _b.mobileData, nidData = _b.nidData, otpData = _b.otpData, brandData = _b.brandData;
-                isAbsher = otpData.isAbsher;
-                responseBody = (isAbsher ? nidData : mobileData).responseBody;
-                isExistingUser = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) === false;
+                _b = connect.data, otpData = _b.otpData, brandData = _b.brandData;
+                responseBody = otpData.responseBody;
+                isExistingUser = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.is_new_individual) === false;
                 leadId = isExistingUser ? (_c = brandData.responseBody) === null || _c === void 0 ? void 0 : _c.lead_id : (_d = otpData.responseBody) === null || _d === void 0 ? void 0 : _d.lead_id;
                 payload = {
                     lang: settings.data.language,
@@ -743,16 +748,32 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(verifyAuth.fulfilled, function (state, action) {
-            var _a;
+            var _a, _b;
             state.error = null;
-            var _b = action.payload, formData = _b.formData, response = _b.response;
+            var _c = action.payload, formData = _c.formData, response = _c.response, leadData = _c.leadData;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.loading = false;
                 state.error = description;
                 return;
             }
-            state.data.otpData.responseBody = response;
+            var name = leadData.name, contact = leadData.contact, brand = leadData.brand;
+            var _d = contact || {}, email = _d.email, phone = _d.phone;
+            var firstName = (name === null || name === void 0 ? void 0 : name.first) + ' ';
+            var middleName = !!(name === null || name === void 0 ? void 0 : name.middle) ? (name === null || name === void 0 ? void 0 : name.middle) + ' ' : '';
+            var thirdName = !!(name === null || name === void 0 ? void 0 : name.third) ? (name === null || name === void 0 ? void 0 : name.third) + ' ' : '';
+            var lastName = !!(name === null || name === void 0 ? void 0 : name.last) ? name === null || name === void 0 ? void 0 : name.last : '';
+            if (!!name) {
+                var capitalizedName = capitalizeTheFirstLetterOfEachWord(firstName + middleName + thirdName + lastName);
+                state.data.individualData.name = capitalizedName;
+            }
+            if (!!email)
+                state.data.individualData.email = email;
+            if (!!(phone === null || phone === void 0 ? void 0 : phone.number))
+                state.data.individualData.mobile = phone === null || phone === void 0 ? void 0 : phone.number;
+            state.data.brandData.brandName = (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.en;
+            state.data.brandData.links.website = brand === null || brand === void 0 ? void 0 : brand.website;
+            state.data.otpData.responseBody = __assign(__assign({}, response), leadData);
             state.data.otpData.otp = formData.otp;
             state.data.brandData.responseBody = __assign(__assign({}, state.data.brandData.responseBody), response);
         })
@@ -881,7 +902,7 @@ export var connectSlice = createSlice({
             .addCase(checkEmailAvailability.fulfilled, function (state, action) {
             var _a;
             state.error = null;
-            state.data.individualData.responseBody = (_a = action.payload) === null || _a === void 0 ? void 0 : _a.response;
+            state.data.individualData.responseBody = __assign(__assign({}, state.data.individualData.responseBody), (_a = action.payload) === null || _a === void 0 ? void 0 : _a.response);
         })
             .addCase(checkEmailAvailability.pending, function (state) {
             state.error = null;
@@ -939,14 +960,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/validation.d.ts

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

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

@@ -13,7 +13,9 @@ var objectElements = {
 };
 export var LicenseValidationSchema = yup.object().shape({
     selectedLicense: yup.object().shape(objectElements).required(''),
-    licenseNumber: yup.string().test({
+    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;
@@ -26,6 +28,7 @@ export var LicenseValidationSchema = yup.object().shape({
             return length === FL_NUMBER_LENGTH ? true : this.createError({ message: 'fl_max_length' });
         }
     })
+        .required('')
 });
 export var KWLicenseValidationSchema = yup.object().shape({
     selectedLicense: yup.object().shape(objectElements).required(''),

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

@@ -54,8 +54,8 @@ import Input from '../../../shared/Input';
 import { useController, useFormContext } from 'react-hook-form';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
-import { checkEmailAvailability } from '../../../app/connect/connectStore';
-import { useAppDispatch } from '../../../../hooks';
+import { checkEmailAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 import Collapse from '../../../../components/Collapse';
 import { styled } from '@mui/material/styles';
@@ -72,7 +72,9 @@ var cancelToken = null;
 var Email = function (_a) {
     var _b;
     var show = _a.show, fetchingEmail = _a.fetchingEmail, emailChecking = _a.emailChecking;
+    var _c = React.useState(''), storedEmail = _c[0], setStoredEmail = _c[1];
     var dispatch = useAppDispatch();
+    var data = useAppSelector(connectSelector).data;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var emailControl = useController({ name: 'email', control: control });
@@ -93,9 +95,15 @@ var Email = function (_a) {
     var handleEmailChange = function (event) {
         emailControl.field.onChange(event.target.value);
     };
+    React.useEffect(function () {
+        var _a, _b;
+        var email = (_b = (_a = data.otpData.responseBody) === null || _a === void 0 ? void 0 : _a.contact) === null || _b === void 0 ? void 0 : _b.email;
+        if (!!email)
+            setStoredEmail(email);
+    }, [data.otpData.responseBody]);
     React.useEffect(function () {
         var isValid = emailValue && !error && emailValue.length > 3;
-        if (isValid) {
+        if (isValid && emailValue != storedEmail) {
             fetchingEmail(true);
             checkEmail(emailValue);
         }

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

@@ -34,11 +34,11 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var Individual = function (_a) {
-    var _b, _c, _d;
-    var _e = React.useState(false), listActive = _e[0], setListActive = _e[1];
-    var _f = React.useState(false), emailChecking = _f[0], setEmailChecking = _f[1];
+    var _b, _c, _d, _e, _f, _g;
+    var _h = React.useState(false), listActive = _h[0], setListActive = _h[1];
+    var _j = React.useState(false), emailChecking = _j[0], setEmailChecking = _j[1];
     var settingsData = useAppSelector(settingsSelector).data;
-    var _g = useAppSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error;
+    var _k = useAppSelector(connectSelector), data = _k.data, loading = _k.loading, error = _k.error;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
@@ -46,7 +46,7 @@ var Individual = function (_a) {
     var isMobile = data.mobileData.mobile;
     var individualData = data.individualData;
     var methods = useForm({
-        resolver: yupResolver(!isMobile ? IndividualMobileValidation : IndividualValidation),
+        resolver: yupResolver(isMobile ? IndividualValidation : IndividualMobileValidation),
         defaultValues: data.individualData,
         mode: 'onChange'
     });
@@ -82,8 +82,12 @@ var Individual = function (_a) {
         if (((_b = (_a = data.individualData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.is_available) === false)
             methods.setError('email', { message: 'tap_js_email_already_exist' });
     }, [(_c = data.individualData) === null || _c === void 0 ? void 0 : _c.responseBody]);
+    var isLeadEmailAvailable = ((_e = (_d = data.otpData.responseBody) === null || _d === void 0 ? void 0 : _d.contact) === null || _e === void 0 ? void 0 : _e.email) === methods.watch('email');
+    var isEmailValid = ((_f = data.individualData.responseBody) === null || _f === void 0 ? void 0 : _f.is_available) === undefined
+        ? isLeadEmailAvailable
+        : (_g = data.individualData.responseBody) === null || _g === void 0 ? void 0 : _g.is_available;
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
-    var disabled = emailErrChecks || emailChecking || !((_d = data.individualData.responseBody) === null || _d === void 0 ? void 0 : _d.is_available);
+    var disabled = emailErrChecks || emailChecking || !isEmailValid;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { show: !isMobile, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Individual);

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

@@ -63,8 +63,8 @@ import Tooltip from '../../../../components/Tooltip';
 import Collapse from '../../../../components/Collapse';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
-import { checkBrandNameAvailability } from '../../../app/connect/connectStore';
-import { useAppDispatch } from '../../../../hooks';
+import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -100,9 +100,11 @@ var cancelToken = null;
 var BrandName = function (_a) {
     var _b;
     var show = _a.show, brandNameChecking = _a.brandNameChecking, fetchingBrandName = _a.fetchingBrandName;
+    var _c = React.useState(''), storedBrand = _c[0], setStoredBrand = _c[1];
     var dispatch = useAppDispatch();
-    var _c = React.useState(false), isHovered = _c[0], setIsHovered = _c[1];
+    var _d = React.useState(false), isHovered = _d[0], setIsHovered = _d[1];
     var t = useTranslation().t;
+    var data = useAppSelector(connectSelector).data;
     var control = useFormContext().control;
     var brandControl = useController({ control: control, name: 'brandName' });
     var brandNameValue = brandControl.field.value;
@@ -125,8 +127,10 @@ var BrandName = function (_a) {
         brandControl.field.onChange(value);
     };
     React.useEffect(function () {
+        var _a, _b, _c;
         var isValid = brandNameValue && !error && brandNameValue.length > 2;
-        if (isValid) {
+        var brand = (_c = (_b = (_a = data.otpData.responseBody) === null || _a === void 0 ? void 0 : _a.brand) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.en;
+        if (isValid && (brandNameValue === null || brandNameValue === void 0 ? void 0 : brandNameValue.toLowerCase()) != brand) {
             fetchingBrandName(true);
             checkBrand(brandNameValue);
         }

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

@@ -37,7 +37,7 @@ var Merchant = function (_a) {
     var _f = React.useState(false), listActive = _f[0], setListActive = _f[1];
     var _g = useAppSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var isNewUser = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.new_user;
+    var isNewUser = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.is_new_individual;
     var isAbsher = data.otpData.isAbsher;
     var _h = data.brandData.responseBody || {}, brands = _h.brands, channelList = _h.channelList;
     var brandList = brands || [];

package/package.json

@@ -1,129 +1,129 @@
-{
-	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.0.68-test",
-	"description": "connect library, auth",
-	"private": false,
-	"main": "build/index.js",
-	"module": "build/index.js",
-	"types": "build/index.d.ts",
-	"files": [
-		"build",
-		"README.md"
-	],
-	"scripts": {
-		"husky:setup": "npx husky install",
-		"prettier": "prettier --list-different \"src/**/*.{md,mdx,ts,js,tsx,jsx,json}\" *.json *.js",
-		"prettier:fix": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md,css,json}\"  *.json *.js",
-		"lint": "eslint src --color --ext .js,.jsx,.ts,.tsx,.json",
-		"lint:fix": "eslint src --ext .js,.jsx,.ts,.tsx --fix",
-		"start": "cross-env NODE_ENV=development webpack serve",
-		"build": "rm -rf build && cross-env NODE_ENV=production webpack",
-		"copy:files": "copyfiles -u 1 src/**/*.css build/",
-		"tsc:alias": "tsc-alias -p tsconfig.json",
-		"ts:build": "rm -rf build && tsc -p tsconfig.json && tsc-alias -p tsconfig.json && yarn copy:files",
-		"push": "npm publish --access public"
-	},
-	"keywords": [],
-	"author": {
-		"name": "Ahmed Elsharkawy",
-		"email": "a.elsharkawy@tap.company"
-	},
-	"license": "ISC",
-	"devDependencies": {
-		"@babel/core": "^7.18.6",
-		"@babel/preset-env": "^7.18.6",
-		"@babel/preset-react": "^7.18.6",
-		"@babel/preset-typescript": "^7.18.6",
-		"@types/lodash-es": "^4.17.6",
-		"@types/moment-hijri": "^2.1.0",
-		"@types/react": "^18.0.15",
-		"@types/react-calendar": "~3.5.1",
-		"@types/react-dom": "^18.0.6",
-		"@typescript-eslint/eslint-plugin": "^5.30.5",
-		"@typescript-eslint/parser": "^5.30.5",
-		"babel-loader": "^8.2.5",
-		"copyfiles": "^2.4.1",
-		"cross-env": "^7.0.3",
-		"css-loader": "^6.7.1",
-		"css-minimizer-webpack-plugin": "^4.0.0",
-		"eslint": "^8.19.0",
-		"eslint-config-airbnb": "^19.0.4",
-		"eslint-config-prettier": "^8.5.0",
-		"eslint-plugin-import": "^2.26.0",
-		"eslint-plugin-jsx-a11y": "^6.6.0",
-		"eslint-plugin-node": "^11.1.0",
-		"eslint-plugin-prettier": "^4.2.1",
-		"eslint-plugin-react": "^7.30.1",
-		"eslint-plugin-react-hooks": "^4.6.0",
-		"file-loader": "^6.2.0",
-		"fork-ts-checker-webpack-plugin": "^7.2.12",
-		"html-loader": "^3.1.2",
-		"html-webpack-plugin": "^5.5.0",
-		"husky": "^8.0.1",
-		"lint-staged": "^13.0.3",
-		"mini-css-extract-plugin": "^2.6.1",
-		"prettier": "^2.7.1",
-		"sass": "^1.53.0",
-		"sass-loader": "^13.0.2",
-		"style-loader": "^3.3.1",
-		"terser-webpack-plugin": "^5.3.3",
-		"tsc-alias": "^1.6.11",
-		"typescript": "^4.7.4",
-		"webpack": "^5.73.0",
-		"webpack-cli": "^4.10.0",
-		"webpack-dev-server": "^4.9.3",
-		"webpack-merge": "^5.8.0"
-	},
-	"dependencies": {
-		"@emotion/react": "^11.9.3",
-		"@emotion/styled": "^11.9.3",
-		"@fingerprintjs/fingerprintjs": "~3.3.4",
-		"@hookform/resolvers": "^2.9.6",
-		"@mui/icons-material": "^5.8.4",
-		"@mui/material": "^5.8.7",
-		"@reduxjs/toolkit": "^1.8.3",
-		"axios": "^0.27.2",
-		"device-detector-js": "^3.0.3",
-		"i18next": "^21.8.14",
-		"i18next-browser-languagedetector": "^6.1.4",
-		"i18next-http-backend": "^1.4.1",
-		"jsencrypt": "^2.3.1",
-		"lodash-es": "^4.17.21",
-		"lottie-web": "^5.9.6",
-		"moment-hijri": "~2.1.2",
-		"react": "^18.2.0",
-		"react-calendar": "~3.7.0",
-		"react-device-detect": "^2.2.2",
-		"react-dom": "^18.2.0",
-		"react-dropzone": "^14.2.2",
-		"react-hook-form": "^7.33.1",
-		"react-i18next": "^11.18.1",
-		"react-otp-input": "^2.4.0",
-		"react-redux": "^8.0.2",
-		"react-spring-bottom-sheet": "^3.4.1",
-		"yup": "^0.32.11"
-	},
-	"peerDependencies": {
-		"react": "^18.2.0",
-		"react-dom": "^18.2.0"
-	},
-	"lint-staged": {
-		"src/**/*.{ts,tsx,json,js,jsx}": [
-			"yarn run prettier:fix",
-			"yarn run lint",
-			"git add ."
-		]
-	},
-	"browserslist": {
-		"production": [
-			">0.2%",
-			"not dead",
-			"not op_mini all"
-		],
-		"development": [
-			"last 1 chrome version",
-			"last 1 firefox version",
-			"last 1 safari version"
-		]
-	}
-}
+{
+	"name": "@tap-payments/auth-jsconnect",
+	"version": "2.0.70-test",
+	"description": "connect library, auth",
+	"private": false,
+	"main": "build/index.js",
+	"module": "build/index.js",
+	"types": "build/index.d.ts",
+	"files": [
+		"build",
+		"README.md"
+	],
+	"scripts": {
+		"husky:setup": "npx husky install",
+		"prettier": "prettier --list-different \"src/**/*.{md,mdx,ts,js,tsx,jsx,json}\" *.json *.js",
+		"prettier:fix": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md,css,json}\"  *.json *.js",
+		"lint": "eslint src --color --ext .js,.jsx,.ts,.tsx,.json",
+		"lint:fix": "eslint src --ext .js,.jsx,.ts,.tsx --fix",
+		"start": "cross-env NODE_ENV=development webpack serve",
+		"build": "rm -rf build && cross-env NODE_ENV=production webpack",
+		"copy:files": "copyfiles -u 1 src/**/*.css build/",
+		"tsc:alias": "tsc-alias -p tsconfig.json",
+		"ts:build": "rm -rf build && tsc -p tsconfig.json && tsc-alias -p tsconfig.json && yarn copy:files",
+		"push": "npm publish --access public"
+	},
+	"keywords": [],
+	"author": {
+		"name": "Ahmed Elsharkawy",
+		"email": "a.elsharkawy@tap.company"
+	},
+	"license": "ISC",
+	"devDependencies": {
+		"@babel/core": "^7.18.6",
+		"@babel/preset-env": "^7.18.6",
+		"@babel/preset-react": "^7.18.6",
+		"@babel/preset-typescript": "^7.18.6",
+		"@types/lodash-es": "^4.17.6",
+		"@types/moment-hijri": "^2.1.0",
+		"@types/react": "^18.0.15",
+		"@types/react-calendar": "~3.5.1",
+		"@types/react-dom": "^18.0.6",
+		"@typescript-eslint/eslint-plugin": "^5.30.5",
+		"@typescript-eslint/parser": "^5.30.5",
+		"babel-loader": "^8.2.5",
+		"copyfiles": "^2.4.1",
+		"cross-env": "^7.0.3",
+		"css-loader": "^6.7.1",
+		"css-minimizer-webpack-plugin": "^4.0.0",
+		"eslint": "^8.19.0",
+		"eslint-config-airbnb": "^19.0.4",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-import": "^2.26.0",
+		"eslint-plugin-jsx-a11y": "^6.6.0",
+		"eslint-plugin-node": "^11.1.0",
+		"eslint-plugin-prettier": "^4.2.1",
+		"eslint-plugin-react": "^7.30.1",
+		"eslint-plugin-react-hooks": "^4.6.0",
+		"file-loader": "^6.2.0",
+		"fork-ts-checker-webpack-plugin": "^7.2.12",
+		"html-loader": "^3.1.2",
+		"html-webpack-plugin": "^5.5.0",
+		"husky": "^8.0.1",
+		"lint-staged": "^13.0.3",
+		"mini-css-extract-plugin": "^2.6.1",
+		"prettier": "^2.7.1",
+		"sass": "^1.53.0",
+		"sass-loader": "^13.0.2",
+		"style-loader": "^3.3.1",
+		"terser-webpack-plugin": "^5.3.3",
+		"tsc-alias": "^1.6.11",
+		"typescript": "^4.7.4",
+		"webpack": "^5.73.0",
+		"webpack-cli": "^4.10.0",
+		"webpack-dev-server": "^4.9.3",
+		"webpack-merge": "^5.8.0"
+	},
+	"dependencies": {
+		"@emotion/react": "^11.9.3",
+		"@emotion/styled": "^11.9.3",
+		"@fingerprintjs/fingerprintjs": "~3.3.4",
+		"@hookform/resolvers": "^2.9.6",
+		"@mui/icons-material": "^5.8.4",
+		"@mui/material": "^5.8.7",
+		"@reduxjs/toolkit": "^1.8.3",
+		"axios": "^0.27.2",
+		"device-detector-js": "^3.0.3",
+		"i18next": "^21.8.14",
+		"i18next-browser-languagedetector": "^6.1.4",
+		"i18next-http-backend": "^1.4.1",
+		"jsencrypt": "^2.3.1",
+		"lodash-es": "^4.17.21",
+		"lottie-web": "^5.9.6",
+		"moment-hijri": "~2.1.2",
+		"react": "^18.2.0",
+		"react-calendar": "~3.7.0",
+		"react-device-detect": "^2.2.2",
+		"react-dom": "^18.2.0",
+		"react-dropzone": "^14.2.2",
+		"react-hook-form": "^7.33.1",
+		"react-i18next": "^11.18.1",
+		"react-otp-input": "^2.4.0",
+		"react-redux": "^8.0.2",
+		"react-spring-bottom-sheet": "^3.4.1",
+		"yup": "^0.32.11"
+	},
+	"peerDependencies": {
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0"
+	},
+	"lint-staged": {
+		"src/**/*.{ts,tsx,json,js,jsx}": [
+			"yarn run prettier:fix",
+			"yarn run lint",
+			"git add ."
+		]
+	},
+	"browserslist": {
+		"production": [
+			">0.2%",
+			"not dead",
+			"not op_mini all"
+		],
+		"development": [
+			"last 1 chrome version",
+			"last 1 firefox version",
+			"last 1 safari version"
+		]
+	}
+}