@tap-payments/auth-jsconnect 2.4.92-test → 2.4.94-test

package/build/assets/locales/ar.json

@@ -416,5 +416,6 @@
     "alert_choose_segment_profit": "يُرجى تحديد الربح",
     "alert_choose_segment_tech": "الرجاء تحديد التقنية",
     "switch_to_islamic_calendar": "التبديل إلى التقويم الهجرى",
-    "switch_to_gregorian_calendar": "التبديل إلى التقويم الميلادي"
+    "switch_to_gregorian_calendar": "التبديل إلى التقويم الميلادي",
+    "choose_any_monthly_income": "رجاءا اختر الدخل الشهرى"
 }

package/build/assets/locales/en.json

@@ -446,5 +446,6 @@
     "alert_choose_segment_profit": "Please select segment profit",
     "alert_choose_segment_tech": "Please select segment tech",
     "switch_to_islamic_calendar": "Switch to Islamic Calendar",
-    "switch_to_gregorian_calendar": "Switch to Gregorian Calendar"
+    "switch_to_gregorian_calendar": "Switch to Gregorian Calendar",
+    "choose_any_monthly_income": "Please choose monthly income"
 }

package/build/components/ArabicDatePicker/ArabicDatePicker.js

@@ -106,6 +106,9 @@ var DatePicker = function (_a) {
         var dateObject = toDateObject(date);
         return dateObject.convert(arabic).format(DATE_FORMAT);
     };
-    return (_jsxs(Container, __assign({ disabled: disabled, id: 'arabic-container-calendar' }, { children: [_jsx(InputFieldStyled, { endAdornment: _jsx(ArrowIcon, __assign({ disabled: disabled }, { children: getEndAdornment() })), value: date ? formateDate(date) : '', placeholder: DATE_FORMAT, onClick: toggleCalender, startAdornment: calenderIcon, disabled: !disabled, readOnly: readOnly, dir: dir }), _jsxs(Collapse, __assign({ in: openCalender }, { children: [_jsx(Calendar, __assign({ calendar: arabic, locale: dir === 'rtl' ? arabic_ar : arabic_en, maxDate: rest.maxDate || defaultMax, minDate: defaultMin, format: DATE_FORMAT, onChange: handleOnDateChange, value: date || (isDob ? new Date(getEighteenYearsAgo()) : undefined), className: 'custom-container' }, rest)), _jsx(Divider, {})] }))] })));
+    return (_jsxs(Container, __assign({ disabled: disabled, id: 'arabic-container-calendar' }, { children: [_jsx(InputFieldStyled, { endAdornment: _jsx(ArrowIcon, __assign({ disabled: disabled }, { children: getEndAdornment() })), value: date ? formateDate(date) : '', placeholder: DATE_FORMAT, onClick: function (e) {
+                    if (!disabled)
+                        toggleCalender(e);
+                }, startAdornment: calenderIcon, disabled: disabled, readOnly: readOnly, dir: dir }), _jsxs(Collapse, __assign({ in: openCalender }, { children: [_jsx(Calendar, __assign({ calendar: arabic, locale: dir === 'rtl' ? arabic_ar : arabic_en, maxDate: rest.maxDate || defaultMax, minDate: defaultMin, format: DATE_FORMAT, onChange: handleOnDateChange, value: date || (isDob ? new Date(getEighteenYearsAgo()) : undefined), className: 'custom-container' }, rest)), _jsx(Divider, {})] }))] })));
 };
 export default memo(DatePicker);

package/build/features/brand/screens/BrandActivities/validation.d.ts

@@ -17,8 +17,8 @@ export declare const BrandActivitiesValidationSchema: () => yup.ObjectSchema<imp
         en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined>;
     customerLocations: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
-    expectedCustomers: any;
-    expectedSalesRange: any;
+    expectedCustomer: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    expectedSale: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     termAndConditionChecked: import("yup/lib/boolean").RequiredBooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject>;
     refundPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
     transactionPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
@@ -40,8 +40,8 @@ export declare const BrandActivitiesValidationSchema: () => yup.ObjectSchema<imp
         en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined>;
     customerLocations: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
-    expectedCustomers: any;
-    expectedSalesRange: any;
+    expectedCustomer: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    expectedSale: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     termAndConditionChecked: import("yup/lib/boolean").RequiredBooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject>;
     refundPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
     transactionPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
@@ -63,8 +63,8 @@ export declare const BrandActivitiesValidationSchema: () => yup.ObjectSchema<imp
         en: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
     }>>[] | undefined>;
     customerLocations: import("yup/lib/array").RequiredArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined>;
-    expectedCustomers: any;
-    expectedSalesRange: any;
+    expectedCustomer: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    expectedSale: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     termAndConditionChecked: import("yup/lib/boolean").RequiredBooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject>;
     refundPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
     transactionPolicy: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;

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

@@ -1,9 +1,4 @@
 import * as yup from 'yup';
-var objectElements = {
-    id: yup.number(),
-    name_ar: yup.string(),
-    name_en: yup.string()
-};
 export var BrandActivitiesValidationSchema = function () {
     return yup.object().shape({
         activities: yup
@@ -13,9 +8,9 @@ export var BrandActivitiesValidationSchema = function () {
             ar: yup.string().nullable(),
             en: yup.string().nullable()
         })),
-        customerLocations: yup.array().required('please_choose_base'),
-        expectedCustomers: yup.object().shape(objectElements).required('select_expected_customers_serve'),
-        expectedSalesRange: yup.object().shape(objectElements).required('select_expected_sales'),
+        customerLocations: yup.array().min(1, 'please_choose_base').required('please_choose_base'),
+        expectedCustomer: yup.object().required('select_expected_customers_serve'),
+        expectedSale: yup.object().required('select_expected_sales'),
         termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
         refundPolicy: yup.boolean().required().isTrue('refund_policy_error'),
         transactionPolicy: yup.boolean().required().isTrue('transaction_policy_error')

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

@@ -82,7 +82,7 @@ var MonthlyIncome = function (props) {
     var error = (_a = monthlyIncomeControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
     return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(InputSelect, { label: t('please_enter_actual_income', {
                         currency: t(findCurrencyByIso2(countryCode.iso2))
-                    }), readOnly: props.readOnly, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, 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), endAdornment: _jsx(EndAdornmentExpanded, { isVerified: isMonthlyIncomeVerified(income), anchorEl: anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'range.en', searchValuePath: ['range.en', 'range.ar'], list: incomeList, onSelectItem: onSelectItem, renderItem: function (item) {
+                    }), required: true, readOnly: props.readOnly, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, 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), endAdornment: _jsx(EndAdornmentExpanded, { isVerified: isMonthlyIncomeVerified(income), anchorEl: anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'range.en', searchValuePath: ['range.en', 'range.ar'], 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(CheckIcon, { isVerified: isMonthlyIncomeVerified(item) })] }));
                         } }) }))] })) })));
 };

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

@@ -5,7 +5,7 @@ export var IndividualInfoValidationSchema = function (objects) {
     return yup.object().shape({
         occupation: isUserType ? yup.object().required('alert_choose_occupation') : yup.object().optional(),
         sourceIncome: isUserType ? yup.object().required('choose_any_source_of_income') : yup.object().optional(),
-        monthlyIncome: yup.object().optional(),
+        monthlyIncome: isUserType ? yup.object().required('choose_any_monthly_income') : yup.object().optional(),
         civilID: yup.array().optional(),
         signatureFileId: yup.array().optional(),
         isPEP: isUserType ? yup.boolean().required('please_choose_relative_pep') : yup.boolean().optional().nullable(),

package/package.json

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