@tap-payments/auth-jsconnect 1.0.51 → 1.0.52

package/build/features/bank/screens/Verify/OTPInput.js

@@ -0,0 +1,42 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import Box from '@mui/material/Box/Box';
+import { styled } from '@mui/material/styles';
+import OTPField from '../../../shared/OTP';
+import { useController, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import { DEFAULT_TIMER_VALUE } from '../../../../constants';
+var BoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'column',
+        fontFamily: theme.typography.fontFamily
+    });
+});
+var OTPInput = function (_a) {
+    var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
+    var t = useTranslation().t;
+    var otpControl = useController({ name: 'otp', control: control });
+    var handleOnOTPChange = function (otp) {
+        otpControl.field.onChange(otp);
+    };
+    var handleOnResendOTP = function () {
+        if (otpControl.field.value)
+            setValue('otp', '', { shouldValidate: true });
+    };
+    var otpValue = otpControl.field.value;
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+};
+export default React.memo(OTPInput);

package/build/features/bank/screens/Verify/Verify.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface OTPProps {
+}
+declare const _default: React.MemoExoticComponent<({}: OTPProps) => JSX.Element>;
+export default _default;

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

@@ -0,0 +1,78 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { useAppDispatch } from '../../../../hooks';
+import { useTranslation } from 'react-i18next';
+import { useSelector } from 'react-redux';
+import { useForm, FormProvider } from 'react-hook-form';
+import { yupResolver } from '@hookform/resolvers/yup';
+import Box from '@mui/material/Box/Box';
+import { styled } from '@mui/material/styles';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { useLanguage } from '../../../../hooks';
+import { maskPhone } from '../../../../utils';
+import Form from '../../../../components/Form';
+import Text from '../../../../components/Text';
+import { ScreenContainer } from '../../../shared/Containers';
+import { bankSelector, clearError, resetOTPScreen, verifyLeadOTP } from '../../../app/bank/bankStore';
+import Button from '../../../shared/Button';
+import { OTPValidation } from './validation';
+import OTPInput from './OTPInput';
+var OTPTitleContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        background: theme.palette.common.white,
+        border: '1px solid',
+        borderColor: theme.palette.divider,
+        direction: theme.direction,
+        borderRadius: theme.spacing(0, 0, 1.25, 1.25),
+        marginBottom: theme.spacing(5.75)
+    });
+});
+var OTPTitleStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightLight, marginBlock: theme.spacing(1.75), marginInlineStart: theme.spacing(2.5), lineHeight: 1.75 }));
+});
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+var VerifyNumber = function (_a) {
+    var _b, _c, _d;
+    var dispatch = useAppDispatch();
+    var _e = useSelector(bankSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var methods = useForm({
+        resolver: yupResolver(OTPValidation),
+        defaultValues: data.otpData,
+        mode: 'onChange'
+    });
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+        return function () {
+            dispatch(resetOTPScreen());
+        };
+    }, [methods.formState.isValid]);
+    var onSubmit = function (formData) {
+        dispatch(verifyLeadOTP(formData));
+    };
+    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;
+    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, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, type: 'submit', isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+};
+export default React.memo(VerifyNumber);

package/build/features/bank/screens/Verify/index.d.ts

@@ -0,0 +1,2 @@
+import OTP from './Verify';
+export default OTP;

package/build/features/bank/screens/Verify/index.js

@@ -0,0 +1,2 @@
+import OTP from './Verify';
+export default OTP;

package/build/features/bank/screens/Verify/validation.d.ts

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const OTPValidation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: 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, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

package/build/features/bank/screens/Verify/validation.js

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var OTPValidation = yup.object().shape({
+    otp: yup.string().min(6, 'otp_min_length').required('otp_required')
+});

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

@@ -1,6 +1,7 @@
 import * as React from 'react';
 interface CRNumberProps {
     show: boolean;
+    readOnly: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show }: CRNumberProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly }: CRNumberProps) => JSX.Element>;
 export default _default;

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

@@ -22,7 +22,7 @@ import Input from '../../../shared/Input';
 import Collapse from '../../../../components/Collapse';
 var CRNumber = function (_a) {
     var _b;
-    var show = _a.show;
+    var show = _a.show, readOnly = _a.readOnly;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var crNumberControl = useController({ control: control, name: 'crNumber' });
@@ -36,6 +36,6 @@ var CRNumber = function (_a) {
     };
     var crNumberValue = crNumberControl.field.value;
     var error = (_b = crNumberControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { label: t('enter_commercial_register_no'), onChange: handleFLNumberChange, inputProps: { maxLength: CR_NUMBER_LENGTH }, value: crNumberValue, endAdornment: (crNumberValue === null || crNumberValue === void 0 ? void 0 : crNumberValue.length) === CR_NUMBER_LENGTH ? (_jsx(CheckIcon, {})) : (crNumberValue && _jsx(ClearIcon, { onClick: clearCRNumber })), placeholder: '0123456789', warningType: 'alert', warningMessage: error && t(error, { length: CR_NUMBER_LENGTH }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t('enter_commercial_register_no'), onChange: handleFLNumberChange, inputProps: { maxLength: CR_NUMBER_LENGTH }, value: crNumberValue, endAdornment: (crNumberValue === null || crNumberValue === void 0 ? void 0 : crNumberValue.length) === CR_NUMBER_LENGTH ? (_jsx(CheckIcon, {})) : (crNumberValue && _jsx(ClearIcon, { onClick: clearCRNumber })), placeholder: '0123456789', warningType: 'alert', warningMessage: error && t(error, { length: CR_NUMBER_LENGTH }) }) }) })));
 };
 export default React.memo(CRNumber);

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

@@ -115,12 +115,13 @@ var CompanyLicense = function (_a) {
     };
     var hasList = (licenseList === null || licenseList === void 0 ? void 0 : licenseList.length) > 0;
     var showCRNumber = !anchorEl;
+    var crReadonly = !isOtherLicense(selectedLicense);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: hasList }, { children: [_jsx(InputStyled, { label: t('enter_commercial_register_no'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: t(getLicenseName(selectedLicense)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList, onSelectItem: onSelectItem, renderItem: function (item) {
                                     return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selectedLicense) }, { children: isOtherLicense(item)
                                                         ? t(getLicenseNumber(item))
                                                         : isAr
                                                             ? getLicenseName(item)
                                                             : getLicenseNumber(item) + '-' + getLicenseName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selectedLicense) && _jsx(CheckIcon, {})] }));
-                                } }) }))] })), _jsx(CRNumber, { show: showCRNumber })] }) })));
+                                } }) }))] })), _jsx(CRNumber, { show: showCRNumber, readOnly: crReadonly })] }) })));
 };
 export default React.memo(CompanyLicense);

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

@@ -1,6 +1,7 @@
 import * as React from 'react';
 interface FLNumberProps {
     show: boolean;
+    readOnly: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show }: FLNumberProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly }: FLNumberProps) => JSX.Element>;
 export default _default;

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

@@ -22,7 +22,7 @@ import Input from '../../../shared/Input';
 import Collapse from '../../../../components/Collapse';
 var FLNumber = function (_a) {
     var _b;
-    var show = _a.show;
+    var show = _a.show, readOnly = _a.readOnly;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var flNumberControl = useController({ control: control, name: 'flNumber' });
@@ -36,6 +36,6 @@ var FLNumber = function (_a) {
     };
     var flNumberValue = flNumberControl.field.value;
     var error = (_b = flNumberControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { label: t('enter_license_no'), onChange: handleFLNumberChange, inputProps: { maxLength: FL_NUMBER_LENGTH }, value: flNumberValue, endAdornment: (flNumberValue === null || flNumberValue === void 0 ? void 0 : flNumberValue.length) === FL_NUMBER_LENGTH ? (_jsx(CheckIcon, {})) : (flNumberValue && _jsx(ClearIcon, { onClick: clearFLNumber })), placeholder: '12345678', warningType: 'alert', warningMessage: error && t(error, { length: FL_NUMBER_LENGTH }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t('enter_license_no'), onChange: handleFLNumberChange, inputProps: { maxLength: FL_NUMBER_LENGTH }, value: flNumberValue, endAdornment: (flNumberValue === null || flNumberValue === void 0 ? void 0 : flNumberValue.length) === FL_NUMBER_LENGTH ? (_jsx(CheckIcon, {})) : (flNumberValue && _jsx(ClearIcon, { onClick: clearFLNumber })), placeholder: '12345678', warningType: 'alert', warningMessage: error && t(error, { length: FL_NUMBER_LENGTH }) }) }) })));
 };
 export default React.memo(FLNumber);

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

@@ -115,12 +115,13 @@ var FreelanceLicense = function (_a) {
     };
     var hasList = (licenseList === null || licenseList === void 0 ? void 0 : licenseList.length) > 0;
     var showFLNumber = !anchorEl;
+    var flReadonly = !isOtherLicense(selectedLicense);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: hasList }, { children: [_jsx(InputStyled, { label: t('enter_freelance_license'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_fl'), value: t(getLicenseName(selectedLicense)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList, onSelectItem: onSelectItem, renderItem: function (item) {
                                     return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selectedLicense) }, { children: isOtherLicense(item)
                                                         ? t(getLicenseNumber(item))
                                                         : isAr
                                                             ? getLicenseName(item)
                                                             : getLicenseNumber(item) + '-' + getLicenseName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selectedLicense) && _jsx(CheckIcon, {})] }));
-                                } }) }))] })), _jsx(FLNumber, { show: showFLNumber })] }) })));
+                                } }) }))] })), _jsx(FLNumber, { show: showFLNumber, readOnly: flReadonly })] }) })));
 };
 export default React.memo(FreelanceLicense);

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

@@ -51,6 +51,6 @@ var Confirm = function () {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputStyled, { label: t(isCR ? 'signup_business_cr_info_title' : 'signup_business_fl_info_title'), value: licenseNumber, disabled: true }), _jsx(InputStyled, { label: t('signup_brand_name_label'), value: brandName, disabled: true }), _jsx(InputStyled, { sx: { marginBlockEnd: 0 }, label: t('signup_legal_name_label'), value: legalName, disabled: true }), _jsx(Button, __assign({ disabled: disabled, loading: loading, error: t(error || ''), onBackClicked: function () { return onBack(); }, isAr: isAr }, { children: t('confirm') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputStyled, { label: t(isCR ? 'signup_business_cr_info_title' : 'signup_business_fl_info_title'), value: licenseNumber, disabled: true }), _jsx(InputStyled, { label: t('signup_brand_name_label'), placeholder: t('signup_brand_name_label'), value: brandName, disabled: true }), _jsx(InputStyled, { sx: { marginBlockEnd: 0 }, label: t('signup_legal_name_label'), placeholder: t('signup_legal_name_label'), value: legalName, disabled: true }), _jsx(Button, __assign({ disabled: disabled, loading: loading, error: t(error || ''), onBackClicked: function () { return onBack(); }, isAr: isAr }, { children: t('confirm') }))] })) })) }));
 };
 export default React.memo(Confirm);

package/build/features/connect/screens/Merchant/BrandList.d.ts

@@ -5,8 +5,6 @@ interface BrandListProps {
     list: Array<BrandInfo>;
     onListOpen?: () => void;
     onListClose?: () => void;
-    showTerms?: () => void;
-    hideTerms?: () => void;
 }
 declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BrandListProps) => JSX.Element>;
 export default _default;

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

@@ -20,18 +20,10 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
+import { useFormContext, useController } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { useLanguage } from '../../../../hooks';
@@ -42,7 +34,6 @@ import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
-import { OTHER_BRAND } from '../../../../constants';
 var InputStyled = styled(Input)(function () { return ({
     '& .MuiInputBase-input': {
         cursor: 'pointer'
@@ -57,11 +48,14 @@ var BrandNameText = styled(Text, { shouldForwardProp: function (prop) { return p
 });
 var BrandList = function (_a) {
     var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
-    var _b = React.useState(list), brandList = _b[0], setBrandList = _b[1];
-    var _c = React.useState(), selectedBrand = _c[0], setSelectedBrand = _c[1];
-    var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
+    var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var _c = useFormContext(), setValue = _c.setValue, control = _c.control, reset = _c.reset;
+    var linksControl = useController({ control: control, name: 'links' });
+    var selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
+    var links = linksControl.field.value;
+    var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
         var _a;
         setAnchorEl(event.currentTarget);
@@ -72,42 +66,24 @@ var BrandList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
-    React.useEffect(function () {
-        var array = list;
-        if ((array === null || array === void 0 ? void 0 : array.length) > 0) {
-            var hasOther = array === null || array === void 0 ? void 0 : array.find(function (item) { return isOtherLicense(item); });
-            var first = array[0];
-            if (first) {
-                setSelectedBrand(first);
-                if (!hasOther)
-                    array = __spreadArray(__spreadArray([], array, true), [OTHER_BRAND], false);
-                setBrandList(array);
-            }
-        }
-    }, [show, list]);
     var getBrandName = function (item) {
         var _a, _b;
-        return (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) || '';
+        return (isAr ? (_a = item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item.name) === null || _b === void 0 ? void 0 : _b.en) || '';
     };
     var getBrandId = function (item) {
-        return (item === null || item === void 0 ? void 0 : item.id) || '';
+        return item.id || '';
     };
     var isOtherLicense = function (item) {
-        return (item === null || item === void 0 ? void 0 : item.id) === 'other';
+        return item.id === 'other';
     };
     var onSelectItem = function (brand) {
-        var _a, _b;
-        setSelectedBrand(brand);
+        selectedBrandControl.field.onChange(brand);
         onCloseBrandList();
-        if (isOtherLicense(brand)) {
-            (_a = rest.showTerms) === null || _a === void 0 ? void 0 : _a.call(rest);
-            return;
-        }
-        (_b = rest.hideTerms) === null || _b === void 0 ? void 0 : _b.call(rest);
+        var website = brand.website;
+        setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
     };
-    var hasList = (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsxs(Collapse, __assign({ in: hasList }, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseBrandList(); } : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: brandList, onSelectItem: onSelectItem, renderItem: function (item) {
-                                return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherLicense(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));
-                            } }) }))] })) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: list, onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherLicense(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));
+                        } }) }))] }) })));
 };
 export default React.memo(BrandList);

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

@@ -29,21 +29,28 @@ import SocialMedia from './SocialMedia';
 import TAC from './TAC';
 import BrandList from './BrandList';
 var Merchant = function (_a) {
-    var _b, _c, _d, _e, _f, _g, _h;
-    var _j = React.useState(false), brandNameChecking = _j[0], setBrandNameChecking = _j[1];
+    var _b, _c, _d, _e, _f;
+    var _g = React.useState(false), brandNameChecking = _g[0], setBrandNameChecking = _g[1];
+    var _h = React.useState(false), isOtherBrand = _h[0], setIsOtherBrand = _h[1];
+    var _j = React.useState(false), listActive = _j[0], setListActive = _j[1];
     var _k = useSelector(connectSelector), data = _k.data, loading = _k.loading, error = _k.error;
     var isNewUser = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.new_user;
-    var _l = React.useState(isNewUser), isOther = _l[0], setIsOther = _l[1];
+    var isAbsher = data.otpData.isAbsher;
+    var brandList = ((_c = data.brandData.responseBody) === null || _c === void 0 ? void 0 : _c.brands) || [];
+    var _l = data.brandData, brandName = _l.brandName, links = _l.links, selectedBrandItem = _l.selectedBrandItem, termAndConditionChecked = _l.termAndConditionChecked;
     var methods = useForm({
-        resolver: yupResolver(MerchantValidationSchema(isOther)),
-        defaultValues: data.brandData,
+        resolver: yupResolver(MerchantValidationSchema(isOtherBrand)),
+        defaultValues: {
+            brandName: brandName,
+            links: links,
+            selectedBrandItem: selectedBrandItem,
+            termAndConditionChecked: termAndConditionChecked
+        },
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var isAbsher = data.otpData.isAbsher;
-    var _m = React.useState(false), listActive = _m[0], setListActive = _m[1];
     var onSubmit = function (formData) {
         dispatch(updateLeadBrand(formData));
     };
@@ -54,14 +61,6 @@ var Merchant = function (_a) {
         }
         dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
-    React.useEffect(function () {
-        if (!isNewUser) {
-            methods.setValue('brandName', '', { shouldValidate: true });
-            methods.setValue('termAndConditionChecked', false, {
-                shouldValidate: true
-            });
-        }
-    }, [isOther]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -70,10 +69,19 @@ var Merchant = function (_a) {
         var _a, _b;
         if (((_b = (_a = data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.response_code) === '5')
             methods.setError('brandName', { message: 'Profile Name already exists' });
-    }, [(_c = data.brandData) === null || _c === void 0 ? void 0 : _c.responseBody]);
+    }, [(_d = data.brandData) === null || _d === void 0 ? void 0 : _d.responseBody]);
+    React.useEffect(function () {
+        methods.setValue('links', __assign(__assign({}, links), { website: selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.website }), { shouldValidate: true });
+    }, []);
+    React.useEffect(function () {
+        setIsOtherBrand(methods.getValues('selectedBrandItem').id === 'other');
+        setTimeout(function () {
+            methods.setValue('termAndConditionChecked', true, { shouldValidate: true });
+        }, 300);
+    }, [methods.getValues('selectedBrandItem')]);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
-    var disabled = brandErrChecks || brandNameChecking || ((_e = (_d = data.brandData) === null || _d === void 0 ? void 0 : _d.responseBody) === null || _e === void 0 ? void 0 : _e.response_code) === '5';
-    var showBrandList = ((_g = (((_f = data.brandData) === null || _f === void 0 ? void 0 : _f.brandList) || [])) === null || _g === void 0 ? void 0 : _g.length) > 0 && !isNewUser;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: showBrandList, list: ((_h = data.brandData) === null || _h === void 0 ? void 0 : _h.brandList) || [], onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); }, showTerms: function () { return setIsOther(true); }, hideTerms: function () { return setIsOther(false); } }), _jsx(BrandName, { show: !listActive && isOther, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(SocialMedia, { show: !listActive, sx: !isOther ? { mb: 0 } : {} }), _jsx(TAC, { show: !listActive && isOther }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    var disabled = brandErrChecks || brandNameChecking || ((_f = (_e = data.brandData) === null || _e === void 0 ? void 0 : _e.responseBody) === null || _f === void 0 ? void 0 : _f.response_code) === '5';
+    var isBrandListAvailable = !isNewUser && brandList.length > 0;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: isBrandListAvailable, list: brandList, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(BrandName, { show: !listActive && isOtherBrand, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(SocialMedia, { show: !listActive }), _jsx(TAC, { show: !listActive && isOtherBrand }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

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

@@ -60,9 +60,10 @@ var SocialMedia = function (_a) {
     var show = _a.show, sx = _a.sx;
     var _e = React.useState(SocialMediaTypes.WEB), socialMediaType = _e[0], setSocialMediaType = _e[1];
     var t = useTranslation().t;
-    var control = useFormContext().control;
+    var _f = useFormContext(), control = _f.control, setValue = _f.setValue, watch = _f.watch;
     var linksControl = useController({ control: control, name: 'links' });
     var links = linksControl.field.value;
+    var brandName = watch('brandName');
     var handleChange = function (_a) {
         var _b;
         var target = _a.target;
@@ -72,6 +73,28 @@ var SocialMedia = function (_a) {
         var _a;
         linksControl.field.onChange(__assign(__assign({}, links), (_a = {}, _a[socialMediaType] = '', _a)));
     };
+    var handleBlueWebsite = function () {
+        if (!!links.website) {
+            var website = links.website;
+            var isWebHasPrefix = !!website.includes('www.');
+            var isWebHasSuffix = !!website.includes('.com');
+            if (!isWebHasPrefix)
+                website = "www.".concat(website);
+            if (!isWebHasSuffix)
+                website = "".concat(website, ".com");
+            setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
+        }
+    };
+    React.useEffect(function () {
+        if (!!brandName) {
+            var website = "www.".concat(brandName.replace(' ', '-'), ".com");
+            setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
+        }
+        if (!brandName) {
+            var website = "other.com";
+            setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
+        }
+    }, [brandName]);
     var websiteValue = links.website || '';
     var twitterValue = links.twitter || '';
     var instagramValue = links.instagram || '';
@@ -81,6 +104,6 @@ var SocialMedia = function (_a) {
     var instagramError = (_d = errors === null || errors === void 0 ? void 0 : errors.instagram) === null || _d === void 0 ? void 0 : _d.message;
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: __assign({ mt: 3, mb: 3, direction: 'ltr' }, sx) }, { children: [_jsx(SocialMediaGroupStyled, { defaultValue: socialMediaType, exclusive: true, onChange: function (e, value) {
                         setSocialMediaType(value);
-                    } }), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.WEB, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: websiteValue, startAdornment: _jsx(TextStyled, { children: "https://" }), placeholder: t('signup_website_placeholder'), warningType: 'alert', warningMessage: websiteError && t(websiteError), endAdornment: !websiteError && websiteValue ? _jsx(CheckIcon, {}) : websiteValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.TWITTER, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: twitterValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_twitter_placeholder'), warningType: 'alert', warningMessage: twitterError && t(twitterError), endAdornment: !twitterError && twitterValue ? _jsx(CheckIcon, {}) : twitterValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.INSTAGRAM, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: instagramValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_instagram_placeholder'), warningType: 'alert', warningMessage: instagramError && t(instagramError), endAdornment: !instagramError && instagramValue ? (_jsx(CheckIcon, {})) : (instagramValue && _jsx(ClearIconStyled, { onClick: handleClear })) }) }))] })) })));
+                    } }), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.WEB, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: websiteValue, onBlur: function () { return handleBlueWebsite(); }, startAdornment: _jsx(TextStyled, { children: "https://" }), placeholder: t('signup_website_placeholder'), warningType: 'alert', warningMessage: websiteError && t(websiteError), endAdornment: !websiteError && websiteValue ? _jsx(CheckIcon, {}) : websiteValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.TWITTER, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: twitterValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_twitter_placeholder'), warningType: 'alert', warningMessage: twitterError && t(twitterError), endAdornment: !twitterError && twitterValue ? _jsx(CheckIcon, {}) : twitterValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.INSTAGRAM, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: instagramValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_instagram_placeholder'), warningType: 'alert', warningMessage: instagramError && t(instagramError), endAdornment: !instagramError && instagramValue ? (_jsx(CheckIcon, {})) : (instagramValue && _jsx(ClearIconStyled, { onClick: handleClear })) }) }))] })) })));
 };
 export default React.memo(SocialMedia);

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

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const MerchantValidationSchema: (isOther: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const MerchantValidationSchema: (isOtherBrand: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
     links: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {

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

@@ -1,15 +1,17 @@
 import { REGEX_WEBSITE } from '../../../../constants';
 import * as yup from 'yup';
-export var MerchantValidationSchema = function (isOther) {
+export var MerchantValidationSchema = function (isOtherBrand) {
     return yup.object().shape({
-        brandName: isOther
+        brandName: isOtherBrand
             ? 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')
             : yup.string().optional(),
-        termAndConditionChecked: isOther ? yup.boolean().required().isTrue('check_terms_cond') : yup.boolean().optional(),
+        termAndConditionChecked: isOtherBrand
+            ? 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) {

package/build/features/featuresScreens.js

@@ -4,7 +4,6 @@ import IndividualScreen from './connect/screens/Individual';
 import MerchantInfoScreen from './connect/screens/Merchant';
 import ConnectOTPScreen from './connect/screens/OTP';
 import ThankYouScreen from './connect/screens/ThankYou';
-import PasswordScreen from './connect/screens/Password';
 import CustomersPage from './business/screens/Customers';
 import IDBODPage from './business/screens/IDBOD';
 import BusinessVerifyPage from './business/screens/Verify';
@@ -18,6 +17,7 @@ import SuccessPasswordPage from './password/screens/Success';
 import ShowIndividualInfoPage from './individual/screens/ShowIndividualInfo';
 import AdditionalIndividualInfoPage from './individual/screens/AdditionalIndividualInfo';
 import SuccessOwnerPage from './individual/screens/Success';
+import BankVerifyPage from './bank/screens/Verify';
 import BankDetailsPage from './bank/screens/BankDetails';
 import BankSuccessPage from './bank/screens/Success';
 import TaxDetailsPage from './tax/screens/TaxDetails';
@@ -39,10 +39,6 @@ export var connectFeatureScreens = [
         name: 'CONNECT_INDIVIDUAL_STEP',
         element: IndividualScreen
     },
-    {
-        name: 'CONNECT_PASSWORD_STEP',
-        element: PasswordScreen
-    },
     {
         name: 'CONNECT_MERCHANT_INFO_STEP',
         element: MerchantInfoScreen
@@ -108,6 +104,10 @@ export var individualFeatureScreens = [
     }
 ];
 export var bankFeatureScreens = [
+    {
+        name: 'BANK_VERIFY_STEP',
+        element: BankVerifyPage
+    },
     {
         name: 'BANK_BANK_DETAILS_STEP',
         element: BankDetailsPage

package/build/hooks/useAppDispatch.d.ts

@@ -2,4 +2,5 @@ export declare const useAppDispatch: () => import("redux-thunk").ThunkDispatch<{
     settings: import("../app/settings").SettingsState;
     connect: import("../features/app/connect/connectStore").ConnectState;
     business: import("../features/app/business/businessStore").BusinessState;
+    bank: import("../features/app/bank/bankStore").BankState;
 }, undefined, import("redux").AnyAction> & import("redux").Dispatch<import("redux").AnyAction>;

package/package.json

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