@tap-payments/auth-jsconnect 2.11.14-development → 2.11.14-sandbox

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

@@ -51,7 +51,7 @@ import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
 import { handleCurrentActiveScreen, handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { PASSWORD_OPERATION_TYPE, PASSWORD_STEP_NAMES } from '../../../constants';
-import { retrieveIndividualData, sendCustomEventToGTM, sleep } from '../../../utils';
+import { isAuthenticationVerificationFailed, retrieveIndividualData, sendCustomEventToGTM, sleep } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('passwordVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -156,9 +156,9 @@ export var retrieveBoardDetails = createAsyncThunk('retrievePasswordBoardDetails
 });
 export var verifyPasswordLeadOTP = createAsyncThunk('verifyPasswordLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, password, settings, responseBody, payload, data, _b, config, board_info_password_status, country_code, board_id, recipient, countryIso2, publicKey, flows, data_3, data_4;
-    var _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), password = _a.password, settings = _a.settings;
                 responseBody = password.data.verify.responseBody;
@@ -169,11 +169,13 @@ export var verifyPasswordLeadOTP = createAsyncThunk('verifyPasswordLeadOTP', fun
                     step_name: PASSWORD_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
-                return [4, API.leadService.verifyLeadOTP(payload)];
+                return [4, API.leadService.verifyTokenOTP(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('PASSWORD_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
-                data = (_h.sent()).data;
-                if ((_d = data === null || data === void 0 ? void 0 : data.errors) === null || _d === void 0 ? void 0 : _d.length)
-                    throw new Error(data.errors[0].description);
+                data = _g.sent();
                 _b = data || {}, config = _b.config, board_info_password_status = _b.board_info_password_status, country_code = _b.country_code, board_id = _b.id, recipient = _b.recipient;
                 countryIso2 = country_code;
                 if (countryIso2)
@@ -181,7 +183,7 @@ export var verifyPasswordLeadOTP = createAsyncThunk('verifyPasswordLeadOTP', fun
                 publicKey = config === null || config === void 0 ? void 0 : config.public_key;
                 if (publicKey)
                     thunkApi.dispatch(handlePublicKey(publicKey));
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, { otp: params.otp });
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, { otp: params.otp });
                 flows = [];
                 if (!(board_info_password_status === 'completed')) return [3, 3];
                 return [4, Promise.all([
@@ -189,7 +191,7 @@ export var verifyPasswordLeadOTP = createAsyncThunk('verifyPasswordLeadOTP', fun
                         thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id, individualId: recipient === null || recipient === void 0 ? void 0 : recipient.id, individualType: recipient === null || recipient === void 0 ? void 0 : recipient.type })).unwrap()
                     ])];
             case 2:
-                data_3 = (_h.sent())[0];
+                data_3 = (_g.sent())[0];
                 flows = (data_3 === null || data_3 === void 0 ? void 0 : data_3.info) || [];
                 thunkApi.dispatch(handleNextScreenStep('PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
                 return [3, 6];
@@ -197,13 +199,13 @@ export var verifyPasswordLeadOTP = createAsyncThunk('verifyPasswordLeadOTP', fun
                 if (!!country_code) return [3, 5];
                 return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 4:
-                data_4 = _h.sent();
-                if ((_g = data_4 === null || data_4 === void 0 ? void 0 : data_4.entity) === null || _g === void 0 ? void 0 : _g.country)
+                data_4 = _g.sent();
+                if ((_f = data_4 === null || data_4 === void 0 ? void 0 : data_4.entity) === null || _f === void 0 ? void 0 : _f.country)
                     thunkApi.dispatch(handleSetCountryByIso2(data_4.entity.country));
-                _h.label = 5;
+                _g.label = 5;
             case 5:
                 thunkApi.dispatch(handleNextScreenStep('PASSWORD_CREATE_PASSWORD_STEP'));
-                _h.label = 6;
+                _g.label = 6;
             case 6: return [2, { data: data, formData: __assign({}, params), flows: flows }];
         }
     });
@@ -296,9 +298,9 @@ export var retrieveBoardStatus = createAsyncThunk('password/retrieveBoardStatus'
 }); });
 export var verifyOperationToken = createAsyncThunk('verifyOperationToken', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var token, boardId, boardInfoId, userId, userType, payload, data, countryIso2, publicKey, data_5;
-    var _a, _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 token = params.token, boardId = params.boardId, boardInfoId = params.boardInfoId, userId = params.userId, userType = params.userType;
                 payload = {
@@ -307,22 +309,20 @@ export var verifyOperationToken = createAsyncThunk('verifyOperationToken', funct
                 };
                 return [4, API.authService.verifyAuth(payload)];
             case 1:
-                data = (_d.sent()).data;
-                if ((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a.length)
-                    throw new Error(data.errors[0].description);
+                data = _c.sent();
                 countryIso2 = data === null || data === void 0 ? void 0 : data.country;
                 if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                publicKey = (_b = data === null || data === void 0 ? void 0 : data.config) === null || _b === void 0 ? void 0 : _b.public_key;
+                publicKey = (_a = data === null || data === void 0 ? void 0 : data.config) === null || _a === void 0 ? void 0 : _a.public_key;
                 if (publicKey)
                     thunkApi.dispatch(handlePublicKey(publicKey));
                 if (!!(data === null || data === void 0 ? void 0 : data.country)) return [3, 3];
                 return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 2:
-                data_5 = _d.sent();
-                if ((_c = data_5 === null || data_5 === void 0 ? void 0 : data_5.entity) === null || _c === void 0 ? void 0 : _c.country)
+                data_5 = _c.sent();
+                if ((_b = data_5 === null || data_5 === void 0 ? void 0 : data_5.entity) === null || _b === void 0 ? void 0 : _b.country)
                     thunkApi.dispatch(handleSetCountryByIso2(data_5.entity.country));
-                _d.label = 3;
+                _c.label = 3;
             case 3:
                 thunkApi.dispatch(handleNextScreenStep('PASSWORD_CREATE_PASSWORD_STEP'));
                 return [2, __assign({ data: data, token: token, boardId: boardId, boardInfoId: boardInfoId }, (userId &&
@@ -347,16 +347,16 @@ export var resendOperationOTP = createAsyncThunk('resendOperationOTPPassword', f
                 };
                 return [4, API.authService.verifyAuth(payload)];
             case 1:
-                data = (_a.sent()).data;
+                data = _a.sent();
                 return [2, { data: data }];
         }
     });
 }); });
 export var resetPassword = createAsyncThunk('resetPassword', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, password, settings, responseBody, passwordData, payload, data;
-    var _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = thunkApi.getState(), password = _a.password, settings = _a.settings;
                 responseBody = password.data.verify.responseBody;
@@ -371,15 +371,15 @@ export var resetPassword = createAsyncThunk('resetPassword', function (params, t
                     },
                     encryption_contract: ['user_credentail.otp', 'user_credentail.new_password']
                 };
-                return [4, API.authService.verifyAuth(payload)];
+                return [4, API.authService.verifyAuth(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('PASSWORD_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
-                data = (_e.sent()).data;
-                if ((_b = data === null || data === void 0 ? void 0 : data.errors) === null || _b === void 0 ? void 0 : _b.length)
-                    throw new Error(data.errors[0].description);
-                if (!(data === null || data === void 0 ? void 0 : data.errors)) {
-                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('PASSWORD_SUCCESS_STEP')); });
-                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, payload);
-                }
+                data = _d.sent();
+                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('PASSWORD_SUCCESS_STEP')); });
+                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, payload);
                 return [2, { data: data, formData: __assign(__assign({}, params), passwordData) }];
         }
     });
@@ -511,9 +511,11 @@ export var passwordSlice = createSlice({
                 flows: flows
             }));
         })
-            .addCase(verifyPasswordLeadOTP.rejected, function (state, action) {
+            .addCase(verifyPasswordLeadOTP.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(createPassword.pending, function (state) {
             state.loading = true;
@@ -599,14 +601,8 @@ export var passwordSlice = createSlice({
             state.error = null;
         })
             .addCase(resendOperationOTP.fulfilled, function (state, action) {
-            var _a;
             state.error = null;
             var data = action.payload.data;
-            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;
-                return;
-            }
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), data);
         })
             .addCase(resendOperationOTP.rejected, function (state, action) {
@@ -624,8 +620,10 @@ export var passwordSlice = createSlice({
             state.loading = true;
             state.error = null;
         })
-            .addCase(resetPassword.rejected, function (state, action) {
-            state.error = action.error.message;
+            .addCase(resetPassword.rejected, function (state, _a) {
+            var message = _a.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
             state.loading = false;
         })
             .addCase(retrieveBoardResetPasswordSuccess.fulfilled, function (state, action) {

package/build/features/app/signIn/signInStore.js

@@ -189,12 +189,10 @@ export var verifyAuthOTP = createAsyncThunk('signIn/verifyAuthOTP', function (pa
                 };
                 return [4, API.authService.verifyAuth(requestBody)];
             case 1:
-                data = (_f.sent()).data;
-                if (!data.errors) {
-                    (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, { otp: params.otp });
-                    thunkApi.dispatch(handleOpen(false));
-                    (_e = (_d = settings.data.appConfig).onFlowCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, data);
-                }
+                data = _f.sent();
+                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, { otp: params.otp });
+                thunkApi.dispatch(handleOpen(false));
+                (_e = (_d = settings.data.appConfig).onFlowCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, data);
                 return [2, { data: data, formData: params }];
         }
     });
@@ -221,16 +219,14 @@ export var verifyAuthPassword = createAsyncThunk('signIn/verifyAuthPassword', fu
                 };
                 return [4, API.authService.verifyAuth(requestBody)];
             case 1:
-                data = (_g.sent()).data;
-                if (!data.errors) {
-                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.password });
-                    if ((data === null || data === void 0 ? void 0 : data.status) === 'pending') {
-                        thunkApi.dispatch(handleNextScreenStep('SIGIN_OTP_STEP'));
-                    }
-                    else {
-                        thunkApi.dispatch(handleOpen(false));
-                        (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, data);
-                    }
+                data = _g.sent();
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.password });
+                if ((data === null || data === void 0 ? void 0 : data.status) === 'pending') {
+                    thunkApi.dispatch(handleNextScreenStep('SIGIN_OTP_STEP'));
+                }
+                else {
+                    thunkApi.dispatch(handleOpen(false));
+                    (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, data);
                 }
                 return [2, data];
         }

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

@@ -51,7 +51,7 @@ import API from '../../../api';
 import { DocumentPurpose, FlowsTypes } from '../../../@types';
 import { handleNextScreenStep, handleCurrentActiveScreen, handleSetCountryByIso2, handlePrevScreenStep, handlePublicKey, onCloseComplete } from '../../../app/settings';
 import { TAX_STEP_NAMES } from '../../../constants';
-import { getRecentDocumentBasedOnPurpose, hasNoneEditableValue, retrieveIndividualData, sleep } from '../../../utils';
+import { getRecentDocumentBasedOnPurpose, hasNoneEditableValue, isAuthenticationVerificationFailed, retrieveIndividualData, sleep } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('taxVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -178,9 +178,9 @@ export var retrieveBoardDetails = createAsyncThunk('tax/retrieveBrandInfo', func
 });
 export var verifyTaxLeadOTP = createAsyncThunk('verifyTaxLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, tax, settings, responseBody, payload, data, _b, config, entity_id, boardId, country_code, entityData, publicKey, countryIso2, data_2;
-    var _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), tax = _a.tax, settings = _a.settings;
                 responseBody = tax.data.verify.responseBody;
@@ -191,11 +191,13 @@ export var verifyTaxLeadOTP = createAsyncThunk('verifyTaxLeadOTP', function (par
                     step_name: TAX_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
-                return [4, API.leadService.verifyLeadOTP(payload)];
+                return [4, API.leadService.verifyTokenOTP(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('TAX_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
-                data = (_j.sent()).data;
-                if ((_d = data.errors) === null || _d === void 0 ? void 0 : _d.length)
-                    throw new Error(data.errors[0].description);
+                data = _h.sent();
                 _b = data || {}, config = _b.config, entity_id = _b.entity_id, boardId = _b.id, country_code = _b.country_code;
                 entityData = undefined;
                 publicKey = config === null || config === void 0 ? void 0 : config.public_key;
@@ -207,19 +209,19 @@ export var verifyTaxLeadOTP = createAsyncThunk('verifyTaxLeadOTP', function (par
                 if (!!entity_id) return [3, 3];
                 return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 2:
-                data_2 = _j.sent();
-                if (!((_e = data_2 === null || data_2 === void 0 ? void 0 : data_2.entity) === null || _e === void 0 ? void 0 : _e.id))
+                data_2 = _h.sent();
+                if (!((_d = data_2 === null || data_2 === void 0 ? void 0 : data_2.entity) === null || _d === void 0 ? void 0 : _d.id))
                     throw new Error('entity_id_missing');
                 entityData = data_2;
                 return [3, 5];
             case 3: return [4, API.entityService.retrieveEntity(entity_id)];
             case 4:
-                entityData = _j.sent();
-                _j.label = 5;
+                entityData = _h.sent();
+                _h.label = 5;
             case 5:
-                if (!countryIso2 && ((_f = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _f === void 0 ? void 0 : _f.country))
+                if (!countryIso2 && ((_e = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _e === void 0 ? void 0 : _e.country))
                     thunkApi.dispatch(handleSetCountryByIso2(entityData.entity.country));
-                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, { otp: params.otp });
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('TAX_TAX_DETAILS_STEP')); });
                 return [2, { data: data, entityData: entityData === null || entityData === void 0 ? void 0 : entityData.entity, formData: params }];
         }
@@ -426,9 +428,11 @@ export var taxSlice = createSlice({
             if (is_vat_acknowledged)
                 state.data.taxData.confirmPolicy = is_vat_acknowledged;
         })
-            .addCase(verifyTaxLeadOTP.rejected, function (state, action) {
+            .addCase(verifyTaxLeadOTP.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(updateTaxInfo.pending, function (state) {
             state.loading = true;

package/build/features/app/terminal/terminalStore.js

@@ -51,7 +51,7 @@ import { handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../
 import { FlowsTypes } from '../../../@types';
 import { CONNECT_FLOWS, NAFATH_PACI_TIMEOUT_DURATION, SELECTED_POS_DEFAULT_INFO, SELECTED_TERMINAL_DEFAULT_INFO, TERMINAL_PUSH_NOTIFICATION_DURATION, TERMINAL_PUSH_NOTIFICATION_FAILED, TERMINAL_STEP_NAMES } from '../../../constants';
 import API from '../../../api';
-import { isNetworkError, isTimeoutError, retrieveIndividualData, sleep } from '../../../utils';
+import { isAuthenticationVerificationFailed, isNetworkError, isTimeoutError, retrieveIndividualData, sleep } from '../../../utils';
 export var verifyToken = createAsyncThunk('terminal/verifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -514,9 +514,11 @@ export var terminalSlice = createSlice({
             state.data.otpData = formData;
             state.data.responseData = { authData: data, boardData: { id: data === null || data === void 0 ? void 0 : data.id, board_info_id: data === null || data === void 0 ? void 0 : data.board_info_id }, terminalData: terminalData };
         })
-            .addCase(verifyTokenOTP.rejected, function (state, action) {
+            .addCase(verifyTokenOTP.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(linkNewTerminal.pending, function (state) {
             state.loading = true;

package/build/features/auth/screens/AuthenticationList/AuthenticationList.js

@@ -17,7 +17,7 @@ import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy, isSA, sendCustomEventToGTM } from '../../../../utils';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
@@ -27,19 +27,22 @@ import BrandList from './BrandList';
 import EntityList from './EntityList';
 import EntityLegalName from './EntityLegalName';
 import LicenseNumber from './LicenseNumber';
-import LicenseType from './EntityLicenseType';
+import EntityLicenseType from './EntityLicenseType';
 var ListType;
 (function (ListType) {
     ListType["BrandList"] = "BrandList";
     ListType["EntityList"] = "EntityList";
 })(ListType || (ListType = {}));
 var AuthenticationList = function (_a) {
+    var _b;
     var settingsData = useAppSelector(settingsSelector).data;
-    var _b = useAppSelector(authSelector), data = _b.data, loading = _b.loading, error = _b.error;
-    var _c = data.authenticationData, brandInfo = _c.brandInfo, entityInfo = _c.entityInfo;
-    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    var _c = useAppSelector(authSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _d = data.authenticationData, brandInfo = _d.brandInfo, entityInfo = _d.entityInfo;
+    var _e = React.useState(), listActive = _e[0], setListActive = _e[1];
     var brandList = (data.responseData || {}).brandList;
-    var _e = React.useState(false), isAddEntity = _e[0], setIsAddEntity = _e[1];
+    var _f = React.useState(false), isAddEntity = _f[0], setIsAddEntity = _f[1];
+    var code = (_b = settingsData.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2;
+    var isSACountry = React.useMemo(function () { return isSA(code); }, [code]);
     React.useEffect(function () {
         sendCustomEventToGTM({
             event: 'Send Event',
@@ -91,6 +94,6 @@ var AuthenticationList = function (_a) {
     };
     var isBrandList = listActive === ListType.BrandList;
     var isEntityList = listActive === ListType.EntityList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isAddEntity && !isEntityList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); }, handleAddEntity: function (flag) { return setIsAddEntity(flag); } }), _jsxs(Collapse, __assign({ in: isAddEntity && !isBrandList && !isEntityList }, { children: [_jsx(EntityLegalName, {}), _jsx(LicenseType, {}), _jsx(LicenseNumber, {})] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: isAddEntity ? t('create_new_entity') : t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isAddEntity && !isEntityList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); }, handleAddEntity: function (flag) { return setIsAddEntity(flag); } }), _jsxs(Collapse, __assign({ in: isAddEntity && !isBrandList && !isEntityList }, { children: [_jsx(EntityLegalName, {}), _jsx(EntityLicenseType, { show: isSACountry }), _jsx(LicenseNumber, {})] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: isAddEntity ? t('create_new_entity') : t('next') })) }))] })) })) }));
 };
 export default React.memo(AuthenticationList);

package/build/features/auth/screens/AuthenticationList/EntityLicenseType.d.ts

@@ -27,5 +27,8 @@ export declare const InfoOutlinedIconStyled: import("@emotion/styled").StyledCom
 } & import("@mui/material/OverridableComponent").CommonProps & Omit<Pick<React.SVGProps<SVGSVGElement>, "string" | "name" | "type" | "version" | "fr" | "in" | "className" | "style" | "display" | "overflow" | "visibility" | "order" | "color" | "width" | "height" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "clipPath" | "cursor" | "direction" | "filter" | "fontSizeAdjust" | "fontStretch" | "fontVariant" | "imageRendering" | "opacity" | "paintOrder" | "pointerEvents" | "rotate" | "scale" | "textRendering" | "transform" | "unicodeBidi" | "wordSpacing" | "writingMode" | "mask" | "offset" | "textDecoration" | "azimuth" | "clip" | "alignmentBaseline" | "baselineShift" | "clipRule" | "colorInterpolation" | "colorRendering" | "dominantBaseline" | "fill" | "fillOpacity" | "fillRule" | "floodColor" | "floodOpacity" | "glyphOrientationVertical" | "lightingColor" | "markerEnd" | "markerMid" | "markerStart" | "shapeRendering" | "stopColor" | "stopOpacity" | "stroke" | "strokeDasharray" | "strokeDashoffset" | "strokeLinecap" | "strokeLinejoin" | "strokeMiterlimit" | "strokeOpacity" | "strokeWidth" | "textAnchor" | "vectorEffect" | "path" | "children" | "key" | "id" | "lang" | "tabIndex" | "role" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "mode" | "end" | "values" | "local" | "x" | "y" | "alphabetic" | "hanging" | "ideographic" | "mathematical" | "origin" | "method" | "operator" | "spacing" | "elevation" | "max" | "href" | "orientation" | "media" | "target" | "min" | "viewBox" | "crossOrigin" | "accentHeight" | "accumulate" | "additive" | "allowReorder" | "amplitude" | "arabicForm" | "ascent" | "attributeName" | "attributeType" | "autoReverse" | "baseFrequency" | "baseProfile" | "bbox" | "begin" | "bias" | "by" | "calcMode" | "capHeight" | "clipPathUnits" | "colorInterpolationFilters" | "colorProfile" | "contentScriptType" | "contentStyleType" | "cx" | "cy" | "d" | "decelerate" | "descent" | "diffuseConstant" | "divisor" | "dur" | "dx" | "dy" | "edgeMode" | "enableBackground" | "exponent" | "externalResourcesRequired" | "filterRes" | "filterUnits" | "focusable" | "format" | "from" | "fx" | "fy" | "g1" | "g2" | "glyphName" | "glyphOrientationHorizontal" | "glyphRef" | "gradientTransform" | "gradientUnits" | "horizAdvX" | "horizOriginX" | "in2" | "intercept" | "k1" | "k2" | "k3" | "k4" | "k" | "kernelMatrix" | "kernelUnitLength" | "kerning" | "keyPoints" | "keySplines" | "keyTimes" | "lengthAdjust" | "limitingConeAngle" | "markerHeight" | "markerUnits" | "markerWidth" | "maskContentUnits" | "maskUnits" | "numOctaves" | "orient" | "overlinePosition" | "overlineThickness" | "panose1" | "pathLength" | "patternContentUnits" | "patternTransform" | "patternUnits" | "points" | "pointsAtX" | "pointsAtY" | "pointsAtZ" | "preserveAlpha" | "preserveAspectRatio" | "primitiveUnits" | "r" | "radius" | "refX" | "refY" | "renderingIntent" | "repeatCount" | "repeatDur" | "requiredExtensions" | "requiredFeatures" | "restart" | "result" | "rx" | "ry" | "seed" | "slope" | "specularConstant" | "specularExponent" | "speed" | "spreadMethod" | "startOffset" | "stdDeviation" | "stemh" | "stemv" | "stitchTiles" | "strikethroughPosition" | "strikethroughThickness" | "surfaceScale" | "systemLanguage" | "tableValues" | "targetX" | "targetY" | "textLength" | "to" | "u1" | "u2" | "underlinePosition" | "underlineThickness" | "unicode" | "unicodeRange" | "unitsPerEm" | "vAlphabetic" | "vertAdvY" | "vertOriginX" | "vertOriginY" | "vHanging" | "vIdeographic" | "viewTarget" | "vMathematical" | "widths" | "x1" | "x2" | "xChannelSelector" | "xHeight" | "xlinkActuate" | "xlinkArcrole" | "xlinkHref" | "xlinkRole" | "xlinkShow" | "xlinkTitle" | "xlinkType" | "xmlBase" | "xmlLang" | "xmlns" | "xmlnsXlink" | "xmlSpace" | "y1" | "y2" | "yChannelSelector" | "z" | "zoomAndPan"> & {
     ref?: ((instance: SVGSVGElement | null) => void) | React.RefObject<SVGSVGElement> | null | undefined;
 }, keyof import("@mui/material/OverridableComponent").CommonProps | "color" | "fontSize" | "shapeRendering" | "children" | "sx" | "htmlColor" | "inheritViewBox" | "titleAccess" | "viewBox"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
-declare const Type: () => JSX.Element;
+declare type TypeProps = {
+    show: boolean;
+};
+declare const Type: ({ show }: TypeProps) => JSX.Element;
 export default Type;

package/build/features/auth/screens/AuthenticationList/EntityLicenseType.js

@@ -26,6 +26,7 @@ import Tooltip from '../../../../components/Tooltip';
 import Radio from '../../../../components/Radio';
 import { clearError, authSelector } from '../../../app/auth/authStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import Collapse from '../../../../components/Collapse';
 var LabelTextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return (__assign(__assign({}, theme.typography.caption), { color: alpha(theme.palette.text.primary, 0.6), marginBlockEnd: theme.spacing(0.625) }));
@@ -70,12 +71,13 @@ export var InfoOutlinedIconStyled = styled(InfoOutlinedIcon)(function (_a) {
         display: 'inline-flex'
     });
 });
-var Type = function () {
+var Type = function (_a) {
+    var show = _a.show;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var error = useAppSelector(authSelector).error;
-    var _a = React.useState(false), isCRHovered = _a[0], setIsCRHovered = _a[1];
-    var _b = React.useState(false), isFLHovered = _b[0], setIsFLHovered = _b[1];
+    var _b = React.useState(false), isCRHovered = _b[0], setIsCRHovered = _b[1];
+    var _c = React.useState(false), isFLHovered = _c[0], setIsFLHovered = _c[1];
     var typeControl = useController({ control: control, name: 'licenseType' });
     var dispatch = useAppDispatch();
     var handleOnChange = function (_a) {
@@ -85,6 +87,6 @@ var Type = function () {
         typeControl.field.onChange(target.value);
     };
     var typeValue = typeControl.field.value;
-    return (_jsxs(ScreenContainer, __assign({ sx: { pb: 1.5, pl: 2.5, pr: 2.5 } }, { children: [_jsxs(LabelTextStyled, { children: [t('signup_business_type_label'), _jsx(Mandatory, {})] }), _jsxs(RadioGroupStyled, __assign({ value: typeValue ? (typeValue === LicenseType.FL ? LicenseType.FL : LicenseType.CR) : false, onChange: handleOnChange }, { children: [_jsx(RadioLabel, { value: LicenseType.FL, label: _jsxs(LabelStyled, { children: [t('homemaker_reg'), _jsx(Tooltip, __assign({ title: t('homemaker_reg_hint'), onMouseOver: function () { return setIsFLHovered(true); }, onMouseLeave: function () { return setIsFLHovered(false); }, onTouchStartCapture: function () { return setIsFLHovered(true); } }, { children: isFLHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) }), _jsx(RadioLabel, { value: LicenseType.CR, sx: { marginInlineEnd: '0px' }, label: _jsxs(LabelStyled, { children: [t('commercial_reg'), _jsx(Tooltip, __assign({ title: t('commercial_reg_hint'), onMouseOver: function () { return setIsCRHovered(true); }, onMouseLeave: function () { return setIsCRHovered(false); }, onTouchStartCapture: function () { return setIsCRHovered(true); } }, { children: isCRHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) })] }))] })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 1.5, pl: 2.5, pr: 2.5 } }, { children: [_jsxs(LabelTextStyled, { children: [t('signup_business_type_label'), _jsx(Mandatory, {})] }), _jsxs(RadioGroupStyled, __assign({ value: typeValue ? (typeValue === LicenseType.FL ? LicenseType.FL : LicenseType.CR) : false, onChange: handleOnChange }, { children: [_jsx(RadioLabel, { value: LicenseType.FL, label: _jsxs(LabelStyled, { children: [t('homemaker_reg'), _jsx(Tooltip, __assign({ title: t('homemaker_reg_hint'), onMouseOver: function () { return setIsFLHovered(true); }, onMouseLeave: function () { return setIsFLHovered(false); }, onTouchStartCapture: function () { return setIsFLHovered(true); } }, { children: isFLHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) }), _jsx(RadioLabel, { value: LicenseType.CR, sx: { marginInlineEnd: '0px' }, label: _jsxs(LabelStyled, { children: [t('commercial_reg'), _jsx(Tooltip, __assign({ title: t('commercial_reg_hint'), onMouseOver: function () { return setIsCRHovered(true); }, onMouseLeave: function () { return setIsCRHovered(false); }, onTouchStartCapture: function () { return setIsCRHovered(true); } }, { children: isCRHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) })] }))] })) })));
 };
 export default Type;

package/build/features/auth/screens/AuthenticationList/EntityList.js

@@ -43,9 +43,12 @@ import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
+import { LicenseType } from '../../../../@types';
 import Icon from '../../../../components/Icon';
 import { authSelector } from '../../../app/auth/authStore';
 import { ADD_ENTITY } from '../../../../constants';
+import { settingsSelector } from '../../../../app/settings';
+import { isSA } from '../../../../utils';
 var EntityContainer = styled(Box)(function () { return ({
     display: 'flex',
     alignItems: 'center'
@@ -74,6 +77,8 @@ var EntityList = function (_a) {
     var entityList = ((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.entityList) || [];
     var selectedEntityControl = useController({ control: control, name: 'entityInfo' });
     var selectedEntity = selectedEntityControl.field.value;
+    var businessCountry = useAppSelector(settingsSelector).data.businessCountry;
+    var isSACountry = React.useMemo(function () { return isSA(businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2); }, [businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2]);
     React.useEffect(function () {
         if (entityList.length > 0) {
             var filteredEntityList = entityList.filter(function (entity) { return (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_id) && entity.business_id === brandInfo.business_id; }) || [];
@@ -121,8 +126,11 @@ var EntityList = function (_a) {
     };
     var onSelectItem = function (entity) {
         selectedEntityControl.field.onChange(entity);
-        if (entity.id === ADD_ENTITY)
+        if (entity.id === ADD_ENTITY) {
+            if (!isSACountry)
+                setValue('licenseType', LicenseType.CR);
             handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(true);
+        }
         else {
             setValue('licenseNumber', '');
             setValue('legalName', '');

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

@@ -23,7 +23,7 @@ import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { businessSelector, clearError, updateLeadBusinessType } from '../../../app/business/businessStore';
 import { BusinessType as Type } from '../../../../@types';
 import Button from '../../../shared/Button';
-import { deepCopy, isKW, isOtherLicense, isOtherThanKWOrSA, isSA, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy, isKW, isOtherLicense, isSA, sendCustomEventToGTM } from '../../../../utils';
 import { KWLicenseValidationSchema, LicenseValidationSchema, OtherCountryLicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
 import LicenseCertificate from './LicenseCertificate';
@@ -60,7 +60,6 @@ var BusinessType = function (_a) {
     };
     var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
-    var isOtherCountry = React.useMemo(function () { return isOtherThanKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var getSchema = function () {
         if (isSACountry)
             return LicenseValidationSchema;
@@ -116,7 +115,7 @@ var BusinessType = function (_a) {
     var isCR = (selected === null || selected === void 0 ? void 0 : selected.type) === Type.CR;
     var isFL = (selected === null || selected === void 0 ? void 0 : selected.type) === Type.FL;
     var hasEntityList = !!(entityLicenseList === null || entityLicenseList === void 0 ? void 0 : entityLicenseList.length);
-    var showLicenseList = hasEntityList ? (isSACountry || isOtherCountry) && isOtherLicense(selectedLicenseEntity) : isSACountry || isOtherCountry;
+    var showLicenseList = hasEntityList ? isSACountry && isOtherLicense(selectedLicenseEntity) : isSACountry;
     var showEntityList = isKWCountry ? hasEntityList && !isLicenseListActive && isCR : hasEntityList && !isLicenseListActive;
     var disabled = !methods.formState.isValid || uploading || uploadingArticle;
     var disableBack = !data.otpData.isNID;

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

@@ -37,7 +37,7 @@ import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
 import { isKW, isOtherLicense, isSA } from '../../../../utils';
-import { OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../../constants';
+import { OTHER_CR_LICENSE } from '../../../../constants';
 import { settingsSelector } from '../../../../app/settings';
 var InputStyled = styled(InputSelect)(function (_a) {
     var theme = _a.theme;
@@ -91,10 +91,10 @@ var LicenseList = function (_a) {
     }, [licenseList, selectedLicense]);
     React.useEffect(function () {
         if (!!country_code) {
-            var isKWCountry = isKW(country_code);
-            if (isKWCountry) {
-                var license = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR ? OTHER_CR_LICENSE : OTHER_FL_LICENSE;
-                setValue('selectedLicense', license, { shouldValidate: true });
+            if (!isSA(country_code)) {
+                setValue('selectedLicense', OTHER_CR_LICENSE, { shouldValidate: true });
+            }
+            if (isKW(country_code)) {
                 setValue('entityLegalName', entityLegalName, { shouldValidate: true });
             }
         }