@tap-payments/auth-jsconnect 2.10.11-beta → 2.10.11

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

@@ -16,7 +16,7 @@ import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { settingsSelector } from '../../../../app/settings';
-import { getCurrencyByCountryIso2, hasVerifiedValue } from '../../../../utils';
+import { hasVerifiedValue } from '../../../../utils';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -26,6 +26,7 @@ import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import { ScreenContainer } from '../../../shared/Containers';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var Container = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -45,16 +46,12 @@ var MonthlyIncome = function (props) {
     var settingsData = useAppSelector(settingsSelector).data;
     var monthlyIncomeList = (data.individualData.responseBody || {}).monthlyIncomeList;
     var monthlyIncomeControl = useController({ control: control, name: 'monthlyIncome' });
-    var countryCode = settingsData.businessCountry;
     var user = (data.verify.responseBody || {}).user;
     var isMonthlyIncomeVerified = function (item) {
         if (!(item === null || item === void 0 ? void 0 : item.id))
             return false;
         return hasVerifiedValue(user === null || user === void 0 ? void 0 : user.data_verification, "monthly_income.".concat(item.id));
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     React.useEffect(function () {
         if ((monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.length) > 0) {
             setIncomeList(monthlyIncomeList);
@@ -83,9 +80,7 @@ var MonthlyIncome = function (props) {
     };
     var income = monthlyIncomeControl.field.value;
     var error = (_a = monthlyIncomeControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
-    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(InputSelect, { label: t('please_enter_actual_income', {
-                        currency: getCurrency
-                    }), required: true, readOnly: props.readOnly, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, placeholder: t('choose_any_source_of_income'), value: (isAr ? income === null || income === void 0 ? void 0 : income.range.ar : income === null || income === void 0 ? void 0 : income.range.en) || '', warningMessage: error && t(error), endAdornment: _jsx(EndAdornmentExpanded, { isVerified: isMonthlyIncomeVerified(income), anchorEl: anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'range.en', searchValuePath: ['range.en', 'range.ar'], list: incomeList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(InputSelect, { label: _jsx(TextWithCurrency, { text: t('monthly_income'), countryCode: settingsData.businessCountry.iso2 }), required: true, readOnly: props.readOnly, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, placeholder: t('choose_any_source_of_income'), value: (isAr ? income === null || income === void 0 ? void 0 : income.range.ar : income === null || income === void 0 ? void 0 : income.range.en) || '', warningMessage: error && t(error), endAdornment: _jsx(EndAdornmentExpanded, { isVerified: isMonthlyIncomeVerified(income), anchorEl: anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'range.en', searchValuePath: ['range.en', 'range.ar'], list: incomeList, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (income === null || income === void 0 ? void 0 : income.id) }, { children: isAr ? item.range.ar : item === null || item === void 0 ? void 0 : item.range.en })) }), item.id === (income === null || income === void 0 ? void 0 : income.id) && _jsx(CheckIcon, { isVerified: isMonthlyIncomeVerified(item) })] }));
                         } }) }))] })) })));
 };

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

@@ -14,13 +14,14 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Collapse from '@mui/material/Collapse';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
 import { individualSelector, clearError } from '../../../app/individual/individualStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var ShareValue = function (_a) {
     var _b;
     var show = _a.show, readOnly = _a.readOnly;
@@ -29,7 +30,6 @@ var ShareValue = function (_a) {
     var control = useFormContext().control;
     var bckError = useAppSelector(individualSelector).error;
     var dispatch = useAppDispatch();
-    var countryCode = settingsData.businessCountry;
     var handleChange = function (_a) {
         var target = _a.target;
         if (bckError)
@@ -37,14 +37,9 @@ var ShareValue = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         shareValueControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     var shareValueControl = useController({ control: control, name: 'shareValue' });
     var shareValue = shareValueControl.field.value;
     var error = (_b = shareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('share_value_label', {
-                    currency: getCurrency
-                }), onChange: handleChange, value: shareValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: shareValue, error: error }) }) })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('share_value_input_label'), countryCode: settingsData.businessCountry.iso2 }), onChange: handleChange, value: shareValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: shareValue, error: error }) }) })) })));
 };
 export default React.memo(ShareValue);

package/build/features/shared/Background/LogoBackground.js

@@ -1,19 +1,16 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
 import { styled } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import Icon from '../../../components/Icon';
 import { ICONS_NAMES } from '../../../constants';
-import { useLanguage } from '../../../hooks';
 var BoxStyled = styled(Box)(function (_a) {
     var _b;
     var theme = _a.theme;
     return (_b = {
             display: 'flex',
-            flexDirection: 'column',
             justifyContent: 'center',
-            alignItems: 'center',
-            paddingTop: theme.spacing(5)
+            paddingTop: theme.spacing(10)
         },
         _b[theme.breakpoints.down('sm')] = {
             paddingTop: theme.spacing(11)
@@ -23,20 +20,11 @@ var BoxStyled = styled(Box)(function (_a) {
 var LogoBadgeStyled = styled(Icon)(function (_a) {
     var theme = _a.theme;
     return ({
-        height: theme.spacing(8.875),
-        width: theme.spacing(8.875)
-    });
-});
-var LogoIconStyled = styled(Icon)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        width: theme.spacing(5.875),
-        height: theme.spacing(3.625),
-        marginTop: theme.spacing(2.5)
+        height: theme.spacing(9.5),
+        width: theme.spacing(19.322)
     });
 });
 var LogoBackground = function () {
-    var isAr = useLanguage().isAr;
-    return (_jsxs(BoxStyled, { children: [_jsx(LogoBadgeStyled, { src: ICONS_NAMES.TAP_LOGO_EN_ICON }), _jsx(LogoIconStyled, { src: isAr ? ICONS_NAMES.TAP_LOGO_TEXT_AR : ICONS_NAMES.TAP_LOGO_TEXT_EN, alt: 'tap logo' })] }));
+    return (_jsx(BoxStyled, { children: _jsx(LogoBadgeStyled, { src: ICONS_NAMES.TAP_LOGO, alt: 'tap logo' }) }));
 };
 export default memo(LogoBackground);

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

@@ -53,8 +53,7 @@ var BackIconStyled = styled(Icon, { shouldForwardProp: function (prop) { return
 var ButtonBoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
-        margin: theme.spacing(0, 2.5, 2.5, 2.5),
-        marginBlockStart: theme.spacing(5),
+        margin: theme.spacing(5, 2.5, 2.5, 2.5),
         maxHeight: theme.spacing(5.375),
         display: 'flex',
         alignItems: 'center',

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

@@ -20,7 +20,7 @@ export declare const InputStyled: import("@emotion/styled").StyledComponent<Pick
     warningType?: "alert" | "error" | "hint" | undefined;
 } & {} & import("@mui/system").MUIStyledCommonProps<Theme>, {}, {}>;
 export interface CustomInputProps extends InputProps {
-    label?: string;
+    label?: string | JSX.Element;
     required?: boolean;
     labelSx?: SxProps<Theme>;
 }

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

@@ -0,0 +1,3 @@
+import * as React from 'react';
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+export default _default;

package/build/features/shared/OTPVerifySecurityError/OTPVerifySecurityError.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import GenericError from '../../shared/GenericError';
+var OTPVerifySecurityError = function () {
+    var t = useTranslation().t;
+    return _jsx(GenericError, { error: t('something_went_wrong'), errorTitle: t('oops') });
+};
+export default React.memo(OTPVerifySecurityError);

package/build/features/shared/OTPVerifySecurityError/index.d.ts

@@ -0,0 +1,2 @@
+import OTPVerifySecurityError from './OTPVerifySecurityError';
+export default OTPVerifySecurityError;

package/build/features/shared/OTPVerifySecurityError/index.js

@@ -0,0 +1,2 @@
+import OTPVerifySecurityError from './OTPVerifySecurityError';
+export default OTPVerifySecurityError;

package/build/hooks/useAppConfig.js

@@ -48,7 +48,7 @@ export var useAppConfig = function (_a) {
         if (!disableSettingFetching && !configToken)
             removeRequestHeaders();
         checkDomain();
-        setBaseUrl(publicKey, rest.businessCountryCode);
+        setBaseUrl(publicKey, rest.region);
         setAppConfig();
         if (typeof boardMaturity === 'boolean')
             dispatch(handelBoardMaturity(boardMaturity));

package/build/utils/common.d.ts

@@ -1,6 +1,6 @@
 export declare const sleep: (milliseconds?: number) => Promise<unknown>;
 export declare const dangerousMessage: (message: string, callBack?: Function) => void;
-export declare const setBaseUrl: (publicKey: string, countryCode?: string) => void;
+export declare const setBaseUrl: (publicKey: string, region?: string) => void;
 export declare const updateLocationUrlWithCountry: (countryIso2: string) => void;
 export declare const openConnect: (pk: string, countryCode?: string) => void;
 export declare function getMetaData(): Record<string, string> | undefined;

package/build/utils/common.js

@@ -1,7 +1,7 @@
 import { axiosInstance } from '../api';
-import { ENDPOINT_PATHS, CONNECT_SANDBOX_URL, CONNECT_BETA_URL } from '../constants';
+import { ENDPOINT_PATHS, CONNECT_SANDBOX_URL, CONNECT_PROD_URL } from '../constants';
 import { objectHasValues } from './object';
-import { isSA } from './string';
+import { isDisasterRecoveryEnv, isSA } from './string';
 export var sleep = function (milliseconds) {
     if (milliseconds === void 0) { milliseconds = 1000; }
     return new Promise(function (resolve) { return setTimeout(resolve, milliseconds); });
@@ -12,14 +12,20 @@ export var dangerousMessage = function (message, callBack) {
     }
     callBack === null || callBack === void 0 ? void 0 : callBack({ message: message });
 };
-export var setBaseUrl = function (publicKey, countryCode) {
-    if (countryCode === void 0) { countryCode = ''; }
+export var setBaseUrl = function (publicKey, region) {
+    if (region === void 0) { region = ''; }
     var isProd = publicKey.includes('pk_live');
-    if (isProd) {
-        axiosInstance.defaults.baseURL = isSA(countryCode) ? ENDPOINT_PATHS.PRODUCTION_BASE_URL_SA : ENDPOINT_PATHS.BETA_BASE_URL;
+    var _a = region.split('-'), country = _a[0], envType = _a[1];
+    if (!isProd) {
+        axiosInstance.defaults.baseURL = ENDPOINT_PATHS.SANDBOX_BASE_URL;
         return;
     }
-    axiosInstance.defaults.baseURL = ENDPOINT_PATHS.SANDBOX_BASE_URL;
+    if (isSA(country)) {
+        axiosInstance.defaults.baseURL = isDisasterRecoveryEnv(envType) ? ENDPOINT_PATHS.PRODUCTION_BASE_URL_SA_DR : ENDPOINT_PATHS.PRODUCTION_BASE_URL_SA;
+    }
+    else {
+        axiosInstance.defaults.baseURL = ENDPOINT_PATHS.PRODUCTION_BASE_URL;
+    }
 };
 export var updateLocationUrlWithCountry = function (countryIso2) {
     var country = countryIso2.toLowerCase();
@@ -38,7 +44,7 @@ export var updateLocationUrlWithCountry = function (countryIso2) {
     window.history.replaceState({}, '', newUrl);
 };
 export var openConnect = function (pk, countryCode) {
-    var newUrl = new URL(pk.includes('pk_live') ? CONNECT_BETA_URL : CONNECT_SANDBOX_URL);
+    var newUrl = new URL(pk.includes('pk_live') ? CONNECT_PROD_URL : CONNECT_SANDBOX_URL);
     if (countryCode) {
         newUrl.pathname = "/".concat(countryCode.toLowerCase());
     }

package/build/utils/error.d.ts

@@ -1,3 +1,5 @@
 export declare const isNetworkError: (error: string | null) => boolean;
 export declare const isTokenExpired: (error: string | null) => boolean;
 export declare const isTimeoutError: (error: string | null) => boolean;
+export declare const isInternalServerError: (error: string | null) => boolean;
+export declare const isAuthenticationVerificationFailed: (error: string | null) => boolean;

package/build/utils/error.js

@@ -7,3 +7,9 @@ export var isTokenExpired = function (error) {
 export var isTimeoutError = function (error) {
     return (error || '').trim().toLowerCase().includes('timeout');
 };
+export var isInternalServerError = function (error) {
+    return ['internal_server_error'].includes((error || '').trim().toLowerCase());
+};
+export var isAuthenticationVerificationFailed = function (error) {
+    return ['failed to verify the auth'].includes((error || '').trim().toLowerCase());
+};

package/build/utils/string.d.ts

@@ -46,7 +46,7 @@ export declare const getBaseUrl: () => string;
 export declare const getScreenNameBasedOnFlow: (flow: string, isAuthorizedUser?: boolean, isOtherThanSAOrKWCountry?: boolean) => "CONNECT_NID_STEP" | "" | "BUSINESS_BUSINESS_TYPE_STEP" | "INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP" | "INDIVIDUAL_LIST_STEP" | "PASSWORD_CREATE_PASSWORD_STEP" | "BANK_BANK_DETAILS_STEP" | "TAX_TAX_DETAILS_STEP" | "ENTITY_NAME_STEP" | "BRAND_INFO_STEP";
 export declare const getEighteenYearsAgo: () => string;
 export declare const isKW: (flag: string) => boolean;
-export declare const isSA: (flag: string) => boolean;
+export declare const isSA: (flag: string | undefined) => boolean;
 export declare const isOtherThanKWOrSA: (flag: string) => boolean;
 export declare const isKWOrSA: (flag: string) => boolean;
 export declare const isLinkedIn: (flag: string) => boolean;
@@ -75,6 +75,7 @@ export declare const getFileType: (type: string) => "" | "image/jpeg" | "image/p
 export declare const isStringHasOneAsterisk: (value: string) => boolean;
 export declare const isOtherLicense: (item?: License) => boolean;
 export declare const formatNumberAsCurrency: (number: string) => string;
-export declare const getCurrencyByCountryIso2: (countryCode: string) => string;
+export declare const getCurrencyByCountryIso2: (countryCode?: string) => string;
 export declare const getMobileNumberLen: (initialLen: number, number: string) => number;
 export declare const getWebsiteLink: (isAr: boolean, countryCode: string, path: string) => string;
+export declare const isDisasterRecoveryEnv: (type?: string) => boolean;

package/build/utils/string.js

@@ -214,7 +214,9 @@ export var isKW = function (flag) {
     return ['kw', 'kwd'].includes(flag === null || flag === void 0 ? void 0 : flag.toLowerCase());
 };
 export var isSA = function (flag) {
-    return ['sa', 'sau'].includes(flag === null || flag === void 0 ? void 0 : flag.toLowerCase());
+    if (!flag)
+        return false;
+    return ['sa', 'sau'].includes(flag.toLowerCase());
 };
 export var isOtherThanKWOrSA = function (flag) {
     return !isKW(flag) && !isSA(flag);
@@ -344,3 +346,4 @@ export var getWebsiteLink = function (isAr, countryCode, path) {
     var language = isAr ? LANGUAGE_ABBREVIATIONS.ARABIC : LANGUAGE_ABBREVIATIONS.ENGLISH;
     return TAP_WEBSITE + language + '-' + countryCode + path;
 };
+export var isDisasterRecoveryEnv = function (type) { return type === 'dr'; };

package/build/utils/validation.js

@@ -53,7 +53,7 @@ export var keepLettersAndSpace = function (str) {
     return str.replace(/[^a-zA-Z] /g, '');
 };
 export var isConnectTapDomain = function (domain) {
-    var regex = /^(https:\/\/)?connect(\.\w+)?\.tap\.company$/;
+    var regex = /^(https:\/\/)?connect((\.|-)\w+)?\.tap\.(company|com\.\w{2})$/;
     return regex.test(domain);
 };
 export var isTapDomain = function (domain) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.10.11-beta",
+	"version": "2.10.11",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",
@@ -21,7 +21,7 @@
 		"copy:files": "copyfiles -u 1 src/**/*.css build/",
 		"tsc:alias": "tsc-alias -p tsconfig.json",
 		"ts:build": "rm -rf build && tsc -p tsconfig.json && tsc-alias -p tsconfig.json && yarn copy:files",
-		"push": "npm publish --access public --tag beta"
+		"push": "npm publish --access public"
 	},
 	"keywords": [],
 	"author": {
@@ -82,7 +82,7 @@
 		"@mui/icons-material": "^5.8.4",
 		"@mui/material": "^5.8.7",
 		"@reduxjs/toolkit": "^1.8.3",
-		"axios": "^0.27.2",
+		"axios": "^1.11.0",
 		"device-detector-js": "^3.0.3",
 		"i18next": "^21.8.14",
 		"i18next-browser-languagedetector": "^6.1.4",