@tap-payments/auth-jsconnect 2.6.94-test → 2.6.95-test

package/build/features/app/individual/individualStore.d.ts

@@ -24,6 +24,7 @@ export declare const verifyToken: import("@reduxjs/toolkit").AsyncThunk<{
         flows: any;
     };
     token: string;
+    userList: User[];
 }, VerifyLeadTokenProps, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
@@ -191,6 +192,7 @@ export declare const verifyLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
     formData: {
         otp: string;
     };
+    userList: User[] | undefined;
 }, OTPFormValues, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;

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

@@ -75,10 +75,10 @@ import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountry
 export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally, isUpdatePhoneInfo = _a.isUpdatePhoneInfo;
     return __awaiter(void 0, void 0, void 0, function () {
-        var payload, settings, data, boardData, individualData, countryCode, boardInfoData, boardInfoStatus, countries, publicKey, board_id, board_info_id, notification, _b, id, type, data_1, birthCountry, individuals, _c, is_authorized, data_state;
-        var _d, _e, _f, _g, _h, _j, _k, _l;
-        return __generator(this, function (_m) {
-            switch (_m.label) {
+        var payload, settings, data, individualData, boardData, countryCode, boardInfoData, userList, boardInfoStatus, countries, publicKey, board_id, board_info_id, notification, _b, id, type, data_1, birthCountry, individuals, _c, is_authorized, data_state;
+        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        return __generator(this, function (_p) {
+            switch (_p.label) {
                 case 0:
                     payload = __assign({ service_name: 'tap_email', verify_token: token }, (isInternally && {
                         notification: {
@@ -88,7 +88,8 @@ export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a
                     settings = thunkApi.getState().settings;
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_m.sent()).data;
+                    data = (_p.sent()).data;
+                    individualData = undefined;
                     boardInfoStatus = undefined;
                     countries = settings.data.countries;
                     if (((_d = data.errors) === null || _d === void 0 ? void 0 : _d.length) || (data === null || data === void 0 ? void 0 : data.mw_error))
@@ -105,63 +106,77 @@ export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a
                     }
                     if (!(data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_INFO)) return [3, 2];
                     thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PHONE_INFO_STEP'));
-                    return [3, 16];
+                    return [3, 20];
                 case 2:
-                    if (!(data.step_name !== INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 15];
+                    if (!(data.step_name !== INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 19];
                     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, 5];
                     return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
                 case 3:
-                    boardInfoData = _m.sent();
+                    boardInfoData = _p.sent();
                     notification = (boardInfoData || {}).notification;
                     _b = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _b.id, type = _b.type;
                     if (!(id && type)) return [3, 5];
                     return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode })).unwrap()];
                 case 4:
-                    data_1 = (_m.sent()).data;
+                    data_1 = (_p.sent()).data;
                     individualData = data_1 || {};
-                    _m.label = 5;
+                    _p.label = 5;
                 case 5:
                     if (!board_id) return [3, 7];
                     return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 6:
-                    boardData = _m.sent();
-                    _m.label = 7;
+                    boardData = _p.sent();
+                    _p.label = 7;
                 case 7:
                     if (!countryCode) {
                         countryCode = (_f = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _f === void 0 ? void 0 : _f.country;
                         if (countryCode)
                             thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                     }
-                    if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 11];
+                    if (!(!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) && !isKWOrSA(countryCode))) return [3, 11];
                     if (!((_g = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _g === void 0 ? void 0 : _g.id)) return [3, 9];
-                    return [4, thunkApi.dispatch(getIndividualList((_h = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _h === void 0 ? void 0 : _h.id))];
+                    return [4, thunkApi.dispatch(getIndividualList((_h = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _h === void 0 ? void 0 : _h.id)).unwrap()];
                 case 8:
-                    _m.sent();
-                    _m.label = 9;
-                case 9: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                    userList = _p.sent();
+                    _p.label = 9;
+                case 9:
+                    userList = userList === null || userList === void 0 ? void 0 : userList.filter(function (user) { return user.id === (individualData === null || individualData === void 0 ? void 0 : individualData.id); });
+                    return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
                 case 10:
-                    boardInfoStatus = _m.sent();
+                    boardInfoStatus = _p.sent();
                     thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
-                    return [3, 14];
+                    return [3, 18];
                 case 11:
-                    birthCountry = ((_j = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _j === void 0 ? void 0 : _j.country) || countryCode;
-                    if (!birthCountry) return [3, 13];
-                    return [4, thunkApi.dispatch(getCityList(birthCountry))];
+                    if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 15];
+                    if (!((_j = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _j === void 0 ? void 0 : _j.id)) return [3, 13];
+                    return [4, thunkApi.dispatch(getIndividualList((_k = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _k === void 0 ? void 0 : _k.id)).unwrap()];
                 case 12:
-                    _m.sent();
-                    _m.label = 13;
-                case 13:
-                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
-                    _m.label = 14;
-                case 14: return [3, 16];
+                    userList = _p.sent();
+                    _p.label = 13;
+                case 13: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                case 14:
+                    boardInfoStatus = _p.sent();
+                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
+                    return [3, 18];
                 case 15:
+                    birthCountry = ((_l = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _l === void 0 ? void 0 : _l.country) || countryCode;
+                    if (!birthCountry) return [3, 17];
+                    return [4, thunkApi.dispatch(getCityList(birthCountry))];
+                case 16:
+                    _p.sent();
+                    _p.label = 17;
+                case 17:
+                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
+                    _p.label = 18;
+                case 18: return [3, 20];
+                case 19:
                     if (isUpdatePhoneInfo) {
                         thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_VERIFY_STEP'));
                     }
-                    _m.label = 16;
-                case 16:
+                    _p.label = 20;
+                case 20:
                     individuals = (boardData || {}).individuals;
                     _c = individualData || {}, is_authorized = _c.is_authorized, data_state = _c.data_state;
                     return [2, {
@@ -172,8 +187,8 @@ export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a
                                 entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                                 merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
                                 merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
-                                name: (_k = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _k === void 0 ? void 0 : _k.names,
-                                contact: (_l = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _l === void 0 ? void 0 : _l.contact,
+                                name: (_m = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _m === void 0 ? void 0 : _m.names,
+                                contact: (_o = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _o === void 0 ? void 0 : _o.contact,
                                 individuals: is_authorized ? individuals : __assign(__assign({}, individuals), (!!data_state && { data_state: data_state })),
                                 countries: countries,
                                 countryCode: countryCode,
@@ -181,7 +196,8 @@ export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a
                                 business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
                                 flows: (boardInfoStatus === null || boardInfoStatus === void 0 ? void 0 : boardInfoStatus.info) || []
                             },
-                            token: token
+                            token: token,
+                            userList: userList || []
                         }];
             }
         });
@@ -424,10 +440,10 @@ 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, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, boardInfoStatus, publicKey, countryCode, notification, _c, id, type, data_3, birthCountry, individuals, _d, is_authorized, data_state;
-    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-    return __generator(this, function (_r) {
-        switch (_r.label) {
+    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, individualData, boardInfoData, userList, boardData, boardInfoStatus, publicKey, countryCode, notification, _c, id, type, data_3, birthCountry, individuals, _d, is_authorized, data_state;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    return __generator(this, function (_t) {
+        switch (_t.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
@@ -442,7 +458,8 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_r.sent()).data;
+                data = (_t.sent()).data;
+                individualData = undefined;
                 boardInfoStatus = undefined;
                 if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
                     throw new Error(data.errors[0].description);
@@ -453,48 +470,62 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 if (!board_id) return [3, 3];
                 return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 2:
-                boardData = _r.sent();
-                _r.label = 3;
+                boardData = _t.sent();
+                _t.label = 3;
             case 3:
                 countryCode = (_h = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _h === void 0 ? void 0 : _h.country;
                 if (!(board_id && board_info_id)) return [3, 6];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 4:
-                boardInfoData = _r.sent();
+                boardInfoData = _t.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, 6];
                 return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode })).unwrap()];
             case 5:
-                data_3 = (_r.sent()).data;
+                data_3 = (_t.sent()).data;
                 individualData = data_3 || {};
-                _r.label = 6;
+                _t.label = 6;
             case 6:
                 if (countryCode)
                     thunkApi.dispatch(handleSetCountryByIso2(countryCode));
-                if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 10];
+                if (!(!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) && !isKWOrSA(countryCode))) return [3, 10];
                 if (!((_j = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _j === void 0 ? void 0 : _j.id)) return [3, 8];
-                return [4, thunkApi.dispatch(getIndividualList((_k = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _k === void 0 ? void 0 : _k.id))];
+                return [4, thunkApi.dispatch(getIndividualList((_k = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _k === void 0 ? void 0 : _k.id)).unwrap()];
             case 7:
-                _r.sent();
-                _r.label = 8;
-            case 8: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                userList = _t.sent();
+                _t.label = 8;
+            case 8:
+                userList = userList === null || userList === void 0 ? void 0 : userList.filter(function (user) { return user.id === (individualData === null || individualData === void 0 ? void 0 : individualData.id); });
+                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 9:
-                boardInfoStatus = _r.sent();
+                boardInfoStatus = _t.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
-                return [3, 13];
+                return [3, 17];
             case 10:
-                birthCountry = ((_l = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _l === void 0 ? void 0 : _l.country) || countryCode;
-                if (!birthCountry) return [3, 12];
-                return [4, thunkApi.dispatch(getCityList(birthCountry))];
+                if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 14];
+                if (!((_l = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _l === void 0 ? void 0 : _l.id)) return [3, 12];
+                return [4, thunkApi.dispatch(getIndividualList((_m = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _m === void 0 ? void 0 : _m.id))];
             case 11:
-                _r.sent();
-                _r.label = 12;
-            case 12:
-                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
-                _r.label = 13;
+                _t.sent();
+                _t.label = 12;
+            case 12: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 13:
-                (_o = (_m = settings.data.appConfig).onStepCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, settings.data.activeScreen.name, { otp: params.otp });
+                boardInfoStatus = _t.sent();
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
+                return [3, 17];
+            case 14:
+                birthCountry = ((_o = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _o === void 0 ? void 0 : _o.country) || countryCode;
+                if (!birthCountry) return [3, 16];
+                return [4, thunkApi.dispatch(getCityList(birthCountry))];
+            case 15:
+                _t.sent();
+                _t.label = 16;
+            case 16:
+                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
+                _t.label = 17;
+            case 17:
+                (_q = (_p = settings.data.appConfig).onStepCompleted) === null || _q === void 0 ? void 0 : _q.call(_p, settings.data.activeScreen.name, { otp: params.otp });
                 individuals = (boardData || {}).individuals;
                 _d = individualData || {}, is_authorized = _d.is_authorized, data_state = _d.data_state;
                 return [2, {
@@ -505,8 +536,8 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                             entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                             merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
                             merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
-                            name: (_p = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _p === void 0 ? void 0 : _p.names,
-                            contact: (_q = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _q === void 0 ? void 0 : _q.contact,
+                            name: (_r = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _r === void 0 ? void 0 : _r.names,
+                            contact: (_s = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _s === void 0 ? void 0 : _s.contact,
                             individuals: is_authorized ? individuals : __assign(__assign({}, individuals), (!!data_state && { data_state: data_state })),
                             countries: countries,
                             countryCode: countryCode,
@@ -514,7 +545,8 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                             business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
                             flows: (boardInfoStatus === null || boardInfoStatus === void 0 ? void 0 : boardInfoStatus.info) || []
                         },
-                        formData: __assign({}, params)
+                        formData: __assign({}, params),
+                        userList: userList
                     }];
         }
     });
@@ -934,8 +966,8 @@ export var individualSlice = createSlice({
         })
             .addCase(verifyToken.fulfilled, function (state, action) {
             state.error = null;
-            var _a = action.payload, data = _a.data, token = _a.token, boardResponse = _a.boardResponse;
-            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.verify.responseBody), boardResponse), { board_id: data.id });
+            var _a = action.payload, data = _a.data, token = _a.token, boardResponse = _a.boardResponse, userList = _a.userList;
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.verify.responseBody), boardResponse), { board_id: data.id, userList: userList });
             state.data.verify.token = token;
         })
             .addCase(verifyToken.rejected, function (state, action) {
@@ -978,7 +1010,7 @@ export var individualSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, data = _b.data, formData = _b.formData, boardResponse = _b.boardResponse;
+            var _b = action.payload, data = _b.data, formData = _b.formData, boardResponse = _b.boardResponse, userList = _b.userList;
             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;
@@ -986,7 +1018,7 @@ export var individualSlice = createSlice({
             }
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), boardResponse);
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), boardResponse), { userList: userList });
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;

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

@@ -25,7 +25,7 @@ import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { alpha, styled, useTheme } from '@mui/material/styles';
 import Box from '@mui/material/Box';
-import { getUserName, isValidEmail } from '../../../../utils';
+import { getUserName, isKWOrSA, isValidEmail } from '../../../../utils';
 import { useLanguage, useAppSelector, useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
 import { IndividualType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
@@ -35,9 +35,10 @@ import Text from '../../../../components/Text';
 import CheckIcon from '../../../shared/CheckIcon';
 import { ScreenContainer } from '../../../shared/Containers';
 import { addDetailsAsync, individualSelector, requestDetailsByEmail, resetIndividualData } from '../../../app/individual/individualStore';
-import IndividualActionButtons from '../../../../features/shared/Button/IndividualActionButtons';
+import IndividualActionButtons from '../../../shared/Button/IndividualActionButtons';
 import { IndividualCollectInfoValidationSchema } from './validation';
 import CollectPhoneEmail from './CollectPhoneEmail';
+import { settingsSelector } from '../../../../app/settings';
 var ScreenContainerStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -85,10 +86,11 @@ var UserList = function (_a) {
     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 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;
+    var _m = verify.responseBody || {}, userList = _m.userList, notification = _m.notification, userRes = _m.user;
     var methods = useForm({
         resolver: yupResolver(IndividualCollectInfoValidationSchema(activeUser)),
         defaultValues: {
@@ -158,6 +160,8 @@ var UserList = function (_a) {
     };
     var isSameUserRequestedBefore = function (user) {
         var _a, _b;
+        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);
     };
     var getUserStatus = function (user) {

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

@@ -18,7 +18,7 @@ import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } fro
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
-import { convertToEnglishDateFormat, deepCopy, getUserName, isOtherThanKWOrSA } from '../../../../utils';
+import { convertToEnglishDateFormat, deepCopy, getUserName, isKWOrSA, isOtherThanKWOrSA } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -144,9 +144,10 @@ var IndividualPersonalInfo = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onBack = function () {
+        var isKWOrSaCountry = isKWOrSA(settingsData.businessCountry.iso2);
         if (error)
             dispatch(clearError());
-        if (is_authorized) {
+        if (is_authorized || !isKWOrSaCountry) {
             dispatch(handleCurrentActiveScreen('INDIVIDUAL_LIST_STEP'));
             return;
         }

package/build/features/shared/Button/FlowsButtons.js

@@ -57,7 +57,7 @@ import { ICONS_NAMES } from '../../../constants';
 import CheckIcon from '@mui/icons-material/Check';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../hooks';
 import { handleOpen, handleCurrentActiveScreen, handleNextScreenStep, settingsSelector } from '../../../app/settings';
-import { dangerousMessage, getScreenNameBasedOnFlow } from '../../../utils';
+import { dangerousMessage, getScreenNameBasedOnFlow, isKWOrSA } from '../../../utils';
 import API from '../../../api';
 import Text from '../../../components/Text';
 import Dot from '../Dot';
@@ -161,7 +161,8 @@ export default function FlowsButtons(_a) {
         if (!item.href)
             return;
         if (flowName === item.name && item.name !== 'password') {
-            dispatch(handleCurrentActiveScreen(getScreenNameBasedOnFlow(item.name, isAuthorizedUser)));
+            var isOtherThanSAOrKWCountry = !isKWOrSA(settingsData.businessCountry.iso2);
+            dispatch(handleCurrentActiveScreen(getScreenNameBasedOnFlow(item.name, isAuthorizedUser, isOtherThanSAOrKWCountry)));
             return;
         }
         if (typeof settingsData.appConfig.onBoardButtonClick === 'function') {

package/build/utils/string.d.ts

@@ -42,7 +42,7 @@ export declare const getRequestHeaders: (deviceInfo: DeviceInfo) => {
 };
 export declare const removeRequestHeaders: () => void;
 export declare const getBaseUrl: () => string;
-export declare const getScreenNameBasedOnFlow: (flow: string, isAuthorizedUser?: boolean) => "CONNECT_NID_STEP" | "" | "BUSINESS_BUSINESS_TYPE_STEP" | "INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP" | "INDIVIDUAL_LIST_STEP" | "BANK_BANK_DETAILS_STEP" | "TAX_TAX_DETAILS_STEP" | "ENTITY_NAME_STEP" | "BRAND_INFO_STEP";
+export declare const getScreenNameBasedOnFlow: (flow: string, isAuthorizedUser?: boolean, isOtherThanSAOrKWCountry?: boolean) => "CONNECT_NID_STEP" | "" | "BUSINESS_BUSINESS_TYPE_STEP" | "INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP" | "INDIVIDUAL_LIST_STEP" | "BANK_BANK_DETAILS_STEP" | "TAX_TAX_DETAILS_STEP" | "ENTITY_NAME_STEP" | "BRAND_INFO_STEP";
 export declare const getEighteenYearsAgo: () => string;
 export declare const isKW: (flag: string) => boolean;
 export declare const isSA: (flag: string) => boolean;

package/build/utils/string.js

@@ -172,7 +172,7 @@ export var getBaseUrl = function () {
     }
     return ENDPOINT_PATHS.PRODUCTION_BASE_URL;
 };
-export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser) {
+export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser, isOtherThanSAOrKWCountry) {
     if (flow === FlowsTypes.BANK) {
         return 'BANK_BANK_DETAILS_STEP';
     }
@@ -180,7 +180,7 @@ export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser) {
         return 'BUSINESS_BUSINESS_TYPE_STEP';
     }
     if (flow === FlowsTypes.INDIVIDUAL) {
-        return isAuthorizedUser ? 'INDIVIDUAL_LIST_STEP' : 'INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP';
+        return isAuthorizedUser || isOtherThanSAOrKWCountry ? 'INDIVIDUAL_LIST_STEP' : 'INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP';
     }
     if (flow === FlowsTypes.CONNECT) {
         return 'CONNECT_NID_STEP';

package/package.json

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