@tap-payments/auth-jsconnect 2.6.10-test → 2.6.13-test

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

@@ -16,7 +16,7 @@ import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { settingsSelector } from '../../../../app/settings';
-import { findCurrencyByIso2, hasVerifiedValue } from '../../../../utils';
+import { hasVerifiedValue } from '../../../../utils';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -81,7 +81,7 @@ var MonthlyIncome = function (props) {
     var income = monthlyIncomeControl.field.value;
     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))
+                        currency: t(data.currency)
                     }), 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/ShareValue.js

@@ -14,8 +14,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Collapse from '@mui/material/Collapse';
-import { findCurrencyByIso2, formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
-import { settingsSelector } from '../../../../app/settings';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
@@ -25,11 +24,10 @@ var ShareValue = function (_a) {
     var _b;
     var show = _a.show, readOnly = _a.readOnly;
     var t = useTranslation().t;
-    var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(individualSelector).data;
     var control = useFormContext().control;
     var bckError = useAppSelector(individualSelector).error;
     var dispatch = useAppDispatch();
-    var countryCode = settingsData.businessCountry.iso2;
     var handleChange = function (_a) {
         var target = _a.target;
         if (bckError)
@@ -41,7 +39,7 @@ var ShareValue = function (_a) {
     var shareValue = shareValueControl.field.value;
     var error = (_b = shareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('share_value_label', {
-                    currency: t(findCurrencyByIso2(countryCode))
+                    currency: t(data.currency)
                 }), onChange: handleChange, value: shareValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: shareValue, error: error }) }) })) })));
 };
 export default React.memo(ShareValue);

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

@@ -1,6 +1,6 @@
 import * as yup from 'yup';
 import { IndividualType } from '../../../../@types';
-export declare const IndividualInfoValidationSchema: (objects: Array<IndividualType>, isSACountry: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const IndividualInfoValidationSchema: (objects: Array<IndividualType>, isKWCountry: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     occupation: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     sourceIncome: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;

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

@@ -1,6 +1,6 @@
 import * as yup from 'yup';
 import { getIndividualType } from '../../../../utils';
-export var IndividualInfoValidationSchema = function (objects, isSACountry) {
+export var IndividualInfoValidationSchema = function (objects, isKWCountry) {
     var isUserType = getIndividualType(objects).isUser;
     return yup.object().shape({
         occupation: isUserType ? yup.object().required('alert_choose_occupation') : yup.object().optional(),
@@ -9,7 +9,7 @@ export var IndividualInfoValidationSchema = function (objects, isSACountry) {
         civilID: yup.array().optional(),
         signatureFileId: yup.array().optional(),
         isPEP: isUserType ? yup.boolean().required('please_choose_relative_pep') : yup.boolean().optional().nullable(),
-        isInfluencer: isUserType && !isSACountry ? yup.boolean().required('please_choose_are_you_influncer') : yup.boolean().optional().nullable(),
+        isInfluencer: isUserType && isKWCountry ? yup.boolean().required('please_choose_are_you_influncer') : yup.boolean().optional().nullable(),
         shareCount: yup.string().optional(),
         shareValue: yup.string().optional()
     });

package/build/hooks/useCountry.d.ts

@@ -1,4 +1,5 @@
 export declare const useCountry: (code: string) => {
     isKuwait: boolean;
     isSaudi: boolean;
+    isOther: boolean;
 };

package/build/hooks/useCountry.js

@@ -1,7 +1,8 @@
-import { isKW } from '../utils';
+import { isKW, isSA } from '../utils';
 import { useMemo } from 'react';
 export var useCountry = function (code) {
     var isKuwait = useMemo(function () { return isKW(code); }, [code]);
-    var isSaudi = useMemo(function () { return isKW(code); }, [code]);
-    return { isKuwait: isKuwait, isSaudi: isSaudi };
+    var isSaudi = useMemo(function () { return isSA(code); }, [code]);
+    var isOther = useMemo(function () { return !isKW(code) && !isSA(code); }, [code]);
+    return { isKuwait: isKuwait, isSaudi: isSaudi, isOther: isOther };
 };

package/build/utils/string.d.ts

@@ -46,6 +46,7 @@ export declare const getScreenNameBasedOnFlow: (flow: string, isAuthorizedUser?:
 export declare const getEighteenYearsAgo: () => string;
 export declare const isKW: (flag: string) => boolean;
 export declare const isSA: (flag: string) => boolean;
+export declare const isOtherThanKWOrSA: (flag: string) => boolean;
 export declare const isLinkedIn: (flag: string) => boolean;
 export declare const isTwitter: (flag: string) => boolean;
 export declare const isWebsite: (flag: string) => boolean;

package/build/utils/string.js

@@ -206,6 +206,9 @@ export var isKW = function (flag) {
 export var isSA = function (flag) {
     return ['sa', 'sau'].includes(flag === null || flag === void 0 ? void 0 : flag.toLowerCase());
 };
+export var isOtherThanKWOrSA = function (flag) {
+    return !isKW(flag) && !isSA(flag);
+};
 export var isLinkedIn = function (flag) {
     return 'linkedin' === (flag === null || flag === void 0 ? void 0 : flag.toLowerCase());
 };

package/package.json

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