@tap-payments/auth-jsconnect 2.0.8 → 2.0.9

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

@@ -3,6 +3,9 @@ export declare type MobileFormValues = {
     mobile: string | null;
     countryCode: CountryCode;
 };
+export declare type EmailFormValues = {
+    email: string | null;
+};
 export declare type OTPFormValues = {
     otp: string;
 };

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

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

package/build/api/entity.d.ts

@@ -50,5 +50,6 @@ declare const entityService: {
     retrieveEntityInfo: (entity_id: string, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     updateIndividualInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;
     uploadFileInfo: (data: UploadFileBody) => Promise<any>;
+    retrieveBusinessInfo: (entity_id: string) => Promise<any>;
 };
 export { entityService };

package/build/api/entity.js

@@ -41,12 +41,19 @@ var updateIndividualInfo = function (_a) {
         data: data
     });
 };
+var retrieveBusinessInfo = function (entity_id) {
+    return httpClient({
+        method: 'get',
+        url: "".concat(ENDPOINT_PATHS.ENTITY, "/").concat(entity_id, "/info")
+    });
+};
 var entityService = {
     createEntityInfo: createEntityInfo,
     updateEntityInfo: updateEntityInfo,
     createBankAccount: createBankAccount,
     retrieveEntityInfo: retrieveEntityInfo,
     updateIndividualInfo: updateIndividualInfo,
-    uploadFileInfo: uploadFileInfo
+    uploadFileInfo: uploadFileInfo,
+    retrieveBusinessInfo: retrieveBusinessInfo
 };
 export { entityService };

package/build/api/index.d.ts

@@ -37,6 +37,7 @@ declare const API: {
         retrieveEntityInfo: (entity_id: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
         updateIndividualInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;
         uploadFileInfo: (data: import("./entity").UploadFileBody) => Promise<any>;
+        retrieveBusinessInfo: (entity_id: string) => Promise<any>;
     };
     availabilityServices: {
         checkEmail: (data: CheckEmailBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;

package/build/app/rootReducer.d.ts

@@ -6,5 +6,6 @@ declare const rootReducer: {
     tax: import("redux").Reducer<import("../features/app/tax/taxStore").TaxState, import("redux").AnyAction>;
     individual: import("redux").Reducer<import("../features/app/individual/individualStore").IndividualState, import("redux").AnyAction>;
     password: import("redux").Reducer<import("../features/app/password/passwordStore").PasswordState, import("redux").AnyAction>;
+    signIn: import("redux").Reducer<import("../features/app/signIn/signInStore").SignInState, import("redux").AnyAction>;
 };
 export default rootReducer;

package/build/app/rootReducer.js

@@ -5,6 +5,7 @@ import bank from '../features/app/bank/bankStore';
 import tax from '../features/app/tax/taxStore';
 import individual from '../features/app/individual/individualStore';
 import password from '../features/app/password/passwordStore';
+import signIn from '../features/app/signIn/signInStore';
 var rootReducer = {
     settings: settings,
     connect: connect,
@@ -12,6 +13,7 @@ var rootReducer = {
     bank: bank,
     tax: tax,
     individual: individual,
-    password: password
+    password: password,
+    signIn: signIn
 };
 export default rootReducer;

package/build/app/store.d.ts

@@ -7,6 +7,7 @@ export declare const store: import("@reduxjs/toolkit").EnhancedStore<{
     tax: import("../features/app/tax/taxStore").TaxState;
     individual: import("../features/app/individual/individualStore").IndividualState;
     password: import("../features/app/password/passwordStore").PasswordState;
+    signIn: import("../features/app/signIn/signInStore").SignInState;
 }, import("redux").AnyAction, import("@reduxjs/toolkit").MiddlewareArray<[import("redux-thunk").ThunkMiddleware<{
     settings: import("./settings").SettingsState;
     connect: import("../features/app/connect/connectStore").ConnectState;
@@ -15,6 +16,7 @@ export declare const store: import("@reduxjs/toolkit").EnhancedStore<{
     tax: import("../features/app/tax/taxStore").TaxState;
     individual: import("../features/app/individual/individualStore").IndividualState;
     password: import("../features/app/password/passwordStore").PasswordState;
+    signIn: import("../features/app/signIn/signInStore").SignInState;
 }, import("redux").AnyAction, undefined>]>>;
 export declare type AppDispatch = typeof store.dispatch;
 export declare type RootState = ReturnType<typeof store.getState>;

package/build/assets/locales/ar.json

@@ -243,5 +243,6 @@
     "bank": "bank",
     "reset_password_success_title": "لقد ارسلنا رسالة بريدية إليك",
     "reset_password_success_description": "تحقق من بريدك الإلكتروني لإعادة تعيين كلمة المرور الخاصة بك.",
-    "license_name_label": "اسم الرخصة"
+    "license_name_label": "اسم الرخصة",
+    "email_button_label": "تواصل مع البريد الإلكتروني"
 }

package/build/assets/locales/en.json

@@ -263,5 +263,6 @@
     "bank": "bank",
     "reset_password_success_title": "We sent you an email",
     "reset_password_success_description": "Check your email to reset your password.",
-    "license_name_label": "License Name"
+    "license_name_label": "License Name",
+    "email_button_label": "Continue with Email"
 }

package/build/components/FileInput/DragAndDrop.js

@@ -27,7 +27,7 @@ var DragAndDrop = function (_a) {
     var _b = useDropzone({
         maxFiles: 1,
         noKeyboard: true,
-        noClick: true,
+        noClick: false,
         multiple: false,
         onDrop: function (files) {
             onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(files === null || files === void 0 ? void 0 : files[0]);

package/build/constants/app.d.ts

@@ -18,6 +18,7 @@ export declare const INDIVIDUAL_SCREENS_NAVIGATION: Array<ScreenStepNavigation>;
 export declare const PASSWORD_SCREENS_NAVIGATION: Array<ScreenStepNavigation>;
 export declare const BANK_SCREENS_NAVIGATION: Array<ScreenStepNavigation>;
 export declare const TAX_SCREENS_NAVIGATION: Array<ScreenStepNavigation>;
+export declare const SigIn_SCREENS_NAVIGATION: Array<ScreenStepNavigation>;
 export declare const DefaultDeviceInfo: {
     source: string;
     device: {
@@ -79,6 +80,14 @@ export declare const CONNECT_STEP_NAMES: {
     VERIFY_AUTH_PASSWORD: string;
     CONNECT_SUCCESS: string;
 };
+export declare const SignIn_STEP_NAMES: {
+    CREATE_AUTH_MOBILE: string;
+    VERIFY_AUTH_MOBILE: string;
+    CREATE_AUTH_EMAIL: string;
+    VERIFY_AUTH_EMAIL: string;
+    VERIFY_AUTH_MOBILE_OTP: string;
+    VERIFY_AUTH_EMAIL_OTP: string;
+};
 export declare const BUSINESS_STEP_NAMES: {
     BUSINESS_INFO: string;
     PHONE_AUTH: string;

package/build/constants/app.js

@@ -253,6 +253,32 @@ export var TAX_SCREENS_NAVIGATION = [
         order: 5
     }
 ];
+export var SigIn_SCREENS_NAVIGATION = [
+    {
+        name: 'SIGIN_MOBILE_STEP',
+        next: ['SIGIN_OTP_STEP', 'SIGIN_PASSWORD_STEP'],
+        prev: 'SIGIN_EMAIL_STEP',
+        order: 1
+    },
+    {
+        name: 'SIGIN_EMAIL_STEP',
+        next: ['SIGIN_OTP_STEP', 'SIGIN_PASSWORD_STEP'],
+        prev: 'SIGIN_MOBILE_STEP',
+        order: 1
+    },
+    {
+        name: 'SIGIN_PASSWORD_STEP',
+        next: 'SIGIN_OTP_STEP',
+        prev: ['SIGIN_MOBILE_STEP', 'SIGIN_EMAIL_STEP'],
+        order: 2
+    },
+    {
+        name: 'SIGIN_OTP_STEP',
+        next: '',
+        prev: ['SIGIN_MOBILE_STEP', 'SIGIN_EMAIL_STEP'],
+        order: 3
+    }
+];
 export var DefaultDeviceInfo = {
     source: 'browser',
     device: {
@@ -314,6 +340,14 @@ export var CONNECT_STEP_NAMES = {
     VERIFY_AUTH_PASSWORD: 'connect_verify_auth_password',
     CONNECT_SUCCESS: 'connect_completed'
 };
+export var SignIn_STEP_NAMES = {
+    CREATE_AUTH_MOBILE: 'signIn_create_auth_mobile',
+    VERIFY_AUTH_MOBILE: 'signIn_verify_auth_mobile',
+    CREATE_AUTH_EMAIL: 'signIn_create_auth_email',
+    VERIFY_AUTH_EMAIL: 'signIn_verify_auth_email',
+    VERIFY_AUTH_MOBILE_OTP: 'signIn_verify_auth_mobile_otp',
+    VERIFY_AUTH_EMAIL_OTP: 'signIn_verify_auth_email_otp'
+};
 export var BUSINESS_STEP_NAMES = {
     BUSINESS_INFO: 'business_info',
     PHONE_AUTH: 'business_phone_auth',

package/build/constants/validation.d.ts

@@ -11,3 +11,4 @@ export declare const REGEX_FULL_NAME: RegExp;
 export declare const REGEX_WEBSITE: RegExp;
 export declare const REGEX_BENEFICIARY_NAME: RegExp;
 export declare const REGEX_BRAND_NAME: RegExp;
+export declare const EMAIL_MAX_LENGTH = 50;

package/build/constants/validation.js

@@ -11,3 +11,4 @@ export var REGEX_FULL_NAME = /^([a-zA-Z]{2,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-z
 export var REGEX_WEBSITE = /^[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,63}(:[0-9]{1,5})?(\/.*)?$/;
 export var REGEX_BENEFICIARY_NAME = /^([\u0600-\u065F\u066A-\u06EF\u06FA-\u06FFa-zA-Z\s])*$/g;
 export var REGEX_BRAND_NAME = /(.*[a-zA-Z0-9]){3}/g;
+export var EMAIL_MAX_LENGTH = 50;

package/build/features/app/bank/bankStore.d.ts

@@ -41,6 +41,7 @@ export interface BankData {
     flowName: FlowsTypes;
 }
 export interface BankState extends SharedState<BankData> {
+    customLoading?: boolean;
 }
 export declare const bankSlice: import("@reduxjs/toolkit").Slice<BankState, {
     clearError: (state: BankState) => void;

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

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActivitiesFormValues, CustomersFormValues, BusinessTypeFormValues, NIDFormValues, OTPFormValues, ResponseData, SharedState, FlowsTypes } from '../../../@types';
+import { ActivitiesFormValues, CustomersFormValues, BusinessTypeFormValues, NIDFormValues, OTPFormValues, ResponseData, SharedState, FlowsTypes, Activity, SalesChannel } from '../../../@types';
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     leadData: any;
@@ -14,6 +14,7 @@ export declare const verifyLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
         isNID: boolean;
         otp: string;
     };
+    entityInfo: any;
 }, OTPFormValues, {}>;
 export declare const updateLeadIdentity: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
@@ -41,8 +42,8 @@ export declare const createAccount: import("@reduxjs/toolkit").AsyncThunk<{
 export declare const updateActivitiesInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: {
-        activities: import("../../../@types").Activity[] | undefined;
-        salesChannels: import("../../../@types").SalesChannel[];
+        activities: Activity[] | undefined;
+        salesChannels: SalesChannel[];
         operationStartDate: string;
     };
 }, ActivitiesFormValues, {}>;
@@ -79,6 +80,7 @@ export interface BusinessData {
     flowName: FlowsTypes;
 }
 export interface BusinessState extends SharedState<BusinessData> {
+    customLoading?: boolean;
 }
 export declare const businessSlice: import("@reduxjs/toolkit").Slice<BusinessState, {
     clearError: (state: BusinessState) => void;

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

@@ -108,32 +108,33 @@ 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, verifyResponse, stepName, payload, data, steps, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var _a, business, settings, isNID, responseBody, verifyResponse, stepName, entityID, payload, data, steps, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, entityInfo;
+    var _b, _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), business = _a.business, settings = _a.settings;
                 isNID = business.data.otpData.isNID;
                 responseBody = (isNID ? business.data.nidData : business.data.verify).responseBody;
                 verifyResponse = business.data.verify.responseBody;
                 stepName = isNID ? BUSINESS_STEP_NAMES.IDENTITY_VERIFY_AUTH : BUSINESS_STEP_NAMES.PHONE_AUTH;
+                entityID = (_c = (_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.id;
                 payload = {
                     data: params.otp,
-                    service_name: (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _b === void 0 ? void 0 : _b.service_name,
+                    service_name: (_d = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _d === void 0 ? void 0 : _d.service_name,
                     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 = (_f.sent()).data;
+                data = (_h.sent()).data;
                 if (!!data.errors) return [3, 11];
                 thunkApi.dispatch(updateStepName(stepName));
                 return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 2:
-                _f.sent();
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
+                _h.sent();
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, { otp: params.otp });
                 steps = responseBody === null || responseBody === void 0 ? void 0 : responseBody.steps;
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
                 hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO);
@@ -144,9 +145,9 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 return [3, 11];
             case 3:
                 if (!hasBusinessCompleted) return [3, 5];
-                return [4, thunkApi.dispatch(retrieveEntityInfo((_e = verifyResponse === null || verifyResponse === void 0 ? void 0 : verifyResponse.entity) === null || _e === void 0 ? void 0 : _e.id))];
+                return [4, thunkApi.dispatch(retrieveEntityInfo((_g = verifyResponse === null || verifyResponse === void 0 ? void 0 : verifyResponse.entity) === null || _g === void 0 ? void 0 : _g.id))];
             case 4:
-                _f.sent();
+                _h.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
                 return [3, 11];
             case 5:
@@ -159,6 +160,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 return [3, 11];
             case 7:
                 if (!hasBusinessCRActivitiesCompleted) return [3, 8];
+                thunkApi.dispatch(retrieveChannels());
                 thunkApi.dispatch(retrieveDataList());
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [3, 11];
@@ -166,13 +168,16 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 if (!hasBusinessCRInfoCompleted) return [3, 10];
                 return [4, thunkApi.dispatch(retrieveChannels())];
             case 9:
-                _f.sent();
+                _h.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
                 return [3, 11];
             case 10:
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                _f.label = 11;
-            case 11: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }) }];
+                _h.label = 11;
+            case 11: return [4, API.entityService.retrieveBusinessInfo(entityID)];
+            case 12:
+                entityInfo = _h.sent();
+                return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }), entityInfo: entityInfo }];
         }
     });
 }); });
@@ -582,10 +587,10 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyLeadOTP.fulfilled, function (state, action) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             state.loading = false;
             state.error = null;
-            var _d = action.payload, data = _d.data, formData = _d.formData;
+            var _e = action.payload, data = _e.data, formData = _e.formData, entityInfo = _e.entityInfo;
             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;
@@ -593,21 +598,29 @@ export var businessSlice = createSlice({
             }
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            var _e = state.data.verify.responseBody || {}, entity = _e.entity, entity_activities = _e.entity_activities, business_type = _e.business_type;
-            var issuingDate = (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
+            var _f = state.data.verify.responseBody || {}, entity = _f.entity, entity_activities = _f.entity_activities, business_type = _f.business_type;
+            var issuingDate = entityInfo ? entityInfo.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);
             }
+            var channels = (_c = state.data.businessTypeData.responseBody) === null || _c === void 0 ? void 0 : _c.channelList;
+            var selectedChannels = (channels === null || channels === void 0 ? void 0 : channels.filter(function (channel) {
+                return entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.channel_services.find(function (storedChannel) { return channel.name_en.toLowerCase() === storedChannel.toLowerCase(); });
+            })) || [channels === null || channels === void 0 ? void 0 : channels[0]];
+            if ((selectedChannels === null || selectedChannels === void 0 ? void 0 : selectedChannels.length) > 0)
+                state.data.activitiesData.salesChannels = selectedChannels;
             var activities = entity_activities || [];
-            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
-            if (!!selectedActivity)
-                state.data.activitiesData.activities = [selectedActivity];
+            var selectedActivity = (activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
+                return entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.activities.find(function (value) { var _a; return ((_a = activity.en) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === value.toLowerCase(); });
+            })) || [activities === null || activities === void 0 ? void 0 : activities[0]];
+            if ((selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0)
+                state.data.activitiesData.activities = selectedActivity;
             state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
             if (!!(entity === null || entity === void 0 ? void 0 : entity.license)) {
                 state.data.businessTypeData.selectedLicense = {
                     legal_name: entity === null || entity === void 0 ? void 0 : entity.legal_name,
-                    license: { number: (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.number },
+                    license: { number: (_d = entity === null || entity === void 0 ? void 0 : entity.license) === null || _d === void 0 ? void 0 : _d.number },
                     type: business_type
                 };
             }

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

@@ -31,7 +31,6 @@ export declare const retrieveLead: import("@reduxjs/toolkit").AsyncThunk<{
 }, {}>;
 export declare const createLead: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
-    brandResponse: any;
     formData: {
         individualId: string;
         stepName: string;
@@ -40,6 +39,7 @@ export declare const createLead: import("@reduxjs/toolkit").AsyncThunk<{
     individualId: string;
     stepName: string;
 }, {}>;
+export declare const retrieveBrandList: import("@reduxjs/toolkit").AsyncThunk<any, string, {}>;
 export declare const updateLeadIndividual: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: IndividualFormValues;
@@ -83,6 +83,7 @@ export interface ConnectData {
     flowName: FlowsTypes;
 }
 export interface ConnectState extends SharedState<ConnectData> {
+    customLoading?: boolean;
 }
 export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectState, {
     clearError: (state: ConnectState) => void;

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

@@ -207,24 +207,30 @@ export var verifyAuth = createAsyncThunk('verifyAuth', function (params, thunkAp
                 return [4, API.authService.verifyAuth(payload)];
             case 1:
                 data = (_e.sent()).data;
-                if (!data.errors) {
-                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
-                    if (responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) {
-                        params_1 = {
-                            leadId: data === null || data === void 0 ? void 0 : data.lead_id,
-                            stepName: 'CONNECT_INDIVIDUAL_STEP'
-                        };
-                        thunkApi.dispatch(retrieveLead(params_1));
-                    }
-                    else {
-                        params_2 = {
-                            individualId: data === null || data === void 0 ? void 0 : data.individual_id,
-                            stepName: 'CONNECT_MERCHANT_INFO_STEP'
-                        };
-                        thunkApi.dispatch(createLead(params_2));
-                    }
+                if (!!data.errors) return [3, 4];
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
+                if (!(responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user)) return [3, 2];
+                params_1 = {
+                    leadId: data === null || data === void 0 ? void 0 : data.lead_id,
+                    stepName: 'CONNECT_INDIVIDUAL_STEP'
+                };
+                thunkApi.dispatch(retrieveLead(params_1));
+                return [3, 4];
+            case 2: return [4, thunkApi.dispatch(retrieveBrandList(data === null || data === void 0 ? void 0 : data.individual_id))];
+            case 3:
+                _e.sent();
+                if (!(data === null || data === void 0 ? void 0 : data.lead_id)) {
+                    params_2 = {
+                        individualId: data === null || data === void 0 ? void 0 : data.individual_id,
+                        stepName: 'CONNECT_MERCHANT_INFO_STEP'
+                    };
+                    thunkApi.dispatch(createLead(params_2));
                 }
-                return [2, { response: data, formData: params }];
+                else {
+                    thunkApi.dispatch(handleNextScreenStep('CONNECT_MERCHANT_INFO_STEP'));
+                }
+                _e.label = 4;
+            case 4: return [2, { response: data, formData: params }];
         }
     });
 }); });
@@ -241,9 +247,9 @@ export var retrieveLead = createAsyncThunk('retrieveLead', function (params, thu
     });
 }); });
 export var createLead = createAsyncThunk('createLead', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, businessCountry, payload, brandPayload, _a, brandResponse, data;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var settings, businessCountry, payload, data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 settings = thunkApi.getState().settings;
                 businessCountry = settings.data.businessCountry;
@@ -251,19 +257,28 @@ export var createLead = createAsyncThunk('createLead', function (params, thunkAp
                     individual_id: params.individualId,
                     country_code: businessCountry.iso2
                 };
-                brandPayload = {
-                    individual_id: params.individualId
-                };
-                return [4, Promise.all([
-                        API.individualService.getBrandList(brandPayload),
-                        API.leadService.createLead(payload)
-                    ])];
+                return [4, API.leadService.createLead(payload)];
             case 1:
-                _a = _b.sent(), brandResponse = _a[0].data, data = _a[1].data;
+                data = (_a.sent()).data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep(params.stepName));
                 }
-                return [2, { response: data, brandResponse: brandResponse, formData: params }];
+                return [2, { response: data, formData: params }];
+        }
+    });
+}); });
+export var retrieveBrandList = createAsyncThunk('retrieveBrandList', function (individualId) { return __awaiter(void 0, void 0, void 0, function () {
+    var brandPayload, data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                brandPayload = {
+                    individual_id: individualId
+                };
+                return [4, API.individualService.getBrandList(brandPayload)];
+            case 1:
+                data = (_a.sent()).data;
+                return [2, data];
         }
     });
 }); });
@@ -334,7 +349,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 payload = {
                     brand: brand,
                     id: (isExistingUser ? (_l = brandData.responseBody) === null || _l === void 0 ? void 0 : _l.lead_id : (_m = otpData.responseBody) === null || _m === void 0 ? void 0 : _m.lead_id) || '',
-                    terms_conditions_accepted: params.termAndConditionChecked,
+                    terms_conditions_accepted: isExistingUser && !isOther ? undefined : params.termAndConditionChecked,
                     step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_MERCHANT,
                     encryption_contract: [
                         'brand.name.en',
@@ -590,6 +605,7 @@ export var connectSlice = createSlice({
             }
             state.data.otpData.responseBody = response;
             state.data.otpData.otp = formData.otp;
+            state.data.brandData.responseBody = __assign(__assign({}, state.data.brandData.responseBody), response);
         })
             .addCase(verifyAuth.pending, function (state) {
             state.loading = true;
@@ -629,30 +645,45 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(createLead.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a;
             state.loading = false;
             state.error = null;
-            var _c = action.payload, response = _c.response, brandResponse = _c.brandResponse;
+            var response = action.payload.response;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            var brandError = (((_b = brandResponse === null || brandResponse === void 0 ? void 0 : brandResponse.errors) === null || _b === void 0 ? void 0 : _b[0]) || {}).description;
             if (description) {
                 state.error = description;
                 return;
             }
+            state.data.brandData.responseBody = __assign(__assign({}, state.data.brandData.responseBody), response);
+        })
+            .addCase(createLead.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(createLead.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(retrieveBrandList.fulfilled, function (state, action) {
+            var _a;
+            state.loading = false;
+            state.error = null;
+            var response = action.payload;
+            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             var brandList = undefined;
-            if (!brandError) {
-                brandList = Array.isArray(brandResponse === null || brandResponse === void 0 ? void 0 : brandResponse.brands) ? __spreadArray(__spreadArray([], brandResponse === null || brandResponse === void 0 ? void 0 : brandResponse.brands, true), [OTHER_BRAND], false) : [];
+            if (!description) {
+                brandList = Array.isArray(response === null || response === void 0 ? void 0 : response.brands) ? __spreadArray(__spreadArray([], response === null || response === void 0 ? void 0 : response.brands, true), [OTHER_BRAND], false) : [];
                 var brand = brandList === null || brandList === void 0 ? void 0 : brandList[0];
                 if (!!brand)
                     state.data.brandData.selectedBrandItem = brand;
             }
-            state.data.brandData.responseBody = __assign({ brands: brandList || [] }, response);
+            state.data.brandData.responseBody = __assign(__assign({}, state.data.brandData.responseBody), { brands: brandList || [] });
         })
-            .addCase(createLead.pending, function (state) {
+            .addCase(retrieveBrandList.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(createLead.rejected, function (state, action) {
+            .addCase(retrieveBrandList.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
         })

package/build/features/app/individual/individualStore.d.ts

@@ -48,6 +48,7 @@ export interface IndividualData {
     flowName: FlowsTypes;
 }
 export interface IndividualState extends SharedState<IndividualData> {
+    customLoading?: boolean;
 }
 export declare const individualSlice: import("@reduxjs/toolkit").Slice<IndividualState, {
     clearError: (state: IndividualState) => void;

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

@@ -386,7 +386,7 @@ export var individualSlice = createSlice({
             var _a = action.payload, data = _a.data, countries = _a.countries, countryCode = _a.countryCode;
             var info = (data || {}).info;
             var _b = state.data.individualData.responseBody || {}, sourceIncomeList = _b.sourceIncomeList, monthlyIncomeList = _b.monthlyIncomeList, occupationList = _b.occupationList;
-            var selectedSourceIncome = (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList.find(function (source) { var _a, _b, _c, _d; return ((_a = source === null || source === void 0 ? void 0 : source.name_en) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === ((_d = (_c = (_b = info === null || info === void 0 ? void 0 : info.source_income) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.name_en) === null || _d === void 0 ? void 0 : _d.toLocaleLowerCase()); })) || (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
+            var selectedSourceIncome = (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList.find(function (source) { var _a, _b, _c; return ((_a = source === null || source === void 0 ? void 0 : source.name_en) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === ((_c = (_b = info === null || info === void 0 ? void 0 : info.source_income) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.toLocaleLowerCase()); })) || (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) { var _a, _b; return ((_a = income === null || income === void 0 ? void 0 : income.name_en) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === ((_b = info === null || info === void 0 ? void 0 : info.actual_income) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()); })) || (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList[2]);

package/build/features/app/password/passwordStore.d.ts

@@ -62,6 +62,7 @@ export interface PasswordData {
     flowName: FlowsTypes;
 }
 export interface PasswordState extends SharedState<PasswordData> {
+    customLoading?: boolean;
 }
 export declare const passwordSlice: import("@reduxjs/toolkit").Slice<PasswordState, {
     clearError: (state: PasswordState) => void;