@licklist/design 0.69.1-dev.4 → 0.69.2

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.1-dev.4",
+  "version": "0.69.2",
   "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.1",
     "@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

@@ -17,6 +17,7 @@ import FormErrorService from '@licklist/plugins/dist/services/Form/FormErrorServ
 import { ServerError } from '@licklist/plugins/dist/hooks/Api/useHttpQuery'
 import { scrollToError } from '@licklist/plugins/dist/utils/ScrollUtils'
 import { getFirstErrorKey } from '@licklist/plugins/dist/utils/FormValues'
+
 import { ProductSet } from '@licklist/core/dist/DataMapper/Product/ProductSetDataMapper'
 import { CategoryGroup } from '../../../../types/categories'
 import { SaleDeadline } from '../SaleDeadline/SaleDeadline'
@@ -30,6 +31,7 @@ import { FileUpload } from '../../../../file-upload'
 import { IntervalInput, IntervalInputValues } from '../../IntervalInput'
 import { SelectEventProductSet } from '../SelectEventProductSet'
 import { Dialog, useDialogContext } from '../../../../modals/dialog'
+
 import { ProductSetFormValues } from '../../../../product-set/form/ProductSetForm'
 import { isUrlValid } from '../../utils/isUrlValid'
 
@@ -63,7 +65,6 @@ export interface EditEventFormProps extends HasPermissionProp {
   setEditProductSetId: (value: string) => void
   isExternalPaymentLinkEnabled?: boolean
   timeZone: string
-  eventProductSet?: ProductSet
 }
 
 const eventImageTypes = {
@@ -84,7 +85,6 @@ export const EditEventForm = ({
   setEditProductSetId,
   isExternalPaymentLinkEnabled,
   timeZone,
-  eventProductSet,
 }: EditEventFormProps) => {
   const { t } = useTranslation(['Design', 'Validation'])
 
@@ -405,7 +405,6 @@ export const EditEventForm = ({
             setShowEditProductSet={setShowEditProductSet}
             showEditProductSet={showEditProductSet}
             timeZone={timeZone}
-            eventProductSet={eventProductSet}
           />
 
           {hasPermission && !showEditProductSet && (

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

@@ -5,11 +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 { 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[]
@@ -18,22 +16,16 @@ interface SelectEventProductSetProps extends HasPermissionProp {
   createProductSet: (props: EditEventFormValues) => void
   setEditProductSetId: (value: string) => void
   timeZone: string
-  eventProductSet?: ProductSet
 }
 
 export const SelectEventProductSet = ({
-  productSets: _productSets,
+  productSets,
   createProductSet,
   setEditProductSetId,
   showEditProductSet,
   setShowEditProductSet,
   timeZone,
-  eventProductSet,
 }: SelectEventProductSetProps) => {
-  const productSets = eventProductSet
-    ? [..._productSets, eventProductSet]
-    : _productSets
-
   const { t } = useTranslation(['Design'])
   const form = useFormContext<EditEventFormValues>()
 
@@ -50,17 +42,6 @@ export const SelectEventProductSet = ({
   const productSetId = watch('productSetId')
   const editedProductSet = watch('editedProductSet')
 
-  const typeheadValues = getTypeHeadItemsFromMenus(
-    editedProductSet
-      ? productSets.map((productSet) =>
-          productSet.id === editedProductSet.id ? editedProductSet : productSet,
-        )
-      : productSets,
-  )
-  const selectedProductSetTypeheadValue = productSetId
-    ? typeheadValues?.find((typeheadValue) => typeheadValue.id === productSetId)
-    : undefined
-
   const onEditProductSet = useCallback(
     () => {
       setEditProductSetId(String(productSetId))
@@ -114,7 +95,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)
   }
 
@@ -130,72 +110,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)
-                        }}
-                        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>
 
-                <Form.Control.Feedback type='invalid'>
-                  {errors?.productSetId?.message}
-                </Form.Control.Feedback>
-              </>
-            )}
+                  <Form.Control.Feedback type='invalid'>
+                    {errors?.productSetId?.message}
+                  </Form.Control.Feedback>
+                </>
+              )
+            }}
           />
         </Form.Group>
       </div>

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,

package/src/iframe/activity-card/ActivityCard.tsx

@@ -1,29 +1,27 @@
 import { ReactNode } from 'react'
 import clsx from 'clsx'
-import { Image } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper'
 
 export const LAYOUT_GRID = 'grid'
 export const LAYOUT_LIST = 'list'
 
+type Layout = typeof LAYOUT_GRID | typeof LAYOUT_LIST
+
 export type ActivityCardProps = {
   title: ReactNode
   duration: ReactNode
   price: ReactNode
-  description?: ReactNode
   onSelect: () => void
   isSelected: boolean
-  layout?: typeof LAYOUT_GRID | typeof LAYOUT_LIST
+  layout?: Layout
   availableTimes?: string | null
-  image?: Image | null
 }
 
 export const ActivityCard = ({
   title,
   duration,
   price,
-  description,
   availableTimes,
-  image,
+  // image,
   onSelect,
   isSelected,
   layout = LAYOUT_GRID,
@@ -32,48 +30,39 @@ export const ActivityCard = ({
     return (
       <button
         type='button'
-        className={clsx('activity-card', { active: isSelected })}
+        className={clsx('activity-card', isSelected && 'active')}
         onClick={onSelect}
       >
-        {image && (
-          <img src={image.url} alt={typeof title === 'string' ? title : ''} />
-        )}
-
-        <div>
+        <div className={clsx('d-flex', 'flex-column')}>
           <div className='activity-card-title'>{title}</div>
           {duration && <div>{duration}</div>}
+
           {price && <div>{price}</div>}
-          {description && (
-            <div className='mt-2 activity-card-description'>{description}</div>
-          )}
         </div>
       </button>
     )
   }
 
   return (
-    <button
-      type='button'
-      onClick={onSelect}
-      className={clsx('activity-card list-activity-card', {
-        active: isSelected,
-      })}
-    >
-      {image && (
-        <img src={image.url} alt={typeof title === 'string' ? title : ''} />
-      )}
+    <div role='button' onClick={onSelect} onKeyPress={onSelect} tabIndex={0}>
+      <div
+        className={clsx('list-activity-card', {
+          active: isSelected,
+        })}
+      >
+        <div className='description'>
+          <div className='title mb-2'>{title}</div>
+          {availableTimes && <div>{availableTimes}</div>}
+          {duration && (
+            <div>
+              <p>{duration}</p>
+            </div>
+          )}
 
-      <div className='activity-card-info'>
-        <div className='activity-card-title mb-2'>{title}</div>
-        {availableTimes && <div>{availableTimes}</div>}
-        {duration && <div>{duration}</div>}
-        {price && <div>{price}</div>}
-        {description && (
-          <div className='mt-2 activity-card-description'>{description}</div>
-        )}
+          {price && <div>{price}</div>}
+        </div>
       </div>
-
       <hr className='list-activity-card-hr' />
-    </button>
+    </div>
   )
 }

package/src/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.tsx

@@ -89,7 +89,6 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
         <FormControl
           type='number'
           onChange={(e) => handleChangeValue(Number(e.target.value))}
-          onWheel={(event) => event.currentTarget.blur()}
           value={value}
           min={0}
           max={max}
@@ -102,14 +101,6 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
         <button
           type='button'
           onClick={handleArrowUpClick}
-          onWheel={(event) => event.currentTarget.blur()}
-          onFocus={(event) =>
-            event.target.addEventListener(
-              'wheel',
-              (event) => event.preventDefault(),
-              { passive: false },
-            )
-          }
           className={`payment-number-input__btn-up ${
             plusButtonGreyedOut && 'disabled-number-input-button'
           }`}

package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx

@@ -51,7 +51,6 @@ export const ProductQuantityInput = ({
       hasDeposit: category.allowDeposits && product?.deposit < product.price,
       price: product.price,
       productCategoryId: category.id,
-      zoneId: category.zone?.id,
       quantity,
       capacity: product?.capacity,
     })

package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx

@@ -61,7 +61,6 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail)
 
   const totalDiscount = calculateTotalDiscount(order.payments)
-
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,

package/src/iframe/ryft/RyftPaymentForm.tsx

@@ -38,7 +38,7 @@ export interface RyftPaymentFormProps {
   isCreateLoading: boolean
   isAppUsingInIframe?: boolean
   onApplePayButtonClick?: () => void
-  payButtonDisabled?: boolean
+  applePayButtonDisabled?: boolean
   initRyft: (
     onSuccess: () => void,
     onFailure: (error?: string) => void,
@@ -57,7 +57,6 @@ export const RyftPaymentForm = ({
   initRyft,
   resetReferrer,
   onSubmit,
-  payButtonDisabled,
 }: RyftPaymentFormProps) => {
   const { t } = useTranslation(['Design', 'Validation', 'Ryft'])
   const formRef = useRef<HTMLFormElement | null>(null)
@@ -90,6 +89,7 @@ export const RyftPaymentForm = ({
 
   const handleSubmit = async () => {
     setIsBtnDisabled(true)
+
     try {
       const paymentSession = await onSubmit()
 
@@ -142,21 +142,17 @@ export const RyftPaymentForm = ({
         t,
         isAppUsingInIframe,
         onApplePayButtonClick,
-        isDisableButton: !payButtonDisabled,
         additionalPaymentMethodsEnabled:
           providerPaymentSettings?.additionalPaymentMethodsEnabled,
       })
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      formRef.current?.childNodes?.length,
-      showApplePayButton,
-      payButtonDisabled,
-    ],
+    [formRef.current?.childNodes?.length, showApplePayButton],
   )
 
   useEffect(() => {
     if (!accountId.data?.account_id || accountId.isError) return
+
     initRyft(
       () => {
         addEventHandler('cardValidationChanged', (e: MessageEvent['data']) => {
@@ -219,12 +215,8 @@ export const RyftPaymentForm = ({
         onSubmit={methods.handleSubmit(handleSubmit)}
         className='ryft-payment-form'
       >
-        <div className='form-disable-box' id="form-disable-box"/>
         <div className='submit-button-wrapper mt-4 p-1'>
-          <Button
-            type='submit'
-            disabled={isBtnDisabled || !isValid}
-          >
+          <Button type='submit' disabled={isBtnDisabled || !isValid}>
             {isBtnDisabled && <ButtonLoader />}
             {t('Design:buyNow')}
           </Button>