@tap-payments/auth-jsconnect 2.0.21-test → 2.0.21

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

@@ -0,0 +1,185 @@
+import { REGEX_WEBSITE, REGEX_BRAND_NAME } from '../../../../constants';
+import * as yup from 'yup';
+export var ValidationOptions;
+(function (ValidationOptions) {
+    ValidationOptions["NEW_USER"] = "NEW_USER";
+    ValidationOptions["EXISTING_USER_WITH_EXIST_BRAND"] = "EXISTING_USER_WITH_EXIST_BRAND";
+    ValidationOptions["EXISTING_USER_WITH_OTHER_BRAND"] = "EXISTING_USER_WITH_OTHER_BRAND";
+})(ValidationOptions || (ValidationOptions = {}));
+export var MerchantValidationSchema = function (userType) {
+    var askingForBrandInfo = userType === ValidationOptions.NEW_USER || userType === ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND;
+    if (askingForBrandInfo) {
+        return yup.object().shape({
+            brandName: yup
+                .string()
+                .test({
+                test: function (value) {
+                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (length === 0)
+                        return true;
+                    return !(value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)) || (value === null || value === void 0 ? void 0 : value.length) < 3
+                        ? this.createError({ message: 'enter_brand_name_english_chars_numbers_space' })
+                        : true;
+                }
+            })
+                .required(''),
+            termAndConditionChecked: yup.boolean().required().isTrue('check_terms_cond'),
+            salesChannels: yup
+                .array()
+                .min(1, 'choose_atleast_one_channel')
+                .of(yup.object().shape({
+                id: yup.string(),
+                name_en: yup.string(),
+                name_ar: yup.string()
+            }))
+                .required('choose_atleast_one_channel'),
+            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();
+                    }
+                }),
+                app: yup
+                    .string()
+                    .nullable()
+                    .transform(function (value) { return (!!value ? value : null); })
+                    .min(2, 'enter_at_least_one')
+                    .optional(),
+                call_center: yup
+                    .string()
+                    .nullable()
+                    .transform(function (value) { return (!!value ? value : null); })
+                    .min(2, 'enter_at_least_one')
+                    .optional(),
+                physical_store: yup
+                    .string()
+                    .nullable()
+                    .transform(function (value) { return (!!value ? value : null); })
+                    .min(2, 'enter_at_least_one')
+                    .optional()
+            }, [
+                ['instagram', 'website'],
+                ['twitter', 'website'],
+                ['instagram', 'twitter']
+            ])
+        });
+    }
+    return yup.object().shape({
+        brandName: yup.string().optional(),
+        termAndConditionChecked: yup.boolean().optional(),
+        salesChannels: yup
+            .array()
+            .min(1, 'choose_atleast_one_channel')
+            .of(yup.object().shape({
+            id: yup.string(),
+            name_en: yup.string(),
+            name_ar: yup.string()
+        }))
+            .required('choose_atleast_one_channel'),
+        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();
+                }
+            }),
+            app: yup
+                .string()
+                .nullable()
+                .transform(function (value) { return (!!value ? value : null); })
+                .min(2, 'enter_at_least_one')
+                .optional(),
+            call_center: yup
+                .string()
+                .nullable()
+                .transform(function (value) { return (!!value ? value : null); })
+                .min(2, 'enter_at_least_one')
+                .optional(),
+            physical_store: yup
+                .string()
+                .nullable()
+                .transform(function (value) { return (!!value ? value : null); })
+                .min(2, 'enter_at_least_one')
+                .optional()
+        }, [
+            ['instagram', 'website'],
+            ['twitter', 'website'],
+            ['instagram', 'twitter']
+        ])
+    });
+};

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

@@ -2,14 +2,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import SuccessScreen from '../../../shared/SuccessScreen';
-import { useAppDispatch } from '../../../../hooks';
-import { updateLeadSuccess } from '../../../app/connect/connectStore';
 var ThankYou = function (_a) {
     var t = useTranslation().t;
-    var dispatch = useAppDispatch();
-    React.useEffect(function () {
-        dispatch(updateLeadSuccess());
-    }, []);
     return (_jsx(SuccessScreen, { title: t("connect_completed_title"), description: t("connect_completed_description"), showEmailProviders: true }));
 };
 export default React.memo(ThankYou);

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

@@ -67,7 +67,7 @@ var SuccessWithFlowButtons = function () {
         if (flows === void 0) { flows = []; }
         var images = ICONS_NAMES;
         var mappedFlows = flows
-            .filter(function (item) { return item.name; })
+            .filter(function (item) { return item === null || item === void 0 ? void 0 : item.name; })
             .map(function (_a) {
             var name = _a.name, url = _a.url, status = _a.status;
             var type = status === 'completed' ? 'completed' : 'pending';

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

@@ -58,8 +58,9 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     React.useEffect(function () {
-        if (error)
+        if (error && methods.formState.isValid && phone)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -71,7 +72,6 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     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 && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };

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

@@ -68,7 +68,7 @@ var SuccessWithFlowButtons = function () {
         if (flows === void 0) { flows = []; }
         var images = ICONS_NAMES;
         var mappedFlows = flows
-            .filter(function (item) { return item.name; })
+            .filter(function (item) { return item === null || item === void 0 ? void 0 : item.name; })
             .map(function (_a) {
             var name = _a.name, url = _a.url, status = _a.status;
             var type = status === 'completed' ? 'completed' : 'pending';

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

@@ -58,8 +58,9 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     React.useEffect(function () {
-        if (error)
+        if (error && methods.formState.isValid && phone)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -71,7 +72,6 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     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 && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled || resendLoading, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };

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

@@ -7,5 +7,6 @@ export interface CustomButtonProps extends ButtonProps {
     disableNextIcon?: boolean;
     onBackClicked?: () => void;
     error?: string;
+    hideError?: boolean;
 }
-export default function CustomButton({ children, disabled, isAr, loading, disableBack, onBackClicked, error, disableNextIcon, ...props }: CustomButtonProps): JSX.Element;
+export default function CustomButton({ children, disabled, isAr, loading, disableBack, onBackClicked, error, hideError, disableNextIcon, ...props }: CustomButtonProps): JSX.Element;

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

@@ -83,7 +83,7 @@ var BackButtonStyled = styled(Button, { shouldForwardProp: function (prop) { ret
     });
 });
 export default function CustomButton(_a) {
-    var children = _a.children, disabled = _a.disabled, isAr = _a.isAr, loading = _a.loading, disableBack = _a.disableBack, onBackClicked = _a.onBackClicked, error = _a.error, disableNextIcon = _a.disableNextIcon, props = __rest(_a, ["children", "disabled", "isAr", "loading", "disableBack", "onBackClicked", "error", "disableNextIcon"]);
+    var children = _a.children, disabled = _a.disabled, isAr = _a.isAr, loading = _a.loading, disableBack = _a.disableBack, onBackClicked = _a.onBackClicked, error = _a.error, hideError = _a.hideError, disableNextIcon = _a.disableNextIcon, props = __rest(_a, ["children", "disabled", "isAr", "loading", "disableBack", "onBackClicked", "error", "hideError", "disableNextIcon"]);
     var _b = React.useState(false), btnLoading = _b[0], setBtnLoading = _b[1];
     var isBackEnabled = !disableBack && !btnLoading;
     React.useEffect(function () {
@@ -95,7 +95,7 @@ export default function CustomButton(_a) {
     React.useEffect(function () {
         setBtnLoading(false);
     }, []);
-    return (_jsxs(Fragment, { children: [_jsx(Collapse, __assign({ in: !!error }, { children: _jsx(Warning, __assign({ sx: { mb: 1 }, warningType: 'error' }, { children: error })) })), _jsxs(ButtonBoxStyled, { children: [isBackEnabled && (_jsx(BackButtonStyled, __assign({ onClick: function () { return onBackClicked === null || onBackClicked === void 0 ? void 0 : onBackClicked(); }, isAr: isAr, type: 'reset', startIcon: _jsx(BackIconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props))), _jsx(ButtonStyled, __assign({ disabled: disabled, isLoading: btnLoading, type: !btnLoading ? 'submit' : 'button', isBack: isBackEnabled, endIcon: btnLoading === false
+    return (_jsxs(Fragment, { children: [_jsx(Collapse, __assign({ in: !!error && !hideError }, { children: _jsx(Warning, __assign({ sx: { mb: 1 }, warningType: 'error' }, { children: error })) })), _jsxs(ButtonBoxStyled, { children: [isBackEnabled && (_jsx(BackButtonStyled, __assign({ onClick: function () { return onBackClicked === null || onBackClicked === void 0 ? void 0 : onBackClicked(); }, isAr: isAr, type: 'reset', startIcon: _jsx(BackIconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props))), _jsx(ButtonStyled, __assign({ disabled: disabled, isLoading: btnLoading, type: !btnLoading ? 'submit' : 'button', isBack: isBackEnabled, endIcon: btnLoading === false
                             ? !disableNextIcon && _jsx(IconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW })
                             : undefined }, props, { children: !btnLoading ? (_jsxs(Text, __assign({ sx: { marginInlineEnd: isBackEnabled ? '-24px' : '-15px' } }, { children: [" ", children] }))) : (_jsx(Loader, { innerColor: 'white', outerColor: 'white', size: 15, toggleAnimation: !!loading })) }))] })] }));
 }

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

@@ -82,5 +82,5 @@ export default function SuccessButton(_a) {
     React.useEffect(function () {
         setBtnLoading(false);
     }, []);
-    return (_jsx(ButtonBoxStyled, { children: _jsx(ButtonStyled, __assign({ isAr: isAr, loading: btnLoading, disabled: disabled, type: 'button', variant: btnLoading ? 'contained' : 'outlined' }, props, { children: children })) }));
+    return (_jsx(ButtonBoxStyled, { children: _jsx(ButtonStyled, __assign({ isAr: isAr, loading: btnLoading, disabled: disabled, type: 'button', variant: btnLoading ? 'contained' : 'outlined', error: error, hideError: true }, props, { children: children })) }));
 }

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

@@ -36,16 +36,15 @@ var LabelContainerStyled = styled(Box)(function (_a) {
 });
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({ direction: theme.direction }, theme.typography.subtitle2), { color: theme.palette.primary.main, fontWeight: theme.typography.fontWeightBold, background: theme.palette.background.default, padding: theme.spacing(1.5, 2.5, 1.5), width: '85%' }));
+    return (__assign(__assign({ direction: theme.direction }, theme.typography.subtitle2), { color: theme.palette.primary.main, fontWeight: theme.typography.fontWeightBold, background: theme.palette.background.default, padding: theme.spacing(1.5, 2.5, 1.5), width: '85%', wordBreak: 'break-all' }));
 });
 var UploadBoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.caption), { background: theme.palette.primary.main, color: theme.palette.common.white, fontWeight: theme.typography.fontWeightRegular, padding: theme.spacing(0.75, 1.75, 0), cursor: 'pointer', width: '15%', display: 'flex', justifyContent: 'center' }));
+    return (__assign(__assign({}, theme.typography.caption), { background: theme.palette.primary.main, color: theme.palette.common.white, fontWeight: theme.typography.fontWeightRegular, cursor: 'pointer', width: '15%', display: 'flex', justifyContent: 'center', alignItems: 'center' }));
 });
 var ClearIconStyled = styled(ClearIcon)(function (_a) {
     var theme = _a.theme;
     return ({
-        marginBlockStart: theme.spacing(0.25),
         width: theme.spacing(3),
         height: theme.spacing(3),
         cursor: 'pointer',

package/build/features/tax/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js

@@ -67,7 +67,7 @@ var SuccessWithFlowButtons = function () {
         if (flows === void 0) { flows = []; }
         var images = ICONS_NAMES;
         var mappedFlows = flows
-            .filter(function (item) { return item.name; })
+            .filter(function (item) { return item === null || item === void 0 ? void 0 : item.name; })
             .map(function (_a) {
             var name = _a.name, url = _a.url, status = _a.status;
             var type = status === 'initiated' || status === 'in_progress' ? 'pending' : 'completed';

package/build/features/tax/screens/Verify/Verify.js

@@ -58,8 +58,9 @@ var VerifyNumber = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.user.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     React.useEffect(function () {
-        if (error)
+        if (error && methods.formState.isValid && phone)
             dispatch(clearError());
         return function () {
             dispatch(resetOTPScreen());
@@ -71,7 +72,6 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.user.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     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 && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };

package/package.json

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