@tap-payments/auth-jsconnect 2.0.122-test → 2.0.123-test

package/build/features/app/connect/connectStore.d.ts

@@ -96,8 +96,9 @@ export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectState
     resetIndividualScreen: (state: ConnectState) => void;
     resetMerchantScreen: (state: ConnectState) => void;
     setDefaultCountryCode: (state: ConnectState, action: ActionState<CountryCode>) => void;
+    resetStore: (state: ConnectState) => void;
 }, "connect/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetMerchantScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setDefaultCountryCode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>;
+export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetMerchantScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setDefaultCountryCode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>;
 declare const _default: import("redux").Reducer<ConnectState, import("redux").AnyAction>;
 export default _default;
 export declare const connectSelector: (state: RootState) => ConnectState;

package/build/features/app/connect/connectStore.js

@@ -56,6 +56,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { handleNextScreenStep } from '../../../app/settings';
@@ -425,10 +434,10 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
     });
 }); });
 export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, responseBody, isNewBrand, brandName, salesChannels, selectedBrandItem, getAddress, channel_services, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, connect, responseBody, isNewBrand, brandName, salesChannels, selectedBrandItem, getAddress, channel_services, payload_1, lead_1, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
+    var _b, _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 responseBody = connect.data.otpData.responseBody;
@@ -450,20 +459,30 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                         })
                     };
                 });
-                if (!!isNewBrand) return [3, 2];
+                if (!!isNewBrand) return [3, 3];
+                payload_1 = {
+                    brand: {
+                        id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || ''
+                    },
+                    id: (responseBody === null || responseBody === void 0 ? void 0 : responseBody.lead_id) || '',
+                    step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_BRAND
+                };
+                return [4, API.leadService.updateLead(payload_1)];
+            case 1:
+                lead_1 = _h.sent();
                 brandReqBody_1 = {
-                    id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || '',
+                    id: ((_b = lead_1.brand) === null || _b === void 0 ? void 0 : _b.id) || '',
                     channel_services: channel_services,
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody_1)];
-            case 1:
-                brand_1 = _g.sent();
+            case 2:
+                brand_1 = _h.sent();
                 thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
-                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, params);
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 return [2, { response: brand_1, formData: params }];
-            case 2:
+            case 3:
                 brandNameBody = {
                     name: {
                         en: brandName,
@@ -478,20 +497,20 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     encryption_contract: ['brand.name.en', 'brand.name.ar', 'brand.name.zh']
                 };
                 return [4, API.leadService.updateLead(payload)];
-            case 3:
-                lead = _g.sent();
+            case 4:
+                lead = _h.sent();
                 brandReqBody = {
-                    id: ((_d = lead.brand) === null || _d === void 0 ? void 0 : _d.id) || '',
+                    id: ((_e = lead.brand) === null || _e === void 0 ? void 0 : _e.id) || '',
                     channel_services: channel_services,
                     term: ['agree'],
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody)];
-            case 4:
-                brand = _g.sent();
+            case 5:
+                brand = _h.sent();
                 thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
                 return [2, { response: brand, formData: params }];
         }
     });
@@ -635,6 +654,10 @@ export var connectSlice = createSlice({
         setDefaultCountryCode: function (state, action) {
             state.data.mobileData.countryCode = action.payload;
             state.data.individualData.countryCode = action.payload;
+        },
+        resetStore: function (state) {
+            var countryCode = state.data.mobileData.countryCode;
+            state.data = __assign(__assign({}, initialState.data), { mobileData: __assign(__assign({}, initialState.data.mobileData), { countryCode: countryCode }), individualData: __assign(__assign({}, initialState.data.individualData), { countryCode: countryCode }) });
         }
     },
     extraReducers: function (builder) {
@@ -725,11 +748,19 @@ export var connectSlice = createSlice({
             if ((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en)
                 state.data.brandData.brandName = brand.name.en;
             if (!isNewUser) {
+                var brandList = [];
+                if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
+                    var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
+                    brandList = __spreadArray([], brand_list, true);
+                    if (!isBrandExist)
+                        brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
+                    brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
+                    state.data.brandData.selectedBrandItem = brandList[0];
+                }
                 state.data.brandData.responseBody = {
-                    brand_list: (brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) ? brand_list.concat(OTHER_BRAND) : [],
+                    brand_list: brandList,
                     channel_list: channel_list
                 };
-                state.data.brandData.selectedBrandItem = (brand_list === null || brand_list === void 0 ? void 0 : brand_list[0]) || {};
             }
             state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, name: name, contact: contact, userInfoMissed: userInfoMissed });
         })
@@ -761,11 +792,19 @@ export var connectSlice = createSlice({
             if ((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en)
                 state.data.brandData.brandName = brand.name.en;
             if (!isNewUser) {
+                var brandList = [];
+                if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
+                    var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
+                    brandList = __spreadArray([], brand_list, true);
+                    if (!isBrandExist)
+                        brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
+                    brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
+                    state.data.brandData.selectedBrandItem = brandList[0];
+                }
                 state.data.brandData.responseBody = {
-                    brand_list: (brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) ? brand_list.concat(OTHER_BRAND) : [],
+                    brand_list: brandList,
                     channel_list: channel_list
                 };
-                state.data.brandData.selectedBrandItem = (brand_list === null || brand_list === void 0 ? void 0 : brand_list[0]) || {};
             }
             state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, name: name, contact: contact, userInfoMissed: userInfoMissed });
         })
@@ -832,7 +871,10 @@ export var connectSlice = createSlice({
                 state.data.brandData.termAndConditionChecked = !!termAndCondition;
             }
             if (brand_list) {
+                var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
                 state.data.brandData.responseBody = { brand_list: brand_list.concat(OTHER_BRAND) };
+                if (!isBrandExist)
+                    state.data.brandData.responseBody.brand_list = brand_list.concat(__assign(__assign({}, brand), { channel_services: [] }), OTHER_BRAND);
                 state.data.brandData.selectedBrandItem = brand_list[0];
             }
             if (channel_list) {
@@ -911,6 +953,6 @@ export var connectSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetMobileScreen = _a.resetMobileScreen, resetOTPScreen = _a.resetOTPScreen, resetIndividualScreen = _a.resetIndividualScreen, resetMerchantScreen = _a.resetMerchantScreen, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, setDefaultCountryCode = _a.setDefaultCountryCode;
+export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetMobileScreen = _a.resetMobileScreen, resetOTPScreen = _a.resetOTPScreen, resetIndividualScreen = _a.resetIndividualScreen, resetMerchantScreen = _a.resetMerchantScreen, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setDefaultCountryCode = _a.setDefaultCountryCode;
 export default connectSlice.reducer;
 export var connectSelector = function (state) { return state.connect; };

package/build/features/connect/screens/CivilID/CivilID.js

@@ -29,7 +29,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { civilIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, connectSelector, createCivilIdAuth, resetMobileScreen } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createCivilIdAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -93,6 +93,9 @@ var CivilID = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
     };
+    React.useEffect(function () {
+        dispatch(resetStore());
+    }, []);
     var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };

package/build/features/connect/screens/Individual/Individual.js

@@ -72,7 +72,7 @@ var Individual = function (_a) {
         var _a;
         dispatch(resetIndividualScreen());
         var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
-        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
+        var screen = startWithNID ? (isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP') : 'CONNECT_MOBILE_STEP';
         dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {

package/build/features/connect/screens/Merchant/Merchant.js

@@ -65,7 +65,7 @@ var Merchant = function (_a) {
             return;
         }
         var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
-        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
+        var screen = startWithNID ? (isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP') : 'CONNECT_MOBILE_STEP';
         dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {

package/build/features/connect/screens/Mobile/Mobile.js

@@ -33,7 +33,7 @@ import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen, resetStore } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
 import { isKW } from '../../../../utils';
@@ -119,6 +119,9 @@ var Mobile = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep(isKWCountry ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP'));
     };
+    React.useEffect(function () {
+        dispatch(resetStore());
+    }, []);
     var isBusinessListActive = listType === ListType.BusinessList;
     var isCountryListActive = listType === ListType.CountryCodeList;
     var listActive = isBusinessListActive || isCountryListActive;

package/build/features/connect/screens/NID/NID.js

@@ -18,7 +18,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, connectSelector, createNIDAuth, resetMobileScreen } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createNIDAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -85,6 +85,9 @@ var NID = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
     };
+    React.useEffect(function () {
+        dispatch(resetStore());
+    }, []);
     var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
 };

package/package.json

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