npm - @tap-payments/auth-jsconnect - Versions diffs - 1.0.99-test → 1.0.100-test - Mend

@tap-payments/auth-jsconnect 1.0.99-test → 1.0.100-test

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (42) hide show

package/build/api/entity.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { AxiosRequestConfig } from 'axios';
 export declare type EntityInfoBody = {
     id: string;
+    lead_id?: string;
     activities?: Array<string>;
     business_operation_start_at?: string;
     channel_services?: Array<string>;

package/build/assets/locales/ar.json CHANGED Viewed

@@ -240,5 +240,7 @@
     "tax_success_title": "Your tax details are updated",
     "bank_success_title": "Your bank details are updated",
     "password_success_title": "Your password is set",
-    "bank": "bank"
+    "bank": "bank",
+    "reset_password_success_title": "لقد ارسلنا رسالة بريدية إليك",
+    "reset_password_success_description": "تحقق من بريدك الإلكتروني لإعادة تعيين كلمة المرور الخاصة بك."
 }

package/build/assets/locales/en.json CHANGED Viewed

@@ -260,5 +260,7 @@
     "bank_success_title": "Your bank details are updated",
     "password_success_title": "Your password is set",
     "account_details": "Your account details",
-    "bank": "bank"
+    "bank": "bank",
+    "reset_password_success_title": "We sent you an email",
+    "reset_password_success_description": "Check your email to reset your password."
 }

package/build/constants/app.js CHANGED Viewed

@@ -106,9 +106,15 @@ export var BUSINESS_SCREENS_NAVIGATION = [
     },
     {
         name: 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
+        next: 'BUSINESS_RESET_PASSWORD_SUCCESS',
+        prev: '',
+        order: 7
+    },
+    {
+        name: 'BUSINESS_RESET_PASSWORD_SUCCESS',
         next: '',
         prev: '',
-        order: 6
+        order: 8
     }
 ];
 export var INDIVIDUAL_SCREENS_NAVIGATION = [
@@ -132,9 +138,15 @@ export var INDIVIDUAL_SCREENS_NAVIGATION = [
     },
     {
         name: 'INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        next: '',
+        next: 'INDIVIDUAL_RESET_PASSWORD_SUCCESS',
         prev: '',
         order: 4
+    },
+    {
+        name: 'INDIVIDUAL_RESET_PASSWORD_SUCCESS',
+        next: '',
+        prev: '',
+        order: 5
     }
 ];
 export var PASSWORD_SCREENS_NAVIGATION = [
@@ -164,9 +176,15 @@ export var PASSWORD_SCREENS_NAVIGATION = [
     },
     {
         name: 'PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        next: '',
+        next: 'PASSWORD_RESET_PASSWORD_SUCCESS',
         prev: '',
         order: 5
+    },
+    {
+        name: 'PASSWORD_RESET_PASSWORD_SUCCESS',
+        next: '',
+        prev: '',
+        order: 6
     }
 ];
 export var BANK_SCREENS_NAVIGATION = [
@@ -190,9 +208,15 @@ export var BANK_SCREENS_NAVIGATION = [
     },
     {
         name: 'BANK_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        next: '',
+        next: 'BANK_RESET_PASSWORD_SUCCESS',
         prev: '',
         order: 4
+    },
+    {
+        name: 'BANK_RESET_PASSWORD_SUCCESS',
+        next: '',
+        prev: '',
+        order: 5
     }
 ];
 export var TAX_SCREENS_NAVIGATION = [
@@ -216,9 +240,15 @@ export var TAX_SCREENS_NAVIGATION = [
     },
     {
         name: 'TAX_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        next: '',
+        next: 'TAX_RESET_PASSWORD_SUCCESS',
         prev: 'TAX_DETAILS_SUCCESS_STEP',
         order: 4
+    },
+    {
+        name: 'TAX_RESET_PASSWORD_SUCCESS',
+        next: '',
+        prev: '',
+        order: 5
     }
 ];
 export var DefaultDeviceInfo = {

package/build/constants/validation.d.ts CHANGED Viewed

@@ -8,3 +8,4 @@ export declare const SAUDI_NUMBER_LENGTH = 9;
 export declare const REGEX_FULL_NAME: RegExp;
 export declare const REGEX_WEBSITE: RegExp;
 export declare const REGEX_BENEFICIARY_NAME: RegExp;
+export declare const REGEX_BRAND_NAME: RegExp;

package/build/constants/validation.js CHANGED Viewed

@@ -8,3 +8,4 @@ export var SAUDI_NUMBER_LENGTH = 9;
 export var REGEX_FULL_NAME = /^([a-zA-Z]{2,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,})$/g;
 export var REGEX_WEBSITE = /^[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,63}(:[0-9]{1,5})?(\/.*)?$/;
 export var REGEX_BENEFICIARY_NAME = /^([\u0600-\u065F\u066A-\u06EF\u06FA-\u06FFa-zA-Z\s])*$/g;
+export var REGEX_BRAND_NAME = /(.*[a-zA-Z0-9]){3}/g;

package/build/features/app/bank/bankStore.js CHANGED Viewed

@@ -155,16 +155,16 @@ export var retrieveEntityInfo = createAsyncThunk('retrieveBankEntityInfo', funct
 }); });
 export var createBankAccount = createAsyncThunk('createBankAccount', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, bank, iban, beneficiaryName, bank_name, requestBody, data;
-    var _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, bank = _a.bank;
                 iban = params.iban;
                 beneficiaryName = params.beneficiaryName;
                 bank_name = params.bankName;
                 requestBody = {
-                    wallet_id: (_b = bank.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.merchant_wallet_id,
+                    wallet_id: (_c = (_b = bank.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.merchant) === null || _c === void 0 ? void 0 : _c.wallet_id,
                     is_acknowledged: params.confirmPolicy,
                     bank_account: {
                         iban: iban,
@@ -176,10 +176,10 @@ export var createBankAccount = createAsyncThunk('createBankAccount', function (p
                 };
                 return [4, API.entityService.createBankAccount(requestBody)];
             case 1:
-                data = (_e.sent()).data;
+                data = (_f.sent()).data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
+                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }

package/build/features/app/business/businessStore.js CHANGED Viewed

@@ -571,10 +571,10 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyLeadOTP.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c;
             state.loading = false;
             state.error = null;
-            var _c = action.payload, data = _c.data, formData = _c.formData;
+            var _d = action.payload, data = _d.data, formData = _d.formData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.error = description;
@@ -582,7 +582,7 @@ export var businessSlice = createSlice({
             }
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            var _d = state.data.verify.responseBody || {}, entity = _d.entity, entity_activities = _d.entity_activities;
+            var _e = state.data.verify.responseBody || {}, entity = _e.entity, entity_activities = _e.entity_activities, business_type = _e.business_type;
             var issuingDate = (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
             if (!!issuingDate) {
                 var formattedDate = moment(issuingDate).format('YYYY-MM-DD');
@@ -593,6 +593,13 @@ export var businessSlice = createSlice({
             if (!!selectedActivity)
                 state.data.activitiesData.activities = [selectedActivity];
             state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
+            if (!!(entity === null || entity === void 0 ? void 0 : entity.license)) {
+                state.data.businessTypeData.selectedLicense = {
+                    legal_name: entity === null || entity === void 0 ? void 0 : entity.legal_name,
+                    license: { number: (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.number },
+                    type: business_type
+                };
+            }
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;
@@ -766,9 +773,9 @@ export var businessSlice = createSlice({
             state.loading = false;
             state.error = null;
             var data = action.payload.data;
-            var message = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).message;
-            if (message) {
-                state.error = message;
+            var _b = ((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}, message = _b.message, description = _b.description;
+            if (message || description) {
+                state.error = message || description;
                 return;
             }
             if ((data === null || data === void 0 ? void 0 : data.status) === 'ALREADY_TAKEN') {

package/build/features/app/individual/individualStore.js CHANGED Viewed

@@ -183,18 +183,19 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
 }); });
 export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, individual, requestBody, data;
-    var _b, _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
                 requestBody = {
                     id: (_b = individual.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.individual_id,
-                    occupation: (_c = params.occupation) === null || _c === void 0 ? void 0 : _c.id,
+                    lead_id: (_c = individual.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.id,
+                    occupation: (_d = params.occupation) === null || _d === void 0 ? void 0 : _d.id,
                     employer_name: params.employerName,
-                    employer_country: (_d = params.employerLocation) === null || _d === void 0 ? void 0 : _d.iso2,
-                    source_income: [(_e = params.sourceIncome) === null || _e === void 0 ? void 0 : _e.id],
-                    actual_income: (_f = params.monthlyIncome) === null || _f === void 0 ? void 0 : _f.id,
+                    employer_country: (_e = params.employerLocation) === null || _e === void 0 ? void 0 : _e.iso2,
+                    source_income: [(_f = params.sourceIncome) === null || _f === void 0 ? void 0 : _f.id],
+                    actual_income: (_g = params.monthlyIncome) === null || _g === void 0 ? void 0 : _g.id,
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
                     encryption_contract: ['employer_name', 'employer_city', 'actual_income', 'source_income[0]'],
@@ -202,10 +203,10 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                 };
                 return [4, API.entityService.updateIndividualInfo(requestBody)];
             case 1:
-                data = (_j.sent()).data;
+                data = (_k.sent()).data;
                 if (!(data === null || data === void 0 ? void 0 : data.errors)) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, requestBody);
+                    (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }

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

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

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

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

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

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

@@ -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/ResetPasswordSuccess/ResetPasswordSuccess.d.ts ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

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

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

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

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

@@ -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/validation.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 }
 ];

package/build/features/individual/screens/ResetPasswordSuccess/ResetPasswordSuccess.d.ts ADDED Viewed

@@ -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/individual/screens/ResetPasswordSuccess/ResetPasswordSuccess.js ADDED Viewed

@@ -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/individual/screens/ResetPasswordSuccess/index.d.ts ADDED Viewed

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

package/build/features/individual/screens/ResetPasswordSuccess/index.js ADDED Viewed

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

package/build/features/individual/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js CHANGED Viewed

@@ -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 { individualSelector } from '../../../app/individual/individualStore';
 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(individualSelector).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/password/screens/ResetPasswordSuccess/ResetPasswordSuccess.d.ts ADDED Viewed

@@ -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/password/screens/ResetPasswordSuccess/ResetPasswordSuccess.js ADDED Viewed

@@ -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/password/screens/ResetPasswordSuccess/index.d.ts ADDED Viewed

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

package/build/features/password/screens/ResetPasswordSuccess/index.js ADDED Viewed

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

package/build/features/password/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js CHANGED Viewed

@@ -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 { passwordSelector } from '../../../app/password/passwordStore';
 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(passwordSelector).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/shared/Button/FlowsButtons.js CHANGED Viewed

@@ -54,7 +54,7 @@ import Link from '@mui/material/Link';
 import { ICONS_NAMES } from '../../../constants';
 import CheckIcon from '@mui/icons-material/Check';
 import { useAppDispatch, useLanguage } from '../../../hooks';
-import { handleOpen, handleCurrentActiveScreen } from '../../../app/settings';
+import { handleOpen, handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
 import { getScreenNameBasedOnFlow } from '../../../utils';
 import API from '../../../api';
 var Image = styled('img')(function (_a) {
@@ -159,11 +159,11 @@ export default function FlowsButtons(_a) {
                         step_name: 'reset_password_auth',
                         encryption_contract: ['user_credentail.email']
                     };
+                    dispatch(handleNextScreenStep());
                     return [4, API.authService
                             .createAuth(payload)
                             .then(function (response) {
                             var _a;
-                            setLoading(false);
                             var data = response.data;
                             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
                             if (description) {
@@ -173,11 +173,8 @@ export default function FlowsButtons(_a) {
                         })
                             .catch(function (error) {
                             alert(error);
-                            setLoading(false);
                         })
-                            .finally(function () {
-                            setLoading(false);
-                        })];
+                            .finally(function () { })];
                 case 1:
                     _a.sent();
                     return [2];

package/build/features/shared/Button/SuccessButton.js CHANGED Viewed

@@ -47,6 +47,20 @@ var ButtonStyled = styled(Button)(function (_a) {
                 easing: theme.transitions.easing.easeInOut,
                 duration: theme.transitions.duration.complex * 2
             })
+        },
+        '&.MuiButton-contained': {
+            color: theme.palette.common.white,
+            backgroundColor: theme.palette.primary.main,
+            '&:hover': {
+                backgroundColor: theme.palette.primary.main
+            },
+            '&:active': {
+                backgroundColor: theme.palette.primary.main
+            },
+            ':disabled': {
+                backgroundColor: theme.palette.primary.main,
+                color: theme.palette.common.white
+            }
         }
     });
 });

package/build/features/tax/screens/ResetPasswordSuccess/ResetPasswordSuccess.d.ts ADDED Viewed

@@ -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/tax/screens/ResetPasswordSuccess/ResetPasswordSuccess.js ADDED Viewed

@@ -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/tax/screens/ResetPasswordSuccess/index.d.ts ADDED Viewed

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

package/build/features/tax/screens/ResetPasswordSuccess/index.js ADDED Viewed

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

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

@@ -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 { taxSelector } from '../../../app/tax/taxStore';
 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(taxSelector).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/utils/string.js CHANGED Viewed

@@ -75,6 +75,7 @@ export var capitalizeTheFirstLetterOfEachWord = function (words) {
 };
 export var getRequestHeaders = function (deviceInfo) {
     var app = deviceInfo.app, browser = deviceInfo.browser, connection = deviceInfo.connection, device = deviceInfo.device, source = deviceInfo.source;
+    console.log('bi:', browser.browser_id);
     return {
         al: encryptString(app.language || ''),
         at: encryptString(source || ''),
@@ -93,7 +94,7 @@ export var getRequestHeaders = function (deviceInfo) {
         bb: encryptString(''),
         bv: encryptString(browser.version || ''),
         bua: encryptString((browser.user_agent || '').substring(0, 80)),
-        bi: encryptString(browser.browser_id || ''),
+        bi: browser.browser_id || '',
         ci: encryptString(connection.ip || ''),
         cm: encryptString(connection.mac || ''),
         l: encryptString((connection.latitude || 0).toString() + '-' + (connection.longitude || 0).toString())

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "1.0.99-test",
+	"version": "1.0.100-test",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",