@tap-payments/auth-jsconnect 2.0.125-test → 2.0.126-test

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

@@ -72,7 +72,7 @@ import { FlowsTypes, AuthForType } from '../../../@types';
 import API from '../../../api';
 import { CONNECT_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_BRAND } from '../../../constants';
 import { defaultCountry } from '../../../constants';
-import { getIndividualName, capitalizeTheFirstLetterOfEachWord, getEighteenYearsAgo, sleep, findCountryByIddPrefix, concatenateObjectValues, isTwitter, isWebsite } from '../../../utils';
+import { getIndividualName, capitalizeTheFirstLetterOfEachWord, getEighteenYearsAgo, sleep, findCountryByIddPrefix, concatenateObjectValues, isTwitter, isWebsite, fixBrandList } from '../../../utils';
 export var createMobileAuth = createAsyncThunk('createMobileAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var settings, requestBody, data;
     var _a, _b;
@@ -226,7 +226,7 @@ export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thu
     });
 }); });
 export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connect, settings, startWithNID, _b, mobileData, nidData, responseBody, stepName, payload, data, lead_id, individual_id, leadBody, leadResponse, _c, isNewUser, brands, err_1, channels, countryCode, contact, name, _d, phone, email, userInfoMissed;
+    var _a, connect, settings, startWithNID, _b, mobileData, nidData, responseBody, stepName, payload, data, lead_id, individual_id, leadBody, leadResponse, _c, isNewUser, channels, brands, err_1, countryCode, contact, name, _d, phone, email, userInfoMissed;
     var _e, _f, _g, _h;
     return __generator(this, function (_j) {
         switch (_j.label) {
@@ -272,24 +272,23 @@ export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params,
                 if ((_f = leadResponse.errors) === null || _f === void 0 ? void 0 : _f.length)
                     throw new Error(leadResponse.errors[0].description);
                 isNewUser = leadResponse.is_new_individual;
-                if (!!isNewUser) return [3, 11];
-                _j.label = 6;
+                if (!!isNewUser) return [3, 10];
+                return [4, API.dataService.getChannelsOfServices({ page: 0 })];
             case 6:
-                _j.trys.push([6, 8, , 9]);
-                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
+                channels = (_j.sent()).list;
+                leadResponse.channel_list = channels;
+                _j.label = 7;
             case 7:
-                brands = (_j.sent()).brands;
-                leadResponse.brand_list = brands;
-                return [3, 9];
+                _j.trys.push([7, 9, , 10]);
+                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
             case 8:
+                brands = (_j.sent()).brands;
+                leadResponse.brand_list = fixBrandList(brands, channels);
+                return [3, 10];
+            case 9:
                 err_1 = _j.sent();
-                return [3, 9];
-            case 9: return [4, API.dataService.getChannelsOfServices({ page: 0 })];
+                return [3, 10];
             case 10:
-                channels = (_j.sent()).list;
-                leadResponse.channel_list = channels;
-                _j.label = 11;
-            case 11:
                 countryCode = settings.data.businessCountry;
                 contact = leadResponse.contact, name = leadResponse.name;
                 _d = contact || {}, phone = _d.phone, email = _d.email;
@@ -307,7 +306,7 @@ export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params,
     });
 }); });
 export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, isSuccess, lead_id, individual_id, leadBody, leadResponse, _b, isNewUser, countryCode, contact, name_1, _c, phone, email, userInfoMissed, brands, err_2, channels;
+    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, isSuccess, lead_id, individual_id, leadBody, leadResponse, _b, isNewUser, countryCode, contact, name_1, _c, phone, email, userInfoMissed, channels, brands, err_2;
     var _d, _e, _f, _g, _h;
     return __generator(this, function (_j) {
         switch (_j.label) {
@@ -320,15 +319,15 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 count = 1;
                 _j.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 17];
+                if (!(count <= maxCalls)) return [3, 16];
                 if (thunkApi.signal.aborted) {
-                    return [3, 17];
+                    return [3, 16];
                 }
                 return [4, API.authService.getVerifyAuth(responseBody === null || responseBody === void 0 ? void 0 : responseBody.auth_token)];
             case 2:
                 authResponse = _j.sent();
                 isSuccess = ((_d = authResponse.status) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'success';
-                if (!isSuccess) return [3, 14];
+                if (!isSuccess) return [3, 13];
                 return [4, ((_e = params === null || params === void 0 ? void 0 : params.onSuccess) === null || _e === void 0 ? void 0 : _e.call(params))];
             case 3:
                 _j.sent();
@@ -355,24 +354,23 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 contact = leadResponse.contact, name_1 = leadResponse.name;
                 _c = contact || {}, phone = _c.phone, email = _c.email;
                 userInfoMissed = (!phone || !email || !name_1) && !isNewUser;
-                if (!!isNewUser) return [3, 13];
-                _j.label = 8;
+                if (!!isNewUser) return [3, 12];
+                return [4, API.dataService.getChannelsOfServices({ page: 0 })];
             case 8:
-                _j.trys.push([8, 10, , 11]);
-                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
+                channels = (_j.sent()).list;
+                leadResponse.channel_list = channels;
+                _j.label = 9;
             case 9:
-                brands = (_j.sent()).brands;
-                leadResponse.brand_list = brands;
-                return [3, 11];
+                _j.trys.push([9, 11, , 12]);
+                return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
             case 10:
+                brands = (_j.sent()).brands;
+                leadResponse.brand_list = fixBrandList(brands, channels);
+                return [3, 12];
+            case 11:
                 err_2 = _j.sent();
-                return [3, 11];
-            case 11: return [4, API.dataService.getChannelsOfServices({ page: 0 })];
+                return [3, 12];
             case 12:
-                channels = (_j.sent()).list;
-                leadResponse.channel_list = channels;
-                _j.label = 13;
-            case 13:
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
                     countryCode = findCountryByIddPrefix(settings.data.countries, phone.country_code);
                 (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, {});
@@ -382,14 +380,14 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 }
                 thunkApi.dispatch(handleNextScreenStep('CONNECT_MERCHANT_INFO_STEP'));
                 return [2, { authResponse: authResponse, leadResponse: leadResponse, isNewUser: isNewUser, countryCode: countryCode, userInfoMissed: userInfoMissed }];
-            case 14: return [4, sleep(interval * 1000)];
-            case 15:
+            case 13: return [4, sleep(interval * 1000)];
+            case 14:
                 _j.sent();
-                _j.label = 16;
-            case 16:
+                _j.label = 15;
+            case 15:
                 count++;
                 return [3, 1];
-            case 17: throw new Error('paci_verification_failed');
+            case 16: throw new Error('paci_verification_failed');
         }
     });
 }); });
@@ -434,13 +432,14 @@ 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, 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) {
+    var _a, settings, connect, responseBody, leadBrandId, isNewBrand, brandName, salesChannels, selectedBrandItem, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 responseBody = connect.data.otpData.responseBody;
+                leadBrandId = responseBody === null || responseBody === void 0 ? void 0 : responseBody.brand_id;
                 isNewBrand = params.isNewBrand, brandName = params.brandName, salesChannels = params.salesChannels, selectedBrandItem = params.selectedBrandItem;
                 getAddress = function (value, isTwitter, isWeb) {
                     if (isTwitter)
@@ -459,7 +458,8 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                         })
                     };
                 });
-                if (!!isNewBrand) return [3, 3];
+                if (!!isNewBrand) return [3, 4];
+                if (!(leadBrandId !== (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id))) return [3, 2];
                 payload_1 = {
                     brand: {
                         id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || ''
@@ -469,20 +469,22 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload_1)];
             case 1:
-                lead_1 = _h.sent();
+                _g.sent();
+                _g.label = 2;
+            case 2:
                 brandReqBody_1 = {
-                    id: ((_b = lead_1.brand) === null || _b === void 0 ? void 0 : _b.id) || '',
+                    id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || '',
                     channel_services: channel_services,
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody_1)];
-            case 2:
-                brand_1 = _h.sent();
+            case 3:
+                brand_1 = _g.sent();
                 thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
+                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, params);
                 return [2, { response: brand_1, formData: params }];
-            case 3:
+            case 4:
                 brandNameBody = {
                     name: {
                         en: brandName,
@@ -497,20 +499,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 4:
-                lead = _h.sent();
+            case 5:
+                lead = _g.sent();
                 brandReqBody = {
-                    id: ((_e = lead.brand) === null || _e === void 0 ? void 0 : _e.id) || '',
+                    id: ((_d = lead.brand) === null || _d === void 0 ? void 0 : _d.id) || '',
                     channel_services: channel_services,
                     term: ['agree'],
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody)];
-            case 5:
-                brand = _h.sent();
+            case 6:
+                brand = _g.sent();
                 thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
                 return [2, { response: brand, formData: params }];
         }
     });
@@ -752,7 +754,7 @@ export var connectSlice = createSlice({
                 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)
+                    if (!isBrandExist && brand)
                         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];
@@ -762,7 +764,7 @@ export var connectSlice = createSlice({
                     channel_list: channel_list
                 };
             }
-            state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, name: name, contact: contact, userInfoMissed: userInfoMissed });
+            state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, brand_id: brand === null || brand === void 0 ? void 0 : brand.id, name: name, contact: contact, userInfoMissed: userInfoMissed });
         })
             .addCase(verifyPACI.rejected, function (state, action) {
             state.loading = false;
@@ -796,7 +798,7 @@ export var connectSlice = createSlice({
                 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)
+                    if (!isBrandExist && brand)
                         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];
@@ -806,7 +808,7 @@ export var connectSlice = createSlice({
                     channel_list: channel_list
                 };
             }
-            state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, name: name, contact: contact, userInfoMissed: userInfoMissed });
+            state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, brand_id: brand === null || brand === void 0 ? void 0 : brand.id, name: name, contact: contact, userInfoMissed: userInfoMissed });
         })
             .addCase(verifyAuth.pending, function (state) {
             state.loading = true;
@@ -870,13 +872,6 @@ 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) {
                 state.data.brandData.responseBody = __assign(__assign({}, state.data.brandData.responseBody), { channel_list: channel_list });
             }

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

@@ -43,7 +43,9 @@ import Collapse from '../../../../components/Collapse';
 import { isKW } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
-    flexDirection: 'column'
+    flexDirection: 'column',
+    minHeight: '240px',
+    justifyContent: 'space-between'
 }); });
 var Individual = function (_a) {
     var _b = React.useState(false), listActive = _b[0], setListActive = _b[1];

package/build/utils/array.d.ts

@@ -23,3 +23,39 @@ export declare const mapSalesChannel: (salesChannel: Array<SaleChannel>) => {
     } | undefined;
     logo?: string | undefined;
 }[];
+export declare const mapBrandSalesChannel: (salesChannel: Array<SaleChannel>, brandSalesChannel: Array<SaleChannel>) => ({
+    sub: ({
+        id: string;
+        code: string;
+        name?: {
+            ar: string;
+            en: string;
+        } | undefined;
+        address?: string | undefined;
+        logo?: string | undefined;
+    } | undefined)[] | undefined;
+    id: string;
+    code: string;
+    name?: {
+        ar: string;
+        en: string;
+    } | undefined;
+    address?: string | undefined;
+    logo?: string | undefined;
+} | {
+    sub?: import("../@types").SubSaleChannel[] | undefined;
+    id: string;
+    code: string;
+    name?: {
+        ar: string;
+        en: string;
+    } | undefined;
+    address?: string | undefined;
+    logo?: string | undefined;
+} | undefined)[];
+export declare const removeDuplicationById: (items: Array<any>) => any[];
+export declare const fixBrandList: (items: Array<{
+    channel_services: Array<SaleChannel>;
+}>, salesChannel: Array<SaleChannel>) => {
+    channel_services: any[];
+}[];

package/build/utils/array.js

@@ -89,3 +89,35 @@ export var mapSalesChannel = function (salesChannel) {
         }));
     });
 };
+export var mapBrandSalesChannel = function (salesChannel, brandSalesChannel) {
+    var findSalesChannel = function (id) { return salesChannel.find(function (item) { return item.id === id; }); };
+    var mapped = brandSalesChannel
+        .map(function (item) {
+        var _a;
+        var originalSalasChannel = findSalesChannel(item.id);
+        if (!originalSalasChannel)
+            return undefined;
+        var hasSub = item.sub && item.sub.length > 0;
+        if (hasSub)
+            return __assign(__assign({}, item), { sub: (_a = originalSalasChannel.sub) === null || _a === void 0 ? void 0 : _a.map(function (subItem) {
+                    var _a;
+                    var brandSubItem = (_a = item.sub) === null || _a === void 0 ? void 0 : _a.find(function (brandSub) { return brandSub.id === subItem.id; });
+                    if (!brandSubItem)
+                        return undefined;
+                    return __assign(__assign({}, subItem), brandSubItem);
+                }).filter(Boolean) });
+        return __assign({}, item);
+    })
+        .filter(Boolean);
+    return mapped;
+};
+export var removeDuplicationById = function (items) {
+    return items.filter(function (item, index) {
+        return items.findIndex(function (i) { return i.id === item.id; }) === index;
+    });
+};
+export var fixBrandList = function (items, salesChannel) {
+    return items.map(function (item) {
+        return __assign(__assign({}, item), { channel_services: removeDuplicationById(mapBrandSalesChannel(salesChannel, item.channel_services || [])) });
+    });
+};

package/package.json

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