npm - @tap-payments/auth-jsconnect - Versions diffs - 2.1.7-test → 2.1.8-test - Mend

@tap-payments/auth-jsconnect 2.1.7-test → 2.1.8-test

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/build/features/app/business/businessStore.d.ts CHANGED Viewed

@@ -4,8 +4,16 @@ export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     leadData: any;
     token: string;
-    brandInfo: any;
+    brandData: any;
     boardId: any;
+    isRequireOTP?: undefined;
+} | {
+    data: any;
+    isRequireOTP: boolean;
+    leadData?: undefined;
+    token?: undefined;
+    brandData?: undefined;
+    boardId?: undefined;
 }, string, {}>;
 export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
@@ -16,7 +24,7 @@ export declare const verifyLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
         isNID: boolean;
         otp: string;
     };
-    brandInfo: any;
+    brand: any;
     leadData: any;
 }, OTPFormValues, {}>;
 interface verifyPACIParams {
@@ -68,6 +76,7 @@ export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<{
     customerBases: any;
     expectedSales: any;
     expectedCustomerSales: any;
+    countryISO2: string;
 }, void, {}>;
 export declare const updateCustomersInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;

package/build/features/app/business/businessStore.js CHANGED Viewed

@@ -60,13 +60,13 @@ import moment from 'moment';
 import API from '../../../api';
 import { BusinessType, FlowsTypes } from '../../../@types';
 import { BUSINESS_FLOW_SUCCESS, BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
-import { convertNumbers2English, getEighteenYearsAgo, hasKey, sleep, isKW, isSA } from '../../../utils';
+import { convertNumbers2English, getEighteenYearsAgo, hasKey, sleep, isKW, isSA, dateFormat } from '../../../utils';
 import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var payload, data, leadResponse, brandInfo, boardResponse, countryIso2, steps, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, entity_activities, data_1, board_id, board_info_id;
-    var _a, _b, _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var payload, data, countryIso2, boardData, brandData, leadData, entity_activities, steps, brand, board_id, board_info_id, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, activityList;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -74,101 +74,100 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_h.sent()).data;
-                leadResponse = undefined;
-                brandInfo = undefined;
-                boardResponse = undefined;
-                countryIso2 = undefined;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 18];
-                if (data === null || data === void 0 ? void 0 : data.country_code) {
-                    countryIso2 = data === null || data === void 0 ? void 0 : data.country_code;
+                data = (_b.sent()).data;
+                if ((_a = data.errors) === null || _a === void 0 ? void 0 : _a.length)
+                    throw new Error(data.errors[0].description);
+                if (data.mw_error)
+                    throw new Error(data.mw_error);
+                countryIso2 = data === null || data === void 0 ? void 0 : data.country_code;
+                if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                }
-                if (!(data.step_name !== BUSINESS_STEP_NAMES.PHONE_AUTH)) return [3, 18];
+                if (!(data.step_name !== BUSINESS_STEP_NAMES.PHONE_AUTH)) return [3, 20];
+                boardData = undefined;
+                brandData = undefined;
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadResponse = _h.sent();
-                if (!countryIso2) {
-                    countryIso2 = (_a = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _a === void 0 ? void 0 : _a.country_code;
-                    if (countryIso2)
-                        thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                }
+                leadData = (_b.sent()).data;
+                countryIso2 = leadData === null || leadData === void 0 ? void 0 : leadData.country_code;
+                if (!countryIso2)
+                    thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH && isKW(countryIso2)) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_CIVIL_ID_STEP'));
                 }
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH && !isKW(countryIso2)) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
                 }
-                if (!(data.step_name === 'business_info')) return [3, 18];
-                steps = (_b = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _b === void 0 ? void 0 : _b.steps;
-                brandID = (_d = (_c = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _c === void 0 ? void 0 : _c.brand) === null || _d === void 0 ? void 0 : _d.id;
+                if (!(data.step_name === BUSINESS_STEP_NAMES.BUSINESS_INFO)) return [3, 19];
+                entity_activities = leadData.entity_activities, steps = leadData.steps, brand = leadData.brand, board_id = leadData.board_id, board_info_id = leadData.board_info_id;
+                brandID = brand === null || brand === void 0 ? void 0 : brand.id;
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
-                hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO) &&
-                    hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM);
+                hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO) && hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM);
                 hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
                 hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
-                entity_activities = leadResponse.data.entity_activities;
                 if (!(!entity_activities && hasBusinessCRInfoCompleted)) return [3, 4];
                 return [4, API.dataService.getActivities()];
             case 3:
-                data_1 = _h.sent();
-                leadResponse.data = __assign(__assign({}, leadResponse.data), { entity_activities: data_1.list });
-                _h.label = 4;
+                activityList = (_b.sent()).list;
+                leadData = __assign(__assign({}, leadData), { entity_activities: activityList });
+                _b.label = 4;
             case 4:
-                if (!hasBusinessCompleted) return [3, 8];
-                board_id = (_e = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _e === void 0 ? void 0 : _e.board_id;
-                board_info_id = (_f = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _f === void 0 ? void 0 : _f.board_info_id;
-                if (!(!!board_id && !!board_info_id)) return [3, 6];
+                if (!hasBusinessCompleted) return [3, 9];
+                if (!(board_id && board_info_id)) return [3, 6];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 5:
-                boardResponse = _h.sent();
-                _h.label = 6;
-            case 6: return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
+                boardData = _b.sent();
+                _b.label = 6;
+            case 6:
+                if (!board_id) return [3, 8];
+                return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
             case 7:
-                _h.sent();
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 18];
+                _b.sent();
+                _b.label = 8;
             case 8:
-                if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 9];
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
-                return [3, 18];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 19];
             case 9:
-                if (!hasBusinessCustomersCompleted) return [3, 10];
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP'));
-                return [3, 18];
+                if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 10];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
+                return [3, 19];
             case 10:
-                if (!hasBusinessCRActivitiesCompleted) return [3, 13];
-                return [4, thunkApi.dispatch(retrieveDataList())];
+                if (!hasBusinessCustomersCompleted) return [3, 11];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP'));
+                return [3, 19];
             case 11:
-                _h.sent();
+                if (!hasBusinessCRActivitiesCompleted) return [3, 14];
+                return [4, thunkApi.dispatch(retrieveDataList())];
+            case 12:
+                _b.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [4, API.brandService.retrieveBrand(brandID)];
-            case 12:
-                brandInfo = _h.sent();
-                return [3, 18];
             case 13:
-                if (!hasBusinessCRInfoCompleted) return [3, 15];
-                return [4, API.brandService.retrieveBrand(brandID)];
+                brandData = _b.sent();
+                return [3, 19];
             case 14:
-                brandInfo = _h.sent();
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
-                return [3, 18];
+                if (!hasBusinessCRInfoCompleted) return [3, 16];
+                return [4, API.brandService.retrieveBrand(brandID)];
             case 15:
-                if (!isSA(countryIso2)) return [3, 17];
-                return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
+                brandData = _b.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
+                return [3, 19];
             case 16:
-                _h.sent();
-                _h.label = 17;
+                if (!isSA(countryIso2)) return [3, 18];
+                return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 17:
+                _b.sent();
+                _b.label = 18;
+            case 18:
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                _h.label = 18;
-            case 18: return [2, {
+                _b.label = 19;
+            case 19: return [2, {
                     data: data,
-                    leadData: __assign(__assign({}, leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data), { flows: BUSINESS_FLOW_SUCCESS.concat((boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info) || []) }),
+                    leadData: __assign(__assign({}, leadData), { flows: BUSINESS_FLOW_SUCCESS.concat((boardData === null || boardData === void 0 ? void 0 : boardData.info) || []) }),
                     token: token,
-                    brandInfo: brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.brand,
-                    boardId: (_g = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _g === void 0 ? void 0 : _g.board_id
+                    brandData: brandData,
+                    boardId: leadData === null || leadData === void 0 ? void 0 : leadData.board_id
                 }];
+            case 20: return [2, { data: data, isRequireOTP: true }];
         }
     });
 }); });
@@ -190,8 +189,8 @@ export var resendOTP = createAsyncThunk('resendOTPBusiness', function (params, t
     });
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, business, settings, isNID, responseBody, stepName, payload, data, brandInfo, leadResponse, _b, brand, country_code, steps, board_id, board_info_id, brandID, countryIso2, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, isIdentityAuthStep, entity_activities, data_2, boardResponse;
-    var _c, _d, _e, _f, _g, _h;
+    var _a, business, settings, isNID, responseBody, stepName, payload, data, brandData, leadData, brand, country_code, steps, board_id, board_info_id, brandID, countryIso2, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, isIdentityAuthStep, entity_activities, activityList, boardResponse;
+    var _b, _c, _d, _e, _f, _g, _h;
     return __generator(this, function (_j) {
         switch (_j.label) {
             case 0:
@@ -201,22 +200,22 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 stepName = isNID ? BUSINESS_STEP_NAMES.IDENTITY_VERIFY_AUTH : BUSINESS_STEP_NAMES.PHONE_AUTH;
                 payload = {
                     data: params.otp,
-                    service_name: ((_d = (_c = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_token) === null || _c === void 0 ? void 0 : _c.verification_by) === null || _d === void 0 ? void 0 : _d.service_name) || ((_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _e === void 0 ? void 0 : _e.service_name),
-                    verify_token: ((_f = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_token) === null || _f === void 0 ? void 0 : _f.verify_token) || (responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token),
+                    service_name: ((_c = (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_token) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.service_name) || ((_d = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _d === void 0 ? void 0 : _d.service_name),
+                    verify_token: ((_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_token) === null || _e === void 0 ? void 0 : _e.verify_token) || (responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token),
                     step_name: stepName,
                     encryption_contract: ['data']
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
                 data = (_j.sent()).data;
-                brandInfo = undefined;
-                leadResponse = undefined;
-                if (!!data.errors) return [3, 20];
+                if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
+                    throw new Error(data.errors[0].description);
+                brandData = undefined;
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadResponse = _j.sent();
+                leadData = (_j.sent()).data;
                 thunkApi.dispatch(updateStepName(stepName));
-                _b = (leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) || {}, brand = _b.brand, country_code = _b.country_code, steps = _b.steps, board_id = _b.board_id, board_info_id = _b.board_info_id;
+                brand = leadData.brand, country_code = leadData.country_code, steps = leadData.steps, board_id = leadData.board_id, board_info_id = leadData.board_info_id;
                 brandID = brand === null || brand === void 0 ? void 0 : brand.id;
                 countryIso2 = country_code;
                 if (countryIso2)
@@ -233,12 +232,12 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 _j.sent();
                 _j.label = 4;
             case 4:
-                entity_activities = ((leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) || {}).entity_activities;
+                entity_activities = leadData.entity_activities;
                 if (!(!entity_activities && hasBusinessCRInfoCompleted)) return [3, 6];
                 return [4, API.dataService.getActivities()];
             case 5:
-                data_2 = _j.sent();
-                leadResponse.data = __assign(__assign({}, leadResponse.data), { entity_activities: data_2.list });
+                activityList = (_j.sent()).list;
+                leadData = __assign(__assign({}, leadData), { entity_activities: activityList });
                 _j.label = 6;
             case 6:
                 if (!isNID) return [3, 7];
@@ -250,11 +249,11 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 return [3, 20];
             case 8:
                 if (!hasBusinessCompleted) return [3, 12];
-                if (!(!!board_id && !!board_info_id)) return [3, 10];
+                if (!(board_id && board_info_id)) return [3, 10];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 9:
                 boardResponse = _j.sent();
-                leadResponse.data = __assign(__assign({}, leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data), { flows: BUSINESS_FLOW_SUCCESS.concat((boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info) || []) });
+                leadData = __assign(__assign({}, leadData), { flows: BUSINESS_FLOW_SUCCESS.concat((boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info) || []) });
                 _j.label = 10;
             case 10: return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
             case 11:
@@ -277,19 +276,19 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 16:
-                brandInfo = _j.sent();
+                brandData = _j.sent();
                 return [3, 20];
             case 17:
                 if (!hasBusinessCRInfoCompleted) return [3, 19];
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 18:
-                brandInfo = _j.sent();
+                brandData = _j.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
                 return [3, 20];
             case 19:
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
                 _j.label = 20;
-            case 20: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }), brandInfo: brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.brand, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data }];
+            case 20: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }), brand: brandData === null || brandData === void 0 ? void 0 : brandData.brand, leadData: leadData }];
         }
     });
 }); });
@@ -573,17 +572,18 @@ export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', funct
     });
 }); });
 export var retrieveDataList = createAsyncThunk('businessRetrieveDataList', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, dataBody, salesDataBody, _a, customerBases, expectedSales, expectedCustomerSales;
+    var settings, countryISO2, dataBody, salesDataBody, _a, customerBases, expectedSales, expectedCustomerSales;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 settings = thunkApi.getState().settings;
+                countryISO2 = settings.data.businessCountry.iso2;
                 dataBody = {
                     page: 0
                 };
                 salesDataBody = {
                     page: 0,
-                    country_code: [settings.data.businessCountry.iso2]
+                    country_code: [countryISO2]
                 };
                 return [4, Promise.all([
                         API.dataService.getCustomerBases(dataBody),
@@ -591,11 +591,12 @@ export var retrieveDataList = createAsyncThunk('businessRetrieveDataList', funct
                         API.dataService.getExpectedCustomerSales(dataBody)
                     ])];
             case 1:
-                _a = _b.sent(), customerBases = _a[0], expectedSales = _a[1], expectedCustomerSales = _a[2];
+                _a = _b.sent(), customerBases = _a[0].list, expectedSales = _a[1].list, expectedCustomerSales = _a[2].list;
                 return [2, {
                         customerBases: customerBases,
                         expectedSales: expectedSales,
-                        expectedCustomerSales: expectedCustomerSales
+                        expectedCustomerSales: expectedCustomerSales,
+                        countryISO2: countryISO2
                     }];
         }
     });
@@ -755,49 +756,46 @@ export var businessSlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b, _c, _d;
+            var _a, _b;
             state.error = null;
             state.customLoading = false;
-            var _e = action.payload, data = _e.data, token = _e.token, leadData = _e.leadData, brandInfo = _e.brandInfo, boardId = _e.boardId;
-            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(__assign(__assign({}, data), leadData), state.data.verify.responseBody), { board_id: boardId, lead_id: data === null || data === void 0 ? void 0 : data.id });
-            state.data.verify.token = token;
+            var _c = action.payload, data = _c.data, boardId = _c.boardId, brandData = _c.brandData, leadData = _c.leadData, token = _c.token, isRequireOTP = _c.isRequireOTP;
+            var responseBody = state.data.verify.responseBody;
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), leadData), responseBody), { board_id: boardId, lead_id: data === null || data === void 0 ? void 0 : data.id });
+            if (token)
+                state.data.verify.token = token;
             state.data.otpData.isNID = false;
-            var _f = state.data.verify.responseBody || {}, entity = _f.entity, entity_activities = _f.entity_activities, business_type = _f.business_type, business_name = _f.business_name;
-            var issuingDate = (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_operation_start_at)
-                ? brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_operation_start_at
-                : (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
-            if (!!issuingDate) {
-                var formattedDate = moment(issuingDate).format('YYYY-MM-DD');
-                state.data.activitiesData.operationStartDate = convertNumbers2English(formattedDate);
-            }
+            if (isRequireOTP)
+                return;
+            var _d = state.data.verify.responseBody || {}, entity = _d.entity, entity_activities = _d.entity_activities, business_type = _d.business_type, business_name = _d.business_name;
+            var issuingDate = (brandData === null || brandData === void 0 ? void 0 : brandData.business_operation_start_at) || ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.issuing_date);
+            if (issuingDate)
+                state.data.activitiesData.operationStartDate = convertNumbers2English(dateFormat(issuingDate));
             var activities = entity_activities || [];
             var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
-                var _a;
-                return (_a = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return activity.id === value.id; });
+                var activities = brandData.activities;
+                return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return activity.id === value.id; });
             });
-            var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities.length) ? [activities[0]] : [];
-            state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities;
+            state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
             state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
             state.data.businessTypeData.entityLegalName = (business_name === null || business_name === void 0 ? void 0 : business_name.en) || '';
-            if (!!(entity === null || entity === void 0 ? void 0 : entity.license)) {
-                var licenseNumber_1 = (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.number;
-                var _g = state.data.businessTypeData || {}, responseBody = _g.responseBody, selectedLicense = _g.selectedLicense;
-                var licenseList = (responseBody || {}).licenseList;
+            var license = (entity || {}).license;
+            if (license) {
+                var number_1 = license.number;
+                var _e = state.data.businessTypeData || {}, busResData = _e.responseBody, selectedLicense = _e.selectedLicense;
+                var licenseList = (busResData || {}).licenseList;
                 var selectedLicenseData = selectedLicense;
-                if (!!licenseNumber_1) {
-                    selectedLicenseData =
-                        ((_d = licenseList === null || licenseList === void 0 ? void 0 : licenseList.find) === null || _d === void 0 ? void 0 : _d.call(licenseList, function (_a) {
-                            var license = _a.license;
-                            return (license === null || license === void 0 ? void 0 : license.number) === licenseNumber_1;
-                        })) ||
-                            business_type === BusinessType.FL
-                            ? __assign(__assign({}, OTHER_FL_LICENSE), { license: { number: licenseNumber_1 } }) : __assign(__assign({}, OTHER_CR_LICENSE), { license: { number: licenseNumber_1 } });
-                    state.data.businessTypeData.licenseNumber = licenseNumber_1 || '';
+                if (number_1) {
+                    var findFL = (_b = licenseList === null || licenseList === void 0 ? void 0 : licenseList.find) === null || _b === void 0 ? void 0 : _b.call(licenseList, function (_a) {
+                        var license = _a.license;
+                        return (license === null || license === void 0 ? void 0 : license.number) === number_1;
+                    });
+                    if (findFL || business_type === BusinessType.FL) {
+                        selectedLicenseData = __assign(__assign({}, OTHER_FL_LICENSE), { license: { number: number_1 } });
+                    }
+                    else
+                        selectedLicenseData = __assign(__assign({}, OTHER_CR_LICENSE), { license: { number: number_1 } });
+                    state.data.businessTypeData.licenseNumber = number_1;
                 }
                 state.data.businessTypeData.selectedLicense = __assign(__assign({}, selectedLicenseData), { type: business_type });
             }
@@ -828,49 +826,42 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyLeadOTP.fulfilled, function (state, action) {
-            var _a, _b, _c, _d;
+            var _a, _b;
             state.loading = false;
             state.error = null;
-            var _e = action.payload, data = _e.data, formData = _e.formData, brandInfo = _e.brandInfo, leadData = _e.leadData;
-            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;
-            }
+            var _c = action.payload, data = _c.data, formData = _c.formData, brand = _c.brand, leadData = _c.leadData;
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            state.data.verify.responseBody = __assign(__assign(__assign({}, leadData), state.data.verify.responseBody), { flows: leadData === null || leadData === void 0 ? void 0 : leadData.flows });
-            var _f = leadData || {}, entity = _f.entity, entity_activities = _f.entity_activities, business_type = _f.business_type, business_name = _f.business_name;
-            var issuingDate = (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_operation_start_at)
-                ? brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_operation_start_at
-                : (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
-            if (!!issuingDate) {
-                var formattedDate = moment(issuingDate).format('YYYY-MM-DD');
-                state.data.activitiesData.operationStartDate = convertNumbers2English(formattedDate);
-            }
+            state.data.verify.responseBody = __assign(__assign(__assign({}, leadData), state.data.verify.responseBody), { flows: (leadData === null || leadData === void 0 ? void 0 : leadData.flows) || [] });
+            var _d = leadData || {}, entity = _d.entity, entity_activities = _d.entity_activities, business_type = _d.business_type, business_name = _d.business_name;
+            var issuingDate = (brand === null || brand === void 0 ? void 0 : brand.business_operation_start_at) || ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.issuing_date);
+            if (issuingDate)
+                state.data.activitiesData.operationStartDate = convertNumbers2English(dateFormat(issuingDate));
             var activities = entity_activities || [];
             var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
-                var _a;
-                return (_a = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return value.id === activity.id; });
+                var activities = brand.activities;
+                return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return value.id === activity.id; });
             });
-            var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities[0]) ? [activities === null || activities === void 0 ? void 0 : activities[0]] : [];
-            state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities;
+            state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
             state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
             state.data.businessTypeData.entityLegalName = (business_name === null || business_name === void 0 ? void 0 : business_name.en) || '';
-            if (!!(entity === null || entity === void 0 ? void 0 : entity.license)) {
-                var licenseNumber_2 = (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.number;
-                var _g = state.data.businessTypeData || {}, responseBody = _g.responseBody, selectedLicense = _g.selectedLicense;
-                var licenseList = (responseBody || {}).licenseList;
+            var license = (entity || {}).license;
+            if (license) {
+                var number_2 = license.number;
+                var _e = state.data.businessTypeData || {}, busResData = _e.responseBody, selectedLicense = _e.selectedLicense;
+                var licenseList = (busResData || {}).licenseList;
                 var selectedLicenseData = selectedLicense;
-                if (!!licenseNumber_2) {
-                    selectedLicenseData =
-                        ((_d = licenseList === null || licenseList === void 0 ? void 0 : licenseList.find) === null || _d === void 0 ? void 0 : _d.call(licenseList, function (_a) {
-                            var license = _a.license;
-                            return (license === null || license === void 0 ? void 0 : license.number) === licenseNumber_2;
-                        })) ||
-                            business_type === BusinessType.FL
-                            ? __assign(__assign({}, OTHER_FL_LICENSE), { license: { number: licenseNumber_2 } }) : __assign(__assign({}, OTHER_CR_LICENSE), { license: { number: licenseNumber_2 } });
-                    state.data.businessTypeData.licenseNumber = licenseNumber_2 || '';
+                if (number_2) {
+                    var findFL = (_b = licenseList === null || licenseList === void 0 ? void 0 : licenseList.find) === null || _b === void 0 ? void 0 : _b.call(licenseList, function (_a) {
+                        var license = _a.license;
+                        return (license === null || license === void 0 ? void 0 : license.number) === number_2;
+                    });
+                    if (findFL || business_type === BusinessType.FL) {
+                        selectedLicenseData = __assign(__assign({}, OTHER_FL_LICENSE), { license: { number: number_2 } });
+                    }
+                    else
+                        selectedLicenseData = __assign(__assign({}, OTHER_CR_LICENSE), { license: { number: number_2 } });
+                    state.data.businessTypeData.licenseNumber = number_2;
                 }
                 state.data.businessTypeData.selectedLicense = __assign(__assign({}, selectedLicenseData), { type: business_type });
             }
@@ -1029,9 +1020,6 @@ export var businessSlice = createSlice({
                 state.data.activitiesData.operationStartDate = convertNumbers2English(formattedDate);
             }
             var activities = entity_activities || [];
-            var selectedActivity = activities[0];
-            if (!!selectedActivity)
-                state.data.activitiesData.activities = [selectedActivity];
             state.data.businessTypeData.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activities: activities }), accountData), documentData);
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { entity: entity });
         })
@@ -1073,19 +1061,19 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(retrieveDataList.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e;
+            var _a, _b;
             state.loading = false;
             state.error = null;
-            var payload = action.payload;
-            var customerBases = ((_a = payload.customerBases) === null || _a === void 0 ? void 0 : _a.list) || [];
-            var customerBase = customerBases === null || customerBases === void 0 ? void 0 : customerBases[1];
-            var expectedSales = ((_b = payload.expectedSales) === null || _b === void 0 ? void 0 : _b.list) || [];
-            var expectedSale = (_d = (_c = expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales[0]) === null || _c === void 0 ? void 0 : _c.sub) === null || _d === void 0 ? void 0 : _d[4];
-            var expectedCustomerSales = ((_e = payload.expectedCustomerSales) === null || _e === void 0 ? void 0 : _e.list) || [];
-            var expectedCustomerSale = expectedCustomerSales === null || expectedCustomerSales === void 0 ? void 0 : expectedCustomerSales[3];
+            var _c = action.payload, customerBases = _c.customerBases, expectedSales = _c.expectedSales, expectedCustomerSales = _c.expectedCustomerSales, countryISO2 = _c.countryISO2;
+            var regional = customerBases.at(1);
+            var local = customerBases.at(0);
+            var expectedSale = (_b = (_a = expectedSales.at(0)) === null || _a === void 0 ? void 0 : _a.sub) === null || _b === void 0 ? void 0 : _b.at(4);
+            var expectedCustomerSale = expectedCustomerSales.at(3);
             state.data.activitiesData.responseBody = __assign(__assign({}, state.data.activitiesData.responseBody), { customerBases: customerBases, expectedSales: expectedSales, expectedCustomerSales: expectedCustomerSales });
-            if (!!customerBase)
-                state.data.customersData.customerLocations = [customerBase, customerBases[0]];
+            if (local && isKW(countryISO2))
+                state.data.customersData.customerLocations = [local];
+            if (regional && local && isSA(countryISO2))
+                state.data.customersData.customerLocations = [regional, local];
             if (!!expectedSale)
                 state.data.customersData.expectedSale = expectedSale;
             if (!!expectedCustomerSale)

package/build/features/app/entity/entityStore.js CHANGED Viewed

@@ -485,9 +485,8 @@ export var entitySlice = createSlice({
                 var _a;
                 return (_a = brand === null || brand === void 0 ? void 0 : brand.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return value.id === activity.id; });
             });
-            var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities.length) ? [activities[0]] : [];
-            state.data.entityData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities;
-            state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities, operationStartDate: startDate || issuingDate, selectedActivities: (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities });
+            state.data.entityData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
+            state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities, operationStartDate: startDate || issuingDate, selectedActivities: (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [] });
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
@@ -547,8 +546,7 @@ export var entitySlice = createSlice({
                 var _a;
                 return (_a = brand === null || brand === void 0 ? void 0 : brand.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { return value.id === activity.id; });
             });
-            var defaultActivities = (activities === null || activities === void 0 ? void 0 : activities.length) ? [activities[0]] : [];
-            state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities, selectedActivities: (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : defaultActivities, operationStartDate: startDate || issuingDate });
+            state.data.entityData.responseBody = __assign(__assign({}, state.data.entityData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities, selectedActivities: (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [], operationStartDate: startDate || issuingDate });
         })
             .addCase(verifyEntityLeadOTP.rejected, function (state, action) {
             state.loading = false;

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

@@ -387,18 +387,11 @@ export var individualSlice = createSlice({
                 (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
-            var selectedMonthlyIncome = (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) { return (income === null || income === void 0 ? void 0 : income.id) === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.id); })) ||
-                (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList[2]);
-            if (!!selectedMonthlyIncome)
-                state.data.individualData.monthlyIncome = selectedMonthlyIncome;
             var code = (user === null || user === void 0 ? void 0 : user.employer_country) || countryCode;
             if (!!code) {
                 var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
                 state.data.individualData.employerLocation = employerLocation;
             }
-            var selectedOccupation = (occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (o) { return (o === null || o === void 0 ? void 0 : o.id) === (occupation === null || occupation === void 0 ? void 0 : occupation.id); })) || (occupationList === null || occupationList === void 0 ? void 0 : occupationList[0]);
-            if (!!selectedOccupation)
-                state.data.individualData.occupation = selectedOccupation;
             state.data.individualData.isPEP = is_relative_PEP;
             state.data.individualData.isInfluencer = is_influencer;
         })
@@ -447,18 +440,11 @@ export var individualSlice = createSlice({
                 (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
-            var selectedMonthlyIncome = (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) { return (income === null || income === void 0 ? void 0 : income.id) === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.id); })) ||
-                (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList[2]);
-            if (!!selectedMonthlyIncome)
-                state.data.individualData.monthlyIncome = selectedMonthlyIncome;
             var code = (user === null || user === void 0 ? void 0 : user.employer_country) || countryCode;
             if (!!code) {
                 var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
                 state.data.individualData.employerLocation = employerLocation;
             }
-            var selectedOccupation = (occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (o) { return (o === null || o === void 0 ? void 0 : o.id) === (occupation === null || occupation === void 0 ? void 0 : occupation.id); })) || (occupationList === null || occupationList === void 0 ? void 0 : occupationList[0]);
-            if (!!selectedOccupation)
-                state.data.individualData.occupation = selectedOccupation;
             state.data.individualData.isPEP = is_relative_PEP;
             state.data.individualData.isInfluencer = is_influencer;
         })

package/build/features/bank/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js CHANGED Viewed

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { getResetFlowUrl, showLastFour, concatenateObjectValues } from '../../../../utils';
+import { getResetFlowUrl, showLastFour, concatenateObjectValues, shortenBankName } from '../../../../utils';
 import { bankSelector } from '../../../app/bank/bankStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -55,7 +55,7 @@ var SuccessWithFlowButtons = function () {
         ? concatenateObjectValues(ar || en, ['first', 'last'])
         : concatenateObjectValues(en, ['first', 'last']);
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.name) || t('bank');
+    var bankName = shortenBankName(bank === null || bank === void 0 ? void 0 : bank.name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = (entity === null || entity === void 0 ? void 0 : entity.vat_id) || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';

package/build/features/business/screens/Activities/validation.js CHANGED Viewed

@@ -1,6 +1,9 @@
 import * as yup from 'yup';
 export var ActivitiesValidationSchema = yup.object().shape({
-    activities: yup.array().of(yup.object().shape({
+    activities: yup
+        .array()
+        .min(1, 'activities_list_alert')
+        .of(yup.object().shape({
         ar: yup.string(),
         en: yup.string()
     })),

package/build/features/business/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js CHANGED Viewed

@@ -17,7 +17,7 @@ import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
 import { businessSelector } from '../../../app/business/businessStore';
-import { concatenateObjectValues, getResetFlowUrl, showLastFour } from '../../../../utils';
+import { concatenateObjectValues, getResetFlowUrl, shortenBankName, showLastFour } from '../../../../utils';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
 import Container from '../../../shared/Containers/ScreenContainer';
@@ -55,7 +55,7 @@ var SuccessWithFlowButtons = function () {
         ? concatenateObjectValues(ar || en, ['first', 'last'])
         : concatenateObjectValues(en, ['first', 'last']);
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
+    var bankName = shortenBankName(bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = (entity === null || entity === void 0 ? void 0 : entity.vat_id) || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';

package/build/features/connect/screens/ThankYou/ThankYou.js CHANGED Viewed

@@ -1,9 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation, Trans } from 'react-i18next';
 import SuccessScreen from '../../../shared/SuccessScreen';
+import { connectSelector } from '../../../../features/app/connect/connectStore';
+import { useAppSelector } from '../../../../hooks';
+import { maskEmail } from '../../../../utils';
 var ThankYou = function (_a) {
+    var _b, _c;
     var t = useTranslation().t;
-    return (_jsx(SuccessScreen, { title: t("connect_completed_title"), description: t("connect_completed_description"), showEmailProviders: true }));
+    var data = useAppSelector(connectSelector).data;
+    var email = maskEmail((_c = (_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.email);
+    return (_jsx(SuccessScreen, { title: t("connect_completed_title"), description: _jsx(Trans, { i18nKey: 'connect_completed_description', values: { email: email } }), showEmailProviders: true }));
 };
 export default React.memo(ThankYou);

package/build/features/entity/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js CHANGED Viewed

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { getResetFlowUrl, showLastFour } from '../../../../utils';
+import { getResetFlowUrl, shortenBankName, showLastFour } from '../../../../utils';
 import { entitySelector } from '../../../app/entity/entityStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -52,7 +52,7 @@ var SuccessWithFlowButtons = function () {
     var _f = useState([]), buttons = _f[0], setButtons = _f[1];
     var username = ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.first) || '') + ' ' + ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.last) || '');
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
+    var bankName = shortenBankName(bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = vatID || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';

package/build/features/individual/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js CHANGED Viewed

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { concatenateObjectValues, getResetFlowUrl, showLastFour } from '../../../../utils';
+import { concatenateObjectValues, getResetFlowUrl, shortenBankName, showLastFour } from '../../../../utils';
 import { individualSelector } from '../../../app/individual/individualStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -55,7 +55,7 @@ var SuccessWithFlowButtons = function () {
         ? concatenateObjectValues(ar || en, ['first', 'last'])
         : concatenateObjectValues(en, ['first', 'last']);
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
+    var bankName = shortenBankName(bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = (entity === null || entity === void 0 ? void 0 : entity.vat_id) || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';

package/build/features/password/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js CHANGED Viewed

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { getResetFlowUrl, showLastFour, concatenateObjectValues } from '../../../../utils';
+import { getResetFlowUrl, showLastFour, concatenateObjectValues, shortenBankName } from '../../../../utils';
 import { passwordSelector } from '../../../app/password/passwordStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -55,7 +55,7 @@ var SuccessWithFlowButtons = function () {
         ? concatenateObjectValues(ar || en, ['first', 'last'])
         : concatenateObjectValues(en, ['first', 'last']);
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
+    var bankName = shortenBankName(bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = (entity === null || entity === void 0 ? void 0 : entity.vat_id) || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';

package/build/features/shared/Button/Button.js CHANGED Viewed

@@ -54,6 +54,7 @@ var ButtonBoxStyled = styled(Box)(function (_a) {
     return ({
         margin: theme.spacing(0, 2.5, 2.5, 2.5),
         marginBlockStart: theme.spacing(5),
+        maxHeight: theme.spacing(5.375),
         display: 'flex',
         alignItems: 'center',
         justifyContent: 'center'

package/build/features/shared/SuccessScreen/SuccessScreen.d.ts CHANGED Viewed

@@ -6,7 +6,7 @@ export interface ThankYouProps {
     successTitle?: string;
     loading?: boolean;
     error?: string;
-    description?: string;
+    description?: string | React.ReactElement;
 }
 declare const _default: React.MemoExoticComponent<({ title, description, showEmailProviders, onSuccess, successTitle, loading, error }: ThankYouProps) => JSX.Element>;
 export default _default;

package/build/features/tax/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js CHANGED Viewed

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { getResetFlowUrl, showLastFour, concatenateObjectValues } from '../../../../utils';
+import { getResetFlowUrl, showLastFour, concatenateObjectValues, shortenBankName } from '../../../../utils';
 import { taxSelector } from '../../../app/tax/taxStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -55,7 +55,7 @@ var SuccessWithFlowButtons = function () {
         ? concatenateObjectValues(ar || en, ['first', 'last'])
         : concatenateObjectValues(en, ['first', 'last']);
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
+    var bankName = shortenBankName(bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = vatID || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';

package/build/utils/date.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export declare const dateFormat: (date: Date, fmt?: string) => string;

package/build/utils/date.js ADDED Viewed

@@ -0,0 +1,5 @@
+import moment from 'moment';
+export var dateFormat = function (date, fmt) {
+    if (fmt === void 0) { fmt = 'YYYY-MM-DD'; }
+    return moment(date).format('YYYY-MM-DD');
+};

package/build/utils/index.d.ts CHANGED Viewed

@@ -8,3 +8,4 @@ export * from './string';
 export * from './device';
 export * from './rsa';
 export * from './common';
+export * from './date';

package/build/utils/index.js CHANGED Viewed

@@ -8,3 +8,4 @@ export * from './string';
 export * from './device';
 export * from './rsa';
 export * from './common';
+export * from './date';

package/build/utils/string.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { DeviceInfo } from '../@types';
 export declare const maskPhone: (str?: string) => string;
+export declare const shortenBankName: (str: string) => string;
 export declare const maskID: (str: string) => string;
 export declare const maskEmail: (str: string) => string;
 export declare const showLastFour: (str: string) => string;

package/build/utils/string.js CHANGED Viewed

@@ -8,13 +8,25 @@ export var maskPhone = function (str) {
     var lastTwo = str.substring(str.length - 2, str.length);
     return ' ••••' + lastTwo;
 };
+export var shortenBankName = function (str) {
+    if (str)
+        return str.slice(0, 20);
+    return '';
+};
 export var maskID = function (str) {
     var lastTwo = str.substring(str.length - 2, str.length);
     return ' ••••' + lastTwo;
 };
 export var maskEmail = function (str) {
-    var lastTwo = str.substring(str.length - 2, str.length);
-    return ' ••••' + lastTwo;
+    if (str) {
+        var name_1 = str.split('@')[0];
+        var maskedName = name_1[0] + '*' + name_1[name_1.length - 1];
+        var domain = str.split('@')[1].split('.')[0];
+        var maskedDomain = '@' + domain[0] + '*' + domain[domain.length - 1];
+        var TLD = '.' + str.split('@')[1].split('.')[1];
+        return maskedName + maskedDomain + TLD;
+    }
+    return '';
 };
 export var showLastFour = function (str) {
     if (str && str.length >= 4) {

package/package.json CHANGED Viewed

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