@tap-payments/auth-jsconnect 2.10.0-beta → 2.10.0-sandbox

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/OTPInput.js

@@ -0,0 +1,49 @@
+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 } from "react/jsx-runtime";
+import * as React from 'react';
+import { useController, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import Box from '@mui/material/Box/Box';
+import { styled } from '@mui/material/styles';
+import OTPField from '../../../shared/OTP';
+import { DEFAULT_TIMER_VALUE } from '../../../../constants';
+import { connectExpressSelector, clearError, resendLeadMobileAuthOTP } from '../../../app/connectExpress/connectExpressStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+var BoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'column',
+        fontFamily: theme.typography.fontFamily
+    });
+});
+var OTPInput = function (_a) {
+    var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
+    var t = useTranslation().t;
+    var dispatch = useAppDispatch();
+    var otpControl = useController({ name: 'otp', control: control });
+    var error = useAppSelector(connectExpressSelector).error;
+    var handleOnOTPChange = function (otp) {
+        if (error)
+            dispatch(clearError());
+        otpControl.field.onChange(otp);
+    };
+    var handleOnResendOTP = function () {
+        if (otpControl.field.value)
+            setValue('otp', '', { shouldValidate: true });
+        dispatch(resendLeadMobileAuthOTP());
+    };
+    var otpValue = otpControl.field.value;
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+};
+export default React.memo(OTPInput);

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/VerifyMobileAuthOTP.d.ts

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

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/VerifyMobileAuthOTP.js

@@ -0,0 +1,88 @@
+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 Box from '@mui/material/Box/Box';
+import { styled } from '@mui/material/styles';
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import Text from '../../../../components/Text';
+import { clearError, connectExpressSelector, verifyAuthMobileOtpAsync, resetVerifyAuthOTPValue } from '../../../app/connectExpress/connectExpressStore';
+import Button from '../../../shared/Button';
+import { ScreenContainer } from '../../../shared/Containers';
+import { useAppDispatch, useAppSelector, useSanitizedTranslation } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { useLanguage } from '../../../../hooks';
+import { useForm, FormProvider } from 'react-hook-form';
+import { yupResolver } from '@hookform/resolvers/yup';
+import Form from '../../../../components/Form';
+import { maskPhone, deepCopy } from '../../../../utils';
+import { AuthForScreen } from '../../../../@types';
+import { OTPValidation } from './validation';
+import OTPInput from './OTPInput';
+var OTPTitleContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        background: theme.palette.common.white,
+        border: '1px solid',
+        borderColor: theme.palette.divider,
+        direction: theme.direction,
+        borderRadius: theme.spacing(0, 0, 1.25, 1.25),
+        marginBottom: theme.spacing(5.75)
+    });
+});
+var OTPTitleStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightLight, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
+});
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+var VerifyMobileAuthOTP = function () {
+    var _a, _b, _c, _d, _e, _f;
+    var dispatch = useAppDispatch();
+    var _g = useAppSelector(connectExpressSelector), data = _g.data, loading = _g.loading, error = _g.error;
+    var t = useTranslation().t;
+    var st = useSanitizedTranslation();
+    var isAr = useLanguage().isAr;
+    var methods = useForm({
+        resolver: yupResolver(OTPValidation),
+        defaultValues: data.verifyAuthOtpData,
+        mode: 'onChange'
+    });
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetVerifyAuthOTPValue());
+        };
+    }, []);
+    var onSubmit = function (formData) {
+        dispatch(verifyAuthMobileOtpAsync(deepCopy(formData)));
+    };
+    var onBack = function () {
+        var authFor = data.verifyAuthOtpData.authFor;
+        var step_name = 'CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP';
+        if (authFor === AuthForScreen.DOB)
+            step_name = 'CONNECT_EXPRESS_COLLECT_DOB_INFO_STEP';
+        else if (authFor === AuthForScreen.MOBILE_OWNERSHIP)
+            step_name = 'COLLECT_MOBILE_OWNERSHIP';
+        dispatch(handlePrevScreenStep(step_name));
+    };
+    var disabled = !methods.formState.isValid;
+    var phone = ((_c = (_b = (_a = data.responseData) === null || _a === void 0 ? void 0 : _a.verifyAuthMobile) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to) ? (_f = (_e = (_d = data.responseData) === null || _d === void 0 ? void 0 : _d.verifyAuthMobile) === null || _e === void 0 ? void 0 : _e.verification_by) === null || _f === void 0 ? void 0 : _f.sent_to : '';
+    var title = t('ide_opt_sent_title');
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? st('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: st(error || '') }, { children: t('next') }))] })) })) }));
+};
+export default React.memo(VerifyMobileAuthOTP);

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/index.d.ts

@@ -0,0 +1,3 @@
+import VerifyMobileAuthOTP, { VerifyMobileAuthOTPProps } from './VerifyMobileAuthOTP';
+export type { VerifyMobileAuthOTPProps };
+export default VerifyMobileAuthOTP;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/index.js

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

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/validation.d.ts

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const OTPValidation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/validation.js

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var OTPValidation = yup.object().shape({
+    otp: yup.string().min(6, 'otp_min_length').required('otp_required')
+});

package/build/features/connectExpress/screens/VerifyNafath/VerifyNafath.js

@@ -4,14 +4,16 @@ import { connectExpressSelector, verifyNafathAsync } from '../../../app/connectE
 import NafathVerification from '../../../shared/NafathVerification';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import GenericPrepareDataLoading from '../GenericPrepareDataLoading';
 var VerifyNafath = function () {
     var _a = React.useState(false), success = _a[0], setSuccess = _a[1];
     var _b = React.useState(false), failed = _b[0], setFailed = _b[1];
     var _c = React.useState(false), isReady = _c[0], setIsReady = _c[1];
+    var _d = React.useState(false), showLoadingScreen = _d[0], setShowLoadingScreen = _d[1];
     var dispatch = useAppDispatch();
     var data = useAppSelector(connectExpressSelector).data;
     var authData = (data.responseData || {}).authData;
-    var _d = authData || {}, expiry = _d.expiry, app_url_android = _d.app_url_android, app_url_ios = _d.app_url_ios, random = _d.random;
+    var _e = authData || {}, expiry = _e.expiry, app_url_android = _e.app_url_android, app_url_ios = _e.app_url_ios, random = _e.random;
     React.useEffect(function () {
         if (authData && !isReady) {
             setIsReady(true);
@@ -20,7 +22,11 @@ var VerifyNafath = function () {
     React.useEffect(function () {
         if (!isReady)
             return;
-        var promise = dispatch(verifyNafathAsync({ onSuccess: function () { return setSuccess(true); }, onFailure: function () { return setFailed(true); } }));
+        var promise = dispatch(verifyNafathAsync({
+            onSuccess: function () { return setSuccess(true); },
+            onFailure: function () { return setFailed(true); },
+            showLoadingScreenAfterNafathSuccess: function () { return setShowLoadingScreen(true); }
+        }));
         return function () {
             promise === null || promise === void 0 ? void 0 : promise.abort();
         };
@@ -30,6 +36,6 @@ var VerifyNafath = function () {
     }, []);
     if (!isReady)
         return null;
-    return (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
+    return showLoadingScreen ? (_jsx(GenericPrepareDataLoading, {})) : (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
 };
 export default React.memo(VerifyNafath);

package/build/features/entity/screens/EntityCapital/CapitalPaid.js

@@ -15,11 +15,12 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
 import { clearError } from '../../../app/entity/entityStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var CapitalPaid = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
@@ -34,14 +35,9 @@ var CapitalPaid = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         capitalPaidControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(settingsData.businessCountry.iso2));
-    }, [settingsData.businessCountry.iso2]);
     var capitalPaidControl = useController({ control: control, name: 'capitalPaid' });
     var capitalPaidValue = capitalPaidControl.field.value;
     var error = (_b = capitalPaidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('capital_paid_label', {
-                currency: getCurrency
-            }), required: true, onChange: handleChange, value: capitalPaidValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_paid_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalPaidValue, isVerified: isVerified }) }) })));
+    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('capital_paid_input_label'), countryCode: settingsData.businessCountry.iso2 }), required: true, onChange: handleChange, value: capitalPaidValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_paid_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalPaidValue, isVerified: isVerified }) }) })));
 };
 export default React.memo(CapitalPaid);

package/build/features/entity/screens/EntityCapital/CapitalShareValue.js

@@ -13,13 +13,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-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 { clearError } from '../../../app/entity/entityStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var CapitalShareValue = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
@@ -34,14 +35,9 @@ var CapitalShareValue = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         capitalShareValueControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(settingsData.businessCountry.iso2));
-    }, [settingsData.businessCountry.iso2]);
     var capitalShareValueControl = useController({ control: control, name: 'capitalShareValue' });
     var capitalShareValueValue = capitalShareValueControl.field.value;
     var error = (_b = capitalShareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('capital_share_value_label', {
-                currency: getCurrency
-            }), required: true, onChange: handleChange, value: capitalShareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalShareValueValue, isVerified: isVerified }) }) })));
+    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('capital_share_value_input_label'), countryCode: settingsData.businessCountry.iso2 }), required: true, onChange: handleChange, value: capitalShareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalShareValueValue, isVerified: isVerified }) }) })));
 };
 export default React.memo(CapitalShareValue);

package/build/features/featuresScreens.js

@@ -27,6 +27,7 @@ import ConnectExpressIdentityVerifyNafathScreen from './connectExpress/screens/I
 import ConnectExpressCollectIndividualScreen from './connectExpress/screens/CollectIndividualInfo';
 import ConnectExpressCollectDobScreen from './connectExpress/screens/DOB';
 import ConnectExpressCollectBusinessScreen from './connectExpress/screens/CollectBusinessInfo';
+import ConnectExpressVerifyAuthMobileOtpScreen from './connectExpress/screens/VerifyMobileAuthOTP';
 import ConnectExpressCreateAccountLoaderScreen from './connectExpress/screens/CreateAccountLoader';
 import ConnectExpressPreparingDataLoaderScreen from './connectExpress/screens/PrepareDataLoading';
 import ConnectExpressSuccessFlowButtonsScreen from './connectExpress/screens/SuccessWithFlowButtons';
@@ -56,6 +57,7 @@ import AuthAccountCreatedLoaderScreen from './auth/screens/AccountCreatedLoader'
 import AuthEmailSentScreen from './auth/screens/EmailSent';
 import AuthMigratingDataScreen from './auth/screens/MigratingData';
 import AuthOperatorError from './auth/screens/OperatorError';
+import AuthPasscodeScreen from './auth/screens/Passcode';
 import CustomersPage from './business/screens/Customers';
 import IDBODPage from './business/screens/IDBOD';
 import BusinessVerifyPage from './business/screens/Verify';
@@ -262,6 +264,10 @@ export var connectExpressFeatureScreens = [
         name: 'CONNECT_EXPRESS_COLLECT_BUSINESS_INFO_STEP',
         element: ConnectExpressCollectBusinessScreen
     },
+    {
+        name: 'CONNECT_EXPRESS_VERIFY_AUTH_OTP_STEP',
+        element: ConnectExpressVerifyAuthMobileOtpScreen
+    },
     {
         name: 'CONNECT_EXPRESS_ACCOUNT_ALREADY_CREATED_STEP',
         element: ConnectExpressAccountAlreadyCreatedScreen
@@ -320,6 +326,10 @@ export var authFeatureScreens = [
         name: 'AUTH_OTP_STEP',
         element: AuthOTPScreen
     },
+    {
+        name: 'AUTH_PASSCODE_STEP',
+        element: AuthPasscodeScreen
+    },
     {
         name: 'AUTH_PASSWORD_STEP',
         element: AuthPasswordScreen

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/kyc/screens/Terms/Terms.js

@@ -15,7 +15,7 @@ import { handleNextScreenStep, settingsSelector } from '../../../../app/settings
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector, useLanguage, useSanitizedTranslation } from '../../../../hooks';
-import { getWebsiteLink, isSA, maskIDNumber } from '../../../../utils';
+import { getWebsiteLink, isOtherThanKWOrSA, isSA, maskIDNumber } from '../../../../utils';
 import { CONNECT_FLOWS, EXTERNAL_LINKS } from '../../../../constants';
 import Button from '../../../shared/Button';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
@@ -55,6 +55,7 @@ export var Terms = function () {
     var termsAndConditionsLink = getWebsiteLink(isAr, countryCode, EXTERNAL_LINKS.TERMS_CONDITIONS);
     var privacyPolicyLink = getWebsiteLink(isAr, countryCode, EXTERNAL_LINKS.PRIVACY_POLICY);
     var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var isOtherThanKWOrSACountry = React.useMemo(function () { return isOtherThanKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var onNext = function () {
         if (hasOneUserOnly) {
             if (isSACountry) {
@@ -76,6 +77,11 @@ export var Terms = function () {
         }
         dispatch(handleNextScreenStep(CONNECT_FLOWS.kyc.users));
     };
-    return (_jsxs(ScreenContainer, { children: [_jsx(Header, { idNumber: idNumber }), _jsx(BoxStyled, __assign({ onClick: function () { return redirect(termsAndConditionsLink); } }, { children: st('kyc_terms_conditions') })), _jsx(BoxStyled, __assign({ onClick: function () { return redirect(termsAndConditionsLink); } }, { children: st('kyc_refund_policy') })), _jsx(BoxStyled, __assign({ onClick: function () { return redirect(termsAndConditionsLink); } }, { children: st('kyc_dispute_policy') })), _jsx(BoxStyled, __assign({ onClick: function () { return redirect(privacyPolicyLink); }, sx: { mb: error ? 3 : 0 } }, { children: st('kyc_privacy_policy') })), _jsx(Button, __assign({ sx: { mt: 3 }, disableBack: true, isAr: isAr, loading: loading, error: st(error || ''), onClick: onNext }, { children: isSACountry ? st('approve_with_nafath_app') : st('approve_with_paci_app') }))] }));
+    var getNextButtonTitle = function () {
+        if (isOtherThanKWOrSACountry)
+            return st('continue');
+        return isSACountry ? st('approve_with_nafath_app') : st('approve_with_paci_app');
+    };
+    return (_jsxs(ScreenContainer, { children: [_jsx(Header, { idNumber: idNumber }), _jsx(BoxStyled, __assign({ onClick: function () { return redirect(termsAndConditionsLink); } }, { children: st('kyc_terms_conditions') })), _jsx(BoxStyled, __assign({ onClick: function () { return redirect(termsAndConditionsLink); } }, { children: st('kyc_refund_policy') })), _jsx(BoxStyled, __assign({ onClick: function () { return redirect(termsAndConditionsLink); } }, { children: st('kyc_dispute_policy') })), _jsx(BoxStyled, __assign({ onClick: function () { return redirect(privacyPolicyLink); }, sx: { mb: error ? 3 : 0 } }, { children: st('kyc_privacy_policy') })), _jsx(Button, __assign({ disabled: isOtherThanKWOrSACountry, sx: { mt: 3 }, disableBack: true, isAr: isAr, loading: loading, error: st(error || ''), onClick: onNext }, { children: getNextButtonTitle() }))] }));
 };
 export default memo(Terms);

package/build/features/kyc/screens/Users/Users.js

@@ -69,7 +69,7 @@ var Users = function () {
         })
             .catch(function () { });
     };
-    return (_jsxs(ScreenContainer, __assign({ sx: { pl: 2, pr: 2 } }, { children: [_jsx(DescriptionStyled, { children: st('kyc_users_description', { provider: isSACountry ? 'NAFATH' : 'PACI' }) }), userList.map(function (user, index) {
+    return (_jsxs(ScreenContainer, __assign({ sx: { pl: 2, pr: 2, pb: 3 } }, { children: [_jsx(DescriptionStyled, { children: st('kyc_users_description', { provider: isSACountry ? 'NAFATH' : 'PACI' }) }), userList.map(function (user, index) {
                 return (_jsx(BoxStyled, __assign({ onClick: function () { return onClickUser(user); } }, { children: (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id && loading ? (_jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 8, style: { height: 20, width: 20 }, toggleAnimation: !!loading })) : (_jsxs(_Fragment, { children: [_jsx(ImgStyled, { src: ICONS_NAMES.individual_filled_icon }), maskIDNumber(user.identification.id), _jsx("span", {})] })) }), index));
             }), error && (_jsx(Warning, __assign({ sx: { mt: 3, mb: 3 }, warningType: 'error' }, { children: error })))] })));
 };

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/Button/FlowsButtons.js

@@ -163,6 +163,7 @@ export default function FlowsButtons(_a) {
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
     var onRedirect = function (item) {
+        var _a;
         if (!item.href)
             return;
         var name = item.name === FlowsTypes.BANK ? 'Wallet' : capitalize(item.name);
@@ -180,7 +181,7 @@ export default function FlowsButtons(_a) {
             return;
         }
         if (typeof settingsData.appConfig.onBoardButtonClick === 'function') {
-            settingsData.appConfig.onBoardButtonClick({ name: item.name, token: item.token });
+            settingsData.appConfig.onBoardButtonClick({ name: item.name, token: item.token, countryCode: (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2 });
             return;
         }
         dispatch(handleOpen(false));

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/hooks/useAppConfig.js

@@ -48,7 +48,7 @@ export var useAppConfig = function (_a) {
         if (!disableSettingFetching && !configToken)
             removeRequestHeaders();
         checkDomain();
-        setBaseUrl(publicKey);
+        setBaseUrl(publicKey, rest.businessCountryCode);
         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) => void;
+export declare const setBaseUrl: (publicKey: string, countryCode?: 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,6 +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';
 export var sleep = function (milliseconds) {
     if (milliseconds === void 0) { milliseconds = 1000; }
     return new Promise(function (resolve) { return setTimeout(resolve, milliseconds); });
@@ -11,10 +12,11 @@ export var dangerousMessage = function (message, callBack) {
     }
     callBack === null || callBack === void 0 ? void 0 : callBack({ message: message });
 };
-export var setBaseUrl = function (publicKey) {
+export var setBaseUrl = function (publicKey, countryCode) {
+    if (countryCode === void 0) { countryCode = ''; }
     var isProd = publicKey.includes('pk_live');
     if (isProd) {
-        axiosInstance.defaults.baseURL = ENDPOINT_PATHS.BETA_BASE_URL;
+        axiosInstance.defaults.baseURL = isSA(countryCode) ? ENDPOINT_PATHS.PRODUCTION_BASE_URL_SA : ENDPOINT_PATHS.PRODUCTION_BASE_URL;
         return;
     }
     axiosInstance.defaults.baseURL = ENDPOINT_PATHS.SANDBOX_BASE_URL;
@@ -36,7 +38,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,2 +1,3 @@
 export declare const isNetworkError: (error: string | null) => boolean;
 export declare const isTokenExpired: (error: string | null) => boolean;
+export declare const isTimeoutError: (error: string | null) => boolean;

package/build/utils/error.js

@@ -4,3 +4,6 @@ export var isNetworkError = function (error) {
 export var isTokenExpired = function (error) {
     return ['token expired'].includes((error || '').trim().toLowerCase());
 };
+export var isTimeoutError = function (error) {
+    return (error || '').trim().toLowerCase().includes('timeout');
+};

package/build/utils/string.d.ts

@@ -75,6 +75,6 @@ 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;