@tap-payments/auth-jsconnect 1.0.20 → 1.0.21

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

@@ -110,13 +110,13 @@ export interface AppInfo {
     identifier: string;
     name: string;
     version: string;
-    requirer: string;
-    requirer_version: string;
-    app_locale: string;
-    sdk_version: string;
-    requirer_sim_network_name: string;
-    requirer_sim_country_iso: string;
-    universal_id: string;
+    requirer?: string;
+    requirer_version?: string;
+    app_locale?: string;
+    sdk_version?: string;
+    requirer_sim_network_name?: string;
+    requirer_sim_country_iso?: string;
+    universal_id?: string;
 }
 export interface OSDetails {
     name: string;

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

@@ -7,6 +7,9 @@ export declare type MobileFormValues = {
 export declare type OTPFormValues = {
     otp: string;
 };
+export declare type PasswordFormValues = {
+    password: string;
+};
 export declare type NIDFormValues = {
     nid: string;
     dob: string;

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

@@ -2,6 +2,7 @@ export interface SharedState<T> {
     error: string | null;
     loading: boolean;
     data: T;
+    searchActive?: boolean;
 }
 export interface ActionState<T> {
     type: string;

package/build/api/availabilityServices.d.ts

@@ -0,0 +1,12 @@
+import { AxiosRequestConfig } from 'axios';
+export declare type CheckEmailBody = {
+    email: string | null;
+};
+export declare type CheckBrandBody = {
+    profile_name: string;
+};
+declare const availabilityServices: {
+    checkEmail: (data: CheckEmailBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
+    checkBrand: (data: CheckBrandBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
+};
+export default availabilityServices;

package/build/api/availabilityServices.js

@@ -0,0 +1,13 @@
+import instance from './axios';
+import { ENDPOINT_PATHS } from '../constants';
+var checkEmail = function (data, config) {
+    return instance.post("".concat(ENDPOINT_PATHS.CHECK_EMAIL), data, config);
+};
+var checkBrand = function (data, config) {
+    return instance.post("".concat(ENDPOINT_PATHS.CHECK_BRAND), data, config);
+};
+var availabilityServices = {
+    checkEmail: checkEmail,
+    checkBrand: checkBrand
+};
+export default availabilityServices;

package/build/api/index.d.ts

@@ -1,6 +1,7 @@
 import { ValidateOperatorBody } from './operator';
 import { CreateAuthBody, VerifyAuthBody } from './auth';
 import { UpdateLeadBody } from './lead';
+import { CheckEmailBody, CheckBrandBody } from './availabilityServices';
 declare const API: {
     ipService: {
         getIP: () => Promise<import("axios").AxiosResponse<any, any>>;
@@ -19,6 +20,10 @@ declare const API: {
     leadService: {
         updateLead: (data: UpdateLeadBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
     };
+    availabilityServices: {
+        checkEmail: (data: CheckEmailBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
+        checkBrand: (data: CheckBrandBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
+    };
 };
-export type { ValidateOperatorBody, CreateAuthBody, VerifyAuthBody, UpdateLeadBody };
+export type { ValidateOperatorBody, CreateAuthBody, VerifyAuthBody, UpdateLeadBody, CheckEmailBody, CheckBrandBody };
 export default API;

package/build/api/index.js

@@ -3,11 +3,13 @@ import { operatorService } from './operator';
 import { countryService } from './country';
 import { authService } from './auth';
 import { leadService } from './lead';
+import availabilityServices from './availabilityServices';
 var API = {
     ipService: ipService,
     operatorService: operatorService,
     countryService: countryService,
     authService: authService,
-    leadService: leadService
+    leadService: leadService,
+    availabilityServices: availabilityServices
 };
 export default API;

package/build/app/settings.d.ts

@@ -24,10 +24,10 @@ export declare const settingsSlice: import("@reduxjs/toolkit").Slice<SettingsSta
     handleLanguage: (state: SettingsState, action: ActionState<LanguageMode>) => void;
     handleNextScreenStep: (state: SettingsState, action: ActionState<string | undefined>) => void;
     handleCurrentActiveScreen: (state: SettingsState, action: ActionState<string>) => void;
-    handlePrevScreenStep: (state: SettingsState) => void;
+    handlePrevScreenStep: (state: SettingsState, action: ActionState<string | undefined>) => void;
     handleActiveFlowScreens: (state: SettingsState, action: ActionState<Array<ScreenStepNavigation>>) => void;
 }, "settings">;
-export declare const handleSkin: import("@reduxjs/toolkit").ActionCreatorWithPayload<ThemeMode, string>, handleLanguage: import("@reduxjs/toolkit").ActionCreatorWithPayload<LanguageMode, string>, handleActiveFlowScreens: import("@reduxjs/toolkit").ActionCreatorWithPayload<ScreenStepNavigation[], string>, handleNextScreenStep: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, string>, handlePrevScreenStep: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, handleCurrentActiveScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>;
+export declare const handleSkin: import("@reduxjs/toolkit").ActionCreatorWithPayload<ThemeMode, string>, handleLanguage: import("@reduxjs/toolkit").ActionCreatorWithPayload<LanguageMode, string>, handleActiveFlowScreens: import("@reduxjs/toolkit").ActionCreatorWithPayload<ScreenStepNavigation[], string>, handleNextScreenStep: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, string>, handlePrevScreenStep: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, string>, handleCurrentActiveScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>;
 declare const _default: import("redux").Reducer<SettingsState, import("redux").AnyAction>;
 export default _default;
 export declare const settingsSelector: (state: RootState) => SettingsState;

package/build/app/settings.js

@@ -122,11 +122,21 @@ export var settingsSlice = createSlice({
                 return alert('Active screen not found');
             state.data.activeScreen = activeScreen;
         },
-        handlePrevScreenStep: function (state) {
+        handlePrevScreenStep: function (state, action) {
             var prev = state.data.activeScreen.prev;
+            if (isArray(prev)) {
+                if (!action.payload)
+                    return alert('Previous screen is an array, but no payload was provided');
+                var prevName_1 = findItem(prev, action.payload);
+                var prevScreen_1 = state.data.featureScreensNavigation.find(function (item) { return item.name === prevName_1; });
+                if (!prevScreen_1)
+                    return alert('Previous screen step not found');
+                state.data.activeScreen = prevScreen_1;
+                return;
+            }
             var prevScreen = state.data.featureScreensNavigation.find(function (item) { return item.name === prev; });
             if (!prevScreen)
-                return alert('Prev screen step not found');
+                return alert('Previous screen step not found');
             state.data.activeScreen = prevScreen;
         },
         handleActiveFlowScreens: function (state, action) {

package/build/constants/api.d.ts

@@ -6,4 +6,6 @@ export declare const ENDPOINT_PATHS: {
     OPERATOR: string;
     AUTH: string;
     LEAD: string;
+    CHECK_EMAIL: string;
+    CHECK_BRAND: string;
 };

package/build/constants/api.js

@@ -5,6 +5,8 @@ var IP_PATH = '/ip';
 var OPERATOR_PATH = '/operator';
 var AUTH_PATH = '/auth';
 var LEAD_PATH = '/lead';
+var CHECK_EMAIL = '/lead/identity/emailcheck';
+var CHECK_BRAND = 'lead/profile/profile_name';
 export var ENDPOINT_PATHS = {
     BASE_URL: API_BASE_URL,
     BUSINESS_COUNTRIES: API_BUSINESS_COUNTRIES,
@@ -12,5 +14,7 @@ export var ENDPOINT_PATHS = {
     IP: IP_PATH,
     OPERATOR: OPERATOR_PATH,
     AUTH: AUTH_PATH,
-    LEAD: LEAD_PATH
+    LEAD: LEAD_PATH,
+    CHECK_EMAIL: CHECK_EMAIL,
+    CHECK_BRAND: CHECK_BRAND
 };

package/build/constants/app.js

@@ -26,7 +26,7 @@ export var CONNECT_SCREENS_NAVIGATION = [
     {
         name: 'CONNECT_OTP_STEP',
         next: ['CONNECT_INDIVIDUAL_STEP', 'CONNECT_PASSWORD_STEP'],
-        prev: 'CONNECT_MOBILE_STEP',
+        prev: ['CONNECT_MOBILE_STEP', 'CONNECT_NID_STEP'],
         order: 2
     },
     {

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

@@ -1,25 +1,36 @@
 import { RootState } from '../../../app/store';
-import { ResponseData, CountryCode, MobileFormValues, NIDFormValues, OTPFormValues, IndividualFormValues, SharedState, BrandFormValues } from '../../../@types';
+import { ResponseData, CountryCode, MobileFormValues, NIDFormValues, OTPFormValues, IndividualFormValues, SharedState, BrandFormValues, PasswordFormValues } from '../../../@types';
 export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
     businessCountries: any;
     countries: any;
 }, void, {}>;
 export declare const createMobileAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
-    formData: MobileFormValues;
-}, MobileFormValues, {}>;
+    formData: MobileFormValues & {
+        isResend: boolean;
+    };
+}, MobileFormValues & {
+    isResend: boolean;
+}, {}>;
 export declare const createNIDAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: {
         type: string;
         nid: string;
         dob: string;
+        isResend: boolean;
     };
-}, NIDFormValues, {}>;
+}, NIDFormValues & {
+    isResend: boolean;
+}, {}>;
 export declare const verifyAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: OTPFormValues;
 }, OTPFormValues, {}>;
+export declare const verifyAuthPassword: import("@reduxjs/toolkit").AsyncThunk<{
+    response: any;
+    formData: PasswordFormValues;
+}, PasswordFormValues, {}>;
 export declare const updateLeadIndividual: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: IndividualFormValues;
@@ -28,6 +39,14 @@ export declare const updateLeadBrand: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: BrandFormValues;
 }, BrandFormValues, {}>;
+export declare const checkEmailAvailability: import("@reduxjs/toolkit").AsyncThunk<{
+    response: any;
+    formData: string;
+} | undefined, string, {}>;
+export declare const checkBrandNameAvailability: import("@reduxjs/toolkit").AsyncThunk<{
+    response: any;
+    formData: string;
+} | undefined, string, {}>;
 export declare const updateLeadSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
@@ -42,6 +61,7 @@ export interface ConnectData {
     otpData: OTPFormValues & ResponseData & {
         isAbsher: boolean;
     };
+    passwordData: PasswordFormValues & ResponseData;
     individualData: IndividualFormValues & ResponseData;
     brandData: BrandFormValues & ResponseData;
 }

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

@@ -93,7 +93,7 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
                 data = (_a.sent()).data;
-                if (!data.errors)
+                if (!data.errors && !params.isResend)
                     thunkApi.dispatch(handleNextScreenStep());
                 return [2, { response: data, formData: params }];
         }
@@ -121,7 +121,7 @@ export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, t
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
                 data = (_b.sent()).data;
-                if (!data.errors)
+                if (!data.errors && !params.isResend)
                     thunkApi.dispatch(handleNextScreenStep());
                 return [2, { response: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
         }
@@ -156,16 +156,43 @@ export var verifyAuth = createAsyncThunk('verifyAuth', function (params, thunkAp
                         thunkApi.dispatch(handleNextScreenStep('CONNECT_INDIVIDUAL_STEP'));
                     }
                     else {
-                        if (responseBody === null || responseBody === void 0 ? void 0 : responseBody.sign_in)
-                            thunkApi.dispatch(handleNextScreenStep('CONNECT_PASSWORD_STEP'));
-                        else
-                            alert('Need to implement this flow');
+                        thunkApi.dispatch(handleNextScreenStep('CONNECT_PASSWORD_STEP'));
                     }
                 }
                 return [2, { response: data, formData: params }];
         }
     });
 }); });
+export var verifyAuthPassword = createAsyncThunk('verifyAuthPassword', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var connect, isAbsher, responseBody, payload, data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                connect = thunkApi.getState().connect;
+                isAbsher = connect.data.otpData.isAbsher;
+                responseBody = (isAbsher ? connect.data.nidData : connect.data.mobileData).responseBody;
+                payload = {
+                    data: params.password,
+                    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: true,
+                    remember_me: responseBody === null || responseBody === void 0 ? void 0 : responseBody.remember_me,
+                    scopes: responseBody === null || responseBody === void 0 ? void 0 : responseBody.scopes,
+                    step_name: CONNECT_STEP_NAMES.VERIFY_AUTH_PASSWORD,
+                    encryption_contract: []
+                };
+                return [4, API.authService.verifyAuth(payload)];
+            case 1:
+                data = (_a.sent()).data;
+                if (!data.errors)
+                    thunkApi.dispatch(handleNextScreenStep());
+                return [2, { response: data, formData: params }];
+        }
+    });
+}); });
 export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connect, isAbsher, headers, payload, data;
     var _b, _c, _d;
@@ -235,6 +262,52 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
         }
     });
 }); });
+export var checkEmailAvailability = createAsyncThunk('checkEmailAvailability', function (email, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connect, headers, requestBody, data;
+    var _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
+                headers = {
+                    lead_id: (_b = connect.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.lead_id,
+                    device_identifier: (_d = (_c = settings.data.deviceInfo) === null || _c === void 0 ? void 0 : _c.browser) === null || _d === void 0 ? void 0 : _d.browser_id
+                };
+                requestBody = {
+                    email: email
+                };
+                return [4, API.availabilityServices.checkEmail(requestBody, { headers: headers })];
+            case 1:
+                data = (_e.sent()).data;
+                if (!data.errors)
+                    return [2, { response: data, formData: email }];
+                return [2];
+        }
+    });
+}); });
+export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailability', function (brandName, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connect, headers, requestBody, data;
+    var _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
+                headers = {
+                    lead_id: ((_b = connect.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.lead_id) || '',
+                    device_identifier: (_d = (_c = settings.data.deviceInfo) === null || _c === void 0 ? void 0 : _c.browser) === null || _d === void 0 ? void 0 : _d.browser_id
+                };
+                requestBody = {
+                    profile_name: brandName
+                };
+                return [4, API.availabilityServices.checkBrand(requestBody, { headers: headers })];
+            case 1:
+                data = (_e.sent()).data;
+                if (!data.errors)
+                    return [2, { response: data, formData: brandName }];
+                return [2];
+        }
+    });
+}); });
 export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connect, headers, payload, data;
     var _b, _c, _d;
@@ -265,6 +338,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
 var initialState = {
     error: null,
     loading: false,
+    searchActive: false,
     data: {
         countries: [],
         businessCountries: [],
@@ -282,6 +356,9 @@ var initialState = {
             otp: '',
             isAbsher: false
         },
+        passwordData: {
+            password: ''
+        },
         individualData: {
             name: '',
             email: '',
@@ -391,6 +468,27 @@ export var connectSlice = createSlice({
             .addCase(verifyAuth.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(verifyAuthPassword.fulfilled, function (state, action) {
+            var _a;
+            state.loading = false;
+            state.error = null;
+            var _b = action.payload, formData = _b.formData, response = _b.response;
+            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || []).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            state.data.passwordData.password = formData.password;
+            state.data.passwordData.responseBody = response;
+        })
+            .addCase(verifyAuthPassword.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(verifyAuthPassword.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(updateLeadIndividual.fulfilled, function (state, action) {
             var _a;
@@ -433,6 +531,34 @@ export var connectSlice = createSlice({
             .addCase(updateLeadBrand.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(checkEmailAvailability.fulfilled, function (state, action) {
+            var _a;
+            state.searchActive = false;
+            state.error = null;
+            state.data.individualData.responseBody = (_a = action.payload) === null || _a === void 0 ? void 0 : _a.response;
+        })
+            .addCase(checkEmailAvailability.pending, function (state) {
+            state.searchActive = true;
+            state.error = null;
+        })
+            .addCase(checkEmailAvailability.rejected, function (state, action) {
+            state.searchActive = false;
+            state.error = action.error.message;
+        })
+            .addCase(checkBrandNameAvailability.fulfilled, function (state, action) {
+            var _a;
+            state.searchActive = false;
+            state.error = null;
+            state.data.brandData.responseBody = (_a = action.payload) === null || _a === void 0 ? void 0 : _a.response;
+        })
+            .addCase(checkBrandNameAvailability.pending, function (state) {
+            state.searchActive = true;
+            state.error = null;
+        })
+            .addCase(checkBrandNameAvailability.rejected, function (state, action) {
+            state.searchActive = false;
+            state.error = action.error.message;
         })
             .addCase(updateLeadSuccess.fulfilled, function (state, action) {
             var _a;

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

@@ -7,14 +7,23 @@ import { keepEmailCharacters } from '../../../../utils';
 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 { debounce } from 'lodash-es';
 var Email = function (_a) {
     var _b;
+    var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var control = useFormContext().control;
     var emailControl = useController({ name: 'email', control: control });
+    var checkEmail = debounce(function (value) {
+        dispatch(checkEmailAvailability(value));
+    }, 500);
     var handleEmailChange = function (event) {
         var value = keepEmailCharacters(event.target.value);
         emailControl.field.onChange(value);
+        if (!!value)
+            checkEmail(value);
     };
     var emailValue = emailControl.field.value;
     var error = (_b = emailControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;

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

@@ -33,10 +33,10 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var Individual = function (_a) {
-    var _b;
-    var _c = React.useState(9), mobileLength = _c[0], setMobileLength = _c[1];
+    var _b, _c;
+    var _d = React.useState(9), mobileLength = _d[0], setMobileLength = _d[1];
     var dispatch = useAppDispatch();
-    var _d = useSelector(connectSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var _e = useSelector(connectSelector), data = _e.data, loading = _e.loading, error = _e.error, searchActive = _e.searchActive;
     var isAbsher = (_b = data.otpData) === null || _b === void 0 ? void 0 : _b.isAbsher;
     var methods = useForm({
         resolver: yupResolver(isAbsher ? IndividualMobileValidation(mobileLength) : IndividualValidation()),
@@ -53,9 +53,14 @@ var Individual = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        var _a, _b;
+        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 t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var disabled = !methods.formState.isValid || !!error;
+    var disabled = !methods.formState.isValid || !!methods.formState.errors.email || !!error || searchActive;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, {}), _jsx(MobileNumber, { setMobileLength: setMobileLength, show: isAbsher, countries: countriesCode }), _jsx(Email, {}), _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

@@ -24,6 +24,9 @@ import ClearIcon from '../../../shared/ClearIcon';
 import Tooltip from '../../../../components/Tooltip';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
+import { checkBrandNameAvailability } from '../../../app/connect/connectStore';
+import { useAppDispatch } from '../../../../hooks';
+import { debounce } from 'lodash-es';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -56,14 +59,20 @@ var InfoIconStyled = styled(InfoIcon)(function (_a) {
 });
 var BrandName = function (_a) {
     var _b;
+    var dispatch = useAppDispatch();
     var _c = React.useState(false), isHovered = _c[0], setIsHovered = _c[1];
     var t = useTranslation().t;
     var control = useFormContext().control;
     var brandControl = useController({ control: control, name: 'brandName' });
+    var checkBrand = debounce(function (value) {
+        dispatch(checkBrandNameAvailability(value));
+    }, 500);
     var handleBrandNameChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanCharsNumbersAndSpace(target.value);
         brandControl.field.onChange(value);
+        if (!!value)
+            checkBrand(value);
     };
     var clearBrandName = function () {
         brandControl.field.onChange('');

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

@@ -27,7 +27,8 @@ import BrandName from './BrandName';
 import SocialMedia from './SocialMedia';
 import TAC from './TAC';
 var Merchant = function (_a) {
-    var _b = useSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _b;
+    var _c = useSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error, searchActive = _c.searchActive;
     var methods = useForm({
         resolver: yupResolver(MerchantValidationSchema),
         defaultValues: data.brandData,
@@ -46,7 +47,12 @@ var Merchant = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    var disabled = !methods.formState.isValid || !!error;
+    React.useEffect(function () {
+        var _a, _b;
+        if (((_b = (_a = data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.response_code) == '5')
+            methods.setError('brandName', { message: 'Profile Name already exists' });
+    }, [(_b = data.brandData) === null || _b === void 0 ? void 0 : _b.responseBody]);
+    var disabled = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error || searchActive;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, {}), _jsx(SocialMedia, {}), _jsx(TAC, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(Merchant);

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

@@ -74,10 +74,11 @@ var ListType;
     ListType["CountryCodeList"] = "CountryCodeList";
 })(ListType || (ListType = {}));
 var Mobile = function (_a) {
-    var _b = React.useState(10), mobileLength = _b[0], setMobileLength = _b[1];
-    var _c = React.useState(), listType = _c[0], setListType = _c[1];
-    var dispatch = useAppDispatch();
+    var _b, _c;
     var _d = useSelector(connectSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var _e = React.useState((_c = (_b = data.mobileData) === null || _b === void 0 ? void 0 : _b.countryCode) === null || _c === void 0 ? void 0 : _c.digits), mobileLength = _e[0], setMobileLength = _e[1];
+    var _f = React.useState(), listType = _f[0], setListType = _f[1];
+    var dispatch = useAppDispatch();
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema(mobileLength)),
         defaultValues: data.mobileData,
@@ -94,7 +95,7 @@ var Mobile = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
-        dispatch(createMobileAuth(formData));
+        dispatch(createMobileAuth(__assign(__assign({}, formData), { isResend: false })));
     };
     var onAbsherButtonClicked = function () {
         dispatch(handleCurrentActiveScreen('CONNECT_NID_STEP'));

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

@@ -47,7 +47,7 @@ var NID = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
-        dispatch(createNIDAuth(data));
+        dispatch(createNIDAuth(__assign(__assign({}, data), { isResend: false })));
     };
     var handleCollapseOpenClose = function (flag) {
         setCollapse(flag);

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

@@ -25,7 +25,7 @@ import { useLanguage } from '../../../../hooks';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Form from '../../../../components/Form';
-import { maskPhone } from '../../../../utils';
+import { maskPhone, maskID } from '../../../../utils';
 import { OTPValidation } from './validation';
 import OTPInput from './OTPInput';
 var OTPTitleContainerStyled = styled(Box)(function (_a) {
@@ -67,11 +67,12 @@ var OTP = function () {
         dispatch(verifyAuth(formData));
     };
     var onBack = function () {
-        handlePrevScreenStep();
+        dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
     var disabled = !methods.formState.isValid || !!error;
     var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
+    var idNumber = data.nidData.nid;
     var title = isAbsher ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, _jsx("span", __assign({ dir: 'ltr' }, { children: maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, 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(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isAbsher ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(OTP);

package/build/features/connect/screens/OTP/OTPInput.js

@@ -29,7 +29,7 @@ var BoxStyled = styled(Box)(function (_a) {
     });
 });
 var OTPInput = function (_a) {
-    var control = useFormContext().control;
+    var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
@@ -41,19 +41,23 @@ var OTPInput = function (_a) {
         otpControl.field.onChange(otp);
     };
     var handleOnResendOTP = function () {
+        if (otpControl.field.value)
+            setValue('otp', '', { shouldValidate: true });
         var params = {
             businessCountry: mobileData.businessCountry,
             countryCode: mobileData.countryCode,
             mobile: mobileData.mobile
         };
-        dispatch(createMobileAuth(params));
+        dispatch(createMobileAuth(__assign(__assign({}, params), { isResend: true })));
     };
     var handleOnResendAbsherOTP = function () {
+        if (otpControl.field.value)
+            setValue('otp', '', { shouldValidate: true });
         var params = {
             nid: nidData.nid,
             dob: nidData.dob
         };
-        dispatch(createNIDAuth(params));
+        dispatch(createNIDAuth(__assign(__assign({}, params), { isResend: true })));
     };
     var otpValue = otpControl.field.value;
     return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: isAbsher ? handleOnResendAbsherOTP : handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));

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

@@ -11,12 +11,14 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
+import { useSelector } from 'react-redux';
+import { useAppDispatch } from '../../../../hooks';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch } from '../../../../hooks';
 import { styled } from '@mui/material/styles';
-import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { clearError, connectSelector, verifyAuthPassword } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -30,23 +32,27 @@ var FormStyled = styled(Form)(function () { return ({
     height: '100%'
 }); });
 var Password = function (_a) {
+    var dispatch = useAppDispatch();
+    var _b = useSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var methods = useForm({
         resolver: yupResolver(PasswordValidationSchema),
-        defaultValues: {
-            password: ''
-        },
+        defaultValues: data.passwordData,
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var dispatch = useAppDispatch();
-    var onSubmit = function (data) {
-        console.log('data', data);
-        dispatch(handleNextScreenStep());
+    var isAbsher = data.otpData.isAbsher;
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    var onSubmit = function (formData) {
+        dispatch(verifyAuthPassword(formData));
     };
     var onBack = function () {
-        dispatch(handlePrevScreenStep());
+        dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(PasswordInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: !methods.formState.isValid, isAr: isAr, loading: false }, { children: t('next') }))] })) })) }));
+    var disabled = !methods.formState.isValid || !!error;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(PasswordInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(Password);

package/build/features/connect/screens/Password/PasswordInput.js

@@ -34,6 +34,6 @@ var PasswordInput = function (_a) {
     };
     var passwordValue = passwordControl.field.value;
     var error = (_b = passwordControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { label: t('tap_js_password_description'), inputProps: { autoComplete: 'off' }, onChange: handlePasswordChange, value: passwordValue, endAdornment: _jsx(PasswordIcon, { show: showPassword, onShow: handleShowPassword, onHide: handleHidePassword }), placeholder: t('tap_js_password_placeholder'), type: showPassword ? 'text' : 'password', warningType: 'alert', warningMessage: error && t(error, { length: 8 }) }) })));
+    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 5 } }, { children: _jsx(Input, { label: t('tap_js_password_description'), inputProps: { autoComplete: 'off' }, onChange: handlePasswordChange, value: passwordValue, endAdornment: _jsx(PasswordIcon, { show: showPassword, onShow: handleShowPassword, onHide: handleHidePassword }), placeholder: t('tap_js_password_placeholder'), type: showPassword ? 'text' : 'password', warningType: 'alert', warningMessage: error && t(error, { length: 8 }) }) })));
 };
 export default React.memo(PasswordInput);

package/build/utils/string.js

@@ -1,14 +1,12 @@
 export var string = '';
 export var maskPhone = function (str) {
     if (str === void 0) { str = ''; }
-    var first = str.substring(0, 1);
     var lastTwo = str.substring(str.length - 2, str.length);
-    return first + '••••' + lastTwo;
+    return ' ••••' + lastTwo;
 };
 export var maskID = function (str) {
-    var first = str.substring(0, 1);
     var lastTwo = str.substring(str.length - 2, str.length);
-    return first + '••••••' + lastTwo;
+    return ' ••••' + lastTwo;
 };
 export var getIndividualName = function (name) {
     var _a;

package/package.json

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