Merge branch 'chore/infrastructure-upgrade2' into deploy/dev

web/app/components/base/emoji-picker/Inner.tsx

@@ -72,7 +72,7 @@ const EmojiPickerInner: FC<IEmojiPickerInnerProps> = ({
   return <div className={cn(className)}>
     <div className='flex w-full flex-col items-center px-3 pb-2'>
       <div className="relative w-full">
-        <div className="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+        <div className="pointer-events-none absolute inset-y-0 left-0 z-10 flex items-center pl-3">
           <MagnifyingGlassIcon className="h-5 w-5 text-text-quaternary" aria-hidden="true" />
         </div>
         <Input

web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx

@@ -194,7 +194,7 @@ function Form<
             )}
             {tooltipContent}
           </div>
-          <div className={`grid-cols- grid${options?.length} gap-3`}>
+          <div className={cn('grid gap-3', `grid-cols-${options?.length}`)}>
             {options.filter((option) => {
               if (option.show_on.length)
                 return option.show_on.every(showOnItem => value[showOnItem.variable] === showOnItem.value)

web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-selector.tsx

@@ -32,7 +32,7 @@ const Selector: FC<SelectorProps> = ({
 
   return (
     <Popover className='relative'>
-      <PopoverButton>
+      <PopoverButton as='div'>
         {
           ({ open }) => (
             <Button className={cn(

web/eslint.config.mjs

@@ -195,9 +195,9 @@ export default combine(
       'tailwindcss/no-custom-classname': 'off',
       'tailwindcss/no-unnecessary-arbitrary-value': 'off',
 
+      'tailwindcss/no-arbitrary-value': 'off',
       'tailwindcss/classnames-order': 'warn',
       'tailwindcss/enforces-negative-arbitrary-values': 'warn',
-      'tailwindcss/no-arbitrary-value': 'warn',
       'tailwindcss/migration-from-tailwind-2': 'warn',
     },
   },