@licklist/design 0.69.3-dev.7 → 0.69.3

package/dist/styles/product-set/ProductSetForm.scss

@@ -15,12 +15,10 @@
     height: 2.5rem;
     border-width: 2px;
     padding: 2px;
-
     label,
     .btn-switch-indicator {
       border-radius: 0.375rem !important;
     }
-
     label {
       height: 2rem;
     }
@@ -36,7 +34,6 @@
       margin-top: 1.5rem;
       margin-bottom: 1.5rem;
     }
-
     @include media-breakpoint-down(sm) {
       padding: 1.5rem 1rem;
       margin-top: 0.5rem;
@@ -62,21 +59,10 @@
     background-color: #ffdbdb;
     color: #d52902;
   }
-
   .category-badge {
     background-color: #e8f4f6;
     color: #1a93aa;
   }
-
-  .item-icon {
-    display: flex;
-    justify-items: center;
-    align-items: center;
-    font-size: 0.65rem;
-    padding: 0.2rem;
-    margin-right: 1rem;
-  }
-
   .product-badge {
     background-color: #e9f5ea;
     color: #269b36;
@@ -89,12 +75,10 @@
 
 .product-set-mobile-modal {
   margin: 0;
-
   .modal-content {
     border-radius: 1rem 1rem 0 0;
     border-width: 0;
     margin: 0;
-
     .modal-body {
       padding: 1rem 0;
     }
@@ -116,22 +100,18 @@
     font-weight: 600;
     font-size: 0.625rem;
   }
-
   .product-set-subtitle-dot {
     margin-right: 0.375rem;
     width: 0.375rem;
     height: 0.375rem;
     border-radius: 3px;
   }
-
   .product-set-subtitle-category-dot {
     background-color: #269b36;
   }
-
   .product-set-subtitle-step-dot {
     background-color: #1a93aa;
   }
-
   .product-set-subtitle-product-dot {
     background-color: #269b36;
   }
@@ -176,7 +156,6 @@
     justify-self: flex-end;
     align-items: flex-end;
   }
-
   .small-badge {
     font-size: 0.5rem;
     height: 1rem;
@@ -184,7 +163,6 @@
     padding: 0 0.2rem;
     margin-bottom: 0.2rem;
   }
-
   .product-set-save-btn-wrapper {
     padding-left: 0 !important;
     display: flex;

package/dist/styles/ryft-payment-form/RyftPaymentForm.scss

@@ -14,7 +14,6 @@
 
     .navigation {
       display: block;
-
       @include media-breakpoint-down(sm) {
         padding: 0;
       }
@@ -24,7 +23,6 @@
       margin-left: 0;
       height: calc(100vh - 2rem);
       max-height: calc(100vh - 1rem);
-
       @include media-breakpoint-down(sm) {
         width: calc(100% - 2rem);
         max-width: unset;
@@ -71,11 +69,9 @@
           .left-block {
             min-height: 100%;
           }
-
           .right-block {
             margin: 0 auto;
             width: 100%;
-
             .children-wrapper {
               .accordion {
                 .collapse {
@@ -89,7 +85,6 @@
         }
       }
     }
-
     ::-webkit-scrollbar {
       display: none;
       scrollbar-width: none;
@@ -102,13 +97,6 @@
 }
 
 .ryft-payment-form {
-  .form-disable-box {
-    display: none;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-  }
-
   .submit-button-wrapper {
     margin: -1rem 0 1rem;
 
@@ -116,18 +104,15 @@
       width: 100%;
     }
   }
-
   #mobile-pay-divider-container {
     display: flex;
     position: relative;
     margin-bottom: 1rem;
-
     #mobile-pay-divider-text {
       margin-right: 1rem;
       font-size: 0.875rem;
       font-weight: 600;
     }
-
     #mobile-pay-divider {
       width: 100%;
       border-bottom: 1px #dfdfdf solid;
@@ -140,7 +125,6 @@
     border: none;
     margin-bottom: 0.5rem;
     text-align: left;
-
     :first-child {
       font-size: 1rem;
       font-weight: 600;
@@ -151,17 +135,14 @@
       margin-bottom: 0.5rem;
     }
   }
-
   .ryft-pay-grid {
     display: flex;
     flex-direction: column;
-
     .apple-pay-button {
       height: 2.5rem;
       margin-top: 1rem;
     }
   }
-
   .mobile-pay-title {
     display: block;
     font-weight: 600;
@@ -176,14 +157,9 @@
 
 @include media-breakpoint-up(md) {
   .ryft-payment-form,
-  .form-disable-box {
-    height: 50%;
-    top: 15rem;
-  }
   .iframe-payment-form {
     position: relative;
     max-height: 300px !important;
-
     .submit-button-wrapper {
       max-width: 15.5rem;
     }
@@ -195,7 +171,6 @@
     max-width: 15.5rem;
     margin-bottom: 1rem;
   }
-
   .ryft-pay-apple-pay-button {
     border-radius: 0.25rem;
   }

package/dist/styles/sales/BookingResults.scss

@@ -5,7 +5,7 @@
     flex-wrap: wrap;
 
     .result-card {
-      height: 14rem;
+      height: 14.25rem;
       border: 1px solid $gray-400;
       max-width: calc(50% - 0.75rem);
       flex: 0 0 calc(50% - 0.75rem);

package/dist/typeahead/Typeahead.d.ts

@@ -1,4 +1,3 @@
-import { CSSObjectWithLabel } from 'react-select';
 export type TypeaheadOptions = {
     id: number | string;
     value: any;
@@ -9,14 +8,11 @@ export interface TypeaheadProps {
     placeholder: string;
     isRequired?: boolean;
     name: string;
-    value?: TypeaheadOptions;
     isMultipleChoise?: boolean;
     noOptionsMessage: string;
     isInvalid?: boolean;
     isCouponForm?: boolean;
-    containerStyles?: CSSObjectWithLabel;
-    onChangeValue?: (value: TypeaheadOptions) => void;
 }
-declare function Typeahead({ options, placeholder, isRequired, isMultipleChoise, name, value, onChangeValue, containerStyles, isCouponForm, noOptionsMessage, isInvalid, }: TypeaheadProps): import("react/jsx-runtime").JSX.Element;
+declare function Typeahead({ options, placeholder, isRequired, isMultipleChoise, name, isCouponForm, noOptionsMessage, isInvalid, }: TypeaheadProps): import("react/jsx-runtime").JSX.Element;
 export { Typeahead };
 //# sourceMappingURL=Typeahead.d.ts.map

package/dist/typeahead/Typeahead.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Typeahead.d.ts","sourceRoot":"","sources":["../../src/typeahead/Typeahead.tsx"],"names":[],"mappings":"AAAA,OAAe,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAGzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,EAAE,GAAG,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,gBAAgB,EAAE,CAAA;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,gBAAgB,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,eAAe,CAAC,EAAE,kBAAkB,CAAA;IACpC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAA;CAClD;AAED,iBAAS,SAAS,CAAC,EACjB,OAAO,EACP,WAAW,EACX,UAAkB,EAClB,gBAAgB,EAChB,IAAS,EACT,KAAK,EACL,aAAa,EACb,eAAe,EACf,YAAoB,EACpB,gBAAqB,EACrB,SAAS,GACV,EAAE,cAAc,2CAoDhB;AAED,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"Typeahead.d.ts","sourceRoot":"","sources":["../../src/typeahead/Typeahead.tsx"],"names":[],"mappings":"AAGA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,EAAE,GAAG,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,gBAAgB,EAAE,CAAA;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,iBAAS,SAAS,CAAC,EACjB,OAAO,EACP,WAAW,EACX,UAAkB,EAClB,gBAAgB,EAChB,IAAS,EACT,YAAoB,EACpB,gBAAqB,EACrB,SAAS,GACV,EAAE,cAAc,2CA4ChB;AAED,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/dist/typeahead/Typeahead.js

@@ -31,7 +31,7 @@ function _object_spread(target) {
     return target;
 }
 function Typeahead(param) {
-    var options = param.options, placeholder = param.placeholder, _param_isRequired = param.isRequired, isRequired = _param_isRequired === void 0 ? false : _param_isRequired, isMultipleChoise = param.isMultipleChoise, _param_name = param.name, name = _param_name === void 0 ? '' : _param_name, value = param.value, onChangeValue = param.onChangeValue, containerStyles = param.containerStyles, _param_isCouponForm = param.isCouponForm, isCouponForm = _param_isCouponForm === void 0 ? false : _param_isCouponForm, _param_noOptionsMessage = param.noOptionsMessage, noOptionsMessage = _param_noOptionsMessage === void 0 ? '' : _param_noOptionsMessage, isInvalid = param.isInvalid;
+    var options = param.options, placeholder = param.placeholder, _param_isRequired = param.isRequired, isRequired = _param_isRequired === void 0 ? false : _param_isRequired, isMultipleChoise = param.isMultipleChoise, _param_name = param.name, name = _param_name === void 0 ? '' : _param_name, _param_isCouponForm = param.isCouponForm, isCouponForm = _param_isCouponForm === void 0 ? false : _param_isCouponForm, _param_noOptionsMessage = param.noOptionsMessage, noOptionsMessage = _param_noOptionsMessage === void 0 ? '' : _param_noOptionsMessage, isInvalid = param.isInvalid;
     var control = useFormContext().control;
     var getStyle = function() {
         var couponFormStyle = isCouponForm ? {
@@ -53,21 +53,14 @@ function Typeahead(param) {
                 var field = param.field;
                 return /*#__PURE__*/ jsx(Select, {
                     placeholder: placeholder,
-                    value: value !== null && value !== void 0 ? value : field.value,
+                    value: field.value,
                     isMulti: isMultipleChoise,
                     styles: {
-                        container: function(base) {
-                            return _object_spread({}, base, containerStyles);
-                        },
                         control: function(base) {
                             return _object_spread({}, base, getStyle());
                         }
                     },
                     onChange: function(value) {
-                        if (onChangeValue) {
-                            onChangeValue(value);
-                            return;
-                        }
                         field.onChange(value);
                     },
                     options: options,

package/dist/zone/form/components/GameDurationControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GameDurationControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/GameDurationControl.tsx"],"names":[],"mappings":"AAOA,KAAK,wBAAwB,GAAG;IAC9B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,mBAAmB,mBAE7B,wBAAwB,4CAgC1B,CAAA"}
+{"version":3,"file":"GameDurationControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/GameDurationControl.tsx"],"names":[],"mappings":"AAOA,KAAK,wBAAwB,GAAG;IAC9B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,mBAAmB,mBAE7B,wBAAwB,4CA+B1B,CAAA"}

package/dist/zone/form/components/GameDurationControl.js

@@ -77,9 +77,6 @@ var GameDurationControl = function(param) {
                 required: false,
                 min: 1
             })), {
-                onWheel: function(event) {
-                    return event.currentTarget.blur();
-                },
                 placeholder: t('Design:duration'),
                 isInvalid: Boolean(errors.defaultDuration),
                 disabled: isLoading

package/dist/zone/form/components/SortControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SortControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/SortControl.tsx"],"names":[],"mappings":"AAOA,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CAoC1D,CAAA"}
+{"version":3,"file":"SortControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/SortControl.tsx"],"names":[],"mappings":"AAOA,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CAmC1D,CAAA"}

package/dist/zone/form/components/SortControl.js

@@ -77,9 +77,6 @@ var SortControl = function(param) {
                 required: false,
                 min: 1
             })), {
-                onWheel: function(event) {
-                    return event.currentTarget.blur();
-                },
                 placeholder: t('Design:ordering'),
                 isInvalid: Boolean(errors.sort),
                 disabled: isLoading

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.69.3-dev.7",
+  "version": "0.69.3",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -42,9 +42,9 @@
     ]
   },
   "peerDependencies": {
-    "@licklist/core": "0.30.0-dev.0",
+    "@licklist/core": "0.30.3",
     "@licklist/eslint-config": "0.5.6",
-    "@licklist/plugins": "0.33.2-dev.1",
+    "@licklist/plugins": "0.33.1",
     "lodash": "4.17.21",
     "luxon": "3.5.0",
     "react": "17.0.2",
@@ -61,9 +61,9 @@
     "@dnd-kit/utilities": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",
     "@fortawesome/free-solid-svg-icons": "5.15.2",
-    "@licklist/core": "0.30.0-dev.0",
+    "@licklist/core": "0.30.1",
     "@licklist/eslint-config": "0.5.6",
-    "@licklist/plugins": "0.33.0-dev.0",
+    "@licklist/plugins": "0.33.1",
     "@mantine/core": "6.0.22",
     "@mantine/hooks": "6.0.22",
     "@mdx-js/react": "1.6.22",
@@ -202,10 +202,8 @@
       "yarn tsc"
     ]
   },
-  "packageManager": "yarn@4.4.0",
   "volta": {
     "node": "20.9.0",
     "yarn": "4.4.0"
-  },
-  "stableVersion": "0.69.1-dev.3"
+  }
 }

package/src/affiliate/form/AffiliateForm.tsx

@@ -76,7 +76,6 @@ export const AffiliateForm = ({
   const copyToClipboard = () =>
     // eslint-disable-next-line consistent-return
     window.navigator.clipboard.writeText(formValues.link)
-
   return (
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(handleSubmit)}>

package/src/auth/Login/LoginComponent.tsx

@@ -44,7 +44,7 @@ const LoginComponent = ({
   const handleError = (error: any) => {
     notification.danger({
       title: 'Error',
-      message: error?.response?.data?.message || error.message,
+      message: error.message,
     })
   }
 

package/src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx

@@ -64,7 +64,6 @@ export interface EditEventFormProps extends HasPermissionProp {
   isExternalPaymentLinkEnabled?: boolean
   timeZone: string
   eventProductSet?: ProductSet
-  overrideNameError?: string
 }
 
 const eventImageTypes = {
@@ -86,7 +85,6 @@ export const EditEventForm = ({
   isExternalPaymentLinkEnabled,
   timeZone,
   eventProductSet,
-  overrideNameError,
 }: EditEventFormProps) => {
   const { t } = useTranslation(['Design', 'Validation'])
 
@@ -408,7 +406,6 @@ export const EditEventForm = ({
             showEditProductSet={showEditProductSet}
             timeZone={timeZone}
             eventProductSet={eventProductSet}
-            overrideNameError={overrideNameError}
           />
 
           {hasPermission && !showEditProductSet && (

package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx

@@ -5,12 +5,9 @@ import { useId } from '@react-aria/utils'
 import { Controller, useFormContext } from 'react-hook-form'
 import { HasPermissionProp } from '@licklist/plugins/dist/types/permission/Permission'
 import { ProductSet } from '@licklist/core/dist/DataMapper/Product/ProductSetDataMapper'
-import { uniqBy } from 'lodash'
-import { getTypeHeadItemsFromMenus } from '../../../../product-set/utils'
 import { ConfirmModal } from '../../../../modals/confirmation/ConfirmModal'
 import { EditEventFormValues } from '../EditEventForm/EditEventForm'
 import { EditEventProductSet } from './component/EditEventProductSet'
-import { Typeahead } from '../../../../typeahead'
 
 interface SelectEventProductSetProps extends HasPermissionProp {
   productSets?: ProductSet[]
@@ -20,7 +17,6 @@ interface SelectEventProductSetProps extends HasPermissionProp {
   setEditProductSetId: (value: string) => void
   timeZone: string
   eventProductSet?: ProductSet
-  overrideNameError?: string
 }
 
 export const SelectEventProductSet = ({
@@ -31,7 +27,6 @@ export const SelectEventProductSet = ({
   setShowEditProductSet,
   timeZone,
   eventProductSet,
-  overrideNameError,
 }: SelectEventProductSetProps) => {
   const productSets = eventProductSet
     ? [..._productSets, eventProductSet]
@@ -53,22 +48,6 @@ export const SelectEventProductSet = ({
   const productSetId = watch('productSetId')
   const editedProductSet = watch('editedProductSet')
 
-  const typeheadValues = uniqBy(
-    getTypeHeadItemsFromMenus(
-      editedProductSet
-        ? productSets.map((productSet) =>
-            productSet.id === editedProductSet.id
-              ? editedProductSet
-              : productSet,
-          )
-        : productSets,
-    ),
-    (item) => item.id,
-  )
-  const selectedProductSetTypeheadValue = productSetId
-    ? typeheadValues?.find((typeheadValue) => typeheadValue.id === productSetId)
-    : undefined
-
   const onEditProductSet = useCallback(
     () => {
       setEditProductSetId(String(productSetId))
@@ -122,7 +101,6 @@ export const SelectEventProductSet = ({
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const onSubmit = (value: EditEventFormValues['editedProductSet']) => {
     setShowEditProductSet(false)
-    setValue('productSetId', value.id)
     setValue('editedProductSet', value)
   }
 
@@ -138,73 +116,93 @@ export const SelectEventProductSet = ({
           <Controller
             control={control}
             name='productSetId'
-            render={() => (
-              <>
-                <div className='d-flex align-items-center flex-row w-100'>
-                  <ConfirmModal>
-                    {(confirm) => (
-                      <Typeahead
-                        name='productSetId'
-                        value={selectedProductSetTypeheadValue}
-                        containerStyles={{ width: '100%' }}
-                        onChangeValue={(typeheadValue) => {
-                          onChangeProductSet(Number(typeheadValue.id), confirm)
-                        }}
-                        isInvalid={!!overrideNameError}
-                        options={typeheadValues}
-                        placeholder={t('Design:choose')}
-                        noOptionsMessage={t('Design:noAvailableProductSets')}
-                      />
-                    )}
-                  </ConfirmModal>
-
-                  <div className='buttons-container'>
-                    {!showEditProductSet && !editedProductSet && (
-                      <Button
-                        variant=''
-                        className='btn product-set-button mr-4'
-                        onClick={handleCreateProductSet}
-                      >
-                        {t('addNewProductSet')}
-                      </Button>
-                    )}
-                    {showOverrideProductSet && (
-                      <Button
-                        variant=''
-                        className='btn product-set-button'
-                        onClick={onEditProductSet}
-                      >
-                        {isOverrideProductSet
-                          ? t('editOverrides')
-                          : t('editProductSet')}
-                      </Button>
-                    )}
-                    {showEditProductSet && (
-                      <Button
-                        variant=''
-                        className='btn product-set-button'
-                        onClick={revertEditProductSet}
-                      >
-                        {t('cancelAndRevert')}
-                      </Button>
-                    )}
-                    {!showEditProductSet && editedProductSet && (
-                      <Button
-                        variant=''
-                        className='btn product-set-button ml-4 text-danger'
-                        onClick={revertEditProductSet}
-                      >
-                        {t('undoChanges')}
-                      </Button>
-                    )}
+            render={({ field }) => {
+              const fieldValue = String(field.value)
+              return (
+                <>
+                  <div className='d-flex align-items-center flex-row w-100'>
+                    <ConfirmModal>
+                      {(confirm) => (
+                        <Form.Control
+                          as='select'
+                          onChange={(e) =>
+                            onChangeProductSet(Number(e.target.value), confirm)
+                          }
+                          isInvalid={Boolean(errors.productSetId)}
+                          value={fieldValue}
+                        >
+                          <option value='' hidden>
+                            {t('Design:chooseProductSet')}
+                          </option>
+                          {productSets?.map((productSet) => {
+                            const isCurrentEditedProductSet =
+                              editedProductSet &&
+                              editedProductSet?.id === productSet?.id
+                            return (
+                              <option key={productSet.id} value={productSet.id}>
+                                {isCurrentEditedProductSet ||
+                                productSet.isOverride
+                                  ? `[${t('edited')}] ${
+                                      isCurrentEditedProductSet
+                                        ? editedProductSet?.name
+                                        : productSet.name
+                                    }`
+                                  : productSet.name}
+                              </option>
+                            )
+                          })}
+                        </Form.Control>
+                      )}
+                    </ConfirmModal>
+
+                    <div className='buttons-container'>
+                      {!showEditProductSet && !editedProductSet && (
+                        <Button
+                          variant=''
+                          className='btn product-set-button mr-4'
+                          onClick={handleCreateProductSet}
+                        >
+                          {t('addNewProductSet')}
+                        </Button>
+                      )}
+                      {showOverrideProductSet && (
+                        <Button
+                          variant=''
+                          className='btn product-set-button'
+                          onClick={onEditProductSet}
+                        >
+                          {isOverrideProductSet
+                            ? t('editOverrides')
+                            : t('editProductSet')}
+                        </Button>
+                      )}
+                      {showEditProductSet && (
+                        <Button
+                          variant=''
+                          className='btn product-set-button'
+                          onClick={revertEditProductSet}
+                        >
+                          {t('cancelAndRevert')}
+                        </Button>
+                      )}
+                      {!showEditProductSet && editedProductSet && (
+                        <Button
+                          variant=''
+                          className='btn product-set-button ml-4 text-danger'
+                          onClick={revertEditProductSet}
+                        >
+                          {t('undoChanges')}
+                        </Button>
+                      )}
+                    </div>
                   </div>
-                </div>
 
-                <div className='manual-form-error'>
-                  {errors?.productSetId?.message || overrideNameError}
-                </div>
-              </>
-            )}
+                  <Form.Control.Feedback type='invalid'>
+                    {errors?.productSetId?.message}
+                  </Form.Control.Feedback>
+                </>
+              )
+            }}
           />
         </Form.Group>
       </div>
@@ -215,7 +213,6 @@ export const SelectEventProductSet = ({
             productSetId === editedProductSet?.id && editedProductSet
           }
           timeZone={timeZone}
-          overrideNameError={overrideNameError}
         />
       )}
     </>

package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx

@@ -23,14 +23,12 @@ interface EditEventProductSetProps {
   onSubmit: (value: EditEventFormValues['editedProductSet']) => void
   defaultValues?: EditEventFormValues['editedProductSet']
   timeZone: string
-  overrideNameError?: string
 }
 
 export const EditEventProductSet = ({
   onSubmit,
   defaultValues,
   timeZone,
-  overrideNameError,
 }: EditEventProductSetProps) => {
   const { companyId } = useParams<{
     companyId: string
@@ -66,15 +64,7 @@ export const EditEventProductSet = ({
     mode: 'onChange',
   })
 
-  const { reset, handleSubmit, watch, setError } = form
-
-  useEffect(() => {
-    if (!overrideNameError) {
-      return
-    }
-    setError('name', { message: overrideNameError })
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [overrideNameError])
+  const { reset, handleSubmit, watch } = form
 
   const formValues = watch()
 

package/src/events/edit-event-modal/utils/getDefaultProductSet.ts

@@ -12,8 +12,6 @@ export const getDefaultValues = (
 ): ProductSetFormValues => ({
   id: productSet?.id ?? 0,
   name: productSet?.name ?? '',
-  description: productSet?.description ?? '',
-  image: productSet?.image,
   type: productSet?.type ?? DEFAULT_PRODUCT_SET_TYPE,
   termsAndConditions: productSet?.termsAndConditions ?? '',
   operationalCost: productSet?.operationalCost ?? DEFAULT_OPERATIONAL_COST_TYPE,
@@ -39,6 +37,7 @@ export const getDefaultValues = (
               ...product,
               subProducts: subProducts?.map(({ ...subProducts }) => ({
                 ...subProducts,
+                originalProductId: null,
                 productCategoryId: undefined,
               })),
               productCategoryId: undefined,