diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 62e9016c..a96e5764 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -4,12 +4,27 @@ module.exports = {
     "plugin:import/recommended",
     "plugin:react/recommended",
     "plugin:tailwindcss/recommended",
+    "plugin:react-hooks/recommended",
   ],
   root: true,
   settings: {
     "import/resolver": {
       node: { extensions: [".js", ".mjs", ".ts", ".d.ts"] },
     },
+    tailwindcss: {
+      callees: ["classnames", "clsx", "ctl", "cn"],
+      whitelist: [
+        "xlog-.+",
+        "text-feature-",
+        "drag-handle",
+        "no-optimization",
+        "qrcode",
+        "share-options",
+        "preserve-3d",
+        "achievement-group",
+        "comment",
+      ],
+    },
   },
   plugins: ["unused-imports"],
   rules: {
@@ -24,19 +39,4 @@ module.exports = {
     "react/no-unknown-property": ["error", { ignore: ["tw"] }],
     "tailwindcss/classnames-order": "off",
   },
-  settings: {
-    tailwindcss: {
-      callees: ["classnames", "clsx", "ctl", "cn"],
-      whitelist: [
-        "xlog-.+",
-        "text-feature-",
-        "drag-handle",
-        "no-optimization",
-        "qrcode",
-        "share-options",
-        "preserve-3d",
-        "achievement-group",
-      ],
-    },
-  },
 }
diff --git a/package.json b/package.json
index 0bc700a1..82966bd1 100644
--- a/package.json
+++ b/package.json
@@ -186,6 +186,7 @@
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-react": "7.34.1",
     "eslint-plugin-tailwindcss": "3.17.0",
+    "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-unused-imports": "3.2.0",
     "husky": "9.0.11",
     "lint-staged": "15.2.4",
@@ -219,4 +220,4 @@
       "tailwindcss-variable-colors@0.0.2": "patches/tailwindcss-variable-colors@0.0.2.patch"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9c7c4741..0f3bf1c8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -477,6 +477,9 @@ importers:
       eslint-plugin-react:
         specifier: 7.34.1
         version: 7.34.1(eslint@8.56.0)
+      eslint-plugin-react-hooks:
+        specifier: 4.6.2
+        version: 4.6.2(eslint@8.56.0)
       eslint-plugin-tailwindcss:
         specifier: 3.17.0
         version: 3.17.0(tailwindcss@3.4.3)
@@ -3606,8 +3609,8 @@ packages:
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
 
-  eslint-plugin-react-hooks@4.6.1:
-    resolution: {integrity: sha512-Ck77j8hF7l9N4S/rzSLOWEKpn994YH6iwUK8fr9mXIaQvGpQYmOnQLbiue1u5kI5T1y+gdgqosnEAO9NCz0DBg==}
+  eslint-plugin-react-hooks@4.6.2:
+    resolution: {integrity: sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
@@ -10970,7 +10973,7 @@ snapshots:
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.56.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0)
       eslint-plugin-jsx-a11y: 6.8.0(eslint@8.56.0)
       eslint-plugin-react: 7.34.1(eslint@8.56.0)
-      eslint-plugin-react-hooks: 4.6.1(eslint@8.56.0)
+      eslint-plugin-react-hooks: 4.6.2(eslint@8.56.0)
     optionalDependencies:
       typescript: 5.4.5
     transitivePeerDependencies:
@@ -11060,7 +11063,7 @@ snapshots:
       object.entries: 1.1.8
       object.fromentries: 2.0.8
 
-  eslint-plugin-react-hooks@4.6.1(eslint@8.56.0):
+  eslint-plugin-react-hooks@4.6.2(eslint@8.56.0):
     dependencies:
       eslint: 8.56.0