@tap-payments/auth-jsconnect 1.0.61 → 1.0.62

package/build/@types/redux.d.ts

@@ -1,6 +1,7 @@
 export interface SharedState<T> {
     error: string | null;
     loading: boolean;
+    customLoading?: boolean;
     data: T;
 }
 export interface ActionState<T> {

package/build/assets/locales/ar.json

@@ -215,9 +215,9 @@
     "select_brand_label": "Brand List",
     "choose_brand": "Choose Brand",
     "confirm_enter_iban": "الايبان",
-    "open_gmail": "Gmail",
-    "open_outlook": "Outlook",
-    "open_apple": "Apple",
+    "gmail_btn_open_title": "Gmail",
+    "outlook_btn_open_title": "Outlook",
+    "apple_btn_open_title": "Apple",
     "choose_any_license": "Choose Licene",
     "future_work": "Future Work",
     "add_other_fl": "Add Freelance",

package/build/assets/locales/en.json

@@ -229,9 +229,9 @@
     "select_brand_label": "Brand List",
     "choose_brand": "Choose Brand",
     "confirm_enter_iban": "IBAN",
-    "open_gmail": "Gmail",
-    "open_outlook": "Outlook",
-    "open_apple": "Apple",
+    "gmail_btn_open_title": "Gmail",
+    "outlook_btn_open_title": "Outlook",
+    "apple_btn_open_title": "Apple",
     "choose_any_license": "Choose Licene",
     "future_work": "Future Work",
     "add_other_fl": "Add Freelance",

package/build/constants/assets.d.ts

@@ -30,6 +30,7 @@ export declare const ICONS_NAMES: {
     ID_IMAGE: string;
     MOBILE_IMAGE: string;
     WHITE_ARROW: string;
+    BLACK_ARROW: string;
     SUCCESS: string;
     ABSHER_LOGO: string;
     EMAIL_ICON: string;

package/build/constants/assets.js

@@ -30,6 +30,7 @@ export var ICONS_NAMES = {
     ID_IMAGE: 'https://villageofwarwick.org/wp-content/uploads/2020/02/ICON99-512-1.png',
     MOBILE_IMAGE: 'https://image.shutterstock.com/image-vector/smartphone-icon-logo-260nw-767440327.jpg',
     WHITE_ARROW: 'https://tap-connecet.b-cdn.net/imgs/whiteArrow.svg',
+    BLACK_ARROW: 'https://dash.b-cdn.net/icons/menu/arrow_right_icon.svg',
     SUCCESS: 'https://tap-connecet.b-cdn.net/imgs/success.svg',
     ABSHER_LOGO: 'https://dash.b-cdn.net/icons/menu/Absher.svg',
     EMAIL_ICON: 'https://dash.b-cdn.net/icons/menu/email.png',

package/build/features/Landing/screens/VerifyAndRedirect/VerifyAndRedirect.js

@@ -36,6 +36,6 @@ var VerifyAndRedirect = function (_a) {
             }, 300);
         }
     }, [data.verify.responseBody]);
-    return (_jsxs(ScreenContainerStyled, { children: [isLoading && _jsx(Loader, {}), errorMessage && _jsx(Error, { error: errorMessage }), !isLoading && !errorMessage && _jsx(Error, { error: 'verified' })] }));
+    return (_jsxs(ScreenContainerStyled, { children: [isLoading && _jsx(Loader, {}), errorMessage && _jsx(Error, { error: errorMessage })] }));
 };
 export default React.memo(VerifyAndRedirect);

package/build/features/app/bank/bankStore.js

@@ -166,6 +166,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
 var initialState = {
     error: null,
     loading: false,
+    customLoading: false,
     data: {
         verify: {
             token: ''
@@ -198,10 +199,12 @@ export var bankSlice = createSlice({
         builder
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
             var _a;
             state.error = null;
+            state.customLoading = false;
             var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.leadData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
@@ -213,6 +216,7 @@ export var bankSlice = createSlice({
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyBankLeadOTP.pending, function (state) {
             state.loading = true;

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

@@ -29,7 +29,7 @@ export declare const updateLeadIdentity: import("@reduxjs/toolkit").AsyncThunk<{
 }, {}>;
 export declare const retrieveEntityList: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
-}, void, {}>;
+}, string, {}>;
 export declare const updateLeadBusinessType: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: BusinessTypeFormValues;

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

@@ -91,18 +91,21 @@ export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token
             case 1:
                 data = (_a.sent()).data;
                 leadResponse = undefined;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 3];
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 4];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
                 leadResponse = _a.sent();
+                return [4, thunkApi.dispatch(retrieveEntityList(data === null || data === void 0 ? void 0 : data.id))];
+            case 3:
+                _a.sent();
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
                 }
                 if (data.step_name === 'business_info') {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
                 }
-                _a.label = 3;
-            case 3: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+                _a.label = 4;
+            case 4: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
         }
     });
 }); });
@@ -179,17 +182,13 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
         }
     });
 }); });
-export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var business, leadId, data;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                business = thunkApi.getState().business;
-                leadId = (_a = business.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.id;
-                return [4, API.leadService.retrieveEntityList(leadId)];
+export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function (leadId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4, API.leadService.retrieveEntityList(leadId)];
             case 1:
-                data = (_b.sent()).data;
+                data = (_a.sent()).data;
                 return [2, { data: data }];
         }
     });
@@ -212,11 +211,13 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_g.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(createAccount());
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
-                }
-                return [2, { data: data, formData: params }];
+                if (!!data.errors) return [3, 3];
+                return [4, thunkApi.dispatch(createAccount())];
+            case 2:
+                _g.sent();
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
+                _g.label = 3;
+            case 3: return [2, { data: data, formData: params }];
         }
     });
 }); });
@@ -366,6 +367,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
 var initialState = {
     error: null,
     loading: false,
+    customLoading: false,
     data: {
         businessCountry: defaultCountry,
         countries: [],
@@ -416,23 +418,28 @@ export var businessSlice = createSlice({
         builder
             .addCase(getCountries.fulfilled, function (state, action) {
             state.error = null;
+            state.customLoading = false;
             var _a = action.payload, businessCountry = _a.businessCountry, countries = _a.countries;
             state.data.countries = countries;
             state.data.businessCountry = businessCountry || defaultCountry;
         })
             .addCase(getCountries.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(getCountries.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e;
+            var _a;
             state.error = null;
-            var _f = action.payload, data = _f.data, token = _f.token, leadData = _f.leadData;
+            state.customLoading = false;
+            var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.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;
@@ -441,16 +448,10 @@ export var businessSlice = createSlice({
             state.data.verify.responseBody = __assign(__assign({}, data), leadData);
             state.data.verify.token = token;
             state.data.otpData.isNID = false;
-            if (!!((_c = (_b = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _b === void 0 ? void 0 : _b.license) === null || _c === void 0 ? void 0 : _c.issuing_date)) {
-                state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_e = (_d = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _d === void 0 ? void 0 : _d.license) === null || _e === void 0 ? void 0 : _e.issuing_date).format('YYYY-MM-DD'));
-            }
-            var activities = (leadData === null || leadData === void 0 ? void 0 : leadData.entity_activities) || [];
-            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
-            if (!!selectedActivity)
-                state.data.activitiesData.activities = [selectedActivity];
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyLeadOTP.pending, function (state) {
             state.loading = true;
@@ -474,13 +475,17 @@ export var businessSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(updateLeadIdentity.pending, function (state, action) {
-            var _a;
-            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
+            var _a, _b;
+            if ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend)
+                state.customLoading = true;
+            if ((_b = action.meta.arg) === null || _b === void 0 ? void 0 : _b.isResend)
+                state.loading = true;
             state.error = null;
         })
             .addCase(updateLeadIdentity.fulfilled, function (state, action) {
             var _a;
             state.loading = false;
+            state.customLoading = false;
             state.error = null;
             var _b = action.payload, data = _b.data, formData = _b.formData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
@@ -495,14 +500,17 @@ export var businessSlice = createSlice({
         })
             .addCase(updateLeadIdentity.rejected, function (state, action) {
             state.loading = false;
+            state.customLoading = false;
             state.error = action.error.message;
         })
             .addCase(retrieveEntityList.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(retrieveEntityList.fulfilled, function (state, action) {
             var _a, _b;
             state.error = null;
+            state.customLoading = false;
             var data = action.payload.data;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             var licenseList = [];
@@ -528,31 +536,32 @@ export var businessSlice = createSlice({
         })
             .addCase(retrieveEntityList.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(updateLeadBusinessType.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
             .addCase(updateLeadBusinessType.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e;
-            state.loading = true;
+            var _a, _b, _c, _d;
+            state.loading = false;
             state.error = null;
-            var _f = action.payload, data = _f.data, formData = _f.formData;
+            var _e = action.payload, data = _e.data, formData = _e.formData;
             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.businessTypeData = __assign(__assign({}, state.data.businessTypeData), formData);
-            if (!!((_c = (_b = data === null || data === void 0 ? void 0 : data.entity) === null || _b === void 0 ? void 0 : _b.license) === null || _c === void 0 ? void 0 : _c.issuing_date)) {
-                state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_e = (_d = data === null || data === void 0 ? void 0 : data.entity) === null || _d === void 0 ? void 0 : _d.license) === null || _e === void 0 ? void 0 : _e.issuing_date).format('YYYY-MM-DD'));
+            var entity = data.entity, entity_activities = data.entity_activities;
+            if (!!((_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date)) {
+                state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_d = (_c = data === null || data === void 0 ? void 0 : data.entity) === null || _c === void 0 ? void 0 : _c.license) === null || _d === void 0 ? void 0 : _d.issuing_date).format('YYYY-MM-DD'));
             }
-            var activities = (data === null || data === void 0 ? void 0 : data.entity_activities) || [];
+            var activities = entity_activities || [];
             var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
             if (!!selectedActivity)
                 state.data.activitiesData.activities = [selectedActivity];
-            var licenseList = (state.data.businessTypeData.responseBody || { licenseList: [] }).licenseList;
-            state.data.businessTypeData.responseBody = __assign(__assign({ licenseList: licenseList }, data), { activities: activities });
+            state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activities: activities });
         })
             .addCase(updateLeadBusinessType.rejected, function (state, action) {
             state.loading = false;

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

@@ -368,6 +368,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
 var initialState = {
     error: null,
     loading: false,
+    customLoading: false,
     data: {
         businessCountry: defaultCountry,
         countries: [],
@@ -432,6 +433,7 @@ export var connectSlice = createSlice({
         builder
             .addCase(getCountries.fulfilled, function (state, action) {
             state.error = null;
+            state.customLoading = false;
             var _a = action.payload, countries = _a.countries, businessCountry = _a.businessCountry;
             state.data.countries = countries;
             state.data.businessCountry = businessCountry || defaultCountry;
@@ -439,13 +441,16 @@ export var connectSlice = createSlice({
         })
             .addCase(getCountries.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(getCountries.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(createMobileAuth.fulfilled, function (state, action) {
             var _a;
             state.loading = false;
+            state.customLoading = false;
             state.error = null;
             var _b = action.payload, formData = _b.formData, response = _b.response;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
@@ -458,12 +463,15 @@ export var connectSlice = createSlice({
             state.data.otpData.isAbsher = false;
         })
             .addCase(createMobileAuth.pending, function (state, action) {
-            var _a;
-            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
+            if (action.meta.arg.isResend)
+                state.customLoading = true;
+            if (!action.meta.arg.isResend)
+                state.loading = true;
             state.error = null;
         })
             .addCase(createMobileAuth.rejected, function (state, action) {
             state.loading = false;
+            state.customLoading = false;
             state.error = action.error.message;
         })
             .addCase(createNIDAuth.fulfilled, function (state, action) {

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

@@ -164,6 +164,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
 var initialState = {
     error: null,
     loading: false,
+    customLoading: false,
     data: {
         verify: {
             token: ''
@@ -199,10 +200,12 @@ export var individualSlice = createSlice({
         builder
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
             var _a;
             state.error = null;
+            state.customLoading = false;
             var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.leadData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
@@ -214,6 +217,7 @@ export var individualSlice = createSlice({
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyLeadOTP.pending, function (state) {
             state.loading = true;

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

@@ -158,6 +158,7 @@ export var passwordSlice = createSlice({
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
             var _a;
             state.error = null;
+            state.customLoading = false;
             var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.leadData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
@@ -166,9 +167,14 @@ export var passwordSlice = createSlice({
             }
             state.data.verify.responseBody = __assign(__assign({}, data), leadData);
             state.data.verify.token = token;
+        })
+            .addCase(verifyLeadToken.pending, function (state, action) {
+            state.customLoading = true;
+            state.error = null;
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyPasswordLeadOTP.pending, function (state) {
             state.loading = true;

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

@@ -190,6 +190,7 @@ export var taxSlice = createSlice({
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
             var _a;
             state.error = null;
+            state.customLoading = false;
             var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.leadData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
@@ -198,9 +199,14 @@ export var taxSlice = createSlice({
             }
             state.data.verify.responseBody = __assign(__assign({}, data), leadData);
             state.data.verify.token = token;
+        })
+            .addCase(verifyLeadToken.pending, function (state, action) {
+            state.error = null;
+            state.customLoading = true;
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyTaxLeadOTP.pending, function (state) {
             state.loading = true;

package/build/features/business/Business.js

@@ -14,7 +14,7 @@ import React, { memo, useEffect } from 'react';
 import { useAppTheme, useAppDispatch, useAppSelector, useAppConfig, useErrorListener } from '../../hooks';
 import { settingsSelector } from '../../app/settings';
 import { FeatureContainer } from '../shared/Containers';
-import { getCountries, verifyLeadToken } from '../app/business/businessStore';
+import { businessSelector, getCountries, verifyLeadToken } from '../app/business/businessStore';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
@@ -28,6 +28,7 @@ var Business = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
+    var customLoading = useAppSelector(businessSelector).customLoading;
     var loading = useAppConfig(__assign({ navigation: BUSINESS_SCREENS_NAVIGATION }, props)).loading;
     useErrorListener();
     var activeScreen = data.activeScreen;
@@ -44,7 +45,7 @@ var Business = memo(function (props) {
     useEffect(function () {
         dispatch(getCountries());
     }, []);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ loading: settingLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: businessFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: businessFeatureScreens.map(function (_a, index) {
                     var Element = _a.element, name = _a.name;
                     var isActive = activeScreen.name === name;
                     return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

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

@@ -61,6 +61,10 @@ var Activities = function () {
         var activities = activitiesData.activities;
         methods.setValue('activities', activities);
     }, [activitiesData === null || activitiesData === void 0 ? void 0 : activitiesData.activities]);
+    React.useEffect(function () {
+        if (activitiesData.operationStartDate)
+            methods.setValue('operationStartDate', activitiesData.operationStartDate, { shouldValidate: true });
+    }, [activitiesData.operationStartDate]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());

package/build/features/business/screens/Activities/ActivitiesList.js

@@ -83,19 +83,18 @@ var ActivitiesList = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
+    var data = useSelector(businessSelector).data;
     var activitiesControl = useController({ name: 'activities', control: control });
     var controlValue = activitiesControl.field.value;
-    var data = useSelector(businessSelector).data;
     var businessTypeData = data.businessTypeData;
-    var response = businessTypeData.responseBody;
+    var activities = (businessTypeData.responseBody || {}).activities;
     var businessType = (_b = businessTypeData.selectedLicense) === null || _b === void 0 ? void 0 : _b.type;
     var isCR = businessType === BusinessType.CR;
     React.useEffect(function () {
-        var _a;
-        if (((_a = response === null || response === void 0 ? void 0 : response.activities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            setActivitiesMenuList(response === null || response === void 0 ? void 0 : response.activities);
+        if ((activities === null || activities === void 0 ? void 0 : activities.length) > 0) {
+            setActivitiesMenuList(activities);
         }
-    }, []);
+    }, [activities]);
     var onOpenList = function (event) {
         var _a;
         setAnchorEl(event.currentTarget);

package/build/features/business/screens/Activities/SalesChannels.js

@@ -84,13 +84,12 @@ var SalesChannels = function () {
     var channelsChecked = channelsControl.field.value;
     var warningMessage = (_a = channelsControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
     var data = useSelector(businessSelector).data;
-    var response = data.businessTypeData.responseBody;
+    var channelList = (data.businessTypeData.responseBody || {}).channelList;
     React.useEffect(function () {
-        var _a;
-        if (((_a = response === null || response === void 0 ? void 0 : response.channelList) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            setChannelsMenuList(response === null || response === void 0 ? void 0 : response.channelList);
+        if ((channelList === null || channelList === void 0 ? void 0 : channelList.length) > 0) {
+            setChannelsMenuList(channelList);
         }
-    }, [response === null || response === void 0 ? void 0 : response.channelList]);
+    }, [channelList]);
     var handleSalesChannelChange = function (event, checked) {
         var selected = channelsMenuList.find(function (channel) { return channel.id.toString() === event.target.id; });
         var isExists = channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.find(function (channel) { return channel.id === (selected === null || selected === void 0 ? void 0 : selected.id); });

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

@@ -21,13 +21,12 @@ import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import { useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { businessSelector, clearError, retrieveEntityList, updateLeadBusinessType } from '../../../app/business/businessStore';
+import { businessSelector, clearError, updateLeadBusinessType } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
 import { LicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
 var BusinessType = function (_a) {
     var _b = useSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error;
-    var businessTypeData = data.businessTypeData;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
@@ -37,10 +36,6 @@ var BusinessType = function (_a) {
         defaultValues: data.businessTypeData,
         mode: 'onChange'
     });
-    React.useEffect(function () {
-        if (!(businessTypeData === null || businessTypeData === void 0 ? void 0 : businessTypeData.responseBody))
-            dispatch(retrieveEntityList());
-    }, []);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());

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

@@ -52,7 +52,7 @@ var LicenseContainer = styled(Box)(function () { return ({
 }); });
 var LicenseNameText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
     var theme = _a.theme, isSelected = _a.isSelected;
-    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
+    return (__assign(__assign({ display: 'flex', color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
 });
 var LicenseList = function (_a) {
     var rest = __rest(_a, []);
@@ -64,7 +64,7 @@ var LicenseList = function (_a) {
     var dispatch = useAppDispatch();
     var _d = useFormContext(), setValue = _d.setValue, control = _d.control;
     var selectedLicenseControl = useController({ control: control, name: 'selectedLicense' });
-    var responseBody = businessTypeData.responseBody, selectedLicense = businessTypeData.selectedLicense;
+    var responseBody = businessTypeData.responseBody, selectedLicense = businessTypeData.selectedLicense, licenseNumber = businessTypeData.licenseNumber;
     var licenseList = (responseBody || { licenseList: [] }).licenseList;
     var onOpenLicenseList = function (event) {
         var _a;
@@ -77,12 +77,14 @@ var LicenseList = function (_a) {
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
     React.useEffect(function () {
-        var list = licenseList || [];
-        if (list.length > 0) {
-            setValue('licenseList', list);
+        if (licenseList.length > 0)
+            setValue('licenseList', licenseList);
+    }, [licenseList]);
+    React.useEffect(function () {
+        if (licenseList.length > 0) {
             if (!!selectedLicense) {
                 setValue('selectedLicense', selectedLicense, { shouldValidate: true });
-                setValue('licenseNumber', getLicenseNumber(selectedLicense), { shouldValidate: true });
+                setValue('licenseNumber', licenseNumber, { shouldValidate: true });
             }
         }
     }, [licenseList, selectedLicense]);
@@ -93,7 +95,7 @@ var LicenseList = function (_a) {
     var getLicenseName = function (item) {
         var _a, _b;
         if ((item === null || item === void 0 ? void 0 : item.type) === BusinessType.FL && !isOtherLicense(item))
-            return 'future_work';
+            return t('future_work');
         return (isAr ? (_a = item === null || item === void 0 ? void 0 : item.legal_name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.legal_name) === null || _b === void 0 ? void 0 : _b.en) || '';
     };
     var isOtherLicense = function (item) {
@@ -110,15 +112,18 @@ var LicenseList = function (_a) {
             setValue('licenseNumber', getLicenseNumber(license), { shouldValidate: true });
         onCloseLicenseList();
     };
+    var getLicenseFullName = function (item) {
+        if (isAr)
+            return (_jsxs(_Fragment, { children: [_jsx("span", { children: getLicenseName(item) }), _jsx("span", { children: ' - ' }), _jsx("span", { children: getLicenseNumber(item) })] }));
+        return (_jsxs(_Fragment, { children: [_jsx("span", { children: getLicenseNumber(item) }), _jsx("span", { children: ' - ' }), _jsx("span", { children: getLicenseName(item) })] }));
+    };
     var showLicenseNumber = !anchorEl;
     var selected = selectedLicenseControl.field.value;
     var licenseReadonly = !isOtherLicense(selected);
     var isCR = (selected === null || selected === void 0 ? void 0 : selected.type) === BusinessType.CR;
-    var flValue = isOtherLicense(selected) ? t(getLicenseName(selected)) : t(getLicenseNumber(selected));
-    return (_jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('choose_any_license'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: isCR ? t(getLicenseName(selected)) : flValue }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList || [], onSelectItem: onSelectItem, renderItem: function (item) {
-                        return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selected) }, { children: isOtherLicense(item)
-                                            ? t(getLicenseName(item))
-                                            : getLicenseNumber(item) + ' - ' + getLicenseName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selected) && _jsx(CheckIcon, {})] }));
+    var flValue = isOtherLicense(selected) ? t(getLicenseName(selected)) : getLicenseNumber(selected);
+    return (_jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('choose_any_license'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: isCR ? getLicenseName(selected) : flValue }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList || [], onSelectItem: onSelectItem, renderItem: function (item) {
+                        return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selected) }, { children: isOtherLicense(item) ? t(getLicenseName(item)) : getLicenseFullName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selected) && _jsx(CheckIcon, {})] }));
                     } }) })), _jsx(LicenseNumber, { show: showLicenseNumber, readOnly: licenseReadonly })] }));
 };
 export default React.memo(LicenseList);

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

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { CR_NUMBER_LENGTH, FL_NUMBER_LENGTH } from '../../../../constants';
-import { removeAllCharsFromNumber, removeAllOtherThanCharsAndNumber } from '../../../../utils';
+import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -31,7 +31,7 @@ var LicenseNumber = function (_a) {
     var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
     var handleFLNumberChange = function (_a) {
         var target = _a.target;
-        var value = isCR ? removeAllCharsFromNumber(target.value) : removeAllOtherThanCharsAndNumber(target.value);
+        var value = removeAllOtherThanCharsAndNumber(target.value);
         licenseNumberControl.field.onChange(value);
     };
     var clearLicenseNumber = function () {

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

@@ -52,7 +52,6 @@ var Customers = function (_a) {
         mode: 'onChange'
     });
     var onSubmit = function (data) {
-        console.log('data', data);
         dispatch(updateCustomersInfo(__assign({}, data)));
     };
     var onBack = function () {

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

@@ -55,22 +55,22 @@ var SuccessWithFlowButtons = function () {
     var t = useTranslation().t;
     return (_jsxs(ContainerStyled, { children: [_jsx(TextContainerStyled, { children: _jsxs(TitleStyled, { children: [t('ide_successfully_verified_message'), " "] }) }), _jsx(ButtonGroupStyled, { children: _jsx(FlowsButtons, { buttons: [
                         {
-                            title: t('tax_flow_completed'),
+                            title: t('tax_flow_pending'),
                             href: '#',
                             src: ICONS_NAMES.TAX_ICON
                         },
                         {
-                            title: t('individual_flow_completed'),
+                            title: t('individual_flow_pending'),
                             href: '#',
                             src: ICONS_NAMES.INDIVIDUAL_ICON
                         },
                         {
-                            title: t('bank_flow_completed'),
+                            title: t('bank_flow_pending'),
                             href: '#',
                             src: ICONS_NAMES.BANK_ICON
                         },
                         {
-                            title: t('password_flow_completed'),
+                            title: t('password_flow_pending'),
                             href: '#',
                             src: ICONS_NAMES.PASSWORD_ICON
                         }

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

@@ -59,7 +59,7 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     React.useEffect(function () {
-        if (error)
+        if (error && methods.formState.isValid)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());

package/build/features/password/screens/CreatePassword/CreatePassword.js

@@ -43,7 +43,6 @@ var CreatePassword = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var onSubmit = function (data) {
-        console.log('data', data);
         dispatch(handleNextScreenStep());
     };
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(Password, {}) }), _jsx(Button, __assign({ disableBack: true, isAr: isAr, disabled: !methods.formState.isValid, loading: false }, { children: t('next') }))] })) })) }));

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

@@ -44,6 +44,7 @@ var ButtonStyled = styled(Button, { shouldForwardProp: function (prop) { return
     var theme = _a.theme, hideIcon = _a.hideIcon;
     return ({
         paddingInlineStart: theme.spacing(0.75),
+        textTransform: 'none',
         backgroundColor: theme.palette.common.white,
         border: "1px solid ".concat(hideIcon ? theme.palette.primary.main : theme.palette.primary.light),
         color: hideIcon ? theme.palette.primary.main : theme.palette.primary.light,

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

@@ -63,7 +63,7 @@ var ButtonStyled = styled(Button, {
     shouldForwardProp: function (prop) { return prop !== 'isBack' && prop !== 'isLoading'; }
 })(function (_a) {
     var theme = _a.theme, isBack = _a.isBack, isLoading = _a.isLoading;
-    return (__assign({ paddingInlineStart: theme.spacing(2.5), marginInlineStart: isBack ? theme.spacing(-5) : theme.spacing(0), paddingLeft: isLoading ? 8 : 'auto', paddingRight: isLoading ? 8 : 'auto', transition: theme.transitions.create(['width', 'padding'], {
+    return (__assign({ paddingInlineStart: theme.spacing(2.5), marginInlineStart: isBack ? theme.spacing(-5) : theme.spacing(0), paddingLeft: isLoading ? 8 : 'auto', paddingRight: isLoading ? 8 : 'auto', textTransform: 'none', transition: theme.transitions.create(['width', 'padding'], {
             easing: theme.transitions.easing.easeInOut,
             duration: theme.transitions.duration.complex * 2
         }) }, (isLoading && {

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

@@ -34,6 +34,7 @@ var GMailButtonStyled = styled(Button)(function (_a) {
     var theme = _a.theme;
     return ({
         width: '100%',
+        textTransform: 'none',
         paddingInlineStart: theme.spacing(0.75),
         marginBottom: theme.spacing(1.875),
         backgroundColor: theme.palette.common.white,
@@ -53,8 +54,8 @@ var OutlookButtonStyled = styled(Button)(function (_a) {
     var theme = _a.theme;
     return ({
         width: '100%',
+        textTransform: 'none',
         paddingInlineStart: theme.spacing(0.75),
-        marginBottom: theme.spacing(1.875),
         backgroundColor: theme.palette.common.white,
         border: "1px solid ".concat(theme.palette.primary.main),
         color: theme.palette.primary.main,
@@ -72,9 +73,11 @@ var AppleButtonStyled = styled(Button)(function (_a) {
     var theme = _a.theme;
     return ({
         width: '100%',
+        textTransform: 'none',
         paddingInlineStart: theme.spacing(0.75),
         backgroundColor: theme.palette.common.white,
         border: "1px solid ".concat(theme.palette.primary.main),
+        marginBottom: theme.spacing(1.875),
         color: theme.palette.primary.main,
         '&:hover': {
             backgroundColor: theme.palette.primary.main,
@@ -88,5 +91,5 @@ var AppleButtonStyled = styled(Button)(function (_a) {
 });
 export default function EmailProvidersButtons(_a) {
     var gmail = _a.gmail, outlook = _a.outlook, apple = _a.apple;
-    return (_jsxs(ButtonBoxStyled, { children: [_jsx(Link, __assign({ href: gmail.href, underline: 'none', target: '_blank' }, { children: _jsx(GMailButtonStyled, __assign({ startIcon: _jsx(Image, { src: ICONS_NAMES.GMAIL_ICON, alt: gmail.title }), type: 'button' }, { children: gmail.title })) })), _jsx(Link, __assign({ href: outlook.href, underline: 'none', target: '_blank' }, { children: _jsx(OutlookButtonStyled, __assign({ startIcon: _jsx(Image, { src: ICONS_NAMES.OUTLOOK_ICON, alt: outlook.title }), type: 'button' }, { children: outlook.title })) })), _jsx(Link, __assign({ href: apple.href, underline: 'none', target: '_blank' }, { children: _jsx(AppleButtonStyled, __assign({ startIcon: _jsx(Image, { src: ICONS_NAMES.APPLE_MAIL_ICON, alt: apple.title }), type: 'button' }, { children: apple.title })) }))] }));
+    return (_jsxs(ButtonBoxStyled, { children: [_jsx(Link, __assign({ href: gmail.href, underline: 'none', target: '_blank' }, { children: _jsx(GMailButtonStyled, __assign({ startIcon: _jsx(Image, { src: ICONS_NAMES.GMAIL_ICON, alt: gmail.title }), type: 'button' }, { children: gmail.title })) })), _jsx(Link, __assign({ href: apple.href, underline: 'none', target: '_blank' }, { children: _jsx(AppleButtonStyled, __assign({ startIcon: _jsx(Image, { src: ICONS_NAMES.APPLE_MAIL_ICON, alt: apple.title }), type: 'button' }, { children: apple.title })) })), _jsx(Link, __assign({ href: outlook.href, underline: 'none', target: '_blank' }, { children: _jsx(OutlookButtonStyled, __assign({ startIcon: _jsx(Image, { src: ICONS_NAMES.OUTLOOK_ICON, alt: outlook.title }), type: 'button' }, { children: outlook.title })) }))] }));
 }

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

@@ -10,17 +10,20 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
 import Button from '../../../components/Button';
 import { alpha, styled } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import Link from '@mui/material/Link';
-var Image = styled('img')(function (_a) {
-    var theme = _a.theme;
+import { ICONS_NAMES } from '../../../constants';
+var Image = styled('img', { shouldForwardProp: function (prop) { return prop !== 'isAr'; } })(function (_a) {
+    var theme = _a.theme, isAr = _a.isAr;
     return ({
         width: theme.spacing(3),
         height: theme.spacing(3),
         fontSize: theme.spacing(3),
-        marginInlineStart: theme.spacing(1)
+        marginInlineStart: theme.spacing(1),
+        transform: isAr ? 'scaleX(-1)' : 'scaleX(1)'
     });
 });
 var ButtonBoxStyled = styled(Box)(function (_a) {
@@ -33,6 +36,7 @@ var ButtonStyled = styled(Button)(function (_a) {
     var theme = _a.theme;
     return ({
         width: '100%',
+        textTransform: 'none',
         paddingInlineStart: theme.spacing(0.75),
         backgroundColor: theme.palette.common.white,
         border: "1px solid ".concat(theme.palette.primary.main),
@@ -49,9 +53,10 @@ var ButtonStyled = styled(Button)(function (_a) {
 });
 export default function FlowsButtons(_a) {
     var buttons = _a.buttons;
-    return (_jsx(ButtonBoxStyled, { children: buttons.map(function (_a, index) {
+    var _b = React.useState(), index = _b[0], setIndex = _b[1];
+    return (_jsx(ButtonBoxStyled, { children: buttons.map(function (_a, idx) {
             var title = _a.title, href = _a.href, src = _a.src;
-            var isLast = index === buttons.length - 1;
-            return (_jsx(Link, __assign({ href: href, underline: 'none', target: '_blank' }, { children: _jsx(ButtonStyled, __assign({ sx: { mb: isLast ? 0 : 1.8 }, startIcon: _jsx(Image, { src: src, alt: title }), type: 'button' }, { children: title })) }), index));
+            var isLast = idx === buttons.length - 1;
+            return (_jsx(Link, __assign({ underline: 'none' }, { children: _jsx(ButtonStyled, __assign({ onMouseEnter: function () { return setIndex(idx); }, onMouseLeave: function () { return setIndex(undefined); }, sx: { mb: isLast ? 0 : 1.8 }, endIcon: _jsx(Image, { src: index === idx ? ICONS_NAMES.WHITE_ARROW : ICONS_NAMES.BLACK_ARROW }), startIcon: _jsx(Image, { src: src, alt: title }), type: 'button' }, { children: title })) }), idx));
         }) }));
 }

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

@@ -42,6 +42,7 @@ var ButtonStyled = styled(Button)(function (_a) {
     var theme = _a.theme;
     return ({
         paddingInlineStart: theme.spacing(0.75),
+        textTransform: 'none',
         backgroundColor: theme.palette.common.white,
         border: "1px solid ".concat(theme.palette.primary.main),
         color: theme.palette.primary.main,

package/build/features/shared/SuccessScreen/SuccessScreen.js

@@ -67,6 +67,6 @@ var ThankYou = function (_a) {
     var title = _a.title, showEmailProviders = _a.showEmailProviders, onSuccess = _a.onSuccess, successTitle = _a.successTitle;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    return (_jsxs(ContainerStyled, { children: [title && (_jsx(TextContainerStyled, { children: _jsxs(TitleStyled, { children: [title, " "] }) })), _jsx(IconStyled, { src: ICONS_NAMES.EMAIL_ICON, alt: 'loading...' }), showEmailProviders && (_jsx(MailBoxStyled, { children: _jsx(EmailProvidersButton, { gmail: { title: t('open_gmail'), href: 'https://mail.google.com/mail/u/0/#inbox' }, outlook: { title: t('open_outlook'), href: 'https://outlook.live.com/mail/0/' }, apple: { title: t('open_apple'), href: 'https://www.icloud.com/mail/' } }) })), onSuccess && !showEmailProviders && (_jsx(MailBoxStyled, { children: _jsx(AbsherButton, __assign({ hideIcon: true, isAr: isAr, onClick: onSuccess }, { children: t(successTitle || 'open_mail_box') })) }))] }));
+    return (_jsxs(ContainerStyled, { children: [title && (_jsx(TextContainerStyled, { children: _jsxs(TitleStyled, { children: [title, " "] }) })), _jsx(IconStyled, { src: ICONS_NAMES.EMAIL_ICON, alt: 'loading...' }), showEmailProviders && (_jsx(MailBoxStyled, { children: _jsx(EmailProvidersButton, { gmail: { title: t('gmail_btn_open_title'), href: 'https://mail.google.com/mail/u/0/#inbox' }, outlook: { title: t('outlook_btn_open_title'), href: 'https://outlook.live.com/mail/0/' }, apple: { title: t('apple_btn_open_title'), href: 'https://www.icloud.com/mail/' } }) })), onSuccess && !showEmailProviders && (_jsx(MailBoxStyled, { children: _jsx(AbsherButton, __assign({ hideIcon: true, isAr: isAr, onClick: onSuccess }, { children: t(successTitle || 'open_mail_box') })) }))] }));
 };
 export default React.memo(ThankYou);

package/package.json

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