@tap-payments/auth-jsconnect 1.0.79 → 1.0.84

package/build/features/app/password/passwordStore.js

@@ -89,9 +89,9 @@ export var retrieveEntityInfo = createAsyncThunk('retrievePasswordEntityInfo', f
 }); });
 export var verifyPasswordLeadOTP = createAsyncThunk('verifyPasswordLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, password, settings, responseBody, payload, data, steps, hasPasswordCompleted;
-    var _b, _c, _d, _e, _f, _g, _h, _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), password = _a.password, settings = _a.settings;
                 responseBody = password.data.verify.responseBody;
@@ -104,23 +104,21 @@ export var verifyPasswordLeadOTP = createAsyncThunk('verifyPasswordLeadOTP', fun
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_k.sent()).data;
-                return [4, thunkApi.dispatch(retrieveEntityInfo((_d = (_c = password.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.entity) === null || _d === void 0 ? void 0 : _d.id))];
+                data = (_f.sent()).data;
+                if (!!data.errors) return [3, 4];
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
+                steps = responseBody === null || responseBody === void 0 ? void 0 : responseBody.steps;
+                hasPasswordCompleted = Object.keys(steps).find(function (key) { return key === PASSWORD_STEP_NAMES.PASSWORD_SUCCESS; });
+                if (!hasPasswordCompleted) return [3, 3];
+                return [4, thunkApi.dispatch(retrieveEntityInfo((_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.entity) === null || _e === void 0 ? void 0 : _e.id))];
             case 2:
-                _k.sent();
-                if (!data.errors) {
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, { otp: params.otp });
-                    (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
-                    steps = (_j = password.data.verify.responseBody) === null || _j === void 0 ? void 0 : _j.steps;
-                    hasPasswordCompleted = Object.keys(steps).find(function (key) { return key === PASSWORD_STEP_NAMES.PASSWORD_SUCCESS; });
-                    if (hasPasswordCompleted) {
-                        thunkApi.dispatch(handleNextScreenStep('PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                    }
-                    else {
-                        thunkApi.dispatch(handleNextScreenStep('PASSWORD_CREATE_PASSWORD_STEP'));
-                    }
-                }
-                return [2, { data: data, formData: __assign({}, params) }];
+                _f.sent();
+                thunkApi.dispatch(handleNextScreenStep('PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 4];
+            case 3:
+                thunkApi.dispatch(handleNextScreenStep('PASSWORD_CREATE_PASSWORD_STEP'));
+                _f.label = 4;
+            case 4: return [2, { data: data, formData: __assign({}, params) }];
         }
     });
 }); });
@@ -149,31 +147,30 @@ export var createPassword = createAsyncThunk('createPassword', function (params,
     });
 }); });
 export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, password, response, payload;
-    var _b, _c, _d, _e, _f, _g, _h, _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var _a, settings, password, id, payload, data;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, password = _a.password;
-                response = undefined;
-                if (!!!((_b = password.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id)) return [3, 3];
+                id = (password.data.verify.responseBody || {}).id;
+                if (!id)
+                    return [2];
                 payload = {
                     step_name: PASSWORD_STEP_NAMES.PASSWORD_SUCCESS,
-                    id: ((_c = password.data.otpData.responseBody) === null || _c === void 0 ? void 0 : _c.id) || '',
+                    id: id,
                     encryption_contract: []
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                response = _k.sent();
-                return [4, thunkApi.dispatch(retrieveEntityInfo((_e = (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.entity) === null || _e === void 0 ? void 0 : _e.id))];
+                data = (_g.sent()).data;
+                return [4, thunkApi.dispatch(retrieveEntityInfo((_b = data.entity) === null || _b === void 0 ? void 0 : _b.id))];
             case 2:
-                _k.sent();
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
-                (_j = (_h = settings.data.appConfig).onFlowCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, { data: response === null || response === void 0 ? void 0 : response.data });
-                _k.label = 3;
-            case 3:
+                _g.sent();
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
+                (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: response === null || response === void 0 ? void 0 : response.data, formData: params }];
+                return [2, { response: data, formData: params }];
         }
     });
 }); });
@@ -286,7 +283,7 @@ export var passwordSlice = createSlice({
                 state.error = description;
                 return;
             }
-            state.data.verify.responseBody = __assign(__assign({}, data), state.data.verify.responseBody);
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), data);
         })
             .addCase(retrieveEntityInfo.rejected, function (state, action) {
             state.error = action.error.message;
@@ -296,12 +293,13 @@ export var passwordSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var response = action.payload.response;
+            var response = (action.payload || {}).response;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.error = description;
                 return;
             }
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: response.flows });
             removeRequestHeaders();
         })
             .addCase(updateLeadSuccess.pending, function (state) {

package/build/features/app/tax/taxStore.d.ts

@@ -19,7 +19,7 @@ export declare const updateTaxInfo: import("@reduxjs/toolkit").AsyncThunk<{
 export declare const updateLeadSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
-}, void, {}>;
+} | undefined, void, {}>;
 declare type VerifyData = {
     token: string;
 };

package/build/features/app/tax/taxStore.js

@@ -89,9 +89,9 @@ export var retrieveEntityInfo = createAsyncThunk('retrieveTaxEntityInfo', functi
 }); });
 export var verifyTaxLeadOTP = createAsyncThunk('verifyTaxLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, tax, settings, responseBody, payload, data, steps, hasTaxCompleted;
-    var _b, _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), tax = _a.tax, settings = _a.settings;
                 responseBody = tax.data.verify.responseBody;
@@ -104,22 +104,21 @@ export var verifyTaxLeadOTP = createAsyncThunk('verifyTaxLeadOTP', function (par
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_h.sent()).data;
-                return [4, thunkApi.dispatch(retrieveEntityInfo((_d = (_c = tax.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.entity) === null || _d === void 0 ? void 0 : _d.id))];
+                data = (_f.sent()).data;
+                if (!!data.errors) return [3, 4];
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
+                steps = responseBody === null || responseBody === void 0 ? void 0 : responseBody.steps;
+                hasTaxCompleted = Object.keys(steps).find(function (key) { return key === TAX_STEP_NAMES.TAX_SUCCESS; });
+                if (!hasTaxCompleted) return [3, 3];
+                return [4, thunkApi.dispatch(retrieveEntityInfo((_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.entity) === null || _e === void 0 ? void 0 : _e.id))];
             case 2:
-                _h.sent();
-                if (!data.errors) {
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, { otp: params.otp });
-                    steps = (_g = tax.data.verify.responseBody) === null || _g === void 0 ? void 0 : _g.steps;
-                    hasTaxCompleted = Object.keys(steps).find(function (key) { return key === TAX_STEP_NAMES.TAX_SUCCESS; });
-                    if (hasTaxCompleted) {
-                        thunkApi.dispatch(handleNextScreenStep('TAX_DETAILS_SUCCESS_STEP'));
-                    }
-                    else {
-                        thunkApi.dispatch(handleNextScreenStep('TAX_TAX_DETAILS_STEP'));
-                    }
-                }
-                return [2, { data: data, formData: params }];
+                _f.sent();
+                thunkApi.dispatch(handleNextScreenStep('TAX_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 4];
+            case 3:
+                thunkApi.dispatch(handleNextScreenStep('TAX_TAX_DETAILS_STEP'));
+                _f.label = 4;
+            case 4: return [2, { data: data, formData: params }];
         }
     });
 }); });
@@ -147,31 +146,30 @@ export var updateTaxInfo = createAsyncThunk('updateTaxInfo', function (params, t
     });
 }); });
 export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, tax, response, payload;
-    var _b, _c, _d, _e, _f, _g, _h, _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var _a, settings, tax, id, payload, data;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, tax = _a.tax;
-                response = undefined;
-                if (!!!((_b = tax.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id)) return [3, 3];
+                id = (tax.data.verify.responseBody || {}).id;
+                if (!id)
+                    return [2];
                 payload = {
                     step_name: TAX_STEP_NAMES.TAX_SUCCESS,
-                    id: ((_c = tax.data.otpData.responseBody) === null || _c === void 0 ? void 0 : _c.id) || '',
+                    id: id,
                     encryption_contract: []
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                response = _k.sent();
-                return [4, thunkApi.dispatch(retrieveEntityInfo((_e = (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.entity) === null || _e === void 0 ? void 0 : _e.id))];
+                data = (_g.sent()).data;
+                return [4, thunkApi.dispatch(retrieveEntityInfo((_b = data.entity) === null || _b === void 0 ? void 0 : _b.id))];
             case 2:
-                _k.sent();
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
-                (_j = (_h = settings.data.appConfig).onFlowCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, { data: response === null || response === void 0 ? void 0 : response.data });
-                _k.label = 3;
-            case 3:
+                _g.sent();
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
+                (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: response === null || response === void 0 ? void 0 : response.data, formData: params }];
+                return [2, { response: data, formData: params }];
         }
     });
 }); });
@@ -283,7 +281,7 @@ export var taxSlice = createSlice({
                 state.error = description;
                 return;
             }
-            state.data.verify.responseBody = __assign(__assign({}, data), state.data.verify.responseBody);
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), data);
         })
             .addCase(retrieveEntityInfo.rejected, function (state, action) {
             state.error = action.error.message;
@@ -293,12 +291,13 @@ export var taxSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var response = action.payload.response;
+            var response = (action.payload || {}).response;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.error = description;
                 return;
             }
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: response.flows });
             removeRequestHeaders();
         })
             .addCase(updateLeadSuccess.pending, function (state) {

package/build/features/bank/Bank.js

@@ -22,12 +22,13 @@ import { FeatureContainer } from '../shared/Containers';
 import { BANK_SCREENS_NAVIGATION } from '../../constants';
 import { bankFeatureScreens } from '../featuresScreens';
 import CustomFooter from '../shared/Footer';
-import { verifyLeadToken } from '../app/bank/bankStore';
+import { bankSelector, verifyLeadToken } from '../app/bank/bankStore';
 var Bank = memo(function (props) {
     var open = React.useState(true)[0];
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
+    var customLoading = useAppSelector(bankSelector).customLoading;
     var loading = useAppConfig(__assign({ navigation: BANK_SCREENS_NAVIGATION }, props)).loading;
     useErrorListener();
     var activeScreen = data.activeScreen;
@@ -41,7 +42,7 @@ var Bank = memo(function (props) {
         if (!loading)
             verifyToken();
     }, [loading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ loading: settingLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: bankFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: bankFeatureScreens.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));

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

@@ -7,10 +7,10 @@ import { bankSelector, updateLeadSuccess } from '../../../app/bank/bankStore';
 var Success = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var loading = useAppSelector(bankSelector).loading;
+    var _b = useAppSelector(bankSelector), loading = _b.loading, error = _b.error;
     var onSuccess = function () {
         dispatch(updateLeadSuccess());
     };
-    return (_jsx(SuccessScreen, { title: t('bank_success_title'), onSuccess: onSuccess, successTitle: t('continue'), disabledSuccessButton: loading }));
+    return (_jsx(SuccessScreen, { title: t('bank_success_title'), onSuccess: onSuccess, successTitle: t('continue'), loading: loading, error: error || '' }));
 };
 export default React.memo(Success);

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

@@ -10,7 +10,7 @@ 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 React, { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
@@ -21,9 +21,11 @@ import { bankSelector } from '../../../app/bank/bankStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
 import Container from '../../../shared/Containers/ScreenContainer';
+import AcceptancePayouts from '../../../shared/AcceptancePayouts';
 var TitleStyled = styled(Text)(function (_a) {
+    var _b;
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { fontWeight: theme.typography.fontWeightBold, color: theme.palette.text.primary, marginBlockEnd: theme.spacing(2.375), marginBlockStart: theme.spacing(2.875), lineHeight: 1.75, padding: '0px 20px' }));
+    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;
@@ -36,37 +38,46 @@ var ContainerStyled = styled(Container)(function (_a) {
 var ButtonGroupStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
-        width: '100%'
+        width: '100%',
+        paddingTop: theme.spacing(3)
     });
 });
 var SuccessWithFlowButtons = function () {
-    var _a;
+    var _a, _b, _c;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var _d = React.useState(false), isAcceptance = _d[0], setIsAcceptance = _d[1];
+    var _e = React.useState(false), isPayout = _e[0], setIsPayout = _e[1];
     var data = useAppSelector(bankSelector).data;
-    var _b = data.verify.responseBody || {}, flows = _b.flows, nameObj = _b.name, entity = _b.entity, businessType = _b.business_type, bank = _b.bank;
-    var _c = useState([]), buttons = _c[0], setButtons = _c[1];
+    var _f = data.verify.responseBody || {}, flows = _f.flows, nameObj = _f.name, entity = _f.entity, brand = _f.brand, bank = _f.bank_account;
+    var _g = useState([]), buttons = _g[0], setButtons = _g[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.name) || '';
-    var iban = (bank === null || bank === void 0 ? void 0 : bank.name) || '';
+    var bankName = (bank === null || bank === void 0 ? void 0 : bank.name) || t('bank');
+    var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = (entity === null || entity === void 0 ? void 0 : entity.tax_number) || '';
+    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 reMapFlowData = function (flows) {
         if (flows === void 0) { flows = []; }
         var images = ICONS_NAMES;
+        var statuses = [];
         var mappedFlows = flows.map(function (_a) {
             var name = _a.name, url = _a.url, status = _a.status;
             var type = status === 'initiated' ? 'pending' : 'completed';
             var title = t("".concat(name, "_flow_").concat(type), {
                 individual_name: username.toLowerCase(),
-                business_type: businessType,
+                business_type: brandName,
                 license_number: t('masking_symbols') + showLastFour(licenseNumber),
                 bank_name: bankName,
                 iban: t('masking_symbols') + iban,
-                tax_id: t('masking_symbols') + taxID
+                tax_id: t('masking_symbols') + showLastFour(taxID)
             });
+            if ("business_flow_completed" === "".concat(name, "_flow_").concat(type))
+                setIsAcceptance(true);
             var isCompleted = status === 'completed' && name !== 'password';
             var isIndividual = name === 'individual';
+            if (name !== 'password')
+                statuses.push(isCompleted);
             var src = isCompleted ? "".concat(name, "_green_icon") : "".concat(name, "_filled_icon");
             var hoverSrc = "".concat(name, "_white_icon");
             return {
@@ -79,11 +90,14 @@ var SuccessWithFlowButtons = function () {
             };
         });
         setButtons(mappedFlows);
+        var isAllCompleted = statuses.filter(function (status) { return status; }).length === flows.length;
+        if (isAllCompleted)
+            setIsPayout(true);
     };
     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(ButtonGroupStyled, { children: _jsx(FlowsButtons, { buttons: buttons }) })] }));
+    return (_jsxs(ContainerStyled, { children: [_jsxs(TitleStyled, { children: [t('account_details'), " "] }), _jsx(AcceptancePayouts, { showAcceptance: isAcceptance, showPayout: isPayout }), _jsx(ButtonGroupStyled, { children: _jsx(FlowsButtons, { buttons: buttons }) })] }));
 };
 export default memo(SuccessWithFlowButtons);

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

@@ -7,10 +7,10 @@ import { businessSelector, updateLeadSuccess } from '../../../app/business/busin
 var Success = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var loading = useAppSelector(businessSelector).loading;
+    var _b = useAppSelector(businessSelector), loading = _b.loading, error = _b.error;
     var onSuccess = function () {
         dispatch(updateLeadSuccess());
     };
-    return (_jsx(SuccessScreen, { title: t('business_completed_title'), description: t('business_completed_description'), onSuccess: onSuccess, successTitle: t('business_completed_button'), disabledSuccessButton: loading }));
+    return (_jsx(SuccessScreen, { title: t('business_completed_title'), description: t('business_completed_description'), onSuccess: onSuccess, successTitle: t('business_completed_button'), loading: loading, error: error || '' }));
 };
 export default React.memo(Success);

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

@@ -10,7 +10,7 @@ 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 React, { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
@@ -21,9 +21,11 @@ import { showLastFour } from '../../../../utils';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
 import Container from '../../../shared/Containers/ScreenContainer';
+import AcceptancePayouts from '../../../shared/AcceptancePayouts';
 var TitleStyled = styled(Text)(function (_a) {
+    var _b;
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { fontWeight: theme.typography.fontWeightBold, color: theme.palette.text.primary, marginBlockEnd: theme.spacing(2.375), marginBlockStart: theme.spacing(2.875), lineHeight: 1.75, padding: '0px 20px' }));
+    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;
@@ -36,37 +38,46 @@ var ContainerStyled = styled(Container)(function (_a) {
 var ButtonGroupStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
-        width: '100%'
+        width: '100%',
+        paddingTop: theme.spacing(3)
     });
 });
 var SuccessWithFlowButtons = function () {
-    var _a;
+    var _a, _b, _c;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var _d = React.useState(false), isAcceptance = _d[0], setIsAcceptance = _d[1];
+    var _e = React.useState(false), isPayout = _e[0], setIsPayout = _e[1];
     var data = useAppSelector(businessSelector).data;
-    var _b = data.verify.responseBody || {}, flows = _b.flows, nameObj = _b.name, entity = _b.entity, businessType = _b.business_type, bank = _b.bank;
-    var _c = useState([]), buttons = _c[0], setButtons = _c[1];
+    var _f = data.verify.responseBody || {}, flows = _f.flows, nameObj = _f.name, entity = _f.entity, brand = _f.brand, bank = _f.bank_account;
+    var _g = useState([]), buttons = _g[0], setButtons = _g[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.name) || '';
-    var iban = (bank === null || bank === void 0 ? void 0 : bank.name) || '';
+    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 = (entity === null || entity === void 0 ? void 0 : entity.tax_number) || '';
+    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 reMapFlowData = function (flows) {
         if (flows === void 0) { flows = []; }
         var images = ICONS_NAMES;
+        var statuses = [];
         var mappedFlows = flows.map(function (_a) {
             var name = _a.name, url = _a.url, status = _a.status;
             var type = status === 'initiated' ? 'pending' : 'completed';
             var title = t("".concat(name, "_flow_").concat(type), {
                 individual_name: username.toLowerCase(),
-                business_type: businessType,
+                business_type: brandName,
                 license_number: t('masking_symbols') + showLastFour(licenseNumber),
                 bank_name: bankName,
                 iban: t('masking_symbols') + iban,
-                tax_id: t('masking_symbols') + taxID
+                tax_id: t('masking_symbols') + showLastFour(taxID)
             });
+            if ("business_flow_completed" === "".concat(name, "_flow_").concat(type))
+                setIsAcceptance(true);
             var isCompleted = status === 'completed' && name !== 'password';
             var isIndividual = name === 'individual';
+            if (name !== 'password')
+                statuses.push(isCompleted);
             var src = isCompleted ? "".concat(name, "_green_icon") : "".concat(name, "_filled_icon");
             var hoverSrc = "".concat(name, "_white_icon");
             return {
@@ -79,11 +90,14 @@ var SuccessWithFlowButtons = function () {
             };
         });
         setButtons(mappedFlows);
+        var isAllCompleted = statuses.filter(function (status) { return status; }).length === flows.length;
+        if (isAllCompleted)
+            setIsPayout(true);
     };
     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(ButtonGroupStyled, { children: _jsx(FlowsButtons, { buttons: buttons }) })] }));
+    return (_jsxs(ContainerStyled, { children: [_jsxs(TitleStyled, { children: [t('account_details'), " "] }), _jsx(AcceptancePayouts, { showAcceptance: isAcceptance, showPayout: isPayout }), _jsx(ButtonGroupStyled, { children: _jsx(FlowsButtons, { buttons: buttons }) })] }));
 };
 export default memo(SuccessWithFlowButtons);

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

@@ -73,7 +73,7 @@ var Merchant = function (_a) {
         if (isNewUser === true) {
             setUserType(ValidationOptions.NEW_USER);
         }
-        if (isNewUser === false && methods.getValues('selectedBrandItem').id === 'other') {
+        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && methods.getValues('selectedBrandItem').id === 'other') {
             setUserType(ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND);
             methods.clearErrors();
             setTimeout(function () {
@@ -82,7 +82,7 @@ var Merchant = function (_a) {
                 methods.setValue('links', sites);
             }, 100);
         }
-        if (isNewUser === false && methods.getValues('selectedBrandItem').id !== 'other') {
+        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && methods.getValues('selectedBrandItem').id !== 'other') {
             setUserType(ValidationOptions.EXISTING_USER_WITH_EXIST_BRAND);
             methods.clearErrors();
             var twitter = ((_a = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.social) === null || _a === void 0 ? void 0 : _a.find(function (item) { return item.includes('twitter.com'); })) || '';
@@ -98,7 +98,9 @@ var Merchant = function (_a) {
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking || ((_d = data.brandData.responseBody) === null || _d === void 0 ? void 0 : _d.response_code) === '5';
     var isBrandListAvailable = userType !== ValidationOptions.NEW_USER && brandList.length > 0;
-    var askingForBrandInfo = userType === ValidationOptions.NEW_USER || userType === ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND;
+    var askingForBrandInfo = userType === ValidationOptions.NEW_USER ||
+        brandList.length === 0 ||
+        userType === ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: isBrandListAvailable, list: brandList, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(BrandName, { show: !listActive && askingForBrandInfo, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(SocialMedia, { show: !listActive, isNewUser: isNewUser }), _jsx(TAC, { show: !listActive && askingForBrandInfo }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

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

@@ -22,6 +22,8 @@ import Collapse from '../../../../components/Collapse';
 import SocialMediaGroup from '../../../../components/SocialMediaGroup';
 import { ScreenContainer } from '../../../shared/Containers';
 import CheckIcon from '../../../shared/CheckIcon';
+import { useAppSelector } from '../../../../hooks';
+import { connectSelector } from '../../../app/connect/connectStore';
 var SocialMediaGroupStyled = styled(SocialMediaGroup)(function (_a) {
     var theme = _a.theme, defaultValue = _a.defaultValue;
     return ({
@@ -56,14 +58,16 @@ var ClearIconStyled = styled(ClearIcon)(function (_a) {
     });
 });
 var SocialMedia = function (_a) {
-    var _b, _c, _d;
+    var _b, _c, _d, _e;
     var show = _a.show, sx = _a.sx, isNewUser = _a.isNewUser;
-    var _e = React.useState(SocialMediaTypes.WEB), socialMediaType = _e[0], setSocialMediaType = _e[1];
+    var _f = React.useState(SocialMediaTypes.WEB), socialMediaType = _f[0], setSocialMediaType = _f[1];
     var t = useTranslation().t;
-    var _f = useFormContext(), control = _f.control, setValue = _f.setValue, watch = _f.watch;
+    var _g = useFormContext(), control = _g.control, setValue = _g.setValue, watch = _g.watch;
     var linksControl = useController({ control: control, name: 'links' });
     var links = linksControl.field.value;
     var brandName = watch('brandName');
+    var data = useAppSelector(connectSelector).data;
+    var brandList = ((_b = data.brandData.responseBody) === null || _b === void 0 ? void 0 : _b.brands) || [];
     var handleChange = function (_a) {
         var _b;
         var target = _a.target;
@@ -90,7 +94,7 @@ var SocialMedia = function (_a) {
             var website = "www.".concat(brandName.replaceAll(' ', '-'), ".com");
             setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
         }
-        if (!brandName && isNewUser === false) {
+        if (!brandName && isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0) {
             var website = "other.com";
             setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
         }
@@ -103,9 +107,9 @@ var SocialMedia = function (_a) {
     var twitterValue = links.twitter || '';
     var instagramValue = links.instagram || '';
     var errors = linksControl.fieldState.error;
-    var websiteError = (_b = errors === null || errors === void 0 ? void 0 : errors.website) === null || _b === void 0 ? void 0 : _b.message;
-    var twitterError = (_c = errors === null || errors === void 0 ? void 0 : errors.twitter) === null || _c === void 0 ? void 0 : _c.message;
-    var instagramError = (_d = errors === null || errors === void 0 ? void 0 : errors.instagram) === null || _d === void 0 ? void 0 : _d.message;
+    var websiteError = (_c = errors === null || errors === void 0 ? void 0 : errors.website) === null || _c === void 0 ? void 0 : _c.message;
+    var twitterError = (_d = errors === null || errors === void 0 ? void 0 : errors.twitter) === null || _d === void 0 ? void 0 : _d.message;
+    var instagramError = (_e = errors === null || errors === void 0 ? void 0 : errors.instagram) === null || _e === void 0 ? void 0 : _e.message;
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: __assign({ mt: 3, mb: 3, direction: 'ltr' }, sx) }, { children: [_jsx(SocialMediaGroupStyled, { defaultValue: socialMediaType, exclusive: true, onChange: function (e, value) {
                         setSocialMediaType(value);
                     } }), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.WEB, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: websiteValue, onBlur: function () { return handleBlueWebsite(); }, startAdornment: _jsx(TextStyled, { children: "https://" }), placeholder: t('signup_website_placeholder'), warningType: 'alert', warningMessage: websiteError && t(websiteError), endAdornment: !websiteError && websiteValue ? _jsx(CheckIcon, {}) : websiteValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.TWITTER, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: twitterValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_twitter_placeholder'), warningType: 'alert', warningMessage: twitterError && t(twitterError), endAdornment: !twitterError && twitterValue ? _jsx(CheckIcon, {}) : twitterValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.INSTAGRAM, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: instagramValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_instagram_placeholder'), warningType: 'alert', warningMessage: instagramError && t(instagramError), endAdornment: !instagramError && instagramValue ? (_jsx(CheckIcon, {})) : (instagramValue && _jsx(ClearIconStyled, { onClick: handleClear })) }) }))] })) })));

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

@@ -12,9 +12,15 @@ export var MerchantValidationSchema = function (userType) {
         return yup.object().shape({
             brandName: yup
                 .string()
-                .min(3, 'enter_brand_name_english_chars_numbers_space')
-                .max(250, 'enter_brand_name_english_chars_numbers_space')
-                .required('enter_valid_brand_name'),
+                .test({
+                test: function (value) {
+                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (length === 0)
+                        return true;
+                    return length < 3 ? this.createError({ message: 'enter_brand_name_english_chars_numbers_space' }) : true;
+                }
+            })
+                .required(''),
             termAndConditionChecked: yup.boolean().required().isTrue('check_terms_cond'),
             links: yup.object().shape({
                 website: yup.string().when(['instagram', 'twitter'], function (instagram, twitter) {

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

@@ -7,10 +7,10 @@ import SuccessScreen from '../../../shared/SuccessScreen';
 var Success = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var loading = useAppSelector(individualSelector).loading;
+    var _b = useAppSelector(individualSelector), loading = _b.loading, error = _b.error;
     var onSuccess = function () {
         dispatch(updateLeadSuccess());
     };
-    return (_jsx(SuccessScreen, { title: t('individual_success_title'), onSuccess: onSuccess, successTitle: t('continue'), disabledSuccessButton: loading }));
+    return (_jsx(SuccessScreen, { title: t('individual_success_title'), onSuccess: onSuccess, successTitle: t('continue'), loading: loading, error: error || '' }));
 };
 export default React.memo(Success);