@tap-payments/auth-jsconnect 2.0.45-test → 2.0.45

package/build/features/signIn/screens/Email/Email.js

@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next';
 import { alpha, styled } from '@mui/material/styles';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
+import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { clearError, signInSelector, createEmailAuth } from '../../../app/signIn/signInStore';
 import Form from '../../../../components/Form';
@@ -70,11 +70,13 @@ var Email = function (_a) {
     var t = useTranslation().t;
     var _b = useAppSelector(signInSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var settingsStore = useAppSelector(settingsSelector);
+    var _c = data.auth, responseBody = _c.responseBody, email = _c.email;
     var methods = useForm({
         resolver: yupResolver(EmailValidationSchema),
-        defaultValues: { email: data.auth.email || '' },
+        defaultValues: { email: email || '' },
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, { email: email || '' });
     React.useEffect(function () {
         handleClearError();
     }, [methods.formState.isValid]);

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

@@ -19,7 +19,7 @@ import { styled, alpha } from '@mui/material/styles';
 import Collapse from '../../../../components/Collapse';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { clearError, createMobileAuth, signInSelector } from '../../../app/signIn/signInStore';
@@ -79,6 +79,10 @@ var Mobile = function (_a) {
         defaultValues: { mobile: data.auth.mobile || '', countryCode: data.auth.countryCode },
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, {
+        mobile: data.auth.mobile || '',
+        countryCode: data.auth.countryCode
+    });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var handleMenuListClick = function (flag) {

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

@@ -9,6 +9,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
@@ -18,7 +29,7 @@ import Text from '../../../../components/Text';
 import { clearError, signInSelector, resetOTPScreen, verifyAuthOTP } from '../../../app/signIn/signInStore';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
 import { useForm, FormProvider } from 'react-hook-form';
@@ -50,11 +61,13 @@ var OTP = function () {
     var _a;
     var dispatch = useAppDispatch();
     var _b = useAppSelector(signInSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _c = data.otpData, responseBody = _c.responseBody, defaultValues = __rest(_c, ["responseBody"]);
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, defaultValues);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var isEmail = !!data.auth.email;

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

@@ -9,6 +9,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
@@ -17,7 +28,7 @@ import { useSelector } from 'react-redux';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import { useLanguage } from '../../../../hooks';
@@ -38,11 +49,13 @@ var Password = function (_a) {
     var dispatch = useAppDispatch();
     var _b = useSelector(signInSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var isEmail = !!data.auth.email;
+    var _c = data.passwordData, responseBody = _c.responseBody, defaultValues = __rest(_c, ["responseBody"]);
     var methods = useForm({
         resolver: yupResolver(PasswordValidation),
-        defaultValues: data.passwordData,
+        defaultValues: defaultValues,
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, defaultValues);
     var onSubmit = function (data) {
         dispatch(verifyAuthPassword(data));
     };

package/build/features/tax/Tax.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="react" />
 import { LibConfig } from '../../@types';
 export interface TaxLibProps extends LibConfig {
+    verifyToken?: string;
 }
-export declare function TaxLib(props: TaxLibProps): JSX.Element;
-export declare function renderTaxLib(config: TaxLibProps, elementId: string): void;
-export declare function unmountTaxLib(elementId: string, unmountTimeout?: number): void;
+export declare function TaxElement(props: TaxLibProps): JSX.Element;
+export declare function renderTaxLib(config: TaxLibProps, elementId: string): {
+    unmount: () => void;
+};

package/build/features/tax/Tax.js

@@ -9,63 +9,64 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx } from "react/jsx-runtime";
-import { memo, useEffect } from 'react';
-import { useAppTheme, useAppDispatch, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener } from '../../hooks';
-import { handleLanguage, settingsSelector } from '../../app/settings';
+import { memo } from 'react';
+import { createRoot } from 'react-dom/client';
+import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener, useVerifyToken } from '../../hooks';
+import { settingsSelector } from '../../app/settings';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { getParameterByName, reactElement } from '../../utils';
+import { createElementAndInject } from '../../utils';
 import { FeatureContainer } from '../shared/Containers';
-import { DIALOG_ID, TAX_SCREENS_NAVIGATION } from '../../constants';
+import { TAX_SCREENS_NAVIGATION } from '../../constants';
 import { taxFeatureScreens } from '../featuresScreens';
 import CustomFooter from '../shared/Footer';
 import { taxSelector, verifyLeadToken } from '../app/tax/taxStore';
 import Background from '../shared/Background';
-var Tax = memo(function (props) {
+var Tax = memo(function (_a) {
+    var verifyToken = _a.verifyToken, props = __rest(_a, ["verifyToken"]);
     var theme = useAppTheme().theme;
-    var dispatch = useAppDispatch();
-    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, loading = _a.loading;
-    var _b = useAppSelector(taxSelector), customLoading = _b.customLoading, taxError = _b.error;
-    useAppConfig(__assign({ navigation: TAX_SCREENS_NAVIGATION }, props));
+    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
+    var _c = useAppSelector(taxSelector), customLoading = _c.customLoading, taxError = _c.error, loading = _c.loading;
+    useAppConfig(__assign(__assign({ navigation: TAX_SCREENS_NAVIGATION }, props), { disableSettingFetching: !!verifyToken }));
     useErrorListener(taxError || error);
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
-    var verifyToken = function () {
-        var token = getParameterByName('token');
-        var lang = getParameterByName('lang');
-        if (lang)
-            dispatch(handleLanguage(lang));
-        if (!token)
-            throw new Error('Auth token is not found!');
-        dispatch(verifyLeadToken(token));
-    };
-    useEffect(function () {
-        if (!loading)
-            verifyToken();
-    }, [loading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: loading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, open: open, error: error, loading: loading || customLoading, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: taxFeatureScreens.map(function (_a, index) {
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation;
+    useVerifyToken({
+        verify: verifyLeadToken,
+        loadingScreenName: 'TAX_LOADING_DATA_STEP',
+        navigation: featureScreensNavigation,
+        open: open,
+        internalToken: verifyToken,
+        settingLoading: settingLoading
+    });
+    var initialLoading = verifyToken ? settingLoading : settingLoading || customLoading;
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, open: open, error: error, loading: initialLoading, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: taxFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
                     }) }) })) })) })));
 });
-export function TaxLib(props) {
+export function TaxElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Tax, __assign({}, props)) })));
 }
 export function renderTaxLib(config, elementId) {
-    reactElement(elementId).render(_jsx(TaxLib, __assign({}, config)));
-}
-export function unmountTaxLib(elementId, unmountTimeout) {
-    if (unmountTimeout === void 0) { unmountTimeout = 1000; }
-    var element = document.getElementById(elementId);
-    var dialogEl = document.getElementById(DIALOG_ID);
-    setTimeout(function () {
-        var _a;
-        ((_a = element === null || element === void 0 ? void 0 : element.children) === null || _a === void 0 ? void 0 : _a.length) && element.removeChild(element.children[0]);
-        dialogEl && dialogEl.remove();
-        reactElement(elementId).unmount();
-    }, unmountTimeout);
+    var element = createElementAndInject(elementId);
+    var root = createRoot(element);
+    root.render(_jsx(TaxElement, __assign({}, config)));
+    var unmount = function () { return root.unmount(); };
+    return { unmount: unmount };
 }

package/build/features/tax/screens/PrepareDataLoading/PrepareDataLoading.d.ts

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

package/build/features/tax/screens/PrepareDataLoading/PrepareDataLoading.js

@@ -0,0 +1,10 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { memo } from 'react';
+import { useAppSelector } from '../../../../hooks';
+import DataLoading from '../../../shared/DataLoading';
+import { taxSelector } from '../../../app/tax/taxStore';
+export var PrepareDataLoading = function () {
+    var error = useAppSelector(taxSelector).error;
+    return _jsx(DataLoading, { error: error });
+};
+export default memo(PrepareDataLoading);

package/build/features/tax/screens/PrepareDataLoading/index.d.ts

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

package/build/features/tax/screens/PrepareDataLoading/index.js

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

package/build/features/tax/screens/ResetPasswordSuccess/ResetPasswordSuccess.js

@@ -1,9 +1,16 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 import SuccessScreen from '../../../shared/SuccessScreen';
+import { useAppSelector } from '../../../../hooks';
+import { maskEmail } from '../../../../utils';
+import { taxSelector } from '../../../../features/app/tax/taxStore';
 var ResetPasswordSuccess = function (_a) {
+    var _b, _c;
     var t = useTranslation().t;
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: t("reset_password_success_description"), showEmailProviders: true }));
+    var data = useAppSelector(taxSelector).data;
+    var email = ((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact).email;
+    var maskedEmail = maskEmail(email);
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true }));
 };
 export default React.memo(ResetPasswordSuccess);

package/build/features/tax/screens/Success/Success.js

@@ -7,10 +7,16 @@ import SuccessScreen from '../../../shared/SuccessScreen';
 var Success = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(taxSelector), loading = _b.loading, error = _b.error;
-    var onSuccess = function () {
+    var _b = useAppSelector(taxSelector), error = _b.error, data = _b.data;
+    var _c = React.useState(false), clicked = _c[0], setClicked = _c[1];
+    var responseBody = data.verify.responseBody;
+    var updateBoardSuccessLoading = (responseBody || {}).updateBoardSuccessLoading;
+    React.useEffect(function () {
         dispatch(updateLeadSuccess());
+    }, []);
+    var onSuccess = function () {
+        setClicked(true);
     };
-    return (_jsx(SuccessScreen, { title: t('tax_success_title'), onSuccess: onSuccess, successTitle: t('continue'), loading: loading, error: error || '' }));
+    return (_jsx(SuccessScreen, { title: t('tax_success_title'), onSuccess: onSuccess, successTitle: t('continue'), loading: clicked && updateBoardSuccessLoading, error: error || '' }));
 };
 export default React.memo(Success);

package/build/features/tax/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js

@@ -9,101 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { memo, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { styled } from '@mui/material/styles';
-import { FlowsButtons } from '../../../shared/Button';
-import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
-import { useAppSelector, useLanguage } from '../../../../hooks';
-import { getResetFlowUrl, showLastFour } from '../../../../utils';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { memo } from 'react';
+import { useAppSelector } from '../../../../hooks';
 import { taxSelector } from '../../../app/tax/taxStore';
-import Box from '@mui/material/Box';
-import Text from '../../../../components/Text';
-import Container from '../../../shared/Containers/ScreenContainer';
-import AcceptancePayouts from '../../../shared/AcceptancePayouts';
-import { settingsSelector } from '../../../../app/settings';
-var TitleStyled = styled(Text)(function (_a) {
-    var _b;
-    var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), (_b = { fontWeight: theme.typography.fontWeightBold, color: theme.palette.text.primary, lineHeight: 1.75, paddingBottom: theme.spacing(3) }, _b[theme.breakpoints.down('sm')] = {}, _b)));
-});
-var ContainerStyled = styled(Container)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        justifyContent: 'space-between',
-        minHeight: theme.spacing(30),
-        alignItems: 'center'
-    });
-});
-var ButtonGroupStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        width: '100%',
-        paddingTop: theme.spacing(3)
-    });
-});
+import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
 var SuccessWithFlowButtons = function () {
-    var _a, _b, _c;
-    var t = useTranslation().t;
-    var isAr = useLanguage().isAr;
     var data = useAppSelector(taxSelector).data;
-    var _d = data.verify.responseBody || {}, flows = _d.flows, nameObj = _d.name, entity = _d.entity, brand = _d.brand, bank = _d.bank, merchant = _d.merchant, identification_id = _d.identification_id, vatID = _d.vatID;
-    var _e = useState([]), buttons = _e[0], setButtons = _e[1];
-    var username = ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.first) || '') + ' ' + ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.last) || '');
-    var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
-    var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
-    var taxID = vatID || '';
-    var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';
-    var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
-    var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;
-    var maskedId = !!identification_id ? " ".concat(t('masking_symbols')).concat(identification_id) : '';
-    var settings = useAppSelector(settingsSelector);
-    var _f = data.verify.responseBody || { contact: {}, board_id: '' }, contact = _f.contact, board_id = _f.board_id, board_info_id = _f.board_info_id;
-    var email = (contact || { email: '' }).email;
-    var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, board_id, board_info_id);
-    var reMapFlowData = function (flows) {
-        if (flows === void 0) { flows = []; }
-        var images = ICONS_NAMES;
-        var mappedFlows = flows
-            .filter(function (item) { return item === null || item === void 0 ? void 0 : item.name; })
-            .map(function (_a) {
-            var name = _a.name, url = _a.url, status = _a.status;
-            var type = status === 'initiated' || status === 'in_progress' ? 'pending' : 'completed';
-            var title = t("".concat(name, "_flow_").concat(type), {
-                individual_name: username.toLowerCase() + maskedId,
-                business_type: brandName,
-                license_number: t('masking_symbols') + showLastFour(licenseNumber),
-                bank_name: bankName,
-                iban: t('masking_symbols') + iban,
-                tax_id: t('masking_symbols') + showLastFour(taxID)
-            });
-            var isCompleted = status === 'completed' && name !== 'password';
-            var isIndividual = name === 'individual';
-            var src = isCompleted ? "".concat(name, "_green_icon") : "".concat(name, "_filled_icon");
-            var hoverSrc = "".concat(name, "_white_icon");
-            return {
-                name: name,
-                status: status,
-                title: title,
-                href: url,
-                src: images[src],
-                hoverSrc: images[hoverSrc],
-                isCompleted: isCompleted,
-                sx: isIndividual ? { textTransform: 'capitalize' } : {}
-            };
-        });
-        setButtons(mappedFlows);
-    };
-    useEffect(function () {
-        if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0)
-            reMapFlowData(flows);
-    }, [flows, isAr]);
-    return (_jsxs(ContainerStyled, { children: [_jsxs(TitleStyled, { children: [t('account_details'), " "] }), _jsx(AcceptancePayouts, { showAcceptance: isAcceptance, showPayout: isPayout }), _jsx(ButtonGroupStyled, { children: _jsx(FlowsButtons, { buttons: buttons, data: {
-                        flowName: data.flowName,
-                        email: email,
-                        emailUrl: url
-                    } }) })] }));
+    var _a = data.verify.responseBody || {}, flows = _a.flows, entity = _a.entity, brand = _a.brand, bank = _a.bank_account, merchant = _a.merchant, user = _a.user, business = _a.business, board_id = _a.board_id, board_info_id = _a.board_info_id, name = _a.name;
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, flows: flows || [] }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/features/tax/screens/TaxDetails/TaxDetails.js

@@ -10,19 +10,22 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ScreenContainer } from '../../../shared/Containers';
-import Button from '../../../shared/Button';
-import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
+import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { styled } from '@mui/material/styles';
 import { useForm, FormProvider } from 'react-hook-form';
-import Form from '../../../../components/Form';
-import { Validation } from './validation';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { styled } from '@mui/material/styles';
+import Form from '../../../../components/Form';
+import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
+import { handleCurrentActiveScreen, settingsSelector } from '../../../../app/settings';
+import { isSA } from '../../../../utils';
+import { ScreenContainer } from '../../../shared/Containers';
+import Button from '../../../shared/Button';
 import { taxSelector, updateTaxInfo } from '../../../app/tax/taxStore';
-import { handleCurrentActiveScreen } from '../../../../app/settings';
+import { Validation } from './validation';
 import VATId from './VATId';
 import ConfirmPolicy from './ConfirmPolicy';
+import TaxDocument from './TaxDocument';
 var FormStyled = styled(Form)(function () { return ({
     height: '100%',
     display: 'flex',
@@ -31,20 +34,28 @@ var FormStyled = styled(Form)(function () { return ({
 }); });
 var TaxDetails = function () {
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(taxSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var _a = useAppSelector(taxSelector), data = _a.data, loading = _a.loading, error = _a.error, uploading = _a.uploading;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var _b = data.taxData, vatId = _b.vatId, confirmPolicy = _b.confirmPolicy, documentId = _b.documentId;
     var methods = useForm({
         resolver: yupResolver(Validation),
-        defaultValues: data.taxData,
+        defaultValues: {
+            vatId: vatId,
+            confirmPolicy: confirmPolicy,
+            documentId: documentId
+        },
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, data.taxData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var onSubmit = function (data) {
         dispatch(updateTaxInfo(data));
     };
     var onBack = function () {
         dispatch(handleCurrentActiveScreen('TAX_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(VATId, {}), _jsx(ConfirmPolicy, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(VATId, {}), _jsx(TaxDocument, { show: isSACountry }), _jsx(ConfirmPolicy, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: !methods.formState.isValid || uploading, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default TaxDetails;

package/build/features/tax/screens/TaxDetails/TaxDocument.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+interface TaxDocumentProps {
+    show: boolean;
+}
+declare const TaxDocument: ({ show }: TaxDocumentProps) => JSX.Element;
+export default TaxDocument;

package/build/features/tax/screens/TaxDetails/TaxDocument.js

@@ -0,0 +1,42 @@
+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 { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { styled } from '@mui/material/styles';
+import Collapse from '../../../../components/Collapse';
+import { ScreenContainer } from '../../../shared/Containers';
+import { taxSelector, uploadingStatus } from '../../../app/tax/taxStore';
+import UploadMultipleFile from '../../../shared/UploadMultipleFile';
+var FeatureStyled = styled(ScreenContainer)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        marginBlockStart: theme.spacing(3)
+    });
+});
+var TaxDocument = function (_a) {
+    var show = _a.show;
+    var t = useTranslation().t;
+    var control = useFormContext().control;
+    var dispatch = useAppDispatch();
+    var documentIdControl = useController({ name: 'documentId', control: control });
+    var loading = useAppSelector(taxSelector).loading;
+    var handleTaxDocumentChange = function (ids) {
+        documentIdControl.field.onChange(ids);
+    };
+    var handleReset = function (ids) {
+        documentIdControl.field.onChange(ids);
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, __assign({ sx: { mb: 2.5 } }, { children: _jsx(UploadMultipleFile, { label: t('title_tax_document'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_tax_document'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_bank_statement'), onFileUploaded: handleTaxDocumentChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, purpose: 'tax_document_user_upload', fileUploadingStatus: function (uploading) { return dispatch(uploadingStatus(uploading)); } }) })) })));
+};
+export default TaxDocument;

package/build/features/tax/screens/TaxDetails/VATId.js

@@ -10,19 +10,24 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
 import Box from '@mui/material/Box';
 import Input from '../../../shared/Input';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { VAT_ID_LENGTH } from '../../../../constants';
+import { useAppSelector } from '../../../../hooks';
+import { isSA, removeAllCharsFromNumber } from '../../../../utils';
+import { settingsSelector } from '../../../../app/settings';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
-import { removeAllCharsFromNumber } from '../../../../utils';
 var VATId = function () {
     var _a;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var vatControl = useController({ name: 'vatId', control: control });
+    var settingsData = useAppSelector(settingsSelector).data;
+    var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var handleOnChange = function (vat) {
         var value = removeAllCharsFromNumber(vat);
         vatControl.field.onChange(value);
@@ -32,6 +37,6 @@ var VATId = function () {
     var clearValue = function () {
         vatControl.field.onChange('');
     };
-    return (_jsx(Box, __assign({ sx: { height: '200px' } }, { children: _jsx(Input, { label: t('vat_id'), inputProps: { maxLength: VAT_ID_LENGTH }, value: vatValue, onChange: function (event) { return handleOnChange(event.target.value); }, placeholder: t('vat_id_placeholder'), warningType: 'alert', warningMessage: vatError && t(vatError), required: true, endAdornment: !vatError && vatValue ? _jsx(CheckIcon, {}) : vatValue && _jsx(ClearIcon, { onClick: clearValue }) }) })));
+    return (_jsx(Box, __assign({ sx: isSACountry ? {} : { height: '200px' } }, { children: _jsx(Input, { label: t('vat_id'), inputProps: { maxLength: VAT_ID_LENGTH }, value: vatValue, onChange: function (event) { return handleOnChange(event.target.value); }, placeholder: t('vat_id_placeholder'), warningType: 'alert', warningMessage: vatError && t(vatError), required: true, endAdornment: !vatError && vatValue ? _jsx(CheckIcon, {}) : vatValue && _jsx(ClearIcon, { onClick: clearValue }) }) })));
 };
 export default VATId;

package/build/features/tax/screens/TaxDetails/validation.d.ts

@@ -2,10 +2,13 @@ import * as yup from 'yup';
 export declare const Validation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     vatId: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+    documentId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     vatId: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+    documentId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     vatId: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+    documentId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
 }>>>;

package/build/features/tax/screens/TaxDetails/validation.js

@@ -1,5 +1,6 @@
 import * as yup from 'yup';
 export var Validation = yup.object().shape({
     vatId: yup.string().min(9, 'alert_vat').max(15, 'alert_vat').required('alert_vat'),
-    confirmPolicy: yup.boolean().required('alert_tax_confirm').isTrue('alert_tax_confirm')
+    confirmPolicy: yup.boolean().required('alert_tax_confirm').isTrue('alert_tax_confirm'),
+    documentId: yup.array().optional()
 });