@tap-payments/auth-jsconnect 2.0.93-test → 2.0.95-test

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

@@ -54,6 +54,7 @@ export declare enum SocialMediaTypes {
 }
 export interface CustomerLocation {
     id: string;
+    code: string;
     name: {
         ar: string;
         en: string;
@@ -98,6 +99,7 @@ export interface Activity {
 }
 export interface SubSaleChannel {
     id: string;
+    code: string;
     name?: {
         ar: string;
         en: string;

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

@@ -18,6 +18,7 @@ export declare type NIDFormValues = {
 };
 export declare type IDFormValues = {
     nid: string;
+    dob: string;
     termAndConditionChecked: boolean;
 };
 export declare type CivilFormValues = {

package/build/api/auth.d.ts

@@ -62,9 +62,12 @@ export declare type CreatePasswordBody = {
     encryption_contract: Array<string>;
 };
 export declare type VerifyAuthKitOTPBody = {
-    lead_id: string;
-    verify_token?: string;
+    auth_token?: string;
     data: string;
+    auth_type: number;
+    service_name: string;
+    sign_in: boolean;
+    device_token: string;
     post_url: string;
     scopes?: Array<string>;
     terms: Array<string>;
@@ -77,5 +80,6 @@ declare const authService: {
     verifyAuthKitOTP: (data: VerifyAuthKitOTPBody) => Promise<any>;
     getVerifyAuth: (token: string, config?: AxiosRequestConfig) => Promise<any>;
     getTokenVerify: (token: string, config?: AxiosRequestConfig) => Promise<any>;
+    createAuthKitNID: (data: CreateAuthBody) => Promise<any>;
 };
 export { authService };

package/build/api/auth.js

@@ -32,17 +32,25 @@ var getTokenVerify = function (token, config) {
 };
 var verifyAuthKitOTP = function (data) {
     return httpClient({
-        method: 'post',
+        method: 'put',
         url: "".concat(ENDPOINT_PATHS.VERIFY_AUTH_OTP),
         data: data
     });
 };
+var createAuthKitNID = function (data) {
+    return httpClient({
+        method: 'post',
+        url: "".concat(ENDPOINT_PATHS.CREATE_AUTH_NID),
+        data: data
+    });
+};
 var authService = {
     createAuth: createAuth,
     verifyAuth: verifyAuth,
     createPassword: createPassword,
     verifyAuthKitOTP: verifyAuthKitOTP,
     getVerifyAuth: getVerifyAuth,
-    getTokenVerify: getTokenVerify
+    getTokenVerify: getTokenVerify,
+    createAuthKitNID: createAuthKitNID
 };
 export { authService };

package/build/api/index.d.ts

@@ -27,6 +27,7 @@ declare const API: {
         verifyAuthKitOTP: (data: VerifyAuthKitOTPBody) => Promise<any>;
         getVerifyAuth: (token: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<any>;
         getTokenVerify: (token: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<any>;
+        createAuthKitNID: (data: CreateAuthBody) => Promise<any>;
     };
     leadService: {
         createLead: (data: CreateLeadBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;

package/build/app/settings.d.ts

@@ -5,6 +5,7 @@ export declare const fetchAppSettingsSync: import("@reduxjs/toolkit").AsyncThunk
     businessCountry: CountryCode;
     locale: any;
     deviceInfo: DeviceInfo;
+    isValidOperator: boolean;
 }, {
     disableCountries?: boolean | undefined;
     disableLocale?: boolean | undefined;
@@ -20,6 +21,7 @@ export interface SettingsData {
     isTapOrigin: boolean;
     businessCountry: CountryCode;
     countries: Array<CountryCode>;
+    isValidOperator: boolean;
 }
 export interface SettingsState extends SharedState<SettingsData> {
 }

package/build/app/settings.js

@@ -53,7 +53,7 @@ import i18n from '../i18n';
 import { updateLocale } from '../utils/locale';
 import API, { setAxiosGlobalHeaders } from '../api';
 export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, _a, appConfig, language, _b, client, device, os, disableCountries, disableLocale, _c, visitorId, _d, ip, latitude, longitude, locale, list, operatorData, deviceInfo, countries, businessCountry;
+    var settings, _a, appConfig, language, _b, client, device, os, disableCountries, disableLocale, _c, visitorId, _d, ip, latitude, longitude, locale, list, operatorData, deviceInfo, operatorStatus, isValidOperator, countries, businessCountry;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
@@ -110,10 +110,11 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
                 setAxiosGlobalHeaders(__assign(__assign({}, getRequestHeaders(deviceInfo)), { authorization: encryptString(appConfig.publicKey), mdn: encryptString(window.location.origin) }));
                 return [4, API.operatorService.validateOperator(operatorData)];
             case 2:
-                _e.sent();
+                operatorStatus = _e.sent();
+                isValidOperator = operatorStatus === 'valid';
                 countries = sortCountries(list);
                 businessCountry = findCountryByIso2(countries, appConfig.businessCountryCode) || defaultCountry;
-                return [2, { countries: countries, businessCountry: businessCountry, locale: locale, deviceInfo: deviceInfo }];
+                return [2, { countries: countries, businessCountry: businessCountry, locale: locale, deviceInfo: deviceInfo, isValidOperator: isValidOperator }];
         }
     });
 }); });
@@ -130,7 +131,8 @@ var initialState = {
         deviceInfo: DefaultDeviceInfo,
         appConfig: {},
         businessCountry: defaultCountry,
-        countries: []
+        countries: [],
+        isValidOperator: false
     }
 };
 export var settingsSlice = createSlice({
@@ -233,10 +235,11 @@ export var settingsSlice = createSlice({
             state.error = null;
         });
         builder.addCase(fetchAppSettingsSync.fulfilled, function (state, action) {
-            var _a = action.payload, businessCountry = _a.businessCountry, countries = _a.countries, locale = _a.locale, deviceInfo = _a.deviceInfo;
+            var _a = action.payload, businessCountry = _a.businessCountry, countries = _a.countries, locale = _a.locale, deviceInfo = _a.deviceInfo, isValidOperator = _a.isValidOperator;
             state.data.countries = countries;
             state.data.businessCountry = businessCountry;
             state.data.deviceInfo = deviceInfo;
+            state.data.isValidOperator = isValidOperator;
             if (locale)
                 updateLocale(locale, businessCountry.iso2);
             state.loading = false;

package/build/constants/api.d.ts

@@ -36,4 +36,5 @@ export declare const ENDPOINT_PATHS: {
     VERIFY_AUTH_OTP: string;
     RETRIEVE_ACTIVITIES_LIST_PATH: string;
     DOCUMENT: string;
+    CREATE_AUTH_NID: string;
 };

package/build/constants/api.js

@@ -34,7 +34,8 @@ var TOKEN_VERIFY_PATH = '/token/verify';
 var RETRIEVE_USER_INFO_PATH = '/user';
 var BOARD_PATH = '/board';
 var CONNECT_PATH = '/connect';
-var VERIFY_AUTH_OTP_PATH = "".concat(CONNECT_PATH, "/lead/verify");
+var CREATE_AUTH_NID_PATH = "".concat(CONNECT_PATH, "/auth");
+var VERIFY_AUTH_OTP_PATH = "".concat(CONNECT_PATH, "/auth");
 var DOCUMENT_PATH = '/document';
 export var ENDPOINT_PATHS = {
     SANDBOX_BASE_URL: SANDBOX_BASE_URL,
@@ -73,5 +74,6 @@ export var ENDPOINT_PATHS = {
     BRAND_SALES_CHANNELS: BRAND_SALES_CHANNELS,
     VERIFY_AUTH_OTP: VERIFY_AUTH_OTP_PATH,
     RETRIEVE_ACTIVITIES_LIST_PATH: RETRIEVE_ACTIVITIES_LIST_PATH,
-    DOCUMENT: DOCUMENT_PATH
+    DOCUMENT: DOCUMENT_PATH,
+    CREATE_AUTH_NID: CREATE_AUTH_NID_PATH
 };

package/build/constants/dummy.d.ts

@@ -1,5 +1,6 @@
 export declare const OTHER_BRAND: {
     id: string;
+    code: string;
     name: {
         ar: string;
         en: string;

package/build/constants/dummy.js

@@ -1,5 +1,6 @@
 export var OTHER_BRAND = {
     id: 'other',
+    code: 'other',
     name: {
         ar: 'other',
         en: 'other'

package/build/features/app/auth/authStore.d.ts

@@ -1,19 +1,23 @@
 import { RootState } from '../../../app/store';
-import { ResponseData, OTPFormValues, SharedState, ActionState } from '../../../@types';
+import { ResponseData, OTPFormValues, SharedState, ActionState, IDFormValues } from '../../../@types';
 export declare const retrieveLead: import("@reduxjs/toolkit").AsyncThunk<any, string, {}>;
 export declare const verifyAuthOTP: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: OTPFormValues;
 }, OTPFormValues, {}>;
+export declare const createAuth: import("@reduxjs/toolkit").AsyncThunk<{
+    data: any;
+    formData: IDFormValues;
+}, IDFormValues, {}>;
 export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export interface AuthData extends ResponseData {
     verifyToken: string | undefined;
     leadId: string;
     postUrl: string;
     otp: string;
-    mobileNumber: string;
     nid: string;
     termAndConditionChecked: boolean;
+    device_token?: string;
     dob: string;
     type: string;
     countryISOCode: string;
@@ -31,16 +35,11 @@ export declare const authSlice: import("@reduxjs/toolkit").Slice<AuthState, {
     storePostUrl: (state: AuthState, action: ActionState<{
         postUrl: string;
     }>) => void;
-    storeTerms: (state: AuthState, action: ActionState<{
-        termAndConditionChecked: boolean;
-    }>) => void;
 }, "auth/store">;
 export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, storeLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     leadId: string;
 }, string>, storePostUrl: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     postUrl: string;
-}, string>, storeTerms: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    termAndConditionChecked: boolean;
 }, string>;
 declare const _default: import("redux").Reducer<AuthState, import("redux").AnyAction>;
 export default _default;

package/build/features/app/auth/authStore.js

@@ -36,8 +36,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { handleOpen } from '../../../app/settings';
+import { handleNextScreenStep, handleOpen } from '../../../app/settings';
 import API from '../../../api';
+import { getEighteenYearsAgo } from '../../../utils';
+import { IDENTIFICATION_TYPE } from '../../../constants';
 export var retrieveLead = createAsyncThunk('retrieveLeadAuthKit', function (leadId) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     return __generator(this, function (_a) {
@@ -50,18 +52,22 @@ export var retrieveLead = createAsyncThunk('retrieveLeadAuthKit', function (lead
     });
 }); });
 export var verifyAuthOTP = createAsyncThunk('verifyAuthOTPKit', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, auth, _b, leadId, postUrl, verifyToken, payload, data;
+    var _a, settings, auth, _b, postUrl, verifyToken, device_token, payload, data;
     var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, auth = _a.auth;
-                _b = auth.data, leadId = _b.leadId, postUrl = _b.postUrl, verifyToken = _b.verifyToken;
+                _b = auth.data, postUrl = _b.postUrl, verifyToken = _b.verifyToken, device_token = _b.device_token;
                 payload = {
-                    lead_id: leadId,
-                    verify_token: verifyToken,
+                    auth_token: verifyToken,
                     data: params.otp,
                     post_url: postUrl,
+                    auth_type: 2,
+                    device_token: device_token || '',
+                    service_name: 'absher',
+                    sign_in: false,
+                    scopes: settings.data.appConfig.scope || [],
                     terms: auth.data.termAndConditionChecked ? ['general'] : [],
                     encryption_contract: ['data']
                 };
@@ -75,24 +81,72 @@ export var verifyAuthOTP = createAsyncThunk('verifyAuthOTPKit', function (params
         }
     });
 }); });
-export var resendOTP = createAsyncThunk('authResendOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var auth, _a, nid, dob, type, countryISOCode, leadId, requestBody, data;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+export var createAuth = createAsyncThunk('authCreateAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, auth, settings, _b, type, countryISOCode, nid, dob, identification_id_type, requestBody, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
-                auth = thunkApi.getState().auth;
-                _a = auth.data || {}, nid = _a.nid, dob = _a.dob, type = _a.type, countryISOCode = _a.countryISOCode, leadId = _a.leadId;
+                _a = thunkApi.getState(), auth = _a.auth, settings = _a.settings;
+                _b = auth.data, type = _b.type, countryISOCode = _b.countryISOCode;
+                nid = params.nid, dob = params.dob;
+                identification_id_type = type
+                    ? type
+                    : params.nid.startsWith('1')
+                        ? IDENTIFICATION_TYPE.NID
+                        : IDENTIFICATION_TYPE.IQAMA;
                 requestBody = {
-                    id: leadId,
-                    identification_id: nid,
-                    identification_id_type: type,
-                    date_of_birth: dob,
-                    country_code: countryISOCode,
-                    encryption_contract: ['country_code', 'identification_id', 'identification_id_type', 'date_of_birth']
+                    lang: settings.data.language,
+                    user_credentail: {
+                        identification_id: nid,
+                        identification_id_type: identification_id_type,
+                        date_of_birth: dob,
+                        country_code: countryISOCode || settings.data.businessCountry.iso2
+                    },
+                    sign_in: false,
+                    is_lead: false,
+                    encryption_contract: [
+                        'user_credentail.country_code',
+                        'user_credentail.identification_id',
+                        'user_credentail.identification_id_type',
+                        'user_credentail.date_of_birth'
+                    ]
                 };
-                return [4, API.leadService.updateLead(requestBody)];
+                return [4, API.authService.createAuthKitNID(requestBody)];
             case 1:
-                data = _b.sent();
+                data = _c.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                return [2, { data: data, formData: params }];
+        }
+    });
+}); });
+export var resendOTP = createAsyncThunk('authResendOTP', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, auth, settings, _b, nid, dob, type, countryISOCode, identification_id_type, requestBody, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _a = thunkApi.getState(), auth = _a.auth, settings = _a.settings;
+                _b = auth.data, nid = _b.nid, dob = _b.dob, type = _b.type, countryISOCode = _b.countryISOCode;
+                identification_id_type = type ? type : nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
+                requestBody = {
+                    lang: settings.data.language,
+                    user_credentail: {
+                        identification_id: nid,
+                        identification_id_type: identification_id_type,
+                        date_of_birth: dob,
+                        country_code: countryISOCode || settings.data.businessCountry.iso2
+                    },
+                    sign_in: false,
+                    is_lead: false,
+                    encryption_contract: [
+                        'user_credentail.country_code',
+                        'user_credentail.identification_id',
+                        'user_credentail.identification_id_type',
+                        'user_credentail.date_of_birth'
+                    ]
+                };
+                return [4, API.authService.createAuthKitNID(requestBody)];
+            case 1:
+                data = _c.sent();
                 return [2, data];
         }
     });
@@ -106,10 +160,9 @@ var initialState = {
         leadId: '',
         postUrl: '',
         otp: '',
-        mobileNumber: '',
         nid: '',
         termAndConditionChecked: false,
-        dob: '',
+        dob: getEighteenYearsAgo(),
         type: '',
         countryISOCode: ''
     }
@@ -134,10 +187,6 @@ export var authSlice = createSlice({
         storePostUrl: function (state, action) {
             var postUrl = action.payload.postUrl;
             state.data.postUrl = postUrl;
-        },
-        storeTerms: function (state, action) {
-            var termAndConditionChecked = action.payload.termAndConditionChecked;
-            state.data.termAndConditionChecked = termAndConditionChecked;
         }
     },
     extraReducers: function (builder) {
@@ -147,7 +196,7 @@ export var authSlice = createSlice({
             state.error = null;
         })
             .addCase(retrieveLead.fulfilled, function (state, action) {
-            var _a, _b, _c;
+            var _a;
             state.customLoading = false;
             state.error = null;
             var data = action.payload;
@@ -156,15 +205,33 @@ export var authSlice = createSlice({
                 state.error = description;
                 return;
             }
-            state.data.mobileNumber = ((_c = (_b = data === null || data === void 0 ? void 0 : data.contact) === null || _b === void 0 ? void 0 : _b.phone) === null || _c === void 0 ? void 0 : _c.number) || '';
             state.data.nid = data === null || data === void 0 ? void 0 : data.identification_id;
             state.data.dob = data === null || data === void 0 ? void 0 : data.date_of_birth;
             state.data.type = data === null || data === void 0 ? void 0 : data.identification_id_type;
             state.data.countryISOCode = data === null || data === void 0 ? void 0 : data.country_code;
+            state.data.responseBody = data;
         })
             .addCase(retrieveLead.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(createAuth.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(createAuth.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            var _a = action.payload, data = _a.data, formData = _a.formData;
+            state.data.verifyToken = data === null || data === void 0 ? void 0 : data.auth_token;
+            state.data.dob = formData.dob;
+            state.data.nid = formData.nid;
+            state.data.termAndConditionChecked = formData.termAndConditionChecked;
+            state.data.device_token = data === null || data === void 0 ? void 0 : data.device_token;
+        })
+            .addCase(createAuth.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(verifyAuthOTP.pending, function (state) {
             state.loading = true;
@@ -184,13 +251,13 @@ export var authSlice = createSlice({
             .addCase(resendOTP.fulfilled, function (state, action) {
             state.error = null;
             var data = action.payload;
-            state.data.verifyToken = data === null || data === void 0 ? void 0 : data.verify_token;
+            state.data.verifyToken = data === null || data === void 0 ? void 0 : data.auth_token;
         })
             .addCase(resendOTP.rejected, function (state, action) {
             state.error = action.error.message;
         });
     }
 });
-export var clearError = (_a = authSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen, storeLeadId = _a.storeLeadId, storePostUrl = _a.storePostUrl, storeTerms = _a.storeTerms;
+export var clearError = (_a = authSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen, storeLeadId = _a.storeLeadId, storePostUrl = _a.storePostUrl;
 export default authSlice.reducer;
 export var authSelector = function (state) { return state.auth; };

package/build/features/auth/Auth.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { LibConfig } from '../../@types';
 export interface AuthLibProps extends LibConfig {
-    leadId: string;
     postURL: string;
+    leadId?: string;
     onClose?: () => void;
 }
 export declare function AuthLib(props: AuthLibProps): JSX.Element;

package/build/features/auth/Auth.js

@@ -45,21 +45,18 @@ var Auth = memo(function (_a) {
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
     useEffect(function () {
-        if (!props.leadId)
-            throw new Error('leadId is required');
         var _a = props || {}, leadId = _a.leadId, postURL = _a.postURL;
         var data = {
-            leadId: leadId,
             postUrl: postURL
         };
-        dispatch(storeLeadId(data));
         dispatch(storePostUrl(data));
+        if (leadId)
+            dispatch(storeLeadId({ leadId: leadId }));
     }, []);
     useEffect(function () {
-        var leadId = (props || {}).leadId;
-        if (!settingLoading && activeScreen.name === 'AUTH_NID_STEP')
-            dispatch(retrieveLead(leadId));
-    }, [settingLoading]);
+        if (data.isValidOperator && props.leadId)
+            dispatch(retrieveLead(props.leadId));
+    }, [data.isValidOperator]);
     var handleDialogClose = function () {
         dispatch(handleOpen(false));
     };

package/build/features/auth/screens/NID/DOB.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+interface DOBProps {
+    show: boolean;
+    onDateClicked?: (flag: boolean) => void;
+}
+declare const DOB: ({ show, onDateClicked }: DOBProps) => JSX.Element;
+export default DOB;

package/build/features/auth/screens/NID/DOB.js

@@ -0,0 +1,47 @@
+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 { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { ScreenContainer } from '../../../shared/Containers';
+import DatePicker from '../../../../components/DatePicker';
+import { alpha, styled } from '@mui/material/styles';
+import { clearError, authSelector } from '../../../app/auth/authStore';
+import Text from '../../../../components/Text';
+import Collapse from '../../../../components/Collapse';
+var InputLabelStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightMedium }, theme.typography.caption), { lineHeight: theme.spacing(2.5) }));
+});
+var DOB = function (_a) {
+    var show = _a.show, onDateClicked = _a.onDateClicked;
+    var t = useTranslation().t;
+    var control = useFormContext().control;
+    var dispatch = useAppDispatch();
+    var dobControl = useController({ control: control, name: 'dob' });
+    var error = useAppSelector(authSelector).error;
+    var handleBirthDateChange = function (data) {
+        dobControl.field.onChange(data);
+        handleClearError();
+    };
+    var handleClearError = function () {
+        if (error)
+            dispatch(clearError());
+    };
+    var dateValue = dobControl.field.value;
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, __assign({ sx: { p: function (_a) {
+                            var spacing = _a.spacing;
+                            return spacing(2.5, 2.5, 1.5, 2.5);
+                        } } }, { children: t('enter_birth_date') })), _jsx(DatePicker, { defaultValue: dateValue ? new Date(dateValue) : new Date(), dir: 'ltr', locale: 'en', onDateChange: handleBirthDateChange, onClick: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(true); }, onDatePicked: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(false); } })] }) })));
+};
+export default DOB;

package/build/features/auth/screens/NID/IDNumber.js

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
+import { useAppSelector } from '../../../../hooks';
 import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
@@ -20,6 +21,9 @@ import Input from '../../../shared/Input';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { ID_NUMBER_LENGTH } from '../../../../constants';
+import { authSelector } from '../../../app/auth/authStore';
+import ClearIcon from '../../../shared/ClearIcon';
+import { removeAllCharsFromNumber } from '../../../../utils';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -37,12 +41,24 @@ var IDNumber = React.forwardRef(function (_a, ref) {
     var t = useTranslation().t;
     var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
     var nidControl = useController({ control: control, name: 'nid' });
+    var data = useAppSelector(authSelector).data;
+    var responseBody = data.responseBody;
+    var defaultNid = responseBody === null || responseBody === void 0 ? void 0 : responseBody.identification_id;
     React.useEffect(function () {
         if (nidControl.field.value)
             setValue('nid', nidControl.field.value, { shouldValidate: true });
     }, []);
+    var handleIdChange = function (_a) {
+        var target = _a.target;
+        var value = removeAllCharsFromNumber(target.value);
+        nidControl.field.onChange(value);
+    };
+    var clearIdNumber = function () {
+        nidControl.field.onChange('');
+    };
     var nidValue = nidControl.field.value;
     var error = (_b = nidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_national_id') }) }), _jsx(Input, { dir: 'ltr', type: 'tel', readOnly: true, inputProps: { maxLength: ID_NUMBER_LENGTH }, value: nidValue, endAdornment: !error && nidValue ? _jsx(CheckIcon, {}) : _jsx(_Fragment, {}), placeholder: t('national_id_placeholder'), warningType: 'alert', warningMessage: error && t(error, { number: '1' }), required: true })] })));
+    var readOnly = !!defaultNid;
+    return (_jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_national_id') }) }), _jsx(Input, { dir: 'ltr', type: 'tel', readOnly: readOnly, inputProps: { maxLength: ID_NUMBER_LENGTH }, value: nidValue, onChange: handleIdChange, endAdornment: !error && nidValue ? _jsx(CheckIcon, {}) : readOnly ? _jsx(_Fragment, {}) : nidValue && _jsx(ClearIcon, { onClick: clearIdNumber }), placeholder: t('national_id_placeholder'), warningType: 'alert', warningMessage: error && t(error, { number: '1' }), required: true })] })));
 });
 export default React.memo(IDNumber);

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

@@ -15,15 +15,17 @@ import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { NIDValidationSchema } from './validation';
+import { NIDValidationSchema, NIDDOBValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
-import { handleNextScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, authSelector, storeTerms } from '../../../app/auth/authStore';
+import { settingsSelector } from '../../../../app/settings';
+import { clearError, authSelector, createAuth } from '../../../app/auth/authStore';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
+import Collapse from '../../../../components/Collapse';
 import IDNumber from './IDNumber';
 import TAC from './TAC';
+import DOB from './DOB';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -32,13 +34,17 @@ var NID = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var _b = useAppSelector(authSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _b = React.useState(false), collapse = _b[0], setCollapse = _b[1];
+    var _c = useAppSelector(authSelector), data = _c.data, loading = _c.loading, error = _c.error;
     var settingsStore = useAppSelector(settingsSelector);
+    var nid = data.nid, dob = data.dob, termAndConditionChecked = data.termAndConditionChecked, responseBody = data.responseBody;
+    var defaultDob = responseBody === null || responseBody === void 0 ? void 0 : responseBody.date_of_birth;
     var methods = useForm({
-        resolver: yupResolver(NIDValidationSchema),
+        resolver: yupResolver(!defaultDob ? NIDDOBValidationSchema : NIDValidationSchema),
         defaultValues: {
-            nid: data.nid,
-            termAndConditionChecked: data.termAndConditionChecked
+            nid: nid,
+            dob: dob,
+            termAndConditionChecked: termAndConditionChecked
         },
         mode: 'onChange'
     });
@@ -46,15 +52,16 @@ var NID = function (_a) {
         handleClearError();
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
-        var termAndConditionChecked = data.termAndConditionChecked;
-        dispatch(storeTerms({ termAndConditionChecked: termAndConditionChecked }));
-        dispatch(handleNextScreenStep());
+        dispatch(createAuth(data));
+    };
+    var handleCollapseOpenClose = function (flag) {
+        setCollapse(flag);
     };
     var handleClearError = function () {
         if (error)
             dispatch(clearError());
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, {}), _jsx(TAC, {}), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, {}) })), _jsx(DOB, { show: !defaultDob, onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(TAC, {}), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') }))] }))] })) })) }));
 };
 export default React.memo(NID);

package/build/features/auth/screens/NID/TAC.js

@@ -25,6 +25,7 @@ import Collapse from '../../../../components/Collapse';
 import { EXTERNAL_LINKS, TAP_WEBSITE } from '../../../../constants';
 import { settingsSelector } from '../../../../app/settings';
 import { useAppSelector } from '../../../../hooks';
+import { authSelector } from '../../../../features/app/auth/authStore';
 var TACContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -66,15 +67,16 @@ var CollapseStyled = styled(Collapse)(function () { return ({
     width: '100%'
 }); });
 var TAC = function () {
-    var _a;
+    var _a, _b;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
     var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(authSelector).data;
     var tacControl = useController({ control: control, name: 'termAndConditionChecked' });
     var tacChecked = tacControl.field.value;
     var warningMessage = (_a = tacControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
-    var countryCode = settingsData.businessCountry.iso2.toLowerCase();
+    var countryCode = ((_b = data.countryISOCode) === null || _b === void 0 ? void 0 : _b.toLowerCase()) || settingsData.businessCountry.iso2.toLowerCase();
     var handleTACCheckedChange = function (event, checked) {
         tacControl.field.onChange(checked);
     };

package/build/features/auth/screens/NID/validation.d.ts

@@ -1,11 +1,27 @@
 import * as yup from 'yup';
 export declare const NIDValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    dob: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    dob: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    dob: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+}>>>;
+export declare const NIDDOBValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>>;

package/build/features/auth/screens/NID/validation.js

@@ -5,5 +5,15 @@ export var NIDValidationSchema = yup.object().shape({
         .matches(/^(1|2)([0-9]{1,})$/g, 'signup_invalid_national_id_format')
         .min(10, 'signup_invalid_national_id')
         .required('signup_invalid_national_id'),
+    dob: yup.string().optional(),
+    termAndConditionChecked: yup.boolean().required().isTrue('check_terms_cond')
+});
+export var NIDDOBValidationSchema = yup.object().shape({
+    nid: yup
+        .string()
+        .matches(/^(1|2)([0-9]{1,})$/g, 'signup_invalid_national_id_format')
+        .min(10, 'signup_invalid_national_id')
+        .required('signup_invalid_national_id'),
+    dob: yup.string().min(5).required('enter_valid_birth_date'),
     termAndConditionChecked: yup.boolean().required().isTrue('check_terms_cond')
 });

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

@@ -22,6 +22,7 @@ import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { useLanguage } from '../../../../hooks';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import { maskPhone } from '../../../../utils';
 import { OTPValidation } from './validation';
@@ -56,7 +57,7 @@ var OTP = function () {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     React.useEffect(function () {
-        if (!!data.mobileNumber && error)
+        if (error)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -65,8 +66,11 @@ var OTP = function () {
     var onSubmit = function (formData) {
         dispatch(verifyAuthOTP(formData));
     };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
     var disabled = !methods.formState.isValid || !!error;
     var phone = data.nid;
-    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') : t('opt_nid_sent_title', { provider: 'ABSHER' }), !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disabled: disabled, disableBack: true, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('confirm') }))] })) })) }));
+    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') : t('opt_nid_sent_title', { provider: 'ABSHER' }), !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disabled: disabled, isAr: isAr, loading: loading, error: t(error || ''), onBackClicked: function () { return onBack(); } }, { children: t('confirm') }))] })) })) }));
 };
 export default React.memo(OTP);

package/build/features/business/screens/Customers/CustomerLocations.js

@@ -110,12 +110,12 @@ var customerLocations = function (_a) {
     };
     var onSelectItem = function (customerLocations) {
         onCloseList();
-        var checked = customerLocationsList.filter(function (location) { return location.id === customerLocations.id; });
-        if (customerLocations.id === 'regional')
-            customerLocationsControl.field.onChange(checked.concat(customerLocationsList.filter(function (location) { return location.id === 'local'; })));
-        else if (customerLocations.id === 'global')
-            customerLocationsControl.field.onChange(checked.concat(customerLocationsList.filter(function (location) { return location.id != customerLocations.id; })));
-        else if (customerLocations.id === 'local')
+        var checked = customerLocationsList.filter(function (location) { return (location === null || location === void 0 ? void 0 : location.code) === customerLocations.code; });
+        if (customerLocations.code === 'regional')
+            customerLocationsControl.field.onChange(checked.concat(customerLocationsList.filter(function (location) { return (location === null || location === void 0 ? void 0 : location.code) === 'local'; })));
+        else if (customerLocations.code === 'global')
+            customerLocationsControl.field.onChange(checked.concat(customerLocationsList.filter(function (location) { return (location === null || location === void 0 ? void 0 : location.code) != customerLocations.code; })));
+        else if (customerLocations.code === 'local')
             customerLocationsControl.field.onChange(checked);
         if (error)
             dispatch(clearError());

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

@@ -129,7 +129,7 @@ var BrandName = function (_a) {
         var brandValue = value.replaceAll(' ', '-').toLowerCase();
         var address = (brandValue[brandValue.length - 1] === '-' ? brandValue.slice(0, -1) : brandValue) + '.com';
         var updatedSalesChannels = salesChannels.map(function (channel) {
-            if (channel.id.toLowerCase() === 'website') {
+            if (channel.code.toLowerCase() === 'website') {
                 return __assign(__assign({}, channel), { address: address });
             }
             return channel;

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

@@ -95,7 +95,7 @@ var SalesChannels = function (_a) {
         else {
             var brandName = getValues('brandName');
             var newChannel = __assign({}, channel);
-            if (newChannel.id === 'website' && brandName) {
+            if (newChannel.code === 'website' && brandName) {
                 var brandValue = brandName.replaceAll(' ', '-').toLowerCase();
                 var address = (brandValue[brandValue.length - 1] === '-' ? brandValue.slice(0, -1) : brandValue) + '.com';
                 newChannel.address = address;

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

@@ -31,6 +31,7 @@ import Collapse from '../../../../components/Collapse';
 import SocialMediaGroup from '../../../../components/SocialMediaGroup';
 import ToggleButton from '../../../../components/ToggleButton';
 import Icon from '../../../../components/Icon';
+import { useLanguage } from '../../../../hooks';
 var SocialMediaGroupStyled = styled(SocialMediaGroup)(function (_a) {
     var theme = _a.theme, defaultValue = _a.defaultValue;
     return ({
@@ -80,6 +81,7 @@ var SocialMedia = function (_a) {
     var show = _a.show;
     var _c = React.useState(''), activeSocialId = _c[0], setActiveSocialId = _c[1];
     var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
     var _d = useFormContext(), setValue = _d.setValue, watch = _d.watch, getFieldState = _d.getFieldState;
     var selectedChannels = watch('salesChannels');
     var salesChannelsState = getFieldState('salesChannels');
@@ -93,6 +95,7 @@ var SocialMedia = function (_a) {
             var _a;
             if (channel.id === id) {
                 return {
+                    code: channel.code,
                     address: value,
                     logo: channel.logo,
                     id: channel.id,
@@ -104,6 +107,7 @@ var SocialMedia = function (_a) {
                 var updatedSub = channel.sub.map(function (subChannel) {
                     if (subChannel.id === id) {
                         return {
+                            code: subChannel.code,
                             address: value,
                             logo: subChannel.logo,
                             id: subChannel.id,
@@ -140,6 +144,12 @@ var SocialMedia = function (_a) {
     React.useEffect(function () {
         setDefaultActiveSocialId();
     }, [setDefaultActiveSocialId]);
+    var getPlaceHolder = function (item) {
+        var _a, _b;
+        if (isAr)
+            return ((_a = item.name) === null || _a === void 0 ? void 0 : _a.ar) || '';
+        return ((_b = item.name) === null || _b === void 0 ? void 0 : _b.en) || '';
+    };
     var hasError = React.useMemo(function () {
         return ['enter_at_least_one', 'invalid_url'].some(function (error) { var _a, _b; return (_b = (_a = salesChannelsState.error) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes(error); });
     }, [salesChannelsState]);
@@ -160,10 +170,10 @@ var SocialMedia = function (_a) {
                             var isSubActive = activeSocialId === sub.id;
                             return (_jsx(Collapse, __assign({ in: isSubActive, timeout: 300 }, { children: _jsx(InputStyled, { onChange: function (e) {
                                         onChangeInput(e.target.value, sub.id);
-                                    }, value: sub.address || '', startAdornment: _jsx(TextStyled, {}), placeholder: t("".concat(sub.id)) }) }), "sub_".concat(subIndex)));
+                                    }, value: sub.address || '', startAdornment: _jsx(TextStyled, {}), placeholder: t(getPlaceHolder(sub)) }) }), "sub_".concat(subIndex)));
                         })) : (_jsx(Collapse, __assign({ in: isActive, timeout: 300 }, { children: _jsx(InputStyled, { onChange: function (e) {
                                     onChangeInput(e.target.value, channel.id);
-                                }, value: channel.address || '', startAdornment: _jsx(TextStyled, {}), placeholder: t("".concat(channel.id)) }) }), index));
+                                }, value: channel.address || '', startAdornment: _jsx(TextStyled, {}), placeholder: t(getPlaceHolder(channel)) }) }), index));
                     }), _jsx(Collapse, __assign({ in: hasError }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(linksErrorMsg) })) }))] })) })) }));
 };
 export default React.memo(SocialMedia);

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

@@ -1,3 +1,12 @@
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { REGEX_WEBSITE, REGEX_BRAND_NAME } from '../../../../constants';
 import * as yup from 'yup';
 export var MerchantValidationSchema = function (isNewBrand) {
@@ -28,12 +37,12 @@ export var MerchantValidationSchema = function (isNewBrand) {
                     var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
                     if (length === 0)
                         return true;
-                    var channels = (value || []);
+                    var channels = __spreadArray([], (value || []), true);
                     var dic = {};
                     channels.forEach(function (channel) {
                         var _a, _b, _c;
                         if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
-                            var key_1 = (_b = channel.id) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                            var key_1 = (_b = channel.code) === null || _b === void 0 ? void 0 : _b.toLowerCase();
                             if (key_1)
                                 dic[key_1] = [];
                             channel.sub.forEach(function (sub) {
@@ -41,7 +50,7 @@ export var MerchantValidationSchema = function (isNewBrand) {
                             });
                         }
                         else {
-                            var key = (_c = channel.id) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+                            var key = (_c = channel.code) === null || _c === void 0 ? void 0 : _c.toLowerCase();
                             if (key)
                                 dic[key] = [channel.address || ''];
                         }
@@ -74,12 +83,12 @@ export var MerchantValidationSchema = function (isNewBrand) {
                 var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
                 if (length === 0)
                     return true;
-                var channels = (value || []);
+                var channels = __spreadArray([], (value || []), true);
                 var dic = {};
                 channels.forEach(function (channel) {
                     var _a, _b, _c;
                     if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
-                        var key_2 = (_b = channel.id) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                        var key_2 = (_b = channel.code) === null || _b === void 0 ? void 0 : _b.toLowerCase();
                         if (key_2)
                             dic[key_2] = [];
                         channel.sub.forEach(function (sub) {
@@ -87,7 +96,7 @@ export var MerchantValidationSchema = function (isNewBrand) {
                         });
                     }
                     else {
-                        var key = (_c = channel.id) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+                        var key = (_c = channel.code) === null || _c === void 0 ? void 0 : _c.toLowerCase();
                         if (key)
                             dic[key] = [channel.address || ''];
                     }

package/build/features/individual/screens/AdditionalIndividualInfo/Occupation.js

@@ -83,8 +83,8 @@ var Occupation = function (_a) {
     };
     var handleSearch = function (value) {
         var filteredList = occupationsList === null || occupationsList === void 0 ? void 0 : occupationsList.filter(function (occupation) {
-            return occupation.name.en.toLowerCase().startsWith(value.toLowerCase()) ||
-                occupation.name.ar.toLowerCase().startsWith(value.toLowerCase());
+            return occupation.name.en.toLowerCase().includes(value.toLowerCase()) ||
+                occupation.name.ar.toLowerCase().includes(value.toLowerCase());
         });
         setOccupationList(filteredList);
     };

package/build/features/shared/Dialog/CloseDialog.js

@@ -22,11 +22,14 @@ var ConfirmCloseBox = styled(Box)(function (_a) {
         borderRadius: theme.spacing(1),
         height: theme.spacing(5.5),
         display: 'flex',
-        justifyContent: 'space-evenly',
+        justifyContent: 'space-between',
+        flexDirection: 'row',
         alignItems: 'center',
         zIndex: 20,
         width: '100%',
-        bottom: theme.spacing(2.625)
+        bottom: theme.spacing(2.625),
+        paddingInlineStart: theme.spacing(2.25),
+        paddingInlineEnd: theme.spacing(2.25)
     });
 });
 var DisableBoxStyled = styled(Box)(function (_a) {
@@ -46,7 +49,8 @@ var YesTextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return ({
         color: theme.palette.primary.main,
-        cursor: 'pointer'
+        cursor: 'pointer',
+        paddingInlineEnd: theme.spacing(2.5)
     });
 });
 var NoTextStyled = styled(Text)(function (_a) {
@@ -56,8 +60,12 @@ var NoTextStyled = styled(Text)(function (_a) {
         cursor: 'pointer'
     });
 });
+var ConfirmEnd = styled(Box)(function () { return ({
+    display: 'flex',
+    flexDirection: 'row'
+}); });
 export default function CloseDialog(_a) {
     var message = _a.message, confirmTitle = _a.confirmTitle, closeTitle = _a.closeTitle, open = _a.open, onConfirm = _a.onConfirm, onCancel = _a.onCancel;
     var theme = useTheme();
-    return (_jsxs(Collapse, __assign({ in: open }, { children: [_jsx(Box, __assign({ sx: { direction: theme.direction } }, { children: _jsxs(ConfirmCloseBox, { children: [_jsxs(Text, { children: [" ", message] }), _jsx(YesTextStyled, __assign({ onClick: onConfirm }, { children: confirmTitle })), _jsx(NoTextStyled, __assign({ onClick: onCancel }, { children: closeTitle }))] }) })), _jsx(DisableBoxStyled, { id: 'disable-container' })] })));
+    return (_jsxs(Collapse, __assign({ in: open }, { children: [_jsx(Box, __assign({ sx: { direction: theme.direction } }, { children: _jsxs(ConfirmCloseBox, { children: [_jsxs(Text, { children: [" ", message] }), _jsxs(ConfirmEnd, { children: [_jsx(YesTextStyled, __assign({ onClick: onConfirm }, { children: confirmTitle })), _jsx(NoTextStyled, __assign({ onClick: onCancel }, { children: closeTitle }))] })] }) })), _jsx(DisableBoxStyled, { id: 'disable-container' })] })));
 }

package/package.json

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