@tap-payments/auth-jsconnect 2.0.50 → 2.0.51

package/build/features/app/brand/brandStore.d.ts

@@ -106,8 +106,8 @@ export declare const checkBrandNameAvailability: import("@reduxjs/toolkit").Asyn
 }>;
 export declare const updateBrand: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
-    formData: BrandFormValues;
-}, BrandFormValues, {
+    formData: Omit<BrandFormValues, "termAndConditionChecked" | "selectedBrandItem">;
+}, Omit<BrandFormValues, "termAndConditionChecked" | "selectedBrandItem">, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
     extra?: unknown;
@@ -176,7 +176,7 @@ type VerifyData = {
 export interface BrandData {
     verify: ResponseData & VerifyData;
     otpData: OTPFormValues & ResponseData;
-    brandData: BrandFormValues & ResponseData;
+    brandData: Omit<BrandFormValues, 'selectedBrandItem' | 'termAndConditionChecked'> & ResponseData;
     brandActivities: BrandActivitiesFormValues & ResponseData;
     flowName: FlowsTypes;
 }

package/build/features/app/brand/brandStore.js

@@ -272,9 +272,9 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (params,
                 teamSizeId = teamSize && { id: teamSize.id };
                 getAddress = function (value, isTwitter, isWeb) {
                     if (isTwitter)
-                        return '@' + value;
+                        return '@' + value.replaceAll('@', '');
                     if (isWeb)
-                        return 'https://' + value;
+                        return 'https://www.' + value.replaceAll('https://www.', '');
                     return value;
                 };
                 channel_services = isChannelServicesEditable
@@ -444,9 +444,7 @@ var initialState = {
         },
         brandData: {
             brandName: '',
-            salesChannels: [],
-            termAndConditionChecked: false,
-            selectedBrandItem: {}
+            salesChannels: []
         },
         brandActivities: {
             activities: [],
@@ -485,7 +483,7 @@ export var brandSlice = createSlice({
             state.customLoading = false;
             var _e = action.payload, data = _e.data, token = _e.token, boardResponse = _e.boardResponse, segmentsList = _e.segmentsList, teamSizeList = _e.teamSizeList, salesChannels = _e.salesChannels;
             var brand = boardResponse.brand, entity = boardResponse.entity;
-            state.data.brandData.brandName = (_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en;
+            state.data.brandData.brandName = (((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en) || '').trim();
             var selectedSegment = (_b = segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.filter(function (segment) {
                 var _a, _b;
                 return segment.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.id);
@@ -538,7 +536,7 @@ export var brandSlice = createSlice({
             var brand = boardResponse.brand, entity = boardResponse.entity;
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            state.data.brandData.brandName = (_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en;
+            state.data.brandData.brandName = (((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en) || '').trim();
             var selectedSegment = (_b = segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.filter(function (segment) {
                 var _a, _b;
                 return segment.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.id);

package/build/features/brand/screens/BrandInfo/BrandInfo.js

@@ -19,32 +19,40 @@ import { useAppDispatch, useAppSelector, useLanguage, useSetFromDefaultValues }
 import { yupResolver } from '@hookform/resolvers/yup';
 import { BrandValidationSchema } from './validation';
 import Button from '../../../shared/Button';
+import { settingsSelector } from '../../../../app/settings';
 import { clearError, brandSelector, updateBrand } from '../../../app/brand/brandStore';
 import { useTranslation } from 'react-i18next';
+import TeamSize from '../../../../features/brand/screens/BrandInfo/TeamSize';
+import Collapse from '../../../../components/Collapse';
+import { mapSalesChannel } from '../../../../utils';
 import BrandName from './BrandName';
 import Segments from './Segments';
 import SalesChannels from './SalesChannels';
-import TeamSize from '../../../../features/brand/screens/BrandInfo/TeamSize';
-import Collapse from '../../../../components/Collapse';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
 }); });
+var ListType;
+(function (ListType) {
+    ListType["SegmentsList"] = "SegmentsList";
+    ListType["TeamSizeList"] = "TeamSizeList";
+})(ListType || (ListType = {}));
 var BrandInfo = function (_a) {
     var _b = React.useState(), listActive = _b[0], setListActive = _b[1];
     var _c = React.useState(false), brandNameChecking = _c[0], setBrandNameChecking = _c[1];
     var dispatch = useAppDispatch();
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var settingData = useAppSelector(settingsSelector).data;
     var _d = useAppSelector(brandSelector), data = _d.data, loading = _d.loading, error = _d.error;
-    var _e = data.brandData, brandName = _e.brandName, segment = _e.segment, teamSize = _e.teamSize, salesChannels = _e.salesChannels, termAndConditionChecked = _e.termAndConditionChecked, selectedBrandItem = _e.selectedBrandItem, responseBody = _e.responseBody;
+    var _e = data.brandData, brandName = _e.brandName, segment = _e.segment, teamSize = _e.teamSize, salesChannels = _e.salesChannels, responseBody = _e.responseBody;
     var methods = useForm({
-        resolver: yupResolver(BrandValidationSchema((responseBody === null || responseBody === void 0 ? void 0 : responseBody.brand) || {})),
+        resolver: yupResolver(BrandValidationSchema()),
         defaultValues: {
             brandName: brandName,
             segment: segment,
             teamSize: teamSize,
-            salesChannels: salesChannels,
-            termAndConditionChecked: termAndConditionChecked,
-            selectedBrandItem: selectedBrandItem
+            salesChannels: salesChannels
         },
         mode: 'onChange'
     });
@@ -52,21 +60,18 @@ var BrandInfo = function (_a) {
     var onSubmit = function (data) {
         dispatch(updateBrand(data));
     };
-    var ListType;
-    (function (ListType) {
-        ListType["SegmentsList"] = "SegmentsList";
-        ListType["TeamSizeList"] = "TeamSizeList";
-    })(ListType || (ListType = {}));
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        if (salesChannels.length)
+            methods.setValue('salesChannels', mapSalesChannel(salesChannels), { shouldValidate: true });
+    }, []);
     React.useEffect(function () {
         if ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.response_code) === '5')
             methods.setError('brandName', { message: 'brand_name_already_exist' });
     }, [responseBody]);
-    var t = useTranslation().t;
-    var isAr = useLanguage().isAr;
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking;
     var handleMenuClick = function (flag) {

package/build/features/brand/screens/BrandInfo/SalesChannels.js

@@ -1,42 +1,24 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useController, useFormContext } from 'react-hook-form';
-import { FieldType } from '../../../../@types';
 import { useAppSelector, useAppDispatch } from '../../../../hooks';
 import { mapSalesChannel } from '../../../../utils';
 import { brandSelector, clearError } from '../../../app/brand/brandStore';
 import SalesChannel from '../../../shared/SalesChannels';
 var SalesChannels = function (_a) {
-    var _b, _c;
-    var _d = useFormContext(), control = _d.control, setValue = _d.setValue, getValues = _d.getValues;
+    var _b;
+    var control = useFormContext().control;
     var dispatch = useAppDispatch();
-    var _e = useController({ control: control, name: 'salesChannels' }), fieldState = _e.fieldState, field = _e.field;
-    var _f = useAppSelector(brandSelector), data = _f.data, error = _f.error;
-    var verify = data.verify, brandData = data.brandData;
-    var selectedBrandItem = brandData.selectedBrandItem, defaultSalesChannels = brandData.salesChannels;
-    var _g = verify.responseBody || {}, channelList = _g.channel_list, brand = _g.brand;
-    var isNonEditable = ((_b = brand === null || brand === void 0 ? void 0 : brand.data_status) === null || _b === void 0 ? void 0 : _b.name) === FieldType.NON_EDITABLE;
-    var selectedBrandControl = getValues('selectedBrandItem');
-    React.useEffect(function () {
-        if (selectedBrandItem.id) {
-            setValue('selectedBrandItem', selectedBrandItem);
-            var sales = mapSalesChannel(selectedBrandItem.channel_services || []);
-            field.onChange(sales);
-        }
-    }, [selectedBrandItem]);
-    React.useEffect(function () {
-        var _a;
-        if ((defaultSalesChannels === null || defaultSalesChannels === void 0 ? void 0 : defaultSalesChannels.length) > 0 && ((_a = field === null || field === void 0 ? void 0 : field.value) === null || _a === void 0 ? void 0 : _a.length) === 0) {
-            var sales = mapSalesChannel(defaultSalesChannels);
-            field.onChange(sales);
-        }
-    }, [defaultSalesChannels]);
+    var _c = useController({ control: control, name: 'salesChannels' }), fieldState = _c.fieldState, field = _c.field;
+    var _d = useAppSelector(brandSelector), data = _d.data, error = _d.error;
+    var channelList = (data.verify.responseBody || {}).channel_list;
+    var isNonEditable = false;
     var selectedSalesChannels = React.useMemo(function () { return mapSalesChannel(field.value); }, [(field.value || []).length]);
     var onChange = function (channels) {
         if (error)
             dispatch(clearError());
         field.onChange(channels);
     };
-    return (_jsx(SalesChannel, { disabled: isNonEditable, error: (_c = fieldState.error) === null || _c === void 0 ? void 0 : _c.message, list: channelList, selectFirstIconListener: selectedBrandControl === null || selectedBrandControl === void 0 ? void 0 : selectedBrandControl.id, onChange: onChange, defaultValue: selectedSalesChannels }));
+    return (_jsx(SalesChannel, { disabled: isNonEditable, error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, list: channelList, onChange: onChange, defaultValue: selectedSalesChannels }));
 };
 export default SalesChannels;

package/build/features/brand/screens/BrandInfo/validation.d.ts

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const BrandValidationSchema: (brand: any) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const BrandValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     segment: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;

package/build/features/brand/screens/BrandInfo/validation.js

@@ -7,7 +7,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { FieldType } from '../../../../@types';
 import { REGEX_WEBSITE, LINKEDIN_URL, SOCIAL_USERNAME, DIGITS_ONLY, REGEX_ALPHANUMERIC } from '../../../../constants';
 import * as yup from 'yup';
 var validationSalesChannels = function (channels) {
@@ -70,10 +69,9 @@ var validationSalesChannels = function (channels) {
     }
     return true;
 };
-export var BrandValidationSchema = function (brand) {
-    var _a = brand || {}, name = _a.name, channel_services = _a.channel_services, data_status = _a.data_status;
-    var isNameOptional = !name && (data_status === null || data_status === void 0 ? void 0 : data_status.name) === FieldType.NON_EDITABLE;
-    var isSalesChannelsOptional = !channel_services && (data_status === null || data_status === void 0 ? void 0 : data_status.channel_services) === FieldType.NON_EDITABLE;
+export var BrandValidationSchema = function () {
+    var isNameOptional = false;
+    var isSalesChannelsOptional = false;
     return yup.object().shape({
         brandName: isNameOptional
             ? yup.string().optional()

package/package.json

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