@tap-payments/auth-jsconnect 1.0.44 → 1.0.47

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

@@ -1,59 +1,63 @@
 import { REGEX_WEBSITE } from '../../../../constants';
 import * as yup from 'yup';
-export var MerchantValidationSchema = yup.object().shape({
-    brandName: yup
-        .string()
-        .min(3, 'enter_brand_name_english_chars_numbers_space')
-        .max(250, 'enter_brand_name_english_chars_numbers_space')
-        .required('enter_valid_brand_name'),
-    termAndConditionChecked: yup.boolean().required().isTrue('check_terms_cond'),
-    links: yup.object().shape({
-        website: yup.string().when(['instagram', 'twitter'], function (instagram, twitter) {
-            if (!instagram && !twitter) {
-                return yup
-                    .string()
-                    .matches(REGEX_WEBSITE, 'ide_not_valid_url')
-                    .transform(function (value) { return (!!value ? value : null); })
-                    .nullable()
-                    .required('enter_at_least_one');
-            }
-            else {
-                return yup
-                    .string()
-                    .matches(REGEX_WEBSITE, 'ide_not_valid_url')
-                    .transform(function (value) { return (!!value ? value : null); })
-                    .nullable()
-                    .optional();
-            }
-        }),
-        instagram: yup
+export var MerchantValidationSchema = function (termsIsRequired) {
+    return yup.object().shape({
+        brandName: yup
             .string()
-            .nullable()
-            .transform(function (value) { return (!!value ? value : null); })
-            .when(['twitter', 'website'], function (twitter, website) {
-            if (!website && !twitter) {
-                return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
-            }
-            else {
-                return yup.string().optional();
-            }
-        }),
-        twitter: yup
-            .string()
-            .nullable()
-            .transform(function (value) { return (!!value ? value : null); })
-            .min(2, 'enter_at_least_one')
-            .when(['website', 'instagram'], function (website, instagram) {
-            if (!website && !instagram) {
-                return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
-            }
-            else {
-                return yup.string().optional();
-            }
-        })
-    }, [
-        ['instagram', 'website'],
-        ['twitter', 'website'],
-        ['instagram', 'twitter']
-    ])
-});
+            .min(3, 'enter_brand_name_english_chars_numbers_space')
+            .max(250, 'enter_brand_name_english_chars_numbers_space')
+            .required('enter_valid_brand_name'),
+        termAndConditionChecked: termsIsRequired
+            ? yup.boolean().required().isTrue('check_terms_cond')
+            : yup.boolean().optional(),
+        links: yup.object().shape({
+            website: yup.string().when(['instagram', 'twitter'], function (instagram, twitter) {
+                if (!instagram && !twitter) {
+                    return yup
+                        .string()
+                        .matches(REGEX_WEBSITE, 'ide_not_valid_url')
+                        .transform(function (value) { return (!!value ? value : null); })
+                        .nullable()
+                        .required('enter_at_least_one');
+                }
+                else {
+                    return yup
+                        .string()
+                        .matches(REGEX_WEBSITE, 'ide_not_valid_url')
+                        .transform(function (value) { return (!!value ? value : null); })
+                        .nullable()
+                        .optional();
+                }
+            }),
+            instagram: yup
+                .string()
+                .nullable()
+                .transform(function (value) { return (!!value ? value : null); })
+                .when(['twitter', 'website'], function (twitter, website) {
+                if (!website && !twitter) {
+                    return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
+                }
+                else {
+                    return yup.string().optional();
+                }
+            }),
+            twitter: yup
+                .string()
+                .nullable()
+                .transform(function (value) { return (!!value ? value : null); })
+                .min(2, 'enter_at_least_one')
+                .when(['website', 'instagram'], function (website, instagram) {
+                if (!website && !instagram) {
+                    return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
+                }
+                else {
+                    return yup.string().optional();
+                }
+            })
+        }, [
+            ['instagram', 'website'],
+            ['twitter', 'website'],
+            ['instagram', 'twitter']
+        ])
+    });
+};

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

@@ -77,14 +77,16 @@ var Mobile = function (_a) {
     var _b = useSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var _c = React.useState(data.mobileData.countryCode.digits), mobileLength = _c[0], setMobileLength = _c[1];
     var _d = React.useState(), listType = _d[0], setListType = _d[1];
+    var _e = React.useState(false), isSA = _e[0], setIsSA = _e[1];
     var dispatch = useAppDispatch();
     var methods = useForm({
-        resolver: yupResolver(PhoneValidationSchema(mobileLength)),
+        resolver: yupResolver(PhoneValidationSchema(mobileLength, isSA)),
         defaultValues: data.mobileData,
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var countryCodeSA = methods.getValues('countryCode').iso2 === 'SA';
     var handleMenuListClick = function (flag) {
         setListType(flag);
     };
@@ -93,6 +95,9 @@ var Mobile = function (_a) {
             methods.setValue('countryCode', data.mobileData.countryCode);
         }
     }, [data.mobileData]);
+    React.useEffect(function () {
+        setIsSA(countryCodeSA);
+    }, [countryCodeSA]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());

package/build/features/connect/screens/Mobile/validation.d.ts

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const PhoneValidationSchema: (length: number) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const PhoneValidationSchema: (length: number, isSA: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     mobile: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     mobile: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;

package/build/features/connect/screens/Mobile/validation.js

@@ -1,6 +1,11 @@
+import { REGEX_SAUDI_NUMBER } from '../../../../constants';
 import * as yup from 'yup';
-export var PhoneValidationSchema = function (length) {
+export var PhoneValidationSchema = function (length, isSA) {
     return yup.object().shape({
-        mobile: yup.string().length(length, 'enter_valid_mobile_number').required('mobile_number_error')
+        mobile: yup
+            .string()
+            .matches(isSA ? REGEX_SAUDI_NUMBER : /^[0-9]/g, 'start_with_number')
+            .length(length, 'enter_valid_mobile_number')
+            .required('mobile_number_error')
     });
 };

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

@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { clearError, connectSelector, createVerifyAuthPassword } from '../../../app/connect/connectStore';
+import { clearError, connectSelector } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -36,7 +36,9 @@ var Password = function (_a) {
     var _b = useSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var methods = useForm({
         resolver: yupResolver(PasswordValidationSchema),
-        defaultValues: data.passwordData,
+        defaultValues: {
+            password: ''
+        },
         mode: 'onChange'
     });
     var t = useTranslation().t;
@@ -47,7 +49,7 @@ var Password = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
-        dispatch(createVerifyAuthPassword(formData));
+        console.log(formData);
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));

package/build/features/individual/Individual.js

@@ -19,10 +19,10 @@ import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
 import { reactElement } from '../../utils';
+import { FeatureContainer } from '../shared/Containers';
 import { INDIVIDUAL_SCREENS_NAVIGATION } from '../../constants';
 import { individualFeatureScreens } from '../featuresScreens';
 import CustomFooter from '../shared/Footer';
-import { FeatureContainer } from '../shared/Containers';
 var Individual = memo(function (props) {
     var open = React.useState(true)[0];
     var t = useTranslation().t;

package/build/features/password/Password.js

@@ -18,11 +18,11 @@ import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
+import { FeatureContainer } from '../shared/Containers';
 import { reactElement } from '../../utils';
 import { PASSWORD_SCREENS_NAVIGATION } from '../../constants';
 import { passwordFeatureScreens } from '../featuresScreens';
 import CustomFooter from '../shared/Footer';
-import { FeatureContainer } from '../shared/Containers';
 var Password = memo(function (props) {
     var open = React.useState(true)[0];
     var t = useTranslation().t;

package/build/features/shared/Button/Button.js

@@ -79,7 +79,7 @@ var BackButtonStyled = styled(Button, { shouldForwardProp: function (prop) { ret
         paddingInlineStart: theme.spacing(2.5),
         width: '10%',
         zIndex: 1,
-        borderRadius: isAr ? theme.spacing(0, 4.75, 4.75, 0) : theme.spacing(4.75, 0, 0, 4.75)
+        borderRadius: isAr ? theme.spacing(0, 4.1, 4.1, 0) : theme.spacing(4.1, 0, 0, 4.1)
     });
 });
 export default function CustomButton(_a) {

package/build/features/tax/Tax.js

@@ -19,10 +19,10 @@ import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
 import { reactElement } from '../../utils';
+import { FeatureContainer } from '../shared/Containers';
 import { TAX_SCREENS_NAVIGATION } from '../../constants';
 import { taxFeatureScreens } from '../featuresScreens';
 import CustomFooter from '../shared/Footer';
-import { FeatureContainer } from '../shared/Containers';
 var Tax = memo(function (props) {
     var open = React.useState(true)[0];
     var t = useTranslation().t;
@@ -36,7 +36,7 @@ var Tax = memo(function (props) {
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: taxFeatureScreens.map(function (_a, index) {
                     var Element = _a.element, name = _a.name;
                     var isActive = activeScreen.name === name;
-                    return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 300, appear: 300, exit: 400 } }, { children: _jsx(Element, {}) }), index));
+                    return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
                 }) }) })) })));
 });
 export function TaxLib(props) {

package/package.json

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

package/build/hooks/useElementSizeById.d.ts

@@ -1,6 +0,0 @@
-interface ElementSize {
-    width: number;
-    height: number;
-}
-export declare const useElementSizeById: (id: string) => ElementSize;
-export {};

package/build/hooks/useElementSizeById.js

@@ -1,12 +0,0 @@
-import { useEffect, useState } from 'react';
-export var useElementSizeById = function (id) {
-    var _a = useState({ width: 0, height: 0 }), size = _a[0], setSize = _a[1];
-    var element = document.getElementById(id);
-    useEffect(function () {
-        if (element) {
-            var _a = element.getBoundingClientRect(), width = _a.width, height = _a.height;
-            setSize({ width: width, height: height });
-        }
-    }, [element]);
-    return size;
-};