@tap-payments/auth-jsconnect 2.0.4 → 2.0.5

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

@@ -277,23 +277,26 @@ export var resetPassword = createAsyncThunk('resetPassword', function (params, t
         }
     });
 }); });
-export var retrieveLead = createAsyncThunk('retrieveLeadPassword', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, password, settings, id, data;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+export var retrieveLeadPassword = createAsyncThunk('retrieveLeadPassword', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, password, settings, id, data, entityData;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), password = _a.password, settings = _a.settings;
                 id = (password.data.verify.responseBody || { id: '' }).id;
                 return [4, API.leadService.retrieveLead(id)];
             case 1:
-                data = (_f.sent()).data;
-                if (!(data === null || data === void 0 ? void 0 : data.errors)) {
+                data = (_g.sent()).data;
+                return [4, API.entityService.retrieveEntityInfo((_b = data === null || data === void 0 ? void 0 : data.entity) === null || _b === void 0 ? void 0 : _b.id)];
+            case 2:
+                entityData = (_g.sent()).data;
+                if (!(data === null || data === void 0 ? void 0 : data.errors) || !(entityData === null || entityData === void 0 ? void 0 : entityData.errors)) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, { id: id });
-                    (_e = (_d = settings.data.appConfig).onFlowCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, { data: data });
+                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { id: id });
+                    (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 }
-                return [2, data];
+                return [2, { lead: data, entity: entityData }];
         }
     });
 }); });
@@ -516,23 +519,23 @@ export var passwordSlice = createSlice({
             state.error = action.error.message;
             state.loading = false;
         })
-            .addCase(retrieveLead.fulfilled, function (state, action) {
-            var _a;
+            .addCase(retrieveLeadPassword.fulfilled, function (state, action) {
+            var _a, _b;
             state.loading = false;
             state.error = null;
-            var data = action.payload;
-            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            var _c = action.payload, lead = _c.lead, entity = _c.entity;
+            var description = (((_a = lead === null || lead === void 0 ? void 0 : lead.errors) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = entity === null || entity === void 0 ? void 0 : entity.errors) === null || _b === void 0 ? void 0 : _b[0]) || {}).description;
             if (description) {
                 state.error = description;
                 return;
             }
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), data);
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), lead), entity);
         })
-            .addCase(retrieveLead.pending, function (state) {
+            .addCase(retrieveLeadPassword.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(retrieveLead.rejected, function (state, action) {
+            .addCase(retrieveLeadPassword.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
         });

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

@@ -27,6 +27,7 @@ import { bankSelector, createBankAccount } from '../../../app/bank/bankStore';
 import Form from '../../../../components/Form';
 import { handleCurrentActiveScreen } from '../../../../app/settings';
 import ConfirmPolicy from './ConfirmPolicy';
+import BankStatement from './BankStatement';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column',
@@ -56,6 +57,6 @@ var BankDetails = function () {
         dispatch(handleCurrentActiveScreen('BANK_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
     };
     var disabled = ibanChecking || !methods.formState.isValid;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Beneficiary, {}), _jsx(IBAN, { fetchingIban: function (value) { return setIbanChecking(value); }, ibanChecking: ibanChecking }), _jsx(BankName, {}), _jsx(ConfirmPolicy, {}), _jsx(ButtonStyled, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('confirm') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Beneficiary, {}), _jsx(IBAN, { fetchingIban: function (value) { return setIbanChecking(value); }, ibanChecking: ibanChecking }), _jsx(BankName, {}), _jsx(BankStatement, {}), _jsx(ConfirmPolicy, {}), _jsx(ButtonStyled, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('confirm') }))] })) })) }));
 };
 export default BankDetails;

package/build/features/bank/screens/BankDetails/BankStatement.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const BankStatement: () => JSX.Element;
+export default BankStatement;

package/build/features/bank/screens/BankDetails/BankStatement.js

@@ -0,0 +1,38 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
+import { styled } from '@mui/material/styles';
+import { ScreenContainer } from '../../../../features/shared/Containers';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import UploadFile from '../../../../features/shared/UploadFile';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { bankSelector, uploadBankStatement } from '../../../../features/app/bank/bankStore';
+var FeatureStyled = styled(ScreenContainer)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        marginBlockStart: theme.spacing(3)
+    });
+});
+var BankStatement = function () {
+    var _a, _b;
+    var dispatch = useAppDispatch();
+    var data = useAppSelector(bankSelector).data;
+    var t = useTranslation().t;
+    var control = useFormContext().control;
+    var bankStatementControl = useController({ name: 'bankStatementId', control: control });
+    var error = (_a = bankStatementControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
+    var uploading = data.bankData.uploading;
+    var handleBankStatementChange = function (file) {
+        dispatch(uploadBankStatement(file));
+    };
+    var handleReset = function () {
+        bankStatementControl.field.onChange('');
+    };
+    React.useEffect(function () {
+        var _a, _b;
+        if ((_a = data.bankData.responseBody) === null || _a === void 0 ? void 0 : _a.fileId)
+            bankStatementControl.field.onChange((_b = data.bankData.responseBody) === null || _b === void 0 ? void 0 : _b.fileId);
+    }, [(_b = data.bankData.responseBody) === null || _b === void 0 ? void 0 : _b.fileId]);
+    return (_jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_bank_statement'), dragTitle: t('drag_and_drop'), uploadTitle: t('title_upload_file'), onFileUploaded: handleBankStatementChange, loading: uploading, onReset: handleReset, error: error && t(error) }) }));
+};
+export default BankStatement;

package/build/features/bank/screens/BankDetails/validation.d.ts

@@ -3,15 +3,18 @@ export declare const BankValidation: yup.ObjectSchema<import("yup/lib/object").A
     iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    bankStatementId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    bankStatementId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    bankStatementId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>>;

package/build/features/bank/screens/BankDetails/validation.js

@@ -12,5 +12,6 @@ export var BankValidation = yup.object().shape({
         .string()
         .matches(REGEX_BENEFICIARY_NAME, 'beneficiary_name_invalid')
         .required('beneficiary_name_required'),
+    bankStatementId: yup.string().optional(),
     confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
 });

package/build/features/bank/screens/ResetPasswordSuccess/ResetPasswordSuccess.d.ts

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

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

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import SuccessScreen from '../../../shared/SuccessScreen';
+var ResetPasswordSuccess = function (_a) {
+    var t = useTranslation().t;
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: t("reset_password_success_description"), showEmailProviders: true }));
+};
+export default React.memo(ResetPasswordSuccess);

package/build/features/bank/screens/ResetPasswordSuccess/index.d.ts

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

package/build/features/bank/screens/ResetPasswordSuccess/index.js

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

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

@@ -10,13 +10,13 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import React, { memo, useEffect, useState } from 'react';
+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 { allAreTruthy, getResetFlowUrl, showLastFour } from '../../../../utils';
+import { getResetFlowUrl, showLastFour } from '../../../../utils';
 import { bankSelector } from '../../../app/bank/bankStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -47,19 +47,20 @@ var SuccessWithFlowButtons = function () {
     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 _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 _d = data.verify.responseBody || {}, flows = _d.flows, nameObj = _d.name, entity = _d.entity, brand = _d.brand, bank = _d.bank_account, merchant = _d.merchant, identification_id = _d.identification_id;
+    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.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 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 _h = data.verify.responseBody || { contact: {}, id: '' }, contact = _h.contact, id = _h.id;
+    var _f = data.verify.responseBody || { contact: {}, id: '' }, contact = _f.contact, id = _f.id;
     var email = (contact || { email: '' }).email;
     var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, id);
     var reMapFlowData = function (flows) {
@@ -71,15 +72,13 @@ var SuccessWithFlowButtons = function () {
             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(),
+                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)
             });
-            if ("business_flow_completed" === "".concat(name, "_flow_").concat(type))
-                setIsAcceptance(true);
             var isCompleted = status === 'completed' && name !== 'password';
             var isIndividual = name === 'individual';
             var src = isCompleted ? "".concat(name, "_green_icon") : "".concat(name, "_filled_icon");
@@ -96,9 +95,6 @@ var SuccessWithFlowButtons = function () {
             };
         });
         setButtons(mappedFlows);
-        var isAllCompleted = allAreTruthy(flows, 'completed', 'status', 'password');
-        if (isAllCompleted)
-            setIsPayout(true);
     };
     useEffect(function () {
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0)

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

@@ -26,6 +26,7 @@ import Collapse from '../../../../components/Collapse';
 import OperationStartDate from './OperationStartDate';
 import { businessSelector, clearError, updateActivitiesInfo } from '../../../app/business/businessStore';
 import { ActivitiesValidationSchema } from './validation';
+import LicenseName from './LicenseName';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -72,6 +73,6 @@ var Activities = function () {
         anchorEl ? setAnchorEl(false) : setAnchorEl(true);
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(ActivitiesList, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(SalesChannels, {}) }))] })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, 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(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(LicenseName, {}) })), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(ActivitiesList, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(SalesChannels, {}) }))] })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default Activities;

package/build/features/business/screens/Activities/LicenseName.d.ts

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

package/build/features/business/screens/Activities/LicenseName.js

@@ -0,0 +1,30 @@
+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 { useTranslation } from 'react-i18next';
+import { ScreenContainer } from '../../../shared/Containers';
+import Input from '../../../shared/Input';
+import Collapse from '../../../../components/Collapse';
+import { useAppSelector, useLanguage } from '../../../../hooks';
+import { businessSelector } from '../../../app/business/businessStore';
+import CheckIcon from '../../../shared/CheckIcon';
+var LicenseName = function (_a) {
+    var _b, _c, _d;
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var data = useAppSelector(businessSelector).data;
+    var entity = (((_b = data.verify) === null || _b === void 0 ? void 0 : _b.responseBody) || {}).entity;
+    var name = isAr ? (_c = entity === null || entity === void 0 ? void 0 : entity.legal_name) === null || _c === void 0 ? void 0 : _c.ar : (_d = entity === null || entity === void 0 ? void 0 : entity.legal_name) === null || _d === void 0 ? void 0 : _d.en;
+    return (_jsx(Collapse, __assign({ in: !!name }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { label: t('license_name_label'), readOnly: true, value: name, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, endAdornment: _jsx(CheckIcon, {}) }) }) })));
+};
+export default React.memo(LicenseName);

package/build/features/business/screens/ResetPasswordSuccess/ResetPasswordSuccess.d.ts

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

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

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import SuccessScreen from '../../../shared/SuccessScreen';
+var ResetPasswordSuccess = function (_a) {
+    var t = useTranslation().t;
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: t("reset_password_success_description"), showEmailProviders: true }));
+};
+export default React.memo(ResetPasswordSuccess);

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

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

package/build/features/business/screens/ResetPasswordSuccess/index.js

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

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

@@ -10,14 +10,14 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import React, { memo, useEffect, useState } from 'react';
+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 { businessSelector } from '../../../app/business/businessStore';
-import { allAreTruthy, getResetFlowUrl, showLastFour } from '../../../../utils';
+import { getResetFlowUrl, showLastFour } from '../../../../utils';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
 import Container from '../../../shared/Containers/ScreenContainer';
@@ -47,19 +47,20 @@ var SuccessWithFlowButtons = function () {
     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 _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 _d = data.verify.responseBody || {}, flows = _d.flows, nameObj = _d.name, entity = _d.entity, brand = _d.brand, bank = _d.bank_account, merchant = _d.merchant, identification_id = _d.identification_id;
+    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 = (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 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 _h = data.verify.responseBody || { contact: {}, id: '' }, contact = _h.contact, id = _h.id;
+    var _f = data.verify.responseBody || { contact: {}, id: '' }, contact = _f.contact, id = _f.id;
     var email = (contact || { email: '' }).email;
     var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, id);
     var reMapFlowData = function (flows) {
@@ -71,15 +72,13 @@ var SuccessWithFlowButtons = function () {
             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(),
+                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)
             });
-            if ("business_flow_completed" === "".concat(name, "_flow_").concat(type))
-                setIsAcceptance(true);
             var isCompleted = status === 'completed' && name !== 'password';
             var isIndividual = name === 'individual';
             var src = isCompleted ? "".concat(name, "_green_icon") : "".concat(name, "_filled_icon");
@@ -96,9 +95,6 @@ var SuccessWithFlowButtons = function () {
             };
         });
         setButtons(mappedFlows);
-        var isAllCompleted = allAreTruthy(flows, 'completed', 'status', 'password');
-        if (isAllCompleted)
-            setIsPayout(true);
     };
     useEffect(function () {
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0)

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

@@ -51,10 +51,8 @@ var BrandList = function (_a) {
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
-    var linksControl = useController({ control: control, name: 'links' });
+    var control = useFormContext().control;
     var selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
-    var links = linksControl.field.value;
     var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
         var _a;
@@ -79,8 +77,6 @@ var BrandList = function (_a) {
     var onSelectItem = function (brand) {
         selectedBrandControl.field.onChange(brand);
         onCloseBrandList();
-        var website = brand.website;
-        setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
     };
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: list, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherLicense(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));

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

@@ -18,6 +18,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
+import { INSTAGRAM_URL, TWITTER_URL } from '../../../../constants';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
@@ -50,6 +51,7 @@ var Merchant = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
+    var formDataSelectedBrand = methods.getValues('selectedBrandItem');
     var onSubmit = function (formData) {
         dispatch(updateLeadBrand(formData));
     };
@@ -69,11 +71,11 @@ var Merchant = function (_a) {
             methods.setError('brandName', { message: 'Profile Name already exists' });
     }, [responseBody]);
     React.useEffect(function () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (isNewUser === true) {
             setUserType(ValidationOptions.NEW_USER);
         }
-        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && methods.getValues('selectedBrandItem').id === 'other') {
+        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && (formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) === 'other') {
             setUserType(ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND);
             methods.clearErrors();
             setTimeout(function () {
@@ -82,17 +84,17 @@ var Merchant = function (_a) {
                 methods.setValue('links', sites);
             }, 100);
         }
-        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && methods.getValues('selectedBrandItem').id !== 'other') {
+        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && (formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.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'); })) || '';
-            var instagram = ((_b = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.social) === null || _b === void 0 ? void 0 : _b.find(function (item) { return item.includes('instagram.com'); })) || '';
-            var sites_1 = __assign(__assign({}, links), { website: selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.website, twitter: twitter, instagram: instagram });
+            var twitter = ((_b = (_a = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.social) === null || _a === void 0 ? void 0 : _a.find(function (item) { return item.includes('twitter.com'); })) === null || _b === void 0 ? void 0 : _b.replaceAll("".concat(TWITTER_URL, "/"), '')) || '';
+            var instagram = ((_d = (_c = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.social) === null || _c === void 0 ? void 0 : _c.find(function (item) { return item.includes('instagram.com'); })) === null || _d === void 0 ? void 0 : _d.replaceAll("".concat(INSTAGRAM_URL, "/"), '')) || '';
+            var sites_1 = __assign(__assign({}, links), { website: formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.website, twitter: twitter, instagram: instagram });
             setTimeout(function () { return methods.setValue('links', sites_1, { shouldValidate: true }); }, 100);
         }
-    }, [methods.getValues('selectedBrandItem'), isNewUser]);
+    }, [formDataSelectedBrand, isNewUser]);
     React.useEffect(function () {
-        if (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id)
+        if (!(formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) && (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id))
             methods.setValue('selectedBrandItem', selectedBrandItem, { shouldValidate: true });
     }, [selectedBrandItem]);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;

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

@@ -1,4 +1,4 @@
-import { REGEX_WEBSITE } from '../../../../constants';
+import { REGEX_WEBSITE, REGEX_BRAND_NAME } from '../../../../constants';
 import * as yup from 'yup';
 export var ValidationOptions;
 (function (ValidationOptions) {
@@ -17,7 +17,9 @@ export var MerchantValidationSchema = function (userType) {
                     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;
+                    return !(value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME))
+                        ? this.createError({ message: 'enter_brand_name_english_chars_numbers_space' })
+                        : true;
                 }
             })
                 .required(''),

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

@@ -107,6 +107,6 @@ var Mobile = function (_a) {
     var disabled = !methods.formState.isValid || !!error;
     var title = t('join_our_community');
     var subTitle = t('ide_terms_and_conditions_description');
-    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.watch('mobile') }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') }))] }))] }))] })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') }))] }))] }))] })) }))] }));
 };
 export default React.memo(Mobile);

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

@@ -85,6 +85,6 @@ var NID = function (_a) {
         dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.watch('nid') }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
 };
 export default React.memo(NID);

package/build/features/featuresScreens.js

@@ -12,23 +12,28 @@ import BusinessTypePage from './business/screens/BusinessType';
 import ActivitiesPage from './business/screens/Activities';
 import SuccessPage from './business/screens/Success';
 import SuccessWithFlowButtonsPage from './business/screens/SuccessWithFlowButtons';
+import ResetPasswordSuccessPage from './business/screens/ResetPasswordSuccess';
 import PasswordVerifyPage from './password/screens/Verify';
 import CreatePasswordPage from './password/screens/CreatePassword';
 import PasswordOTPPage from './password/screens/OTP';
 import SuccessPasswordPage from './password/screens/Success';
 import PasswordSuccessWithFlowPage from './password/screens/SuccessWithFlowButtons';
+import PasswordResetPasswordSuccessPage from './password/screens/ResetPasswordSuccess';
 import IndividualVerifyPage from './individual/screens/Verify';
 import AdditionalIndividualInfoPage from './individual/screens/AdditionalIndividualInfo';
 import SuccessOwnerPage from './individual/screens/Success';
 import IndividualSuccessWithFlowPage from './individual/screens/SuccessWithFlowButtons';
+import IndividualResetPasswordSuccessPage from './individual/screens/ResetPasswordSuccess';
 import BankVerifyPage from './bank/screens/Verify';
 import BankDetailsPage from './bank/screens/BankDetails';
 import BankSuccessPage from './bank/screens/Success';
 import BankSuccessWithFlowPage from './bank/screens/SuccessWithFlowButtons';
+import BankResetPasswordSuccessPage from './bank/screens/ResetPasswordSuccess';
 import TaxVerifyPage from './tax/screens/Verify';
 import TaxDetailsPage from './tax/screens/TaxDetails';
 import TaxSuccessPage from './tax/screens/Success';
 import TaxSuccessWithFlowPage from './tax/screens/SuccessWithFlowButtons';
+import TaxResetPasswordSuccessPage from './tax/screens/ResetPasswordSuccess';
 export var connectFeatureScreens = [
     {
         name: 'CONNECT_NID_STEP',
@@ -81,7 +86,8 @@ export var businessFeatureScreens = [
         element: CustomersPage
     },
     { name: 'BUSINESS_SUCCESS_STEP', element: SuccessPage },
-    { name: 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP', element: SuccessWithFlowButtonsPage }
+    { name: 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP', element: SuccessWithFlowButtonsPage },
+    { name: 'BUSINESS_RESET_PASSWORD_SUCCESS', element: ResetPasswordSuccessPage }
 ];
 export var passwordFeatureScreens = [
     {
@@ -103,7 +109,8 @@ export var passwordFeatureScreens = [
     {
         name: 'PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: PasswordSuccessWithFlowPage
-    }
+    },
+    { name: 'PASSWORD_RESET_PASSWORD_SUCCESS', element: PasswordResetPasswordSuccessPage }
 ];
 export var individualFeatureScreens = [
     {
@@ -121,7 +128,8 @@ export var individualFeatureScreens = [
     {
         name: 'INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: IndividualSuccessWithFlowPage
-    }
+    },
+    { name: 'INDIVIDUAL_RESET_PASSWORD_SUCCESS', element: IndividualResetPasswordSuccessPage }
 ];
 export var bankFeatureScreens = [
     {
@@ -139,7 +147,8 @@ export var bankFeatureScreens = [
     {
         name: 'BANK_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: BankSuccessWithFlowPage
-    }
+    },
+    { name: 'BANK_RESET_PASSWORD_SUCCESS', element: BankResetPasswordSuccessPage }
 ];
 export var taxFeatureScreens = [
     {
@@ -157,5 +166,6 @@ export var taxFeatureScreens = [
     {
         name: 'TAX_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: TaxSuccessWithFlowPage
-    }
+    },
+    { name: 'TAX_RESET_PASSWORD_SUCCESS', element: TaxResetPasswordSuccessPage }
 ];