@tap-payments/auth-jsconnect 2.1.31-test → 2.1.33-test

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

@@ -275,38 +275,48 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
     });
 }); });
 export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, individual, _b, id, type, _c, civilID, signatureFileId, documentBody, requestBody, data;
-    var _d, _e, _f, _g, _h, _j, _k, _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var _a, settings, individual, _b, id, type, civilID, signatureFileId, businessCountry, documentsList, requestBody, documentBody, data;
+    var _c, _d, _e, _f, _g, _h, _j, _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
-                _b = ((_e = (_d = individual.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.notification) === null || _e === void 0 ? void 0 : _e.recipient) || {}, id = _b.id, type = _b.type;
-                _c = individual.data.attachmentsData, civilID = _c.civilID, signatureFileId = _c.signatureFileId;
-                documentBody = [];
+                _b = ((_d = (_c = individual.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.notification) === null || _d === void 0 ? void 0 : _d.recipient) || {}, id = _b.id, type = _b.type;
+                civilID = params.civilID, signatureFileId = params.signatureFileId;
+                businessCountry = settings.data.businessCountry;
+                documentsList = [];
                 if (!!civilID)
-                    documentBody.push(civilID);
+                    documentsList.push({ type: 'Civil ID File', images: [civilID] });
                 if (!!signatureFileId)
-                    documentBody.push(signatureFileId);
+                    documentsList.push({ type: 'Signature File', images: [signatureFileId] });
                 requestBody = {
                     id: id,
                     type: type,
-                    occupation: { id: (_f = params.occupation) === null || _f === void 0 ? void 0 : _f.id },
+                    occupation: { id: (_e = params.occupation) === null || _e === void 0 ? void 0 : _e.id },
                     employer_name: params.employerName,
-                    employer_country: (_g = params.employerLocation) === null || _g === void 0 ? void 0 : _g.iso2,
-                    source_income: [{ id: (_h = params.sourceIncome) === null || _h === void 0 ? void 0 : _h.id }],
-                    monthly_income: { id: (_j = params.monthlyIncome) === null || _j === void 0 ? void 0 : _j.id },
+                    employer_country: (_f = params.employerLocation) === null || _f === void 0 ? void 0 : _f.iso2,
+                    source_income: [{ id: (_g = params.sourceIncome) === null || _g === void 0 ? void 0 : _g.id }],
+                    monthly_income: { id: (_h = params.monthlyIncome) === null || _h === void 0 ? void 0 : _h.id },
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
-                    documents: documentBody,
                     encryption_contract: ['employer_name', 'employer_country'],
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
                 };
-                return [4, API.individualService.updateIndividual(requestBody)];
+                documentBody = {
+                    individual_type_id: id || '',
+                    country: businessCountry.iso2,
+                    documents: documentsList
+                };
+                if (!(documentsList.length > 0)) return [3, 2];
+                return [4, API.entityService.updateDocumentInfo(documentBody)];
             case 1:
-                data = (_m.sent()).data;
+                _l.sent();
+                _l.label = 2;
+            case 2: return [4, API.individualService.updateIndividual(requestBody)];
+            case 3:
+                data = (_l.sent()).data;
                 thunkApi.dispatch(handleNextScreenStep());
-                (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, requestBody);
+                (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, requestBody);
                 return [2, { data: data, formData: params }];
         }
     });
@@ -331,7 +341,7 @@ export var uploadCivilIdFile = createAsyncThunk('uploadCivilIdFile', function (_
                     return [4, API.entityService.uploadFileInfo(uploadPayload, { onUploadProgress: onUploadProgress })];
                 case 1:
                     data = _b.sent();
-                    return [2, { data: data }];
+                    return [2, { data: data, file: file }];
             }
         });
     });
@@ -356,7 +366,7 @@ export var uploadSignatureFile = createAsyncThunk('uploadSignatureFile', functio
                     return [4, API.entityService.uploadFileInfo(uploadPayload, { onUploadProgress: onUploadProgress })];
                 case 1:
                     data = _b.sent();
-                    return [2, { data: data }];
+                    return [2, { data: data, file: file }];
             }
         });
     });
@@ -462,6 +472,14 @@ export var individualSlice = createSlice({
                 var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
                 state.data.individualData.employerLocation = employerLocation;
             }
+            var selectedMonthlyIncome = monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) {
+                return income.id === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.id);
+            });
+            var selectedOccupation = occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (occup) {
+                return occup.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id);
+            });
+            state.data.individualData.monthlyIncome = selectedMonthlyIncome;
+            state.data.individualData.occupation = selectedOccupation;
             state.data.individualData.isPEP = is_relative_PEP;
             state.data.individualData.isInfluencer = is_influencer;
         })
@@ -515,6 +533,14 @@ export var individualSlice = createSlice({
                 var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
                 state.data.individualData.employerLocation = employerLocation;
             }
+            var selectedMonthlyIncome = monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) {
+                return income.id === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.id);
+            });
+            var selectedOccupation = occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (occup) {
+                return occup.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id);
+            });
+            state.data.individualData.monthlyIncome = selectedMonthlyIncome;
+            state.data.individualData.occupation = selectedOccupation;
             state.data.individualData.isPEP = is_relative_PEP;
             state.data.individualData.isInfluencer = is_influencer;
         })
@@ -542,15 +568,9 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(updateIndividualInfo.fulfilled, function (state, action) {
-            var _a;
             state.loading = 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;
-            if (description) {
-                state.error = description;
-                return;
-            }
+            var _a = action.payload, data = _a.data, formData = _a.formData;
             state.data.individualData = formData;
             state.data.individualData.responseBody = data;
         })
@@ -580,8 +600,9 @@ export var individualSlice = createSlice({
             .addCase(uploadCivilIdFile.fulfilled, function (state, action) {
             state.error = null;
             state.data.attachmentsData.civilIDUploading = false;
-            var data = action.payload.data;
+            var _a = action.payload, data = _a.data, file = _a.file;
             state.data.attachmentsData.civilID = data === null || data === void 0 ? void 0 : data.id;
+            state.data.attachmentsData.civilIDFile = file;
         })
             .addCase(uploadCivilIdFile.rejected, function (state) {
             state.data.attachmentsData.civilIDUploading = false;
@@ -594,8 +615,9 @@ export var individualSlice = createSlice({
             .addCase(uploadSignatureFile.fulfilled, function (state, action) {
             state.error = null;
             state.data.attachmentsData.signatureFileUploading = false;
-            var data = action.payload.data;
+            var _a = action.payload, data = _a.data, file = _a.file;
             state.data.attachmentsData.signatureFileId = data === null || data === void 0 ? void 0 : data.id;
+            state.data.attachmentsData.signatureFile = file;
         })
             .addCase(uploadSignatureFile.rejected, function (state) {
             state.data.attachmentsData.signatureFileUploading = false;

package/build/features/brand/screens/BrandActivities/ExpectedSalesRange.js

@@ -113,7 +113,7 @@ var ExpectedSalesRange = function (_a) {
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_monthly', {
-                        currency: findCurrencyByIso2(countryCode.iso2)
+                        currency: t(findCurrencyByIso2(countryCode.iso2))
                     }) }), _jsx(InputStyled, { readOnly: true, value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)

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

@@ -26,7 +26,7 @@ import { isSA } from '../../../../utils';
 import { KWLicenseValidationSchema, LicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
 var BusinessType = function (_a) {
-    var _b = useAppSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error, uploading = _b.uploading;
+    var _b = useAppSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error, uploading = _b.uploading, uploadingArticle = _b.uploadingArticle;
     var settingsData = useAppSelector(settingsSelector).data;
     var _c = data.businessTypeData, selectedLicense = _c.selectedLicense, licenseNumber = _c.licenseNumber, entityLegalName = _c.entityLegalName, certificateId = _c.certificateId, certificateFile = _c.certificateFile, articleId = _c.articleId, articleFile = _c.articleFile;
     var t = useTranslation().t;
@@ -65,7 +65,7 @@ var BusinessType = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var disabled = !methods.formState.isValid || !!error || uploading;
+    var disabled = !methods.formState.isValid || !!error || uploading || uploadingArticle;
     var disableBack = !data.otpData.isNID;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(LicenseList, { onListOpen: function () {
                             setListActive(true);

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

@@ -39,26 +39,24 @@ var LicenseCertificate = function (_a) {
     var certificateValue = certificateFileControl.field.value;
     var error = ((_b = certificateFileControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message) || ((_c = certificateIdControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message);
     var handleLicenseCertificateChange = function (files) {
-        for (var index = 0; index < files.length; index++) {
-            var file = files === null || files === void 0 ? void 0 : files[index];
-            if (!file)
-                continue;
-            if (!VALID_FILE_FORMATS.includes(file === null || file === void 0 ? void 0 : file.type)) {
-                setError('certificateFile', { message: 'file_not_supported_alert' });
-                continue;
-            }
-            if ((file === null || file === void 0 ? void 0 : file.size) > MAX_FILE_SIZE) {
-                setError('certificateFile', { message: 'file_size_alert' });
-                continue;
-            }
-            certificateFileControl.field.onChange(file);
-            dispatch(uploadLicenseCertificate({
-                file: file,
-                onProgress: function (value) {
-                    setProgress(value);
-                }
-            }));
+        var file = (files || [])[0];
+        if (!file)
+            return;
+        if (!VALID_FILE_FORMATS.includes(file.type)) {
+            setError('certificateFile', { message: 'file_not_supported_alert' });
+            return;
         }
+        if (file.size > MAX_FILE_SIZE) {
+            setError('certificateFile', { message: 'file_size_alert' });
+            return;
+        }
+        certificateFileControl.field.onChange(file);
+        dispatch(uploadLicenseCertificate({
+            file: file,
+            onProgress: function (value) {
+                setProgress(value);
+            }
+        }));
     };
     var handleReset = function () {
         certificateFileControl.field.onChange(null);
@@ -76,6 +74,6 @@ var LicenseCertificate = function (_a) {
         if ((certificateFileControl.formState.isValid || !!certificateValue) && error != 'file_upload_error')
             clearErrors();
     }, [certificateFileControl.formState.isValid, certificateValue]);
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_license_certificate'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_certificate'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_bank_statement'), onFileUploaded: handleLicenseCertificateChange, isFileUploaded: !uploading && !!certificateValue, isSubmitting: loading, isUploading: uploading, progress: progress, onReset: handleReset, error: error && t(error), multiple: true }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_license_certificate'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_certificate'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_bank_statement'), onFileUploaded: handleLicenseCertificateChange, isFileUploaded: !uploading && !!certificateValue, isSubmitting: loading, isUploading: uploading, progress: progress, onReset: handleReset, error: error && t(error) }) }) })));
 };
 export default LicenseCertificate;

package/build/features/business/screens/BusinessType/validation.d.ts

@@ -15,16 +15,22 @@ export declare const KWLicenseValidationSchema: yup.ObjectSchema<import("yup/lib
     entityLegalName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     certificateId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     certificateFile: any;
+    articleId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    articleFile: any;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     selectedLicense: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     entityLegalName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     certificateId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     certificateFile: any;
+    articleId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    articleFile: any;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     selectedLicense: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     entityLegalName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     certificateId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     certificateFile: any;
+    articleId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    articleFile: any;
 }>>>;

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

@@ -85,6 +85,19 @@ export var KWLicenseValidationSchema = yup.object().shape({
                     : this.createError({ message: 'alert_file_upload' });
             return true;
         }
+    })
+        .optional(),
+    articleId: yup.string().optional(),
+    articleFile: yup
+        .mixed()
+        .test({
+        test: function (value) {
+            if (!!value)
+                return VALID_FILE_FORMATS.includes(value === null || value === void 0 ? void 0 : value.type) && (value === null || value === void 0 ? void 0 : value.size) < MAX_FILE_SIZE
+                    ? true
+                    : this.createError({ message: 'alert_file_upload' });
+            return true;
+        }
     })
         .optional()
 });

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

@@ -113,7 +113,7 @@ var ExpectedSalesRange = function (_a) {
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_monthly', {
-                        currency: findCurrencyByIso2(countryCode.iso2)
+                        currency: t(findCurrencyByIso2(countryCode.iso2))
                     }) }), _jsx(InputStyled, { readOnly: true, value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)

package/build/features/entity/screens/EntityCapital/CapitalPaid.js

@@ -41,7 +41,7 @@ var CapitalPaid = function (_a) {
     var error = (_e = capitalPaidControl.fieldState.error) === null || _e === void 0 ? void 0 : _e.message;
     var hide = !paid && disabled;
     return (_jsx(Collapse, __assign({ in: !hide }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { label: t('capital_paid_label', {
-                    currency: findCurrencyByIso2(countryCode)
+                    currency: t(findCurrencyByIso2(countryCode))
                 }), onChange: handleChange, disabled: disabled, value: capitalPaidValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_paid_hint'), warningType: 'alert', warningMessage: error && t(error) }) })) })));
 };
 export default React.memo(CapitalPaid);

package/build/features/entity/screens/EntityCapital/CapitalShareValue.js

@@ -41,7 +41,7 @@ var CapitalShareValue = function (_a) {
     var capitalShareValueValue = capitalShareValueControl.field.value;
     var error = (_f = capitalShareValueControl.fieldState.error) === null || _f === void 0 ? void 0 : _f.message;
     return (_jsx(Collapse, __assign({ in: !hide }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { label: t('capital_share_value_label', {
-                    currency: findCurrencyByIso2(countryCode)
+                    currency: t(findCurrencyByIso2(countryCode))
                 }), onChange: handleChange, disabled: disabled, value: capitalShareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_share_value_hint'), warningType: 'alert', warningMessage: error && t(error) }) })) })));
 };
 export default React.memo(CapitalShareValue);

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

@@ -8,6 +8,7 @@ import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { individualSelector, uploadCivilIdFile } from '../../../../features/app/individual/individualStore';
 import { MAX_FILE_SIZE, VALID_FILE_FORMATS } from '../../../../constants';
 import UploadFile from '../../../../features/shared/UploadFile';
+import { maskFileName } from '../../../../utils';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -18,11 +19,11 @@ var CivilIDFile = function () {
     var _a, _b;
     var _c = React.useState(0), progress = _c[0], setProgress = _c[1];
     var t = useTranslation().t;
-    var _d = useFormContext(), control = _d.control, setError = _d.setError, clearErrors = _d.clearErrors;
+    var _d = useFormContext(), control = _d.control, setError = _d.setError, clearErrors = _d.clearErrors, setValue = _d.setValue;
     var civilIDFileControl = useController({ name: 'civilIDFile', control: control });
-    var civilIDFileIdControl = useController({ name: 'civilIDFileId', control: control });
+    var civilIDFileIdControl = useController({ name: 'civilID', control: control });
     var _e = useAppSelector(individualSelector), data = _e.data, loading = _e.loading, sysError = _e.error;
-    var civilIDUploading = data.attachmentsData.civilIDUploading;
+    var _f = data.attachmentsData, civilIDUploading = _f.civilIDUploading, civilIDFile = _f.civilIDFile, civilID = _f.civilID;
     var dispatch = useAppDispatch();
     var civilIDValue = civilIDFileControl.field.value;
     var error = ((_a = civilIDFileControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message) || ((_b = civilIDFileIdControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message);
@@ -51,6 +52,12 @@ var CivilIDFile = function () {
         civilIDFileIdControl.field.onChange('');
         setProgress(0);
     };
+    React.useEffect(function () {
+        if (!!civilIDFile) {
+            setValue('civilIDFile', civilIDFile);
+            setValue('civilID', civilID);
+        }
+    }, [civilIDFile, civilID]);
     React.useEffect(function () {
         if (sysError === 'file_upload_error') {
             setError('civilIDFileId', { message: sysError });
@@ -62,6 +69,13 @@ var CivilIDFile = function () {
         if ((civilIDFileControl.formState.isValid || !!civilIDValue) && error != 'file_upload_error')
             clearErrors();
     }, [civilIDFileControl.formState.isValid, civilIDValue]);
-    return (_jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isFileUploaded: !civilIDUploading && !!civilIDValue, isSubmitting: loading, isUploading: civilIDUploading, progress: progress, onReset: handleReset, error: error && t(error) }) }));
+    React.useEffect(function () {
+        if (!!civilIDFile) {
+            civilIDFileControl.field.onChange(civilIDFile);
+            civilIDFileIdControl.field.onChange(civilID);
+        }
+    }, []);
+    var fileName = civilIDValue ? maskFileName(civilIDValue === null || civilIDValue === void 0 ? void 0 : civilIDValue.name) : '';
+    return (_jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isFileUploaded: !civilIDUploading && !!civilIDValue, isSubmitting: loading, isUploading: civilIDUploading, progress: progress, onReset: handleReset, initialFileName: fileName, error: error && t(error) }) }));
 };
 export default CivilIDFile;

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

@@ -99,7 +99,7 @@ var MonthlyIncome = function (_a) {
     var income = monthlyIncomeControl.field.value;
     var error = (_b = monthlyIncomeControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(Input, { label: t('please_enter_actual_income', {
-                        currency: findCurrencyByIso2(countryCode.iso2)
+                        currency: t(findCurrencyByIso2(countryCode.iso2))
                     }), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_source_of_income'), value: (isAr ? income === null || income === void 0 ? void 0 : income.range.ar : income === null || income === void 0 ? void 0 : income.range.en) || '', warningMessage: error && t(error) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'range.en', list: incomeList, onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (income === null || income === void 0 ? void 0 : income.id) }, { children: isAr ? item.range.ar : item === null || item === void 0 ? void 0 : item.range.en })) }), item.id === (income === null || income === void 0 ? void 0 : income.id) && _jsx(CheckIconStyled, {})] }));
                             } })] }))] })) })));

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

@@ -91,7 +91,8 @@ var Occupation = function (_a) {
     var occupation = occupationControl.field.value;
     var error = (_c = occupationControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
     return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('occupation_title'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_occupation'), value: (isAr ? occupation === null || occupation === void 0 ? void 0 : occupation.name.ar : occupation === null || occupation === void 0 ? void 0 : occupation.name.en) || '', warningMessage: error && t(error) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.en', list: occupationList, onSelectItem: onSelectItem, renderItem: function (item) {
-                                return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) }, { children: isAr ? item.name.ar : item === null || item === void 0 ? void 0 : item.name.en })) }), item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) && _jsx(CheckIconStyled, {})] }));
+                                var _a, _b;
+                                return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) }), item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) && _jsx(CheckIconStyled, {})] }));
                             } })] }))] })) })));
 };
 export default Occupation;

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

@@ -20,6 +20,7 @@ import { individualSelector, uploadSignatureFile } from '../../../../features/ap
 import { MAX_FILE_SIZE, VALID_FILE_FORMATS } from '../../../../constants';
 import UploadFile from '../../../../features/shared/UploadFile';
 import Collapse from '../../../../components/Collapse';
+import { maskFileName } from '../../../../utils';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -31,11 +32,11 @@ var SignatureFile = function (_a) {
     var show = _a.show;
     var _d = React.useState(0), progress = _d[0], setProgress = _d[1];
     var t = useTranslation().t;
-    var _e = useFormContext(), control = _e.control, setError = _e.setError, clearErrors = _e.clearErrors;
+    var _e = useFormContext(), control = _e.control, setError = _e.setError, clearErrors = _e.clearErrors, setValue = _e.setValue;
     var signatureFileControl = useController({ name: 'signatureFile', control: control });
     var signatureFileIdControl = useController({ name: 'signatureFileId', control: control });
     var _f = useAppSelector(individualSelector), data = _f.data, loading = _f.loading, sysError = _f.error;
-    var signatureFileUploading = data.attachmentsData.signatureFileUploading;
+    var _g = data.attachmentsData, signatureFileUploading = _g.signatureFileUploading, signatureFile = _g.signatureFile, signatureFileId = _g.signatureFileId;
     var dispatch = useAppDispatch();
     var signatureValue = signatureFileControl.field.value;
     var error = ((_b = signatureFileControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message) || ((_c = signatureFileIdControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message);
@@ -73,6 +74,17 @@ var SignatureFile = function (_a) {
         if ((signatureFileControl.formState.isValid || !!signatureValue) && error != 'file_upload_error')
             clearErrors();
     }, [signatureFileControl.formState.isValid, signatureValue]);
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_signature_file'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_signature'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_signature_file'), onFileUploaded: handleSignatureChange, isFileUploaded: !signatureFileUploading && !!signatureValue, isSubmitting: loading, isUploading: signatureFileUploading, progress: progress, onReset: handleReset, error: error && t(error) }) }) })));
+    React.useEffect(function () {
+        if (!!signatureFile) {
+            setValue('signatureFile', signatureFile);
+            setValue('signatureFileId', signatureFileId);
+        }
+    }, [signatureFile, signatureFileId]);
+    React.useEffect(function () {
+        if (!!signatureValue)
+            signatureFileControl.field.onChange(signatureFile);
+    }, []);
+    var fileName = signatureValue ? maskFileName(signatureValue === null || signatureValue === void 0 ? void 0 : signatureValue.name) : '';
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_signature_file'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_signature'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_signature_file'), onFileUploaded: handleSignatureChange, isFileUploaded: !signatureFileUploading && !!signatureValue, isSubmitting: loading, initialFileName: fileName, isUploading: signatureFileUploading, progress: progress, onReset: handleReset, error: error && t(error) }) }) })));
 };
 export default SignatureFile;

package/build/features/individual/screens/AdditionalIndividualInfo/validation.d.ts

@@ -6,7 +6,7 @@ export declare const IndividualInfoValidationSchema: yup.ObjectSchema<import("yu
     sourceIncome: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     employerLocation: import("yup/lib/object").OptionalObjectSchema<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>>>;
-    civilIDFileId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    civilID: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     civilIDFile: any;
     signatureFileId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     signatureFile: any;
@@ -17,7 +17,7 @@ export declare const IndividualInfoValidationSchema: yup.ObjectSchema<import("yu
     sourceIncome: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     employerLocation: import("yup/lib/object").OptionalObjectSchema<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>>>;
-    civilIDFileId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    civilID: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     civilIDFile: any;
     signatureFileId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     signatureFile: any;
@@ -28,7 +28,7 @@ export declare const IndividualInfoValidationSchema: yup.ObjectSchema<import("yu
     sourceIncome: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     employerLocation: import("yup/lib/object").OptionalObjectSchema<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>>>;
-    civilIDFileId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    civilID: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     civilIDFile: any;
     signatureFileId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     signatureFile: any;

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

@@ -20,7 +20,7 @@ export var IndividualInfoValidationSchema = yup.object().shape({
             return yup.object().optional();
         }
     }),
-    civilIDFileId: yup.string().optional(),
+    civilID: yup.string().optional(),
     civilIDFile: yup
         .mixed()
         .test({

package/build/features/shared/PaciVerification/VerifyPACILoading.js

@@ -1,12 +1,26 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from 'react';
+import { styled } from '@mui/material/styles';
 import LottieFile, { LottieAnimationFiles } from '../../../components/Lottie';
+import Icon from '../../../components/Icon';
+import { ICONS_NAMES } from '../../../constants';
+var IconStyled = styled(Icon)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        position: 'absolute',
+        top: '50%',
+        left: '50%',
+        transform: 'translate(-50%, -50%)',
+        width: 64,
+        height: 64
+    });
+});
 var VerifyPACILoading = function (_a) {
     var _b = _a.loop, loop = _b === void 0 ? true : _b, type = _a.type;
     if (type === 1)
-        return (_jsx(_Fragment, { children: _jsx(LottieFile, { file: LottieAnimationFiles.start_loading, loop: loop, width: '60%' }) }));
+        return (_jsxs(_Fragment, { children: [_jsx(LottieFile, { file: LottieAnimationFiles.pulsating_circle_waves, loop: loop, width: '90%' }), _jsx(IconStyled, { src: ICONS_NAMES.PACI_VERIFY_ICON })] }));
     if (type === 2)
-        return (_jsx(_Fragment, { children: _jsx(LottieFile, { file: LottieAnimationFiles.still_loading, loop: loop, width: '60%' }) }));
+        return (_jsxs(_Fragment, { children: [_jsx(LottieFile, { file: LottieAnimationFiles.pulsating_circle_waves, loop: loop, width: '90%' }), _jsx(IconStyled, { src: ICONS_NAMES.PACI_VERIFY_ICON })] }));
     return (_jsx(_Fragment, { children: _jsx(LottieFile, { file: LottieAnimationFiles.error, loop: false, width: '60%' }) }));
 };
 VerifyPACILoading.defaultProps = {};