@tap-payments/auth-jsconnect 2.0.22 → 2.0.23

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

@@ -49,13 +49,13 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
-import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
+import { handleNextScreenStep } from '../../../app/settings';
 import { BUSINESS_FLOW_SUCCESS, INDIVIDUAl_STEP_NAMES } from '../../../constants';
 export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var payload, settings, data, boardData, countryCode, boardInfoData, countries, board_id, board_info_id, entity, info, hasIndividualCompleted;
-    var _a, _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var payload, settings, data, boardData, individualData, countryCode, boardInfoData, countries, board_id, board_info_id, notification, _a, id, type, info, hasIndividualCompleted;
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -64,49 +64,59 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                 settings = thunkApi.getState().settings;
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_d.sent()).data;
+                data = (_f.sent()).data;
                 boardInfoData = undefined;
                 countries = settings.data.countries;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 6];
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 10];
+                if (!(data.step_name !== INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 10];
                 board_id = data === null || data === void 0 ? void 0 : data.id;
                 board_info_id = data === null || data === void 0 ? void 0 : data.board_info_id;
-                if (!(!!board_id && !!board_info_id)) return [3, 3];
+                if (!(board_id && board_info_id)) return [3, 4];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 2:
-                boardInfoData = _d.sent();
-                _d.label = 3;
-            case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
+                boardInfoData = _f.sent();
+                notification = (boardInfoData || {}).notification;
+                _a = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _a.id, type = _a.type;
+                if (!(id && type)) return [3, 4];
+                return [4, API.individualService.retrieveIndividual(id, type)];
+            case 3:
+                individualData = _f.sent();
+                _f.label = 4;
             case 4:
-                boardData = _d.sent();
-                entity = ((boardData === null || boardData === void 0 ? void 0 : boardData.business) || {}).entity;
-                countryCode = entity === null || entity === void 0 ? void 0 : entity.country;
+                countryCode = (_b = individualData === null || individualData === void 0 ? void 0 : individualData.user) === null || _b === void 0 ? void 0 : _b.nationality;
                 info = boardInfoData.info;
-                hasIndividualCompleted = ((_a = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _a === void 0 ? void 0 : _a.status) === 'completed';
-                return [4, thunkApi.dispatch(retrieveDataList(entity === null || entity === void 0 ? void 0 : entity.country))];
+                hasIndividualCompleted = ((_c = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _c === void 0 ? void 0 : _c.status) === 'completed';
+                if (!hasIndividualCompleted) return [3, 7];
+                if (!board_id) return [3, 6];
+                return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 5:
-                _d.sent();
-                if (data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_AUTH) {
-                    thunkApi.dispatch(handleCurrentActiveScreen('INDIVIDUAL_VERIFY_STEP'));
-                }
-                else if (hasIndividualCompleted) {
-                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                }
-                else if (data.step_name === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO) {
-                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                }
-                _d.label = 6;
-            case 6: return [2, {
+                boardData = _f.sent();
+                _f.label = 6;
+            case 6:
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 10];
+            case 7:
+                if (!countryCode) return [3, 9];
+                return [4, thunkApi.dispatch(retrieveDataList(countryCode))];
+            case 8:
+                _f.sent();
+                _f.label = 9;
+            case 9:
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
+                _f.label = 10;
+            case 10: return [2, {
                     data: data,
                     boardResponse: {
-                        user: boardData === null || boardData === void 0 ? void 0 : boardData.user,
+                        user: individualData === null || individualData === void 0 ? void 0 : individualData.user,
                         brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
                         bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
                         entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                         merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
-                        name: (_b = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _b === void 0 ? void 0 : _b.name,
-                        contact: (_c = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _c === void 0 ? void 0 : _c.contact,
+                        name: (_d = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _d === void 0 ? void 0 : _d.name,
+                        contact: (_e = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _e === void 0 ? void 0 : _e.contact,
                         countries: countries,
                         countryCode: countryCode,
+                        notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
                         flows: BUSINESS_FLOW_SUCCESS.concat(boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info)
                     },
                     token: token
@@ -173,63 +183,107 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetai
     });
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, individual, settings, responseBody, payload, data, flows, hasIndividualCompleted;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, countryCode, notification, _c, id, type, info, hasIndividualCompleted;
+    var _d, _e, _f, _g, _h, _j, _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
+                _b = responseBody || {}, board_id = _b.board_id, board_info_id = _b.board_info_id;
+                countries = settings.data.countries;
                 payload = {
                     data: params.otp,
-                    service_name: (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _b === void 0 ? void 0 : _b.service_name,
+                    service_name: (_d = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _d === void 0 ? void 0 : _d.service_name,
                     verify_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token,
                     step_name: INDIVIDUAl_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_f.sent()).data;
-                if (!(data === null || data === void 0 ? void 0 : data.errors)) {
-                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
-                    flows = (responseBody || {}).flows;
-                    hasIndividualCompleted = ((_e = flows === null || flows === void 0 ? void 0 : flows.find(function (flow) { return flow.name === 'individual'; })) === null || _e === void 0 ? void 0 : _e.status) === 'completed';
-                    if (hasIndividualCompleted) {
-                        thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                    }
-                    else {
-                        thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                    }
-                }
-                return [2, { data: data, formData: __assign({}, params) }];
+                data = (_l.sent()).data;
+                countryCode = undefined;
+                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 10];
+                if (!(board_id && board_info_id)) return [3, 4];
+                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
+            case 2:
+                boardInfoData = _l.sent();
+                notification = (boardInfoData || {}).notification;
+                _c = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _c.id, type = _c.type;
+                if (!(id && type)) return [3, 4];
+                return [4, API.individualService.retrieveIndividual(id, type)];
+            case 3:
+                individualData = _l.sent();
+                _l.label = 4;
+            case 4:
+                countryCode = (_e = individualData === null || individualData === void 0 ? void 0 : individualData.user) === null || _e === void 0 ? void 0 : _e.nationality;
+                info = boardInfoData.info;
+                hasIndividualCompleted = ((_f = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _f === void 0 ? void 0 : _f.status) === 'completed';
+                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
+                if (!hasIndividualCompleted) return [3, 7];
+                if (!board_id) return [3, 6];
+                return [4, API.boardService.retrieveBoardDetails(board_id)];
+            case 5:
+                boardData = _l.sent();
+                _l.label = 6;
+            case 6:
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 10];
+            case 7:
+                if (!countryCode) return [3, 9];
+                return [4, thunkApi.dispatch(retrieveDataList(countryCode))];
+            case 8:
+                _l.sent();
+                _l.label = 9;
+            case 9:
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
+                _l.label = 10;
+            case 10: return [2, {
+                    data: data,
+                    boardResponse: {
+                        user: individualData === null || individualData === void 0 ? void 0 : individualData.user,
+                        brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
+                        bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
+                        entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
+                        merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
+                        name: (_j = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _j === void 0 ? void 0 : _j.name,
+                        contact: (_k = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _k === void 0 ? void 0 : _k.contact,
+                        countries: countries,
+                        notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
+                        flows: BUSINESS_FLOW_SUCCESS.concat(boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info)
+                    },
+                    formData: __assign({}, params)
+                }];
         }
     });
 }); });
 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, _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var _a, settings, individual, _b, id, type, requestBody, data;
+    var _c, _d, _e, _f, _g, _h, _j, _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
+                _b = ((_d = (_c = individual.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.notification) === null || _d === void 0 ? void 0 : _d.recipient) || {}, id = _b.id, type = _b.type;
                 requestBody = {
-                    id: (_c = (_b = individual.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.user) === null || _c === void 0 ? void 0 : _c.id,
-                    occupation: { id: (_d = params.occupation) === null || _d === void 0 ? void 0 : _d.id },
+                    id: id,
+                    type: type,
+                    occupation: { id: (_e = params.occupation) === null || _e === void 0 ? void 0 : _e.id },
                     employer_name: params.employerName,
-                    employer_country: (_e = params.employerLocation) === null || _e === void 0 ? void 0 : _e.iso2,
-                    source_income: [{ id: (_f = params.sourceIncome) === null || _f === void 0 ? void 0 : _f.id }],
-                    monthly_income: { id: (_g = params.monthlyIncome) === null || _g === void 0 ? void 0 : _g.id },
+                    employer_country: (_f = params.employerLocation) === null || _f === void 0 ? void 0 : _f.iso2,
+                    source_income: [{ id: (_g = params.sourceIncome) === null || _g === void 0 ? void 0 : _g.id }],
+                    monthly_income: { id: (_h = params.monthlyIncome) === null || _h === void 0 ? void 0 : _h.id },
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
                     encryption_contract: ['employer_name', 'employer_country'],
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
                 };
-                return [4, API.entityService.updateIndividualInfo(requestBody)];
+                return [4, API.individualService.updateIndividual(requestBody)];
             case 1:
-                data = (_k.sent()).data;
+                data = (_l.sent()).data;
                 if (!(data === null || data === void 0 ? void 0 : data.errors)) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, requestBody);
+                    (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }
@@ -315,9 +369,9 @@ export var individualSlice = createSlice({
                 state.error = description;
                 return;
             }
-            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), boardResponse), state.data.verify.responseBody), { board_id: data.id });
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.verify.responseBody), boardResponse), { board_id: data.id });
             state.data.verify.token = token;
-            var _c = boardResponse || {}, countries = _c.countries, countryCode = _c.countryCode, user = _c.user;
+            var _c = boardResponse || {}, countries = _c.countries, user = _c.user;
             var _d = user || {}, source_income = _d.source_income, monthly_income = _d.monthly_income, occupation = _d.occupation, is_relative_PEP = _d.is_relative_PEP, is_influencer = _d.is_influencer;
             var _e = state.data.individualData.responseBody || {}, sourceIncomeList = _e.sourceIncomeList, monthlyIncomeList = _e.monthlyIncomeList, occupationList = _e.occupationList;
             var selectedSourceIncome = (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList.find(function (source) { var _a; return (source === null || source === void 0 ? void 0 : source.id) === ((_a = source_income === null || source_income === void 0 ? void 0 : source_income[0]) === null || _a === void 0 ? void 0 : _a.id); })) ||
@@ -328,7 +382,7 @@ export var individualSlice = createSlice({
                 (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList[2]);
             if (!!selectedMonthlyIncome)
                 state.data.individualData.monthlyIncome = selectedMonthlyIncome;
-            var code = (data === null || data === void 0 ? void 0 : data.employer_country) || countryCode;
+            var code = user === null || user === void 0 ? void 0 : user.employer_country;
             if (!!code) {
                 var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
                 state.data.individualData.employerLocation = employerLocation;
@@ -368,7 +422,7 @@ export var individualSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, data = _b.data, formData = _b.formData;
+            var _b = action.payload, data = _b.data, formData = _b.formData, boardResponse = _b.boardResponse;
             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;
@@ -376,7 +430,28 @@ export var individualSlice = createSlice({
             }
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            state.data.individualData = __assign({}, state.data.individualData);
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), boardResponse);
+            var _c = boardResponse || {}, countries = _c.countries, user = _c.user;
+            var _d = user || {}, source_income = _d.source_income, monthly_income = _d.monthly_income, occupation = _d.occupation, is_relative_PEP = _d.is_relative_PEP, is_influencer = _d.is_influencer;
+            var _e = state.data.individualData.responseBody || {}, sourceIncomeList = _e.sourceIncomeList, monthlyIncomeList = _e.monthlyIncomeList, occupationList = _e.occupationList;
+            var selectedSourceIncome = (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList.find(function (source) { var _a; return (source === null || source === void 0 ? void 0 : source.id) === ((_a = source_income === null || source_income === void 0 ? void 0 : source_income[0]) === null || _a === void 0 ? void 0 : _a.id); })) ||
+                (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
+            if (!!selectedSourceIncome)
+                state.data.individualData.sourceIncome = selectedSourceIncome;
+            var selectedMonthlyIncome = (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) { return (income === null || income === void 0 ? void 0 : income.id) === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.id); })) ||
+                (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList[2]);
+            if (!!selectedMonthlyIncome)
+                state.data.individualData.monthlyIncome = selectedMonthlyIncome;
+            var code = user === null || user === void 0 ? void 0 : user.employer_country;
+            if (!!code) {
+                var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
+                state.data.individualData.employerLocation = employerLocation;
+            }
+            var selectedOccupation = (occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (o) { return (o === null || o === void 0 ? void 0 : o.id) === (occupation === null || occupation === void 0 ? void 0 : occupation.id); })) || (occupationList === null || occupationList === void 0 ? void 0 : occupationList[0]);
+            if (!!selectedOccupation)
+                state.data.individualData.occupation = selectedOccupation;
+            state.data.individualData.isPEP = is_relative_PEP;
+            state.data.individualData.isInfluencer = is_influencer;
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;

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

@@ -259,6 +259,7 @@ export var taxSlice = createSlice({
             }
             state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), boardResponse), state.data.verify.responseBody), { board_id: data.id, name: user.name, bank_account: bank_account, vatID: vatID, merchant: merchant });
             state.data.verify.token = token;
+            state.data.taxData.vatId = vatID;
         })
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;

package/build/features/auth/Auth.d.ts

@@ -2,7 +2,7 @@
 import { LibConfig } from '../../@types';
 export interface AuthLibProps extends LibConfig {
     postURL: string;
-    leadId?: string;
+    leadId: string;
     onClose?: () => void;
 }
 export declare function AuthLib(props: AuthLibProps): JSX.Element;

package/build/features/auth/Auth.js

@@ -45,6 +45,8 @@ var Auth = memo(function (_a) {
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
     useEffect(function () {
+        if (!props.leadId)
+            throw new Error('leadId is required');
         var _a = props || {}, leadId = _a.leadId, postURL = _a.postURL;
         var data = {
             postUrl: postURL
@@ -52,11 +54,10 @@ var Auth = memo(function (_a) {
         if (!props.open)
             return;
         dispatch(storePostUrl(data));
-        if (leadId)
-            dispatch(storeLeadId({ leadId: leadId }));
+        dispatch(storeLeadId({ leadId: leadId }));
     }, []);
     useEffect(function () {
-        if (data.isValidOperator && props.leadId && props.open)
+        if (data.isValidOperator && props.open)
             dispatch(retrieveLead(props.leadId));
     }, [data.isValidOperator]);
     var handleDialogClose = function () {

package/build/features/bank/Bank.js

@@ -28,7 +28,7 @@ var Bank = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
-    var _b = useAppSelector(bankSelector), customLoading = _b.customLoading, bankError = _b.error;
+    var _b = useAppSelector(bankSelector), customLoading = _b.customLoading, loading = _b.loading, bankError = _b.error;
     useAppConfig(__assign({ navigation: BANK_SCREENS_NAVIGATION }, props));
     useErrorListener(bankError || error);
     useStepStartedListener();
@@ -46,7 +46,7 @@ var Bank = memo(function (props) {
         if (!settingLoading && open)
             verifyToken();
     }, [settingLoading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: bankFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: bankFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

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

@@ -25,18 +25,23 @@ var InputStyled = styled(Input)(function (_a) {
     });
 });
 var Beneficiary = function () {
-    var _a, _b, _c, _d;
+    var _a, _b;
     var t = useTranslation().t;
-    var _e = useFormContext(), setValue = _e.setValue, control = _e.control;
+    var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
     var isAr = useLanguage().isAr;
     var data = useAppSelector(bankSelector).data;
     var beneficiaryControl = useController({ name: 'beneficiaryName', control: control });
     var beneficiaryValue = beneficiaryControl.field.value;
     var hasError = (_a = beneficiaryControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
     var error = (_b = beneficiaryControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var legalName = (_d = (_c = data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.entity) === null || _d === void 0 ? void 0 : _d.legal_name;
+    var _d = data.verify.responseBody || {}, bank_account = _d.bank_account, entity = _d.entity;
+    var legalName = (entity === null || entity === void 0 ? void 0 : entity.legal_name) || {};
     React.useEffect(function () {
-        setValue('beneficiaryName', isAr ? legalName === null || legalName === void 0 ? void 0 : legalName.ar : legalName === null || legalName === void 0 ? void 0 : legalName.en);
+        var beneficiary_name = (bank_account || {}).beneficiary_name;
+        if (beneficiary_name)
+            setValue('beneficiaryName', beneficiary_name);
+        else
+            setValue('beneficiaryName', isAr ? legalName === null || legalName === void 0 ? void 0 : legalName.ar : legalName === null || legalName === void 0 ? void 0 : legalName.en);
     }, []);
     var handleBeneficiaryChange = function (_a) {
         var target = _a.target;
@@ -46,6 +51,6 @@ var Beneficiary = function () {
     var clearValue = function () {
         beneficiaryControl.field.onChange('');
     };
-    return (_jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('beneficiary_name'), onChange: handleBeneficiaryChange, disabled: !!legalName, value: beneficiaryValue, placeholder: t('beneficiary_name'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: !hasError && beneficiaryValue ? _jsx(CheckIcon, {}) : beneficiaryValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(InputStyled, { label: t('beneficiary_name'), onChange: handleBeneficiaryChange, value: beneficiaryValue, placeholder: t('beneficiary_name'), warningType: 'alert', warningMessage: error && t(error), required: true, endAdornment: !hasError && beneficiaryValue ? _jsx(CheckIcon, {}) : beneficiaryValue && _jsx(ClearIcon, { onClick: clearValue }) }) }));
 };
 export default Beneficiary;

package/build/features/business/Business.js

@@ -28,7 +28,7 @@ var Business = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
-    var _b = useAppSelector(businessSelector), customLoading = _b.customLoading, businessError = _b.error;
+    var _b = useAppSelector(businessSelector), customLoading = _b.customLoading, businessError = _b.error, loading = _b.loading;
     useAppConfig(__assign({ navigation: BUSINESS_SCREENS_NAVIGATION }, props));
     useErrorListener(businessError || error);
     useStepStartedListener();
@@ -46,7 +46,7 @@ var Business = memo(function (props) {
         if (!settingLoading && open)
             verifyToken();
     }, [settingLoading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: businessFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: businessFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

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

@@ -15,7 +15,7 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import { useLanguage } from '../../../../hooks';
@@ -26,16 +26,23 @@ import { isSA } from '../../../../utils';
 import { KWLicenseValidationSchema, LicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
 var BusinessType = function (_a) {
-    var _b;
-    var _c = useAppSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error, uploading = _c.uploading;
+    var _b = useAppSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error, uploading = _b.uploading;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var businessTypeData = data.businessTypeData;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _d = React.useState(false), listActive = _d[0], setListActive = _d[1];
-    var isSACountry = React.useMemo(function () { var _a; return isSA((_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.country_code); }, [(_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.country_code]);
+    var _c = React.useState(false), listActive = _c[0], setListActive = _c[1];
+    var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var methods = useForm({
         resolver: yupResolver(!isSACountry ? KWLicenseValidationSchema : LicenseValidationSchema),
-        defaultValues: data.businessTypeData,
+        defaultValues: {
+            selectedLicense: businessTypeData.selectedLicense,
+            licenseNumber: businessTypeData.licenseNumber,
+            entityLegalName: businessTypeData.entityLegalName,
+            certificateId: businessTypeData.certificateId,
+            certificateFile: businessTypeData.certificateFile
+        },
         mode: 'onChange'
     });
     React.useEffect(function () {

package/build/features/business/screens/BusinessType/EntityName.js

@@ -21,7 +21,7 @@ import { isSA, removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils'
 import { styled } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import { useAppSelector } from '../../../../hooks';
-import { businessSelector } from '../../../app/business/businessStore';
+import { settingsSelector } from '../../../../app/settings';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -34,15 +34,15 @@ var BoxStyled = styled(Box)(function (_a) {
     });
 });
 var EntityName = function (_a) {
-    var _b, _c;
+    var _b;
     var show = _a.show;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var entityNameControl = useController({ control: control, name: 'entityLegalName' });
     var entityNameValue = entityNameControl.field.value;
     var error = (_b = entityNameControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var data = useAppSelector(businessSelector).data;
-    var isSACountry = React.useMemo(function () { var _a; return isSA((_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.country_code); }, [(_c = data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.country_code]);
+    var settingsData = useAppSelector(settingsSelector).data;
+    var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var handleChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanCharsNumbersAndSpace(target.value);

package/build/features/business/screens/Customers/CustomerLocations.js

@@ -130,7 +130,7 @@ var customerLocations = function (_a) {
     };
     var customerLocationsValue = customerLocationsControl.field.value;
     var customerLocationSelected = customerLocationsValue === null || customerLocationsValue === void 0 ? void 0 : customerLocationsValue[0];
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('select_customer_base') }), _jsx(InputStyled, { readOnly: true, value: isAr ? customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.name.ar : customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.name.en, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { searchKeyPath: 'name.en', list: customerLocationsList, placeholder: 'choose_customer_base', onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('select_customer_base') }), _jsx(InputStyled, { readOnly: true, placeholder: t('choose_expected_sales'), value: isAr ? customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.name.ar : customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.name.en, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { searchKeyPath: 'name.en', list: customerLocationsList, placeholder: 'choose_customer_base', onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (customerLocationsValue === null || customerLocationsValue === void 0 ? void 0 : customerLocationsValue.id) }, { children: isAr ? item.name.ar : item.name.en })) })), item.id === (customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.id) && _jsx(CheckIconStyled, {}), checkRemainingCondition(item) && item.id != (customerLocationSelected === null || customerLocationSelected === void 0 ? void 0 : customerLocationSelected.id) && _jsx(RemainingCheck, {})] }));
                             } })] }))] }) })));
 };

package/build/features/business/screens/Customers/ExpectedCustomers.js

@@ -91,7 +91,7 @@ var ExpectedCustomers = function (_a) {
     };
     var expectedCustomersValue = expectedCustomerControl.field.value;
     var expectedCustomersSelected = expectedCustomersValue;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: true, value: isAr ? expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name.ar : expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name.en, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: true, placeholder: t('choose_expected_sales'), value: isAr ? expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name.ar : expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name.en, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedCustomersValue === null || expectedCustomersValue === void 0 ? void 0 : expectedCustomersValue.id) }, { children: isAr ? item.name.ar : item.name.en })) }), item.id === (expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.id) && _jsx(CheckIconStyled, {})] }));
                             } })] }))] }) })));
 };

package/build/features/connect/Connect.js

@@ -40,7 +40,7 @@ var Connect = memo(function (_a) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
-    var connectError = useAppSelector(connectSelector).error;
+    var _c = useAppSelector(connectSelector), connectError = _c.error, loading = _c.loading;
     useAppConfig(__assign({ navigation: CONNECT_SCREENS_NAVIGATION }, props));
     useErrorListener(connectError || error);
     useStepStartedListener();
@@ -60,7 +60,7 @@ var Connect = memo(function (_a) {
     var handleDialogClose = function () {
         dispatch(handleOpen(false));
     };
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ onClose: onClose, onConfirm: handleDialogClose, isTapOrigin: isTapOrigin, loading: settingLoading, error: error, open: open, footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: connectFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', onClose: onClose, onConfirm: handleDialogClose, isTapOrigin: isTapOrigin, loading: settingLoading, error: error, open: open, footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: connectFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));