@tap-payments/auth-jsconnect 1.0.31 → 1.0.34

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

@@ -13,17 +13,19 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
+import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
-import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
+import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
+import { businessSelector, clearError, verifyLeadOTP } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
-import { maskPhone } from '../../../../utils';
 import { OTPValidation } from './validation';
 import OTPInput from './OTPInput';
 var OTPTitleContainerStyled = styled(Box)(function (_a) {
@@ -46,31 +48,28 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var VerifyNumber = function (_a) {
-    var phone = _a.phone, code = _a.code;
+    var _b, _c, _d;
     var dispatch = useAppDispatch();
+    var _e = useSelector(businessSelector), data = _e.data, loading = _e.loading, error = _e.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
-        defaultValues: {
-            otp: ''
-        },
+        defaultValues: data.otpData,
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var onSubmit = function (data) {
-        console.log('data', data);
-        if (data.otp === '123456')
-            return dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
-        dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    var onSubmit = function (formData) {
+        dispatch(verifyLeadOTP(formData));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var loading = false;
-    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('ide_opt_sent_title'), _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: !methods.formState.isValid, type: 'submit', isAr: isAr, loading: loading }, { children: t('next') }))] })) })) }));
-};
-VerifyNumber.defaultProps = {
-    phone: '564656085',
-    code: '+996'
+    var disabled = !methods.formState.isValid || !!error;
+    var phone = ((_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number) || '';
+    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('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone)) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, type: 'submit', isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/features/business/screens/Verify/index.d.ts

@@ -1,3 +1,2 @@
-import OTP, { OTPProps } from './Verify';
-export type { OTPProps };
+import OTP from './Verify';
 export default OTP;

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

@@ -24,7 +24,7 @@ import { IndividualValidation, IndividualMobileValidation } from './validation';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
-import { clearError, connectSelector, updateLeadIndividual } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, resetIndividualScreen, updateLeadIndividual } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import MobileNumber from './MobileNumber';
 import { countriesCode } from '../../../../constants';
@@ -58,6 +58,11 @@ var Individual = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetIndividualScreen());
+        };
+    }, []);
     React.useEffect(function () {
         var name = individualData.name, email = individualData.email, mobile = individualData.mobile, countryCode = individualData.countryCode;
         if (!!name)

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

@@ -19,6 +19,15 @@ import { useController, useFormContext } from 'react-hook-form';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import Collapse from '../../../../components/Collapse';
+import { styled } from '@mui/material/styles';
+var InputStyled = styled(Input)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        input: {
+            textTransform: 'capitalize'
+        }
+    });
+});
 var Name = function (_a) {
     var _b;
     var show = _a.show;
@@ -34,6 +43,6 @@ var Name = function (_a) {
     var clearNumber = function () {
         nameControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mb: 3, mt: 2.5 } }, { children: _jsx(Input, { label: t('signup_merchant_name_label'), value: nameValue, onChange: handleNameChange, placeholder: t('signup_merchant_name_label'), warningType: 'alert', warningMessage: error && t(error), endAdornment: !error && nameValue ? _jsx(CheckIcon, {}) : nameValue && _jsx(ClearIcon, { onClick: clearNumber }) }) })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mb: 3, mt: 2.5 } }, { children: _jsx(InputStyled, { label: t('signup_merchant_name_label'), value: nameValue, onChange: handleNameChange, placeholder: t('signup_merchant_name_label'), warningType: 'alert', warningMessage: error && t(error), endAdornment: !error && nameValue ? _jsx(CheckIcon, {}) : nameValue && _jsx(ClearIcon, { onClick: clearNumber }) }) })) })));
 };
 export default React.memo(Name);

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

@@ -1,9 +1,10 @@
+import { REGEX_FULL_NAME } from '../../../../constants';
 import * as yup from 'yup';
 export var IndividualValidation = function () {
     return yup.object().shape({
         name: yup
             .string()
-            .matches(/^([a-zA-Z0-9]+\s{1}[a-zA-Z0-9]{2,}|[a-zA-Z0-9]+\s{1}[a-zA-Z0-9]{1,}\s{1}[a-zA-Z0-9]{2,})$/g, 'please write your first and last name')
+            .matches(REGEX_FULL_NAME, 'please write your first and last name')
             .required('please write your first and last name'),
         email: yup.string().email('email_not_valid').required('email_not_valid')
     });
@@ -12,7 +13,7 @@ export var IndividualMobileValidation = function (length) {
     return yup.object().shape({
         name: yup
             .string()
-            .matches(/^([a-zA-Z0-9]+\s{1}[a-zA-Z0-9]{2,}|[a-zA-Z0-9]+\s{1}[a-zA-Z0-9]{1,}\s{1}[a-zA-Z0-9]{2,})$/g, 'please write your first and last name')
+            .matches(REGEX_FULL_NAME, 'please write your first and last name')
             .required('please write your first and last name'),
         email: yup.string().email('email_not_valid').required('email_not_valid'),
         mobile: yup.string().length(length, 'enter_valid_mobile_number').required('mobile_number_error')

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

@@ -20,7 +20,7 @@ import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
-import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, resetMerchantScreen, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import { MerchantValidationSchema } from './validation';
 import BrandName from './BrandName';
@@ -47,6 +47,11 @@ var Merchant = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetMerchantScreen());
+        };
+    }, []);
     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')

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

@@ -23,7 +23,7 @@ import Button, { AbsherButton } from '../../../shared/Button';
 import { useAppDispatch } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { clearError, connectSelector, createMobileAuth } from '../../../app/connect/connectStore';
+import { clearError, resetMobileScreen, connectSelector, createMobileAuth } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
 import Text from '../../../../components/Text';
@@ -101,6 +101,11 @@ var Mobile = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetMobileScreen());
+        };
+    }, []);
     var onSubmit = function (formData) {
         dispatch(createMobileAuth(__assign(__assign({}, formData), { isResend: false })));
     };

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

@@ -19,7 +19,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, connectSelector, createNIDAuth } from '../../../app/connect/connectStore';
+import { clearError, resetNIDScreen, connectSelector, createNIDAuth } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { AbsherButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -73,6 +73,11 @@ var NID = function (_a) {
     React.useEffect(function () {
         handleClearError();
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetNIDScreen());
+        };
+    }, []);
     var onSubmit = function (data) {
         dispatch(createNIDAuth(__assign(__assign({}, data), { isResend: false })));
     };

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

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import Text from '../../../../components/Text';
-import { clearError, connectSelector, verifyAuth } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, resetOTPScreen, verifyAuth } from '../../../app/connect/connectStore';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
 import { useAppDispatch } from '../../../../hooks';
@@ -63,6 +63,11 @@ var OTP = function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetOTPScreen());
+        };
+    }, []);
     var onSubmit = function (formData) {
         dispatch(verifyAuth(formData));
     };

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

@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { clearError, connectSelector, verifyAuthPassword } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createVerifyAuthPassword, resetPasswordScreen } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -46,8 +46,13 @@ var Password = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetPasswordScreen());
+        };
+    }, []);
     var onSubmit = function (formData) {
-        dispatch(verifyAuthPassword(formData));
+        dispatch(createVerifyAuthPassword(formData));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));

package/build/features/featuresScreens.js

@@ -1,4 +1,4 @@
-import MobileScreen from '../features/connect/screens/Mobile';
+import MobileScreen from './connect/screens/Mobile';
 import NIDScreen from './connect/screens/NID';
 import IndividualScreen from './connect/screens/Individual';
 import MerchantInfoScreen from './connect/screens/Merchant';
@@ -7,8 +7,8 @@ import ThankYouScreen from './connect/screens/ThankYou';
 import PasswordScreen from './connect/screens/Password';
 import CustomersPage from './business/screens/Customers';
 import IDBODPage from './business/screens/IDBOD';
-import BusinessVerifyPage from '../features/business/screens/Verify';
-import BusinessOTPPage from '../features/business/screens/OTP';
+import BusinessVerifyPage from './business/screens/Verify';
+import BusinessOTPPage from './business/screens/OTP';
 import BusinessTypePage from './business/screens/BusinessType';
 import ActivitiesPage from './business/screens/Activities';
 import SuccessPage from './business/screens/Success';

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

@@ -1,14 +1,12 @@
 import * as yup from 'yup';
+import { REGEX_FULL_NAME } from '../../../../constants';
 export var IndividualInfoValidationSchema = yup.object().shape({
     sourceIncome: yup.object().required('choose_any_source_of_income'),
     monthlyIncome: yup.string().optional(),
     employerName: yup.string().when('sourceIncome', function (sourceIncomeValue) {
         var _a;
         if (((_a = sourceIncomeValue === null || sourceIncomeValue === void 0 ? void 0 : sourceIncomeValue.nameEn) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'salary') {
-            return yup
-                .string()
-                .matches(/^([a-zA-Z0-9]+\s{1}[a-zA-Z0-9]{2,}|[a-zA-Z0-9]+\s{1}[a-zA-Z0-9]{1,}\s{1}[a-zA-Z0-9]{2,})$/g, 'employer_name_invalid')
-                .required('please_enter_employer_name');
+            return yup.string().matches(REGEX_FULL_NAME, 'employer_name_invalid').required('please_enter_employer_name');
         }
         else {
             return yup.string().optional();

package/build/features/shared/Button/AbsherButton.js

@@ -31,7 +31,7 @@ var IconStyled = styled(Icon)(function (_a) {
     return ({
         width: theme.spacing(3),
         height: theme.spacing(3),
-        marginInlineStart: theme.spacing(2)
+        marginInlineStart: theme.spacing(0.75)
     });
 });
 var ButtonBoxStyled = styled(Box)(function (_a) {

package/build/features/shared/Input/Input.d.ts

@@ -16,7 +16,7 @@ export declare const InputLabelStyled: import("@emotion/styled").StyledComponent
 export declare const InputStyled: import("@emotion/styled").StyledComponent<Pick<InputProps, "name" | "type" | "className" | "style" | "classes" | "color" | "margin" | "translate" | "slot" | "title" | "ref" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "sx" | "size" | "disabled" | "error" | "components" | "componentsProps" | "value" | "autoFocus" | "fullWidth" | "required" | "rows" | "inputProps" | "inputRef" | "readOnly" | "autoComplete" | "disableInjectingGlobalStyles" | "endAdornment" | "inputComponent" | "multiline" | "renderSuffix" | "maxRows" | "minRows" | "startAdornment" | "disableUnderline" | "onEnterPressed" | "warningMessage"> & {
     placeholder?: string | undefined;
     hide?: boolean | undefined;
-    warningType?: "alert" | "error" | undefined;
+    warningType?: "alert" | "error" | "hint" | undefined;
 } & {} & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
 interface CustomButtonProps extends InputProps {
     label?: string;

package/build/hooks/useAppConfig.js

@@ -9,6 +9,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -20,43 +56,82 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { handleActiveFlowScreens, settingsSelector, getClientIp, getLocale, getBrowserFingerPrint, getOperator, handleSetAppConfig, handleLanguage } from '../app/settings';
 import { useAppDispatch } from './useAppDispatch';
 import { useAppSelector } from './useAppSelector';
+import { setAxiosGlobalHeaders } from '../api';
+import { getRequestHeaders, encryptString } from '../utils';
 export var useAppConfig = function (_a) {
     var appInfo = _a.appInfo, navigation = _a.navigation, publicKey = _a.publicKey, rest = __rest(_a, ["appInfo", "navigation", "publicKey"]);
+    var _b = useState(true), loading = _b[0], setLoading = _b[1];
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, loading = _b.loading;
-    var deviceInfo = data.deviceInfo, language = data.language;
-    var device = deviceInfo.device, browser = deviceInfo.browser;
-    useEffect(function () {
-        dispatch(getLocale());
-        dispatch(handleActiveFlowScreens(navigation));
-        dispatch(getClientIp());
-        dispatch(getBrowserFingerPrint(appInfo));
-        dispatch(handleSetAppConfig(__assign({ appInfo: appInfo, publicKey: publicKey }, rest)));
-    }, []);
-    var handleGetOperator = function () {
-        var _a, _b;
-        var payload = {
-            type: 'website',
-            app_client_version: 'onboarding_version_2',
-            requirer_browser: "".concat(browser === null || browser === void 0 ? void 0 : browser.name, " , ").concat(browser === null || browser === void 0 ? void 0 : browser.version),
-            os: "".concat((_a = device.os) === null || _a === void 0 ? void 0 : _a.name, " , ").concat((_b = device.os) === null || _b === void 0 ? void 0 : _b.version),
-            locale: language,
-            connect_pkey: publicKey || ''
-        };
-        dispatch(getOperator(payload));
+    var _c = useAppSelector(settingsSelector), data = _c.data, error = _c.error;
+    var deviceInfo = data.deviceInfo, language = data.language, appConfig = data.appConfig;
+    var device = deviceInfo.device, browser = deviceInfo.browser, connection = deviceInfo.connection;
+    var addAxiosHeader = function () {
+        setAxiosGlobalHeaders(__assign(__assign({}, getRequestHeaders(deviceInfo)), { authorization: encryptString(publicKey), mdn: encryptString(window.location.origin) }));
     };
+    var handleAppConfig = function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            dispatch(handleSetAppConfig(__assign({ appInfo: appInfo, publicKey: publicKey }, rest)));
+            dispatch(handleActiveFlowScreens(navigation));
+            return [2];
+        });
+    }); };
+    var handleAppApiConfig = function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4, dispatch(getLocale())];
+                case 1:
+                    _a.sent();
+                    return [4, dispatch(getClientIp())];
+                case 2:
+                    _a.sent();
+                    return [4, dispatch(getBrowserFingerPrint(appInfo))];
+                case 3:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); };
+    var handleGetOperator = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var payload;
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    payload = {
+                        type: 'website',
+                        app_client_version: 'js-auth-connect',
+                        requirer_browser: "".concat(browser === null || browser === void 0 ? void 0 : browser.name, " , ").concat(browser === null || browser === void 0 ? void 0 : browser.version),
+                        os: "".concat((_a = device.os) === null || _a === void 0 ? void 0 : _a.name, " , ").concat((_b = device.os) === null || _b === void 0 ? void 0 : _b.version),
+                        locale: language
+                    };
+                    return [4, dispatch(getOperator(payload))];
+                case 1:
+                    _c.sent();
+                    setLoading(false);
+                    return [2];
+            }
+        });
+    }); };
     useEffect(function () {
         if (data.appConfig.language)
             dispatch(handleLanguage(data.appConfig.language));
     }, [data.appConfig.language]);
     useEffect(function () {
-        if (device.os.name && browser.name && publicKey) {
+        handleAppConfig();
+    }, []);
+    useEffect(function () {
+        if (appConfig.publicKey)
+            handleAppApiConfig();
+    }, [appConfig]);
+    useEffect(function () {
+        if (connection.ip && browser.browser_id) {
+            addAxiosHeader();
             handleGetOperator();
         }
-    }, [device, browser, publicKey]);
+    }, [connection, browser]);
     return { loading: loading, error: error };
 };

package/build/theme/palette.js

@@ -42,6 +42,10 @@ export var lightPalette = {
         main: '#F5A623',
         light: '#FF9F00',
         dark: '#F5A6234D'
+    },
+    info: {
+        main: '#808592',
+        light: '#EAECEF'
     }
 };
 export var darkPalette = {

package/build/utils/string.d.ts

@@ -1,3 +1,4 @@
+import { DeviceInfo } from '../@types';
 export declare const maskPhone: (str?: string) => string;
 export declare const maskID: (str: string) => string;
 export declare const getIndividualName: (name: string) => {
@@ -9,3 +10,27 @@ export declare const convertNumbers2English: (str: string) => string;
 export declare const getParameterByName: (name: string) => string | null;
 export declare const getClientEmailUrl: () => string;
 export declare const capitalizeTheFirstLetterOfEachWord: (words: string) => string;
+export declare const getRequestHeaders: (deviceInfo: DeviceInfo) => {
+    al: string;
+    at: string;
+    aid: string;
+    an: string;
+    av: string;
+    acv: string;
+    asv: string;
+    rn: string;
+    rt: string;
+    rb: string;
+    rm: string;
+    ro: string;
+    rov: string;
+    bn: string;
+    bb: string;
+    bv: string;
+    bua: string;
+    bi: string;
+    ci: string;
+    cm: string;
+    l: string;
+};
+export declare const removeRequestHeaders: () => void;

package/build/utils/string.js

@@ -1,3 +1,5 @@
+import { encryptString } from '.';
+import { removeAxiosGlobalHeaders } from '../api';
 export var maskPhone = function (str) {
     if (str === void 0) { str = ''; }
     var lastTwo = str.substring(str.length - 2, str.length);
@@ -57,3 +59,57 @@ export var capitalizeTheFirstLetterOfEachWord = function (words) {
     }
     return separateWord.join(' ');
 };
+export var getRequestHeaders = function (deviceInfo) {
+    console.log(deviceInfo);
+    var app = deviceInfo.app, browser = deviceInfo.browser, connection = deviceInfo.connection, device = deviceInfo.device, source = deviceInfo.source;
+    return {
+        al: encryptString(app.language || ''),
+        at: encryptString(source || ''),
+        aid: encryptString(app.identifier || ''),
+        an: encryptString(app.name || ''),
+        av: encryptString(app.version || '0.0.0'),
+        acv: encryptString(''),
+        asv: encryptString(''),
+        rn: encryptString(device.name || ''),
+        rt: encryptString(device.type || ''),
+        rb: encryptString(device.brand || ''),
+        rm: encryptString(device.model || ''),
+        ro: encryptString(device.os.name || ''),
+        rov: encryptString(device.os.version || ''),
+        bn: encryptString(browser.name || ''),
+        bb: encryptString(''),
+        bv: encryptString(browser.version || ''),
+        bua: encryptString((browser.user_agent || '').substring(0, 80)),
+        bi: encryptString(browser.browser_id || ''),
+        ci: encryptString(connection.ip || ''),
+        cm: encryptString(connection.mac || ''),
+        l: encryptString((connection.latitude || 0).toString() + '-' + (connection.longitude || 0).toString())
+    };
+};
+export var removeRequestHeaders = function () {
+    removeAxiosGlobalHeaders([
+        'al',
+        'at',
+        'aid',
+        'an',
+        'av',
+        'acv',
+        'asv',
+        'rn',
+        'rt',
+        'rb',
+        'rm',
+        'ro',
+        'rov',
+        'bn',
+        'bb',
+        'bv',
+        'bua',
+        'bi',
+        'ci',
+        'cm',
+        'l',
+        'mdn',
+        'authorization'
+    ]);
+};

package/package.json

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