@tap-payments/auth-jsconnect 2.0.90-test → 2.0.91-test

package/build/assets/locales/ar.json

@@ -258,5 +258,11 @@
     "cr_kw_max_length": "May you please verify the entered commercial registration number. (Note - the commercial registration minimum of 3 may contains characters and digits).",
     "fl_kw_max_length": "May you please verify the entered freelancer registration reference. (Note - the freelancer registration may contains characters and digits).",
     "title_license_certificate": "License Certificate",
+    "brand_name_already_exist": "Profile Name already exists",
+    "enter_at_least_one_call_center": "Please enter at least one call center number",
+    "enter_at_least_one_mobile_app": "Please enter at least one mobile app store",
+    "enter_at_least_one_physical_store": "Please enter at least one physical store",
+    "enter_at_least_one_website": "Please enter at least one website",
+    "enter_at_least_one_social_media": "Please enter at least one social media",
     "homemaker_reg": "Home maker"
 }

package/build/assets/locales/en.json

@@ -278,5 +278,11 @@
     "cr_kw_max_length": "May you please verify the entered commercial registration number. (Note - the commercial registration minimum of 3 may contains characters and digits).",
     "fl_kw_max_length": "May you please verify the entered freelancer registration reference. (Note - the freelancer registration may contains characters and digits).",
     "title_license_certificate": "License Certificate",
+    "brand_name_already_exist": "Profile Name already exists",
+    "enter_at_least_one_call_center": "Please enter at least one call center number",
+    "enter_at_least_one_mobile_app": "Please enter at least one mobile app store",
+    "enter_at_least_one_physical_store": "Please enter at least one physical store",
+    "enter_at_least_one_website": "Please enter at least one website",
+    "enter_at_least_one_social_media": "Please enter at least one social media",
     "homemaker_reg": "Home maker"
 }

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

@@ -80,7 +80,7 @@ var BrandList = function (_a) {
             setValue('salesChannels', brand.channel_services || []);
         if (isOtherBrand(brand)) {
             setValue('salesChannels', []);
-            setValue('brandName', 'other');
+            setValue('brandName', '');
         }
         onCloseBrandList();
     };

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

@@ -64,7 +64,8 @@ var Merchant = function (_a) {
             return;
         }
         var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
-        dispatch(handlePrevScreenStep(isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
+        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
+        dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {
         if (error)
@@ -72,12 +73,12 @@ var Merchant = function (_a) {
     }, [methods.formState.isValid]);
     React.useEffect(function () {
         if ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.response_code) === '5')
-            methods.setError('brandName', { message: 'Profile Name already exists' });
+            methods.setError('brandName', { message: 'brand_name_already_exist' });
     }, [responseBody]);
     React.useEffect(function () {
         if (selectedBrandItem.id) {
-            methods.setValue('selectedBrandItem', selectedBrandItem, { shouldValidate: true });
-            methods.setValue('salesChannels', selectedBrandItem.channel_services || [], { shouldValidate: true });
+            methods.setValue('selectedBrandItem', selectedBrandItem);
+            methods.setValue('salesChannels', selectedBrandItem.channel_services || []);
         }
     }, [selectedBrandItem]);
     React.useEffect(function () {
@@ -86,7 +87,7 @@ var Merchant = function (_a) {
     }, [salesChannels]);
     React.useEffect(function () {
         if (termAndConditionChecked === true)
-            methods.setValue('termAndConditionChecked', termAndConditionChecked, { shouldValidate: true });
+            methods.setValue('termAndConditionChecked', termAndConditionChecked);
     }, [termAndConditionChecked]);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking || ((_c = data.brandData.responseBody) === null || _c === void 0 ? void 0 : _c.response_code) === '5';

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

@@ -76,10 +76,10 @@ var SalesChannels = function (_a) {
     var _b;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var control = useFormContext().control;
+    var _c = useFormContext(), control = _c.control, getValues = _c.getValues;
     var dispatch = useAppDispatch();
     var channelsControl = useController({ control: control, name: 'salesChannels' });
-    var _c = useAppSelector(connectSelector), data = _c.data, error = _c.error;
+    var _d = useAppSelector(connectSelector), data = _d.data, error = _d.error;
     var channelList = (data.brandData.responseBody || {}).channel_list;
     var isChecked = function (id) {
         var item = channelsControl.field.value.find(function (item) { return item.id === id; });
@@ -93,7 +93,14 @@ var SalesChannels = function (_a) {
             channelsControl.field.onChange(filterChannels);
         }
         else {
-            channelsControl.field.onChange(__spreadArray(__spreadArray([], channelsControl.field.value, true), [channel], false));
+            var brandName = getValues('brandName');
+            var newChannel = __assign({}, channel);
+            if (newChannel.id === 'website' && brandName) {
+                var brandValue = brandName.replaceAll(' ', '-').toLowerCase();
+                var address = (brandValue[brandValue.length - 1] === '-' ? brandValue.slice(0, -1) : brandValue) + '.com';
+                newChannel.address = address;
+            }
+            channelsControl.field.onChange(__spreadArray(__spreadArray([], channelsControl.field.value, true), [newChannel], false));
         }
     };
     var warningMessage = (_b = channelsControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;

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

@@ -120,7 +120,14 @@ var SocialMedia = function (_a) {
     };
     var setDefaultActiveSocialId = React.useCallback(function () {
         var _a;
-        if (selectedChannels.length >= 1 && !activeSocialId) {
+        var idExist = selectedChannels.find(function (channel) {
+            var _a;
+            if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
+                return channel.sub.find(function (subChannel) { return subChannel.address; });
+            }
+            return channel.id === activeSocialId;
+        });
+        if (selectedChannels.length >= 1 && !idExist) {
             var firstChannel = selectedChannels[0];
             if ((_a = firstChannel.sub) === null || _a === void 0 ? void 0 : _a.length) {
                 setActiveSocialId(firstChannel.sub[0].id);
@@ -134,8 +141,7 @@ var SocialMedia = function (_a) {
         setDefaultActiveSocialId();
     }, [setDefaultActiveSocialId]);
     var hasError = React.useMemo(function () {
-        var _a;
-        return ['enter_at_least_one', 'ide_not_valid_url'].includes(((_a = salesChannelsState.error) === null || _a === void 0 ? void 0 : _a.message) || '');
+        return ['enter_at_least_one', 'invalid_url'].some(function (error) { var _a, _b; return (_b = (_a = salesChannelsState.error) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes(error); });
     }, [salesChannelsState]);
     var linksErrorMsg = (_b = salesChannelsState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(Box, { children: _jsx(Collapse, __assign({ in: show && selectedChannels.length > 0 }, { children: _jsxs(Box, __assign({ sx: { mb: 3, direction: 'ltr' } }, { children: [_jsx(SocialMediaGroupStyled, __assign({ exclusive: true, onChange: function (e, value) {

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

@@ -11,11 +11,11 @@ export var MerchantValidationSchema = function (isNewBrand) {
                     if (length === 0)
                         return true;
                     if (length < 3 || !(value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)))
-                        return this.createError({ message: 'enter_brand_name_english_chars_numbers_spac' });
+                        return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
                     return true;
                 }
             })
-                .required('enter_brand_name_english_chars_numbers_spac'),
+                .required('enter_brand_name_english_chars_numbers_space'),
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
             salesChannels: yup
                 .array()
@@ -31,27 +31,32 @@ export var MerchantValidationSchema = function (isNewBrand) {
                     var channels = (value || []);
                     var dic = {};
                     channels.forEach(function (channel) {
-                        var _a, _b;
+                        var _a, _b, _c;
                         if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
+                            var key_1 = (_b = channel.id) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                            if (key_1)
+                                dic[key_1] = [];
                             channel.sub.forEach(function (sub) {
-                                var _a;
-                                var key = (_a = sub.id) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-                                if (key)
-                                    dic[key] = sub.address || '';
+                                dic[key_1].push(sub.address || '');
                             });
                         }
                         else {
-                            var key = (_b = channel.id) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                            var key = (_c = channel.id) === null || _c === void 0 ? void 0 : _c.toLowerCase();
                             if (key)
-                                dic[key] = channel.address || '';
+                                dic[key] = [channel.address || ''];
                         }
                     });
-                    var requiredOneItemAtLest = Object.values(dic).every(function (item) { return item === ''; });
-                    if (requiredOneItemAtLest)
-                        return this.createError({ message: 'enter_at_least_one' });
-                    var isValidURL = !!dic['website'] ? REGEX_WEBSITE.test(dic['website']) : true;
-                    if (!isValidURL)
-                        return this.createError({ message: 'ide_not_valid_url' });
+                    for (var key in dic) {
+                        var values = dic[key];
+                        var atLestOne = values.every(function (item) { return item === ''; });
+                        if (atLestOne)
+                            return this.createError({ message: "enter_at_least_one_".concat(key) });
+                        if (key === 'website') {
+                            var isWebsite = values.every(function (item) { return item === '' || item.match(REGEX_WEBSITE); });
+                            if (!isWebsite)
+                                return this.createError({ message: 'invalid_url' });
+                        }
+                    }
                     return true;
                 }
             })
@@ -72,27 +77,32 @@ export var MerchantValidationSchema = function (isNewBrand) {
                 var channels = (value || []);
                 var dic = {};
                 channels.forEach(function (channel) {
-                    var _a, _b;
+                    var _a, _b, _c;
                     if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
+                        var key_2 = (_b = channel.id) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                        if (key_2)
+                            dic[key_2] = [];
                         channel.sub.forEach(function (sub) {
-                            var _a;
-                            var key = (_a = sub.id) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-                            if (key)
-                                dic[key] = sub.address || '';
+                            dic[key_2].push(sub.address || '');
                         });
                     }
                     else {
-                        var key = (_b = channel.id) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                        var key = (_c = channel.id) === null || _c === void 0 ? void 0 : _c.toLowerCase();
                         if (key)
-                            dic[key] = channel.address || '';
+                            dic[key] = [channel.address || ''];
                     }
                 });
-                var requiredOneItemAtLest = Object.values(dic).every(function (item) { return item === ''; });
-                if (requiredOneItemAtLest)
-                    return this.createError({ message: 'enter_at_least_one' });
-                var isValidURL = !!dic['website'] ? REGEX_WEBSITE.test(dic['website']) : true;
-                if (!isValidURL)
-                    return this.createError({ message: 'ide_not_valid_url' });
+                for (var key in dic) {
+                    var values = dic[key];
+                    var atLestOne = values.every(function (item) { return item === ''; });
+                    if (atLestOne)
+                        return this.createError({ message: "enter_at_least_one_".concat(key) });
+                    if (key === 'website') {
+                        var isWebsite = values.every(function (item) { return item === '' || item.match(REGEX_WEBSITE); });
+                        if (!isWebsite)
+                            return this.createError({ message: 'invalid_url' });
+                    }
+                }
                 return true;
             }
         })

package/package.json

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