@tap-payments/auth-jsconnect 2.0.6 → 2.0.8

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

@@ -50,6 +50,7 @@ export declare type BankFormValues = {
     beneficiaryName: string;
     bankName: string;
     bankStatementId?: string;
+    bankStatementFile?: File;
     uploading?: boolean;
     confirmPolicy: boolean;
 };

package/build/api/entity.d.ts

@@ -6,7 +6,7 @@ export declare type EntityInfoBody = {
     business_operation_start_at?: string;
     channel_services?: Array<string>;
     physical_store_available?: boolean;
-    yearly_sales_range?: string;
+    monthly_sales_range?: string;
     customers_served_monthly?: number;
     customers_base?: Array<string>;
     vat_id?: string;
@@ -32,14 +32,14 @@ export declare type EntityBankUpdateBody = {
         iban: string;
         swift_code?: string;
         account_number?: string;
+        is_acknowledged: boolean;
     };
-    is_acknowledged: boolean;
     step_name: string;
     encryption_contract?: Array<string>;
 };
 export declare type UploadFileBody = {
     file_link_create: boolean;
-    file: File | null;
+    file?: File;
     title: string | undefined;
     purpose: string;
 };

package/build/api/index.d.ts

@@ -60,6 +60,7 @@ declare const API: {
     };
     individualService: {
         getBrandList: (data: BrandListBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
+        retrieveIndividualInfo: (id: string) => Promise<any>;
     };
 };
 export type { ValidateOperatorBody, CreateAuthBody, VerifyAuthBody, CreateLeadBody, UpdateLeadBody, LeadVerifyBody, LeadOTPVerifyBody, CheckEmailBody, CheckBrandBody, LeadIdentityUpdateBody, EntityInfoBody, CreateAccountBody, EntityBankUpdateBody, CreatePasswordBody, BrandListBody, VerifyOperationAuthBody, ResetPasswordVerifyAuthBody };

package/build/api/individual.d.ts

@@ -4,5 +4,6 @@ export declare type BrandListBody = {
 };
 declare const individualService: {
     getBrandList: (data: BrandListBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
+    retrieveIndividualInfo: (id: string) => Promise<any>;
 };
 export { individualService };

package/build/api/individual.js

@@ -1,9 +1,16 @@
 import { ENDPOINT_PATHS } from '../constants';
-import instance from './axios';
+import instance, { httpClient } from './axios';
 var getBrandList = function (data, config) {
     return instance.post("".concat(ENDPOINT_PATHS.BRAND_LIST), data, config);
 };
+var retrieveIndividualInfo = function (id) {
+    return httpClient({
+        method: 'get',
+        url: "".concat(ENDPOINT_PATHS.INDIVIDUAL, "/").concat(id, "/info")
+    });
+};
 var individualService = {
-    getBrandList: getBrandList
+    getBrandList: getBrandList,
+    retrieveIndividualInfo: retrieveIndividualInfo
 };
 export { individualService };

package/build/components/FileInput/DragAndDrop.js

@@ -29,7 +29,6 @@ var DragAndDrop = function (_a) {
         noKeyboard: true,
         noClick: true,
         multiple: false,
-        accept: { 'image/jpeg': ['.jpeg'], 'image/png': ['.png'], 'image/jpg': ['.jpg'], 'application/pdf': ['.pdf'] },
         onDrop: function (files) {
             onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(files === null || files === void 0 ? void 0 : files[0]);
         }

package/build/constants/app.js

@@ -56,6 +56,8 @@ export var BUSINESS_SCREENS_NAVIGATION = [
         next: [
             'BUSINESS_IDBOD_STEP',
             'BUSINESS_BUSINESS_TYPE_STEP',
+            'BUSINESS_CUSTOMERS_STEP',
+            'BUSINESS_SUCCESS_STEP',
             'BUSINESS_ACTIVITIES_STEP',
             'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'
         ],

package/build/constants/validation.d.ts

@@ -6,6 +6,7 @@ export declare const FL_NUMBER_LENGTH = 8;
 export declare const CR_NUMBER_LENGTH = 10;
 export declare const SAUDI_NUMBER_LENGTH = 9;
 export declare const MAX_FILE_SIZE = 1000000;
+export declare const VALID_FILE_FORMATS: string[];
 export declare const REGEX_FULL_NAME: RegExp;
 export declare const REGEX_WEBSITE: RegExp;
 export declare const REGEX_BENEFICIARY_NAME: RegExp;

package/build/constants/validation.js

@@ -6,6 +6,7 @@ export var FL_NUMBER_LENGTH = 8;
 export var CR_NUMBER_LENGTH = 10;
 export var SAUDI_NUMBER_LENGTH = 9;
 export var MAX_FILE_SIZE = 1000000;
+export var VALID_FILE_FORMATS = ['image/jpeg', 'image/png', 'image/jpg', 'application/pdf'];
 export var REGEX_FULL_NAME = /^([a-zA-Z]{2,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,})$/g;
 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;

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

@@ -20,7 +20,6 @@ export declare const createBankAccount: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: BankFormValues;
 }, BankFormValues, {}>;
-export declare const uploadBankStatement: import("@reduxjs/toolkit").AsyncThunk<any, File, {}>;
 export declare const checkIbanBank: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, {

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

@@ -154,56 +154,51 @@ export var retrieveEntityInfo = createAsyncThunk('retrieveBankEntityInfo', funct
     });
 }); });
 export var createBankAccount = createAsyncThunk('createBankAccount', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, bank, iban, beneficiaryName, bank_name, requestBody, data;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var _a, settings, bank, iban, beneficiaryName, bank_name, fileResponse, uploadPayload, requestBody, data;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, bank = _a.bank;
                 iban = params.iban;
                 beneficiaryName = params.beneficiaryName;
                 bank_name = params.bankName;
+                fileResponse = undefined;
+                uploadPayload = {
+                    file_link_create: true,
+                    title: (_b = params.bankStatementFile) === null || _b === void 0 ? void 0 : _b.name,
+                    purpose: 'identity_document',
+                    file: params.bankStatementFile
+                };
+                if (!params.bankStatementFile) return [3, 2];
+                return [4, API.entityService.uploadFileInfo(uploadPayload)];
+            case 1:
+                fileResponse = _g.sent();
+                _g.label = 2;
+            case 2:
                 requestBody = {
-                    wallet_id: (_c = (_b = bank.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.merchant) === null || _c === void 0 ? void 0 : _c.wallet_id,
-                    is_acknowledged: params.confirmPolicy,
+                    wallet_id: (_d = (_c = bank.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.merchant) === null || _d === void 0 ? void 0 : _d.wallet_id,
                     bank_account: {
                         iban: iban,
                         beneficiary_name: beneficiaryName,
                         bank_name: bank_name,
-                        bank_statement_file_id: params.bankStatementId
+                        bank_statement_file_id: fileResponse === null || fileResponse === void 0 ? void 0 : fileResponse.id,
+                        is_acknowledged: params.confirmPolicy
                     },
                     step_name: BANK_STEP_NAMES.BANK_INFO,
                     encryption_contract: ['bank_account.iban', 'bank_account.beneficiary_name', 'bank_account.bank_name']
                 };
                 return [4, API.entityService.createBankAccount(requestBody)];
-            case 1:
-                data = (_f.sent()).data;
+            case 3:
+                data = (_g.sent()).data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
+                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }
     });
 }); });
-export var uploadBankStatement = createAsyncThunk('uploadBankStatement', function (file, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var requestBody, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                requestBody = {
-                    file_link_create: true,
-                    title: file === null || file === void 0 ? void 0 : file.name,
-                    purpose: 'identity_document',
-                    file: file
-                };
-                return [4, API.entityService.uploadFileInfo(requestBody)];
-            case 1:
-                data = _a.sent();
-                return [2, data];
-        }
-    });
-}); });
 export var checkIbanBank = createAsyncThunk('checkIbanBank', function (_a) {
     var iban = _a.iban, cancelToken = _a.cancelToken, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -424,20 +419,6 @@ export var bankSlice = createSlice({
             if (action.error.message === 'Aborted')
                 return;
             state.error = action.error.message;
-        })
-            .addCase(uploadBankStatement.pending, function (state) {
-            state.data.bankData.uploading = true;
-            state.error = null;
-        })
-            .addCase(uploadBankStatement.fulfilled, function (state, action) {
-            state.data.bankData.uploading = false;
-            state.error = null;
-            var id = action.payload.id;
-            state.data.bankData.responseBody = { fileId: id };
-        })
-            .addCase(uploadBankStatement.rejected, function (state, action) {
-            state.data.bankData.uploading = false;
-            state.error = action.error.message;
         });
     }
 });

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

@@ -108,7 +108,7 @@ 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;
+    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) {
@@ -128,7 +128,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
                 data = (_f.sent()).data;
-                if (!!data.errors) return [3, 9];
+                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:
@@ -137,31 +137,42 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 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);
+                hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
+                hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
                 if (!isNID) return [3, 3];
                 thunkApi.dispatch(handleNextScreenStep());
-                return [3, 9];
+                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))];
             case 4:
                 _f.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 9];
+                return [3, 11];
             case 5:
                 if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 6];
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
-                return [3, 9];
+                return [3, 11];
             case 6:
-                if (!hasBusinessCRInfoCompleted) return [3, 8];
-                return [4, thunkApi.dispatch(retrieveChannels())];
+                if (!hasBusinessCustomersCompleted) return [3, 7];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP'));
+                return [3, 11];
             case 7:
+                if (!hasBusinessCRActivitiesCompleted) return [3, 8];
+                thunkApi.dispatch(retrieveDataList());
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
+                return [3, 11];
+            case 8:
+                if (!hasBusinessCRInfoCompleted) return [3, 10];
+                return [4, thunkApi.dispatch(retrieveChannels())];
+            case 9:
                 _f.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
-                return [3, 9];
-            case 8:
+                return [3, 11];
+            case 10:
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                _f.label = 9;
-            case 9: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }) }];
+                _f.label = 11;
+            case 11: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }) }];
         }
     });
 }); });
@@ -389,11 +400,11 @@ export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', functio
                     customers_base: customerBase,
                     id: id,
                     customers_served_monthly: parseInt(((_c = params.expectedCustomer) === null || _c === void 0 ? void 0 : _c.id) || '0'),
-                    yearly_sales_range: ((_d = params.expectedSale) === null || _d === void 0 ? void 0 : _d.id) || '',
+                    monthly_sales_range: ((_d = params.expectedSale) === null || _d === void 0 ? void 0 : _d.id) || '',
                     agree_refund: params.refundPolicy,
                     agree_chargeback: params.transactionPolicy,
                     step_name: stepName,
-                    encryption_contract: ['customers_served_monthly', 'yearly_sales_range']
+                    encryption_contract: ['customers_served_monthly', 'monthly_sales_range']
                 };
                 return [4, API.entityService.updateEntityInfo(requestBody)];
             case 1:

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

@@ -310,9 +310,9 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
 }); });
 export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connect, instagram, twitter, _b, mobileData, nidData, otpData, brandData, isAbsher, responseBody, isExistingUser, isOther, brand, payload, data;
-    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    return __generator(this, function (_q) {
+        switch (_q.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 instagram = !!((_c = params.links) === null || _c === void 0 ? void 0 : _c.instagram) ? "".concat(INSTAGRAM_URL, "/").concat((_d = params.links) === null || _d === void 0 ? void 0 : _d.instagram) : '';
@@ -321,19 +321,19 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 isAbsher = otpData.isAbsher;
                 responseBody = (isAbsher ? nidData : mobileData).responseBody;
                 isExistingUser = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) === false;
-                isOther = ((_g = params.selectedBrandItem) === null || _g === void 0 ? void 0 : _g.id) === 'other';
+                isOther = !!((_g = params.selectedBrandItem) === null || _g === void 0 ? void 0 : _g.id) ? ((_h = params.selectedBrandItem) === null || _h === void 0 ? void 0 : _h.id) === 'other' : true;
                 brand = __assign({ name: {
                         en: params.brandName,
                         ar: params.brandName,
                         zh: params.brandName
-                    }, website: (_h = params.links) === null || _h === void 0 ? void 0 : _h.website, social: [twitter, instagram] }, (isExistingUser &&
+                    }, website: (_j = params.links) === null || _j === void 0 ? void 0 : _j.website, social: [twitter, instagram] }, (isExistingUser &&
                     !isOther && {
-                    id: (_j = params.selectedBrandItem) === null || _j === void 0 ? void 0 : _j.id,
+                    id: (_k = params.selectedBrandItem) === null || _k === void 0 ? void 0 : _k.id,
                     name: undefined
                 }));
                 payload = {
                     brand: brand,
-                    id: (isExistingUser ? (_k = brandData.responseBody) === null || _k === void 0 ? void 0 : _k.lead_id : (_l = otpData.responseBody) === null || _l === void 0 ? void 0 : _l.lead_id) || '',
+                    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,
                     step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_MERCHANT,
                     encryption_contract: [
@@ -347,10 +347,10 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_p.sent()).data;
+                data = (_q.sent()).data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_o = (_m = settings.data.appConfig).onStepCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, settings.data.activeScreen.name, params);
+                    (_p = (_o = settings.data.appConfig).onStepCompleted) === null || _p === void 0 ? void 0 : _p.call(_o, settings.data.activeScreen.name, params);
                 }
                 return [2, { response: data, formData: params }];
         }

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

@@ -11,10 +11,16 @@ export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<{
 export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<{
     sourceIncome: any;
     monthlyIncome: any;
-    countryCode: string;
     occupation: any;
-    countries: import("../../../@types").CountryCode[];
 }, string, {}>;
+export declare const retrieveIndividualInfo: import("@reduxjs/toolkit").AsyncThunk<{
+    data: any;
+    countries: import("../../../@types").CountryCode[];
+    countryCode: string;
+}, {
+    id: string;
+    countryCode: string;
+}, {}>;
 export declare const retrieveEntityInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, string, {}>;

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

@@ -53,10 +53,9 @@ import { hasKey } from '../../../utils';
 import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
 import { INDIVIDUAl_STEP_NAMES } from '../../../constants';
 export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var payload, data, leadResponse, _a, steps, entity, hasTaxCompleted;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var payload, data, leadResponse, _a, steps, entity, individual_id, hasTaxCompleted;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -64,32 +63,35 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_d.sent()).data;
+                data = (_b.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, 7];
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 8];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadResponse = _d.sent();
-                _a = leadResponse.data, steps = _a.steps, entity = _a.entity;
+                leadResponse = _b.sent();
+                _a = leadResponse.data, steps = _a.steps, entity = _a.entity, individual_id = _a.individual_id;
                 hasTaxCompleted = hasKey(steps, INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS);
                 if (!(data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 3];
                 thunkApi.dispatch(handleCurrentActiveScreen('INDIVIDUAL_VERIFY_STEP'));
-                return [3, 7];
+                return [3, 8];
             case 3:
                 if (!hasTaxCompleted) return [3, 5];
                 return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
             case 4:
-                _d.sent();
+                _b.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 7];
+                return [3, 8];
             case 5:
-                if (!(data.step_name === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO)) return [3, 7];
-                return [4, thunkApi.dispatch(retrieveDataList((_c = (_b = leadResponse.data) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.country))];
+                if (!(data.step_name === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO)) return [3, 8];
+                return [4, thunkApi.dispatch(retrieveDataList(entity === null || entity === void 0 ? void 0 : entity.country))];
             case 6:
-                _d.sent();
+                _b.sent();
+                return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: individual_id, countryCode: entity === null || entity === void 0 ? void 0 : entity.country }))];
+            case 7:
+                _b.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                _d.label = 7;
-            case 7: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+                _b.label = 8;
+            case 8: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
         }
     });
 }); });
@@ -110,8 +112,8 @@ export var resendOTP = createAsyncThunk('resendOTPIndividual', function (params,
         }
     });
 }); });
-export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, sourceIncome, monthlyIncome, occupation, settings, countries;
+export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', function (countryCode) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, sourceIncome, monthlyIncome, occupation;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0: return [4, Promise.all([
@@ -121,18 +123,34 @@ export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', fun
                 ])];
             case 1:
                 _a = _b.sent(), sourceIncome = _a[0].data, monthlyIncome = _a[1].data, occupation = _a[2];
-                settings = thunkApi.getState().settings;
-                countries = settings.data.countries;
                 return [2, {
                         sourceIncome: sourceIncome,
                         monthlyIncome: monthlyIncome,
-                        countryCode: countryCode,
-                        occupation: occupation,
-                        countries: countries
+                        occupation: occupation
                     }];
         }
     });
 }); });
+export var retrieveIndividualInfo = createAsyncThunk('individualRetrieveIndividualInfo', function (_a, thunkApi) {
+    var id = _a.id, countryCode = _a.countryCode;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var data, settings, countries;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4, API.individualService.retrieveIndividualInfo(id)];
+                case 1:
+                    data = _b.sent();
+                    settings = thunkApi.getState().settings;
+                    countries = settings.data.countries;
+                    return [2, {
+                            data: data,
+                            countries: countries,
+                            countryCode: countryCode
+                        }];
+            }
+        });
+    });
+});
 export var retrieveEntityInfo = createAsyncThunk('retrieveIndividualEntityInfo', function (entityID) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     return __generator(this, function (_a) {
@@ -145,8 +163,8 @@ export var retrieveEntityInfo = createAsyncThunk('retrieveIndividualEntityInfo',
     });
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, individual, settings, responseBody, payload, data, steps, hasIndividualCompleted;
-    var _b, _c, _d, _e, _f;
+    var _a, individual, settings, responseBody, payload, data, _b, steps, individual_id, entity, hasIndividualCompleted;
+    var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
             case 0:
@@ -154,7 +172,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 responseBody = individual.data.verify.responseBody;
                 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: (_c = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _c === void 0 ? void 0 : _c.service_name,
                     verify_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token,
                     step_name: INDIVIDUAl_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
@@ -162,22 +180,25 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
                 data = (_g.sent()).data;
-                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 5];
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
-                steps = responseBody === null || responseBody === void 0 ? void 0 : responseBody.steps;
+                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 6];
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, { otp: params.otp });
+                _b = responseBody || {}, steps = _b.steps, individual_id = _b.individual_id, entity = _b.entity;
                 hasIndividualCompleted = hasKey(steps, INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS);
                 if (!hasIndividualCompleted) return [3, 3];
-                return [4, thunkApi.dispatch(retrieveEntityInfo((_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.entity) === null || _e === void 0 ? void 0 : _e.id))];
+                return [4, thunkApi.dispatch(retrieveEntityInfo((_f = responseBody === null || responseBody === void 0 ? void 0 : responseBody.entity) === null || _f === void 0 ? void 0 : _f.id))];
             case 2:
                 _g.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 5];
-            case 3: return [4, thunkApi.dispatch(retrieveDataList((_f = responseBody === null || responseBody === void 0 ? void 0 : responseBody.entity) === null || _f === void 0 ? void 0 : _f.country))];
+                return [3, 6];
+            case 3: return [4, thunkApi.dispatch(retrieveDataList(entity === null || entity === void 0 ? void 0 : entity.country))];
             case 4:
+                _g.sent();
+                return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: individual_id, countryCode: entity === null || entity === void 0 ? void 0 : entity.country }))];
+            case 5:
                 _g.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                _g.label = 5;
-            case 5: return [2, { data: data, formData: __assign({}, params) }];
+                _g.label = 6;
+            case 6: return [2, { data: data, formData: __assign({}, params) }];
         }
     });
 }); });
@@ -347,24 +368,42 @@ export var individualSlice = createSlice({
             .addCase(retrieveDataList.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, countryCode = _a.countryCode, countries = _a.countries, occupation = _a.occupation;
+            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, occupation = _a.occupation;
             var data = state.data.individualData.responseBody;
             state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncome || [], monthlyIncomeList: monthlyIncome || [], occupationList: occupation || [] });
-            var selectedSourceIncome = sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome[0];
+        })
+            .addCase(retrieveDataList.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(retrieveIndividualInfo.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(retrieveIndividualInfo.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            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]);
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
-            var selectedMonthlyIncome = monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome[2];
+            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]);
             if (!!selectedMonthlyIncome)
                 state.data.individualData.monthlyIncome = selectedMonthlyIncome;
-            if (!!countryCode) {
-                var employerLocation = countries.find(function (country) { return country.iso2 === countryCode; });
+            var code = (info === null || info === void 0 ? void 0 : info.employer_country) || countryCode;
+            if (!!code) {
+                var employerLocation = countries.find(function (country) { return country.iso2 === code; });
                 state.data.individualData.employerLocation = employerLocation;
             }
-            var selectedOccupation = occupation === null || occupation === void 0 ? void 0 : occupation[0];
+            var selectedOccupation = (occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (occupation) { var _a, _b; return ((_a = occupation === null || occupation === void 0 ? void 0 : occupation.name_en) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === ((_b = info === null || info === void 0 ? void 0 : info.occupation) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()); })) || (occupationList === null || occupationList === void 0 ? void 0 : occupationList[0]);
             if (!!selectedOccupation)
                 state.data.individualData.occupation = selectedOccupation;
+            state.data.individualData.isPEP = info === null || info === void 0 ? void 0 : info.is_relative_PEP;
+            state.data.individualData.isInfluencer = info === null || info === void 0 ? void 0 : info.is_influencer;
         })
-            .addCase(retrieveDataList.rejected, function (state, action) {
+            .addCase(retrieveIndividualInfo.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
         })

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

@@ -210,9 +210,8 @@ export var updateLeadSuccess = createAsyncThunk('passwordUpdateLeadSuccess', fun
 }); });
 export var verifyOperationToken = createAsyncThunk('verifyOperationToken', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var token, leadId, payload, data;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 token = params.token, leadId = params.leadId;
                 payload = {
@@ -221,11 +220,8 @@ export var verifyOperationToken = createAsyncThunk('verifyOperationToken', funct
                 };
                 return [4, API.authService.verifyAuth(payload)];
             case 1:
-                data = (_c.sent()).data;
+                data = (_a.sent()).data;
                 thunkApi.dispatch(handleNextScreenStep('PASSWORD_CREATE_PASSWORD_STEP'));
-                if ((data === null || data === void 0 ? void 0 : data.errors) || (data === null || data === void 0 ? void 0 : data.mw_error)) {
-                    alert((_b = (_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.description);
-                }
                 return [2, { data: data, token: token, leadId: leadId }];
         }
     });

package/build/features/bank/screens/BankDetails/BankStatement.js

@@ -1,12 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from 'react';
 import { styled } from '@mui/material/styles';
 import { ScreenContainer } from '../../../../features/shared/Containers';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import UploadFile from '../../../../features/shared/UploadFile';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { bankSelector, uploadBankStatement } from '../../../../features/app/bank/bankStore';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -14,25 +11,17 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
     });
 });
 var BankStatement = function () {
-    var _a, _b;
-    var dispatch = useAppDispatch();
-    var data = useAppSelector(bankSelector).data;
+    var _a;
     var t = useTranslation().t;
     var control = useFormContext().control;
-    var bankStatementControl = useController({ name: 'bankStatementId', control: control });
-    var error = (_a = bankStatementControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
-    var uploading = data.bankData.uploading;
+    var bankStatementFileControl = useController({ name: 'bankStatementFile', control: control });
+    var error = (_a = bankStatementFileControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
     var handleBankStatementChange = function (file) {
-        dispatch(uploadBankStatement(file));
+        bankStatementFileControl.field.onChange(file);
     };
     var handleReset = function () {
-        bankStatementControl.field.onChange('');
+        bankStatementFileControl.field.onChange(null);
     };
-    React.useEffect(function () {
-        var _a, _b;
-        if ((_a = data.bankData.responseBody) === null || _a === void 0 ? void 0 : _a.fileId)
-            bankStatementControl.field.onChange((_b = data.bankData.responseBody) === null || _b === void 0 ? void 0 : _b.fileId);
-    }, [(_b = data.bankData.responseBody) === null || _b === void 0 ? void 0 : _b.fileId]);
-    return (_jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_bank_statement'), dragTitle: t('drag_and_drop'), uploadTitle: t('title_upload_file'), onFileUploaded: handleBankStatementChange, loading: uploading, onReset: handleReset, error: error && t(error) }) }));
+    return (_jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_bank_statement'), dragTitle: t('drag_and_drop'), uploadTitle: t('title_upload_file'), onFileUploaded: handleBankStatementChange, isSubmitting: bankStatementFileControl.formState.isSubmitted, onReset: handleReset, error: error && t(error) }) }));
 };
 export default BankStatement;

package/build/features/bank/screens/BankDetails/validation.d.ts

@@ -4,17 +4,20 @@ export declare const BankValidation: yup.ObjectSchema<import("yup/lib/object").A
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     bankStatementId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    bankStatementFile: any;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     bankStatementId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    bankStatementFile: any;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     iban: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     bankName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     beneficiaryName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     bankStatementId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    bankStatementFile: any;
     confirmPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
 }>>>;

package/build/features/bank/screens/BankDetails/validation.js

@@ -1,4 +1,4 @@
-import { REGEX_BENEFICIARY_NAME } from '../../../../constants';
+import { REGEX_BENEFICIARY_NAME, VALID_FILE_FORMATS } from '../../../../constants';
 import * as yup from 'yup';
 export var BankValidation = yup.object().shape({
     iban: yup
@@ -13,5 +13,15 @@ export var BankValidation = yup.object().shape({
         .matches(REGEX_BENEFICIARY_NAME, 'beneficiary_name_invalid')
         .required('beneficiary_name_required'),
     bankStatementId: yup.string().optional(),
+    bankStatementFile: yup
+        .mixed()
+        .test({
+        test: function (value) {
+            if (!!value)
+                return VALID_FILE_FORMATS.includes(value === null || value === void 0 ? void 0 : value.type) ? true : this.createError({ message: 'alert_file_upload' });
+            return true;
+        }
+    })
+        .optional(),
     confirmPolicy: yup.boolean().required('alert_bank_confirm').isTrue('alert_bank_confirm')
 });

package/build/features/business/screens/Activities/ActivitiesList.d.ts

@@ -20,7 +20,7 @@ export declare const InputStyled: import("@emotion/styled").StyledComponent<Pick
 export declare const CheckIconStyled: import("@emotion/styled").StyledComponent<{
     children?: React.ReactNode;
     classes?: Partial<import("@mui/material").SvgIconClasses> | undefined;
-    color?: "inherit" | "disabled" | "error" | "primary" | "secondary" | "action" | "info" | "success" | "warning" | undefined;
+    color?: "inherit" | "disabled" | "error" | "info" | "primary" | "secondary" | "action" | "success" | "warning" | undefined;
     fontSize?: "small" | "inherit" | "medium" | "large" | undefined;
     htmlColor?: string | undefined;
     inheritViewBox?: boolean | undefined;

package/build/features/business/screens/Customers/CustomerLocations.d.ts

@@ -35,7 +35,7 @@ export declare const NameContainer: import("@emotion/styled").StyledComponent<im
 export declare const CheckIconStyled: import("@emotion/styled").StyledComponent<{
     children?: React.ReactNode;
     classes?: Partial<import("@mui/material").SvgIconClasses> | undefined;
-    color?: "inherit" | "disabled" | "error" | "primary" | "secondary" | "action" | "info" | "success" | "warning" | undefined;
+    color?: "inherit" | "disabled" | "error" | "info" | "primary" | "secondary" | "action" | "success" | "warning" | undefined;
     fontSize?: "small" | "inherit" | "medium" | "large" | undefined;
     htmlColor?: string | undefined;
     inheritViewBox?: boolean | undefined;
@@ -49,7 +49,7 @@ export declare const CheckIconStyled: import("@emotion/styled").StyledComponent<
 export declare const RemainingCheck: import("@emotion/styled").StyledComponent<{
     children?: React.ReactNode;
     classes?: Partial<import("@mui/material").SvgIconClasses> | undefined;
-    color?: "inherit" | "disabled" | "error" | "primary" | "secondary" | "action" | "info" | "success" | "warning" | undefined;
+    color?: "inherit" | "disabled" | "error" | "info" | "primary" | "secondary" | "action" | "success" | "warning" | undefined;
     fontSize?: "small" | "inherit" | "medium" | "large" | undefined;
     htmlColor?: string | undefined;
     inheritViewBox?: boolean | undefined;

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

@@ -71,7 +71,7 @@ var Merchant = function (_a) {
             methods.setError('brandName', { message: 'Profile Name already exists' });
     }, [responseBody]);
     React.useEffect(function () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (isNewUser === true) {
             setUserType(ValidationOptions.NEW_USER);
         }
@@ -89,7 +89,8 @@ var Merchant = function (_a) {
             methods.clearErrors();
             var twitter = ((_b = (_a = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.social) === null || _a === void 0 ? void 0 : _a.find(function (item) { return item.includes('twitter.com'); })) === null || _b === void 0 ? void 0 : _b.replaceAll("".concat(TWITTER_URL, "/"), '')) || '';
             var instagram = ((_d = (_c = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.social) === null || _c === void 0 ? void 0 : _c.find(function (item) { return item.includes('instagram.com'); })) === null || _d === void 0 ? void 0 : _d.replaceAll("".concat(INSTAGRAM_URL, "/"), '')) || '';
-            var sites_1 = __assign(__assign({}, links), { website: formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.website, twitter: twitter, instagram: instagram });
+            var website = (_e = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.website) === null || _e === void 0 ? void 0 : _e.replaceAll(/(https|http):\/\//g, '');
+            var sites_1 = __assign(__assign({}, links), { website: website, twitter: twitter, instagram: instagram });
             setTimeout(function () { return methods.setValue('links', sites_1, { shouldValidate: true }); }, 100);
         }
     }, [formDataSelectedBrand, isNewUser]);

package/build/features/individual/screens/AdditionalIndividualInfo/AdditionalIndividualInfo.js

@@ -45,13 +45,14 @@ var AdditionalIndividualInfo = function (_a) {
     var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var settingsData = useAppSelector(settingsSelector).data;
     var countries = settingsData.countries;
+    var _c = data.individualData || {}, sourceIncome = _c.sourceIncome, monthlyIncome = _c.monthlyIncome, employerLocation = _c.employerLocation, occupation = _c.occupation, isPEP = _c.isPEP, isInfluencer = _c.isInfluencer;
     var methods = useForm({
         resolver: yupResolver(IndividualInfoValidationSchema),
         defaultValues: data.individualData,
         mode: 'onChange'
     });
-    var _c = React.useState(), listActive = _c[0], setListActive = _c[1];
-    var _d = React.useState(false), employerFieldsActive = _d[0], setEmployerFieldsActive = _d[1];
+    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    var _e = React.useState(false), employerFieldsActive = _e[0], setEmployerFieldsActive = _e[1];
     React.useEffect(function () {
         var _a, _b;
         if (((_b = (_a = methods.getValues('sourceIncome')) === null || _a === void 0 ? void 0 : _a.name_en) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'salary')
@@ -61,10 +62,23 @@ var AdditionalIndividualInfo = function (_a) {
         }
     }, [methods.watch('sourceIncome')]);
     React.useEffect(function () {
-        if (data.individualData.employerLocation) {
-            methods.setValue('employerLocation', data.individualData.employerLocation);
+        if (!!sourceIncome) {
+            methods.setValue('sourceIncome', sourceIncome);
         }
-    }, [data.individualData.employerLocation]);
+        if (!!monthlyIncome) {
+            methods.setValue('monthlyIncome', monthlyIncome);
+        }
+        if (!!employerLocation) {
+            methods.setValue('employerLocation', employerLocation);
+        }
+        if (!!occupation) {
+            methods.setValue('occupation', occupation);
+        }
+        if (isPEP !== undefined)
+            methods.setValue('isPEP', isPEP);
+        if (isInfluencer !== undefined)
+            methods.setValue('isInfluencer', isInfluencer);
+    }, [data.individualData]);
     var onSubmit = function (data) {
         dispatch(updateIndividualInfo(data));
     };

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

@@ -72,7 +72,7 @@ var OTP = function (_a) {
     };
     var disabled = !methods.formState.isValid || !!error;
     var phone = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.auth_info) === null || _c === void 0 ? void 0 : _c.phone;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('opt_nid_sent_title', { provider: 'ABSHER' }), ' ', !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 OTP.defaultProps = {};
 export default React.memo(OTP);

package/build/features/shared/UploadFile/UploadFile.d.ts

@@ -13,9 +13,9 @@ interface UploadFileProps {
     dragTitle: string;
     uploadTitle: string;
     error?: string;
-    loading?: boolean;
+    isSubmitting?: boolean;
     onFileUploaded: (file: File) => void;
     onReset: () => void;
 }
-declare const UploadFile: ({ label, required, dragTitle, uploadTitle, loading, error, onFileUploaded, onReset }: UploadFileProps) => JSX.Element;
+declare const UploadFile: ({ label, required, dragTitle, uploadTitle, isSubmitting, error, onFileUploaded, onReset }: UploadFileProps) => JSX.Element;
 export default UploadFile;

package/build/features/shared/UploadFile/UploadFile.js

@@ -21,8 +21,6 @@ import Collapse from '../../../components/Collapse';
 import Warning from '../../../components/Warning';
 import Icon from '../../../components/Icon';
 import { ICONS_NAMES } from '../../../constants';
-import { useTranslation } from 'react-i18next';
-import Loader from '../../../components/Loader';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -61,17 +59,18 @@ export var InputContainerStyled = styled(Box)(function (_a) {
     });
 });
 var UploadFile = function (_a) {
-    var label = _a.label, required = _a.required, dragTitle = _a.dragTitle, uploadTitle = _a.uploadTitle, loading = _a.loading, error = _a.error, onFileUploaded = _a.onFileUploaded, onReset = _a.onReset;
+    var label = _a.label, required = _a.required, dragTitle = _a.dragTitle, uploadTitle = _a.uploadTitle, isSubmitting = _a.isSubmitting, error = _a.error, onFileUploaded = _a.onFileUploaded, onReset = _a.onReset;
     var _b = React.useState(''), fileName = _b[0], setFileName = _b[1];
-    var t = useTranslation().t;
     var handleFileChange = function (file) {
         setFileName(file === null || file === void 0 ? void 0 : file.name);
         onFileUploaded === null || onFileUploaded === void 0 ? void 0 : onFileUploaded(file);
     };
     var handleReset = function () {
-        setFileName('');
-        onReset === null || onReset === void 0 ? void 0 : onReset();
+        if (!isSubmitting) {
+            setFileName('');
+            onReset === null || onReset === void 0 ? void 0 : onReset();
+        }
     };
-    return (_jsxs(FeatureStyled, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: label }), required && _jsx(Mandatory, {})] }), _jsx(Collapse, __assign({ in: !fileName }, { children: _jsxs(InputContainerStyled, { children: [_jsx(DragAndDrop, { title: dragTitle, onSuccess: handleFileChange }), _jsx(UploadInput, { title: uploadTitle, onChange: handleFileChange })] }) })), _jsx(Collapse, __assign({ in: !!fileName }, { children: _jsxs(InputContainerStyled, { children: [_jsx(BoxStyled, { children: loading ? t('loading_bank_statement') : fileName }), _jsxs(UploadBoxStyled, __assign({ onClick: handleReset }, { children: [_jsx(Collapse, __assign({ in: !loading }, { children: _jsx(IconStyled, { src: ICONS_NAMES.DELETE_ICON }) })), _jsx(Collapse, __assign({ in: loading }, { children: _jsx(Loader, { innerColor: 'white', outerColor: 'white', toggleAnimation: true, style: { width: 30, height: 30 }, svgStyle: { width: 30, height: 30 } }) }))] }))] }) })), _jsx(Collapse, __assign({ in: !!error, timeout: 400 }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: error })) }))] }));
+    return (_jsxs(FeatureStyled, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: label }), required && _jsx(Mandatory, {})] }), _jsx(Collapse, __assign({ in: !fileName }, { children: _jsxs(InputContainerStyled, { children: [_jsx(DragAndDrop, { title: dragTitle, onSuccess: handleFileChange }), _jsx(UploadInput, { title: uploadTitle, onChange: handleFileChange })] }) })), _jsx(Collapse, __assign({ in: !!fileName }, { children: _jsxs(InputContainerStyled, { children: [_jsx(BoxStyled, { children: fileName }), _jsx(UploadBoxStyled, __assign({ onClick: handleReset }, { children: _jsx(IconStyled, { src: ICONS_NAMES.DELETE_ICON }) }))] }) })), _jsx(Collapse, __assign({ in: !!error, timeout: 400 }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: error })) }))] }));
 };
 export default UploadFile;

package/package.json

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