@tap-payments/auth-jsconnect 2.8.19-test → 2.8.21-test

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

@@ -31,7 +31,6 @@ export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<{
     rejectedMeta?: unknown;
 }>;
 export declare const retrieveBoardStatus: import("@reduxjs/toolkit").AsyncThunk<{
-    data: any;
     flows: any;
 }, void, {
     state?: unknown;

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

@@ -119,52 +119,47 @@ export var resendOTP = createAsyncThunk('resendOTPTax', function (params, thunkA
     });
 }); });
 export var retrieveBoardStatus = createAsyncThunk('tax/retrieveBoardStatus', function (parmas, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var tax, _a, board_id, board_info_id, _b, boardInfoData, data, _c, id, type;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var tax, _a, board_id, board_info_id, recipient, _b, id, type, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 tax = thunkApi.getState().tax;
-                _a = tax.data.verify.responseBody || {}, board_id = _a.board_id, board_info_id = _a.board_info_id;
+                _a = tax.data.verify.responseBody || {}, board_id = _a.board_id, board_info_id = _a.board_info_id, recipient = _a.recipient;
                 if (!board_id || !board_info_id)
                     throw new Error('Internal server error');
+                _b = recipient || {}, id = _b.id, type = _b.type;
                 return [4, Promise.all([
-                        API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id }),
-                        API.boardService.retrieveBoardInfoStatus(board_id)
+                        API.boardService.retrieveBoardInfoStatus(board_id),
+                        thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id, individualId: id, individualType: type })).unwrap()
                     ])];
             case 1:
-                _b = _e.sent(), boardInfoData = _b[0], data = _b[1];
-                _c = ((_d = boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification) === null || _d === void 0 ? void 0 : _d.recipient) || {}, id = _c.id, type = _c.type;
-                return [4, thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id, individualId: id, individualType: type })).unwrap()];
-            case 2:
-                _e.sent();
+                data = (_c.sent())[0];
                 thunkApi.dispatch(handlePrevScreenStep());
-                return [2, { data: boardInfoData, flows: (data === null || data === void 0 ? void 0 : data.info) || [] }];
+                return [2, { flows: (data === null || data === void 0 ? void 0 : data.info) || [] }];
         }
     });
 }); });
 export var retrieveBoardDetails = createAsyncThunk('tax/retrieveBrandInfo', function (_a) {
     var boardId = _a.boardId, id = _a.individualId, type = _a.individualType;
     return __awaiter(void 0, void 0, void 0, function () {
-        var data, individualData, serviceCallBack, data_state;
-        var _b, _c, _d, _e;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
+        var data, individualData, boardData, serviceCallBack, _b, boardRes, individualRes;
+        var _c, _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0: return [4, API.boardService.retrieveBoardDetails(boardId)];
                 case 1:
-                    data = _f.sent();
+                    data = _g.sent();
                     individualData = data === null || data === void 0 ? void 0 : data.user;
-                    if (!(((_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.id) !== id)) return [3, 3];
+                    boardData = data;
+                    if (!(((_c = data === null || data === void 0 ? void 0 : data.user) === null || _c === void 0 ? void 0 : _c.id) !== id)) return [3, 3];
                     serviceCallBack = function () { return API.individualService.retrieveIndividual(id, type); };
                     return [4, retrieveIndividualData(type, data, serviceCallBack)];
                 case 2:
-                    individualData = _f.sent();
-                    _f.label = 3;
-                case 3:
-                    data_state = (((individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) ? data === null || data === void 0 ? void 0 : data.individuals : individualData) || {}).data_state;
-                    return [2, __assign(__assign(__assign(__assign({}, data), { user: data === null || data === void 0 ? void 0 : data.user, brand: data === null || data === void 0 ? void 0 : data.brand, bank_account: data === null || data === void 0 ? void 0 : data.bank_account, entity: data === null || data === void 0 ? void 0 : data.entity, merchant: data === null || data === void 0 ? void 0 : data.merchant, name: (_c = data === null || data === void 0 ? void 0 : data.user) === null || _c === void 0 ? void 0 : _c.names, vatID: (_d = data === null || data === void 0 ? void 0 : data.entity) === null || _d === void 0 ? void 0 : _d.vat_id, individuals: data === null || data === void 0 ? void 0 : data.individuals, contact: (_e = data === null || data === void 0 ? void 0 : data.user) === null || _e === void 0 ? void 0 : _e.contact }), (individualData && { user: individualData })), (data_state && {
-                            individuals: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.individuals), { data_state: data_state })
-                        }))];
+                    _b = _g.sent(), boardRes = _b.boardRes, individualRes = _b.individualRes;
+                    individualData = individualRes;
+                    boardData = boardRes;
+                    _g.label = 3;
+                case 3: return [2, __assign(__assign({}, boardData), { 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: (_d = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _d === void 0 ? void 0 : _d.names, vatID: (_e = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _e === void 0 ? void 0 : _e.vat_id, individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals, contact: (_f = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _f === void 0 ? void 0 : _f.contact, user: individualData })];
             }
         });
     });
@@ -443,8 +438,8 @@ export var taxSlice = createSlice({
             .addCase(retrieveBoardStatus.fulfilled, function (state, action) {
             state.error = null;
             state.loading = false;
-            var _a = action.payload, flows = _a.flows, data = _a.data;
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows, notification: data === null || data === void 0 ? void 0 : data.notification });
+            var flows = action.payload.flows;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows });
         })
             .addCase(retrieveBoardStatus.rejected, function (state, action) {
             state.error = action.error.message;

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

@@ -16,11 +16,12 @@ import Box from '@mui/material/Box';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Text from '../../../../components/Text';
-import Button from '../../../../components/Button';
 import Collapse from '../../../../components/Collapse';
 import Warning from '../../../../components/Warning';
+import Button from '../../../../components/Button';
+import Loader from '../../../../components/Loader';
 import { ScreenContainer } from '../../../shared/Containers';
-import { individualSelector } from '../../../app/individual/individualStore';
+import { individualSelector, retrieveBoardStatus } from '../../../app/individual/individualStore';
 import UserList from './UserList';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -49,12 +50,17 @@ export var SubTitleStyled = styled(Text)(function (_a) {
 var IndividualList = function () {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var error = useAppSelector(individualSelector).error;
+    var _a = useAppSelector(individualSelector), error = _a.error, data = _a.data, loading = _a.loading;
     var settingsData = useAppSelector(settingsSelector).data;
+    var flows = (data.verify.responseBody || {}).flows;
     var onBack = function () {
-        dispatch(handlePrevScreenStep());
+        if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
+            dispatch(handlePrevScreenStep());
+            return;
+        }
+        dispatch(retrieveBoardStatus());
     };
     var hideBack = settingsData.appConfig.mode === 'content';
-    return (_jsxs(ScreenContainer, { children: [_jsxs(BoxStyled, { children: [_jsxs(ContentStyled, { children: [_jsx(TitleStyled, { children: t('company_individuals') }), _jsx(SubTitleStyled, { children: t('company_individuals_add_or_request_details') })] }), _jsx(UserList, {})] }), _jsx(Collapse, __assign({ in: !!error, timeout: 400 }, { children: _jsx(Warning, __assign({ warningType: 'error' }, { children: t(error || '') })) })), !hideBack && (_jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return onBack(); }, variant: 'text' }, { children: t('back') })))] }));
+    return (_jsxs(ScreenContainer, { children: [_jsxs(BoxStyled, { children: [_jsxs(ContentStyled, { children: [_jsx(TitleStyled, { children: t('company_individuals') }), _jsx(SubTitleStyled, { children: t('company_individuals_add_or_request_details') })] }), _jsx(UserList, {})] }), _jsx(Collapse, __assign({ in: !!error, timeout: 400 }, { children: _jsx(Warning, __assign({ warningType: 'error' }, { children: t(error || '') })) })), !hideBack && (_jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return onBack(); }, variant: 'text' }, { children: loading ? _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 15, toggleAnimation: !!loading }) : t('back') })))] }));
 };
 export default IndividualList;

package/build/features/individual/screens/IndividualList/UserList.js

@@ -85,12 +85,12 @@ var UserList = function (_a) {
     var dispatch = useAppDispatch();
     var _j = React.useState(false), emailChecking = _j[0], setEmailChecking = _j[1];
     var theme = useTheme();
-    var _k = useAppSelector(individualSelector), data = _k.data, loading = _k.loading, error = _k.error;
+    var _k = useAppSelector(individualSelector), data = _k.data, addOrRequestDetailLoading = _k.addOrRequestDetailLoading, error = _k.error;
     var settingsData = useAppSelector(settingsSelector).data;
     var _l = data.individualCollectData, email = _l.email, mobile = _l.mobile, responseBody = _l.responseBody;
     var is_available = (responseBody || {}).is_available;
     var verify = data.verify;
-    var _m = verify.responseBody || {}, userList = _m.userList, notification = _m.notification, userRes = _m.user;
+    var _m = verify.responseBody || {}, userList = _m.userList, recipient = _m.recipient, userRes = _m.user;
     var methods = useForm({
         resolver: yupResolver(IndividualCollectInfoValidationSchema(activeUser)),
         defaultValues: {
@@ -159,10 +159,10 @@ var UserList = function (_a) {
         return (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id;
     };
     var isSameUserRequestedBefore = function (user) {
-        var _a, _b;
+        var _a;
         if (!(userRes === null || userRes === void 0 ? void 0 : userRes.is_authorized) && !isKWOrSA(settingsData.businessCountry.iso2))
             return false;
-        return (_a = user === null || user === void 0 ? void 0 : user.ids) === null || _a === void 0 ? void 0 : _a.includes((_b = notification === null || notification === void 0 ? void 0 : notification.recipient) === null || _b === void 0 ? void 0 : _b.id);
+        return (_a = user === null || user === void 0 ? void 0 : user.ids) === null || _a === void 0 ? void 0 : _a.includes(recipient === null || recipient === void 0 ? void 0 : recipient.id);
     };
     var getUserStatus = function (user) {
         return user === null || user === void 0 ? void 0 : user.individual_data_state;
@@ -196,7 +196,7 @@ var UserList = function (_a) {
                                 status: getUserStatus(user),
                                 title: t('add_details'),
                                 onClick: onAddDetails,
-                                loading: isActiveUser(user) && loading && type === IndividualRequestType.ADD
+                                loading: isActiveUser(user) && !!addOrRequestDetailLoading && type === IndividualRequestType.ADD
                             }, requestEmail: {
                                 children: getCollectForm(user),
                                 title: t('request_details_by_email'),
@@ -204,7 +204,7 @@ var UserList = function (_a) {
                                 disabled: showCollectForm ? disabled : false,
                                 onClick: onRequestEmail,
                                 show: !isSameUserRequestedBefore(user),
-                                loading: isActiveUser(user) && loading && type === IndividualRequestType.REQUEST_EMAIL
+                                loading: isActiveUser(user) && !!addOrRequestDetailLoading && type === IndividualRequestType.REQUEST_EMAIL
                             } }) }))] }), index));
         }) }));
 };

package/package.json

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