diff --git a/SoarCraft.AwaiShop/Hub/Order/Get.cs b/SoarCraft.AwaiShop/Hub/Order/Get.cs
index 10ca2415..2e824016 100644
--- a/SoarCraft.AwaiShop/Hub/Order/Get.cs
+++ b/SoarCraft.AwaiShop/Hub/Order/Get.cs
@@ -26,12 +26,12 @@ await this.Db.Orders
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 1.0.0
+     * @version 1.1.0
      * </remarks>
      */
     [Authorize]
-    public async Task<dynamic> OrderGetDetail(uint orderId) {
-        var items = await this.Db.OrderCombos
+    public async Task<dynamic> OrderGetItems(uint orderId) =>
+        await this.Db.OrderCombos
             .Where(x => x.OrderId == orderId && x.Order.UserId == this.UserId)
             .Select(x => new {
                 x.Quantity,
@@ -39,14 +39,17 @@ public async Task<dynamic> OrderGetDetail(uint orderId) {
             })
             .ToArrayAsync();
 
-        var cmts = await this.Db.Comments
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 1.3.0
+     * @version 0.1.0
+     * </remarks>
+     */
+    [Authorize]
+    public Task<uint[]> OrderGetCmts(uint orderId) =>
+        this.Db.Comments
             .Where(x => x.OrderId == orderId && x.Order.UserId == this.UserId)
             .Select(x => x.CommentId)
             .ToArrayAsync();
-
-        return new {
-            Items = items,
-            Comments = cmts
-        };
-    }
 }
diff --git a/package.json b/package.json
index 3fcb6eba..d36cb641 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@azure/msal-react": "^2.0.11",
     "@fluentui/react-components": "^9.46.4",
     "@fluentui/react-hooks": "^8.6.36",
-    "@fluentui/react-icons": "^2.0.226",
+    "@fluentui/react-icons": "^2.0.227",
     "@griffel/react": "^1.5.20",
     "@lexical/clipboard": "0.10.0",
     "@lexical/code": "0.10.0",
@@ -57,6 +57,6 @@
     "@types/react-dom": "^18.2.19",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "typescript": "^5.3.3",
-    "vite": "^5.1.0"
+    "vite": "^5.1.1"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5582967c..c52c18af 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,8 +21,8 @@ dependencies:
     specifier: ^8.6.36
     version: 8.6.36(@types/react@18.2.55)(react@18.2.0)
   '@fluentui/react-icons':
-    specifier: ^2.0.226
-    version: 2.0.226(react@18.2.0)
+    specifier: ^2.0.227
+    version: 2.0.227(react@18.2.0)
   '@griffel/react':
     specifier: ^1.5.20
     version: 1.5.20(react@18.2.0)
@@ -55,7 +55,7 @@ dependencies:
     version: 0.10.0(lexical@0.10.0)
   '@lexical/react':
     specifier: 0.10.0
-    version: 0.10.0(lexical@0.10.0)(react-dom@18.2.0)(react@18.2.0)(yjs@13.6.11)
+    version: 0.10.0(lexical@0.10.0)(react-dom@18.2.0)(react@18.2.0)(yjs@13.6.12)
   '@lexical/rich-text':
     specifier: 0.10.0
     version: 0.10.0(@lexical/clipboard@0.10.0)(@lexical/selection@0.10.0)(@lexical/utils@0.10.0)(lexical@0.10.0)
@@ -123,13 +123,13 @@ devDependencies:
     version: 18.2.19
   '@vitejs/plugin-react-swc':
     specifier: ^3.6.0
-    version: 3.6.0(vite@5.1.0)
+    version: 3.6.0(vite@5.1.1)
   typescript:
     specifier: ^5.3.3
     version: 5.3.3
   vite:
-    specifier: ^5.1.0
-    version: 5.1.0
+    specifier: ^5.1.1
+    version: 5.1.1
 
 packages:
 
@@ -385,16 +385,16 @@ packages:
       '@floating-ui/utils': 0.2.1
     dev: false
 
-  /@floating-ui/devtools@0.2.1(@floating-ui/dom@1.6.1):
+  /@floating-ui/devtools@0.2.1(@floating-ui/dom@1.6.3):
     resolution: {integrity: sha512-8PHJLbD6VhBh+LJ1uty/Bz30qs02NXCE5u8WpOhSewlYXUWl03GNXknr9AS2yaAWJEQaY27x7eByJs44gODBcw==}
     peerDependencies:
       '@floating-ui/dom': '>=1.5.4'
     dependencies:
-      '@floating-ui/dom': 1.6.1
+      '@floating-ui/dom': 1.6.3
     dev: false
 
-  /@floating-ui/dom@1.6.1:
-    resolution: {integrity: sha512-iA8qE43/H5iGozC3W0YSnVSW42Vh522yyM1gj+BqRwVsTNOyr231PsXDaV04yT39PsO0QL2QpbI/M0ZaLUQgRQ==}
+  /@floating-ui/dom@1.6.3:
+    resolution: {integrity: sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==}
     dependencies:
       '@floating-ui/core': 1.6.0
       '@floating-ui/utils': 0.2.1
@@ -441,7 +441,7 @@ packages:
     dependencies:
       '@fluentui/react-aria': 9.8.2(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-context-selector': 9.1.51(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-tabster': 9.19.0(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
@@ -466,7 +466,7 @@ packages:
     dependencies:
       '@fluentui/react-avatar': 9.6.14(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
       '@fluentui/react-button': 9.3.68(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-tabster': 9.19.0(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-theme': 9.1.16
@@ -512,7 +512,7 @@ packages:
     dependencies:
       '@fluentui/react-badge': 9.2.24(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-context-selector': 9.1.51(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-popover': 9.8.38(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
@@ -537,7 +537,7 @@ packages:
       react: '>=16.14.0 <19.0.0'
       react-dom: '>=16.14.0 <19.0.0'
     dependencies:
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-theme': 9.1.16
@@ -560,7 +560,7 @@ packages:
     dependencies:
       '@fluentui/react-aria': 9.8.2(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-button': 9.3.68(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-link': 9.2.10(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
@@ -585,7 +585,7 @@ packages:
     dependencies:
       '@fluentui/keyboard-keys': 9.0.7
       '@fluentui/react-aria': 9.8.2(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-tabster': 9.19.0(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
@@ -629,7 +629,7 @@ packages:
       react-dom: '>=16.14.0 <19.0.0'
     dependencies:
       '@fluentui/react-field': 9.1.53(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-label': 9.1.61(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
@@ -658,7 +658,7 @@ packages:
       '@fluentui/keyboard-keys': 9.0.7
       '@fluentui/react-context-selector': 9.1.51(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
       '@fluentui/react-field': 9.1.53(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-portal': 9.4.13(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-positioning': 9.13.3(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
@@ -772,7 +772,7 @@ packages:
       '@fluentui/keyboard-keys': 9.0.7
       '@fluentui/react-aria': 9.8.2(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-context-selector': 9.1.51(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-portal': 9.4.13(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
@@ -844,7 +844,7 @@ packages:
       react-dom: '>=16.14.0 <19.0.0'
     dependencies:
       '@fluentui/react-context-selector': 9.1.51(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-label': 9.1.61(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-theme': 9.1.16
@@ -873,8 +873,8 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@fluentui/react-icons@2.0.226(react@18.2.0):
-    resolution: {integrity: sha512-OF2m1plWQnvvgXqdBTAIe+S7juC1fp2fnO3kMzIFH0c6doXMegNL6brD3mIDPk+JPIaZTAmWsDHTlIV10FyvHA==}
+  /@fluentui/react-icons@2.0.227(react@18.2.0):
+    resolution: {integrity: sha512-KcuzBJvf1LL1YW7XBg7Y4RoCpFMUU2br9BPqwN5gZDKALHQF9RdHPtwdGTzxKsHacOTpHnNDQrbDW+NvxiEMVQ==}
     peerDependencies:
       react: '>=16.8.0 <19.0.0'
     dependencies:
@@ -911,7 +911,7 @@ packages:
       react: '>=16.14.0 <19.0.0'
       react-dom: '>=16.14.0 <19.0.0'
     dependencies:
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-label': 9.1.61(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-popover': 9.8.38(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
@@ -936,7 +936,7 @@ packages:
       react: '>=16.8.0 <19.0.0'
       react-dom: '>=16.8.0 <19.0.0'
     dependencies:
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-label': 9.1.61(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-popover': 9.8.38(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
@@ -1043,7 +1043,7 @@ packages:
       '@fluentui/keyboard-keys': 9.0.7
       '@fluentui/react-aria': 9.8.2(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-context-selector': 9.1.51(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-portal': 9.4.13(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-positioning': 9.13.3(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
@@ -1069,7 +1069,7 @@ packages:
       react-dom: '>=16.8.0 <19.0.0'
     dependencies:
       '@fluentui/react-button': 9.3.68(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-theme': 9.1.16
@@ -1205,8 +1205,8 @@ packages:
       react: '>=16.14.0 <19.0.0'
       react-dom: '>=16.14.0 <19.0.0'
     dependencies:
-      '@floating-ui/devtools': 0.2.1(@floating-ui/dom@1.6.1)
-      '@floating-ui/dom': 1.6.1
+      '@floating-ui/devtools': 0.2.1(@floating-ui/dom@1.6.3)
+      '@floating-ui/dom': 1.6.3
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-theme': 9.1.16
       '@fluentui/react-utilities': 9.18.0(@types/react@18.2.55)(react@18.2.0)
@@ -1249,7 +1249,7 @@ packages:
       react: '>=16.14.0 <19.0.0'
       react-dom: '>=16.14.0 <19.0.0'
     dependencies:
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-tabster': 9.19.0(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
@@ -1298,7 +1298,7 @@ packages:
       react-dom: '>=16.14.0 <19.0.0'
     dependencies:
       '@fluentui/react-field': 9.1.53(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-theme': 9.1.16
@@ -1382,7 +1382,7 @@ packages:
     dependencies:
       '@fluentui/keyboard-keys': 9.0.7
       '@fluentui/react-field': 9.1.53(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-theme': 9.1.16
@@ -1427,7 +1427,7 @@ packages:
       react-dom: '>=16.14.0 <19.0.0'
     dependencies:
       '@fluentui/react-field': 9.1.53(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-label': 9.1.61(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
@@ -1457,7 +1457,7 @@ packages:
       '@fluentui/react-avatar': 9.6.14(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
       '@fluentui/react-checkbox': 9.2.12(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
       '@fluentui/react-context-selector': 9.1.51(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-radio': 9.2.7(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
@@ -1530,7 +1530,7 @@ packages:
       '@fluentui/keyboard-keys': 9.0.7
       '@fluentui/react-aria': 9.8.2(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-avatar': 9.6.14(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-tabster': 9.19.0(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
@@ -1606,7 +1606,7 @@ packages:
     dependencies:
       '@fluentui/keyboard-keys': 9.0.7
       '@fluentui/react-aria': 9.8.2(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-portal': 9.4.13(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
@@ -1687,7 +1687,7 @@ packages:
       '@fluentui/react-button': 9.3.68(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)
       '@fluentui/react-checkbox': 9.2.12(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
       '@fluentui/react-context-selector': 9.1.51(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
-      '@fluentui/react-icons': 2.0.226(react@18.2.0)
+      '@fluentui/react-icons': 2.0.227(react@18.2.0)
       '@fluentui/react-jsx-runtime': 9.0.29(@types/react@18.2.55)(react@18.2.0)
       '@fluentui/react-radio': 9.2.7(@types/react-dom@18.2.19)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0)(scheduler@0.20.2)
       '@fluentui/react-shared-contexts': 9.14.0(@types/react@18.2.55)(react@18.2.0)
@@ -1940,7 +1940,7 @@ packages:
       lexical: 0.10.0
     dev: false
 
-  /@lexical/react@0.10.0(lexical@0.10.0)(react-dom@18.2.0)(react@18.2.0)(yjs@13.6.11):
+  /@lexical/react@0.10.0(lexical@0.10.0)(react-dom@18.2.0)(react@18.2.0)(yjs@13.6.12):
     resolution: {integrity: sha512-7Ql/Y3FZSsPSCObT58CYRUd4tQzKL2U8B1xO0KXZBUbj+sO6gpNbc7/Y7MiZwCQzVNwP84j7mwkXQ1EnUBS52A==}
     peerDependencies:
       lexical: 0.10.0
@@ -1963,7 +1963,7 @@ packages:
       '@lexical/table': 0.10.0(lexical@0.10.0)
       '@lexical/text': 0.10.0(lexical@0.10.0)
       '@lexical/utils': 0.10.0(lexical@0.10.0)
-      '@lexical/yjs': 0.10.0(lexical@0.10.0)(yjs@13.6.11)
+      '@lexical/yjs': 0.10.0(lexical@0.10.0)(yjs@13.6.12)
       lexical: 0.10.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -2022,7 +2022,7 @@ packages:
       lexical: 0.10.0
     dev: false
 
-  /@lexical/yjs@0.10.0(lexical@0.10.0)(yjs@13.6.11):
+  /@lexical/yjs@0.10.0(lexical@0.10.0)(yjs@13.6.12):
     resolution: {integrity: sha512-OV5yLl4XjfDKgRPSb1EyefU7c+MILKZrOzbPlv2xeTgIEd/sJiEszxvJlYsngLLN65wBDNKk90EcCWpH3KLz7A==}
     peerDependencies:
       lexical: 0.10.0
@@ -2030,7 +2030,7 @@ packages:
     dependencies:
       '@lexical/offset': 0.10.0(lexical@0.10.0)
       lexical: 0.10.0
-      yjs: 13.6.11
+      yjs: 13.6.12
     dev: false
 
   /@microsoft/signalr-protocol-msgpack@8.0.0:
@@ -2063,104 +2063,104 @@ packages:
     engines: {node: '>= 10'}
     dev: false
 
-  /@rollup/rollup-android-arm-eabi@4.9.6:
-    resolution: {integrity: sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==}
+  /@rollup/rollup-android-arm-eabi@4.10.0:
+    resolution: {integrity: sha512-/MeDQmcD96nVoRumKUljsYOLqfv1YFJps+0pTrb2Z9Nl/w5qNUysMaWQsrd1mvAlNT4yza1iVyIu4Q4AgF6V3A==}
     cpu: [arm]
     os: [android]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-android-arm64@4.9.6:
-    resolution: {integrity: sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==}
+  /@rollup/rollup-android-arm64@4.10.0:
+    resolution: {integrity: sha512-lvu0jK97mZDJdpZKDnZI93I0Om8lSDaiPx3OiCk0RXn3E8CMPJNS/wxjAvSJJzhhZpfjXsjLWL8LnS6qET4VNQ==}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-darwin-arm64@4.9.6:
-    resolution: {integrity: sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==}
+  /@rollup/rollup-darwin-arm64@4.10.0:
+    resolution: {integrity: sha512-uFpayx8I8tyOvDkD7X6n0PriDRWxcqEjqgtlxnUA/G9oS93ur9aZ8c8BEpzFmsed1TH5WZNG5IONB8IiW90TQg==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-darwin-x64@4.9.6:
-    resolution: {integrity: sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==}
+  /@rollup/rollup-darwin-x64@4.10.0:
+    resolution: {integrity: sha512-nIdCX03qFKoR/MwQegQBK+qZoSpO3LESurVAC6s6jazLA1Mpmgzo3Nj3H1vydXp/JM29bkCiuF7tDuToj4+U9Q==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm-gnueabihf@4.9.6:
-    resolution: {integrity: sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==}
+  /@rollup/rollup-linux-arm-gnueabihf@4.10.0:
+    resolution: {integrity: sha512-Fz7a+y5sYhYZMQFRkOyCs4PLhICAnxRX/GnWYReaAoruUzuRtcf+Qnw+T0CoAWbHCuz2gBUwmWnUgQ67fb3FYw==}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-gnu@4.9.6:
-    resolution: {integrity: sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==}
+  /@rollup/rollup-linux-arm64-gnu@4.10.0:
+    resolution: {integrity: sha512-yPtF9jIix88orwfTi0lJiqINnlWo6p93MtZEoaehZnmCzEmLL0eqjA3eGVeyQhMtxdV+Mlsgfwhh0+M/k1/V7Q==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-musl@4.9.6:
-    resolution: {integrity: sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==}
+  /@rollup/rollup-linux-arm64-musl@4.10.0:
+    resolution: {integrity: sha512-9GW9yA30ib+vfFiwjX+N7PnjTnCMiUffhWj4vkG4ukYv1kJ4T9gHNg8zw+ChsOccM27G9yXrEtMScf1LaCuoWQ==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-riscv64-gnu@4.9.6:
-    resolution: {integrity: sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==}
+  /@rollup/rollup-linux-riscv64-gnu@4.10.0:
+    resolution: {integrity: sha512-X1ES+V4bMq2ws5fF4zHornxebNxMXye0ZZjUrzOrf7UMx1d6wMQtfcchZ8SqUnQPPHdOyOLW6fTcUiFgHFadRA==}
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-x64-gnu@4.9.6:
-    resolution: {integrity: sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==}
+  /@rollup/rollup-linux-x64-gnu@4.10.0:
+    resolution: {integrity: sha512-w/5OpT2EnI/Xvypw4FIhV34jmNqU5PZjZue2l2Y3ty1Ootm3SqhI+AmfhlUYGBTd9JnpneZCDnt3uNOiOBkMyw==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-x64-musl@4.9.6:
-    resolution: {integrity: sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==}
+  /@rollup/rollup-linux-x64-musl@4.10.0:
+    resolution: {integrity: sha512-q/meftEe3QlwQiGYxD9rWwB21DoKQ9Q8wA40of/of6yGHhZuGfZO0c3WYkN9dNlopHlNT3mf5BPsUSxoPuVQaw==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-arm64-msvc@4.9.6:
-    resolution: {integrity: sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==}
+  /@rollup/rollup-win32-arm64-msvc@4.10.0:
+    resolution: {integrity: sha512-NrR6667wlUfP0BHaEIKgYM/2va+Oj+RjZSASbBMnszM9k+1AmliRjHc3lJIiOehtSSjqYiO7R6KLNrWOX+YNSQ==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-ia32-msvc@4.9.6:
-    resolution: {integrity: sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==}
+  /@rollup/rollup-win32-ia32-msvc@4.10.0:
+    resolution: {integrity: sha512-FV0Tpt84LPYDduIDcXvEC7HKtyXxdvhdAOvOeWMWbQNulxViH2O07QXkT/FffX4FqEI02jEbCJbr+YcuKdyyMg==}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-x64-msvc@4.9.6:
-    resolution: {integrity: sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==}
+  /@rollup/rollup-win32-x64-msvc@4.10.0:
+    resolution: {integrity: sha512-OZoJd+o5TaTSQeFFQ6WjFCiltiYVjIdsXxwu/XZ8qRpsvMQr4UsVrE5UyT9RIvsnuF47DqkJKhhVZ2Q9YW9IpQ==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
@@ -2348,13 +2348,13 @@ packages:
   /@types/scheduler@0.16.8:
     resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==}
 
-  /@vitejs/plugin-react-swc@3.6.0(vite@5.1.0):
+  /@vitejs/plugin-react-swc@3.6.0(vite@5.1.1):
     resolution: {integrity: sha512-XFRbsGgpGxGzEV5i5+vRiro1bwcIaZDIdBRP16qwm+jP68ue/S8FJTBEgOeojtVDYrbSua3XFp71kC8VJE6v+g==}
     peerDependencies:
       vite: ^4 || ^5
     dependencies:
       '@swc/core': 1.4.0
-      vite: 5.1.0
+      vite: 5.1.1
     transitivePeerDependencies:
       - '@swc/helpers'
     dev: true
@@ -2831,7 +2831,7 @@ packages:
       function-bind: 1.1.2
       has-proto: 1.0.1
       has-symbols: 1.0.3
-      hasown: 2.0.0
+      hasown: 2.0.1
     dev: false
 
   /glob-parent@5.1.2:
@@ -2878,8 +2878,8 @@ packages:
     engines: {node: '>= 0.4'}
     dev: false
 
-  /hasown@2.0.0:
-    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
+  /hasown@2.0.1:
+    resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==}
     engines: {node: '>= 0.4'}
     dependencies:
       function-bind: 1.1.2
@@ -3378,26 +3378,26 @@ packages:
       glob: 7.2.3
     dev: false
 
-  /rollup@4.9.6:
-    resolution: {integrity: sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==}
+  /rollup@4.10.0:
+    resolution: {integrity: sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
     dependencies:
       '@types/estree': 1.0.5
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.9.6
-      '@rollup/rollup-android-arm64': 4.9.6
-      '@rollup/rollup-darwin-arm64': 4.9.6
-      '@rollup/rollup-darwin-x64': 4.9.6
-      '@rollup/rollup-linux-arm-gnueabihf': 4.9.6
-      '@rollup/rollup-linux-arm64-gnu': 4.9.6
-      '@rollup/rollup-linux-arm64-musl': 4.9.6
-      '@rollup/rollup-linux-riscv64-gnu': 4.9.6
-      '@rollup/rollup-linux-x64-gnu': 4.9.6
-      '@rollup/rollup-linux-x64-musl': 4.9.6
-      '@rollup/rollup-win32-arm64-msvc': 4.9.6
-      '@rollup/rollup-win32-ia32-msvc': 4.9.6
-      '@rollup/rollup-win32-x64-msvc': 4.9.6
+      '@rollup/rollup-android-arm-eabi': 4.10.0
+      '@rollup/rollup-android-arm64': 4.10.0
+      '@rollup/rollup-darwin-arm64': 4.10.0
+      '@rollup/rollup-darwin-x64': 4.10.0
+      '@rollup/rollup-linux-arm-gnueabihf': 4.10.0
+      '@rollup/rollup-linux-arm64-gnu': 4.10.0
+      '@rollup/rollup-linux-arm64-musl': 4.10.0
+      '@rollup/rollup-linux-riscv64-gnu': 4.10.0
+      '@rollup/rollup-linux-x64-gnu': 4.10.0
+      '@rollup/rollup-linux-x64-musl': 4.10.0
+      '@rollup/rollup-win32-arm64-msvc': 4.10.0
+      '@rollup/rollup-win32-ia32-msvc': 4.10.0
+      '@rollup/rollup-win32-x64-msvc': 4.10.0
       fsevents: 2.3.3
     dev: true
 
@@ -3668,8 +3668,8 @@ packages:
     engines: {node: '>= 0.8'}
     dev: false
 
-  /vite@5.1.0:
-    resolution: {integrity: sha512-STmSFzhY4ljuhz14bg9LkMTk3d98IO6DIArnTY6MeBwiD1Za2StcQtz7fzOUnRCqrHSD5+OS2reg4HOz1eoLnw==}
+  /vite@5.1.1:
+    resolution: {integrity: sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -3698,7 +3698,7 @@ packages:
     dependencies:
       esbuild: 0.19.12
       postcss: 8.4.35
-      rollup: 4.9.6
+      rollup: 4.10.0
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
@@ -3781,8 +3781,8 @@ packages:
       yargs-parser: 20.2.9
     dev: false
 
-  /yjs@13.6.11:
-    resolution: {integrity: sha512-FvRRJKX9u270dOLkllGF/UDCWwmIv2Z+ucM4v1QO1TuxdmoiMnSUXH1HAcOKOrkBEhQtPTkxep7tD2DrQB+l0g==}
+  /yjs@13.6.12:
+    resolution: {integrity: sha512-KOT8ILoyVH2f/PxPadeu5kVVS055D1r3x1iFfJVJzFdnN98pVGM8H07NcKsO+fG3F7/0tf30Vnokf5YIqhU/iw==}
     engines: {node: '>=16.0.0', npm: '>=8.0.0'}
     dependencies:
       lib0: 0.2.88
diff --git a/src/Pages/History/Append.tsx b/src/Components/Order/Append.tsx
similarity index 72%
rename from src/Pages/History/Append.tsx
rename to src/Components/Order/Append.tsx
index 4484cb63..cfad0730 100644
--- a/src/Pages/History/Append.tsx
+++ b/src/Components/Order/Append.tsx
@@ -1,10 +1,11 @@
 import { Button, Field, Textarea, Toast, ToastTitle, makeStyles } from "@fluentui/react-components";
 import { useConst } from "@fluentui/react-hooks";
 import { useState } from "react";
-import { Logger } from "~/Helpers/Logger";
 import { Flex } from "~/Helpers/Styles";
 import { useErrorToast } from "~/Helpers/useToast";
 import { Hub } from "~/ShopNet";
+import { AdminHub } from "~/ShopNet/Admin";
+import { IOrderComp } from "./Comment";
 
 /**
  * @author Aloento
@@ -21,21 +22,9 @@ const useStyles = makeStyles({
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.1.1
+ * @version 1.0.0
  */
-interface IOrderAppend {
-  OrderId: number;
-  Status?: string;
-  Refresh: () => void;
-  ParentLog: Logger;
-}
-
-/**
- * @author Aloento
- * @since 0.5.0
- * @version 0.4.2
- */
-export function OrderAppend({ OrderId, Status, Refresh, ParentLog }: IOrderAppend) {
+export function CommentAppend({ OrderId, Refresh, ParentLog, Status, Admin }: IOrderComp) {
   const log = useConst(() => ParentLog.With("Append"));
 
   const style = useStyles();
@@ -43,7 +32,9 @@ export function OrderAppend({ OrderId, Status, Refresh, ParentLog }: IOrderAppen
 
   const { dispatch, dispatchToast } = useErrorToast(log);
 
-  const { run: append } = Hub.Order.Post.useAppend({
+  const hub = (Admin ? AdminHub : Hub).Order.Post as typeof AdminHub.Order.Post & typeof Hub.Order.Post;
+
+  const { run: append } = hub.useAppend({
     manual: true,
     onError(e, req) {
       dispatch({
@@ -64,11 +55,11 @@ export function OrderAppend({ OrderId, Status, Refresh, ParentLog }: IOrderAppen
     }
   });
 
-  const { run: cancel } = Hub.Order.Post.useCancel({
+  const { run: cancel } = (Admin ? hub.useClose : hub.useCancel)({
     manual: true,
     onError(e, params) {
       dispatch({
-        Message: "Failed Cancel Order",
+        Message: `Failed ${Admin ? "Close" : "Cancel"} Order`,
         Request: params,
         Error: e
       });
@@ -76,7 +67,7 @@ export function OrderAppend({ OrderId, Status, Refresh, ParentLog }: IOrderAppen
     onSuccess() {
       dispatchToast(
         <Toast>
-          <ToastTitle>Order Canceled</ToastTitle>
+          <ToastTitle>Order {Admin ? "Closed" : "Cancelled"}</ToastTitle>
         </Toast>,
         { intent: "success" }
       );
@@ -100,7 +91,11 @@ export function OrderAppend({ OrderId, Status, Refresh, ParentLog }: IOrderAppen
       {
         !(Status === "Finished" || Status === "Returning") &&
         <Button onClick={() => cancel(OrderId, cmt!)}>
-          {Status === "Shipping" ? "Ask Return" : "Cancel Order"} with Reason
+          {
+            Admin
+              ? "Force Close"
+              : Status === "Shipping" ? "Ask Return" : "Cancel Order"
+          } with Reason
         </Button>
       }
 
diff --git a/src/Components/Order/Comment.tsx b/src/Components/Order/Comment.tsx
new file mode 100644
index 00000000..ddbcd88b
--- /dev/null
+++ b/src/Components/Order/Comment.tsx
@@ -0,0 +1,60 @@
+import { Body1, Caption1Stronger, Field, Label } from "@fluentui/react-components";
+import { useConst } from "@fluentui/react-hooks";
+import { useRequest } from "ahooks";
+import { ICompLog } from "~/Helpers/Logger";
+import { Hub } from "~/ShopNet";
+import { CommentAppend } from "./Append";
+
+/**
+ * @author Aloento
+ * @since 1.0.0
+ * @version 0.1.0
+ */
+export interface IComment {
+  Content: string;
+  Time: Date;
+  User: string;
+}
+
+/**
+ * @author Aloento
+ * @since 0.5.0
+ * @version 0.2.0
+ */
+export interface IOrderComp extends ICompLog {
+  OrderId: number;
+  Refresh: () => void;
+  Status?: string;
+  Admin?: true;
+}
+
+/**
+ * @author Aloento
+ * @since 1.0.0
+ * @version 0.1.0
+ */
+export function OrderComment({ OrderId, Refresh, ParentLog, Status, Admin }: IOrderComp) {
+  const log = useConst(() => ParentLog.With("Comment"));
+
+  const { data, run } = useRequest(() => Hub.Order.Get.Cmts(OrderId, log), {
+    manual: true,
+    onError: log.error
+  });
+
+  return <>
+    <Field label="Comment" size="large">
+      {data?.length === 0
+        ?
+        <Label>No Comment</Label>
+        :
+        data?.map((v, i) => <div key={i}>
+          <Caption1Stronger>{v.User} {v.Time.toLocaleString()}</Caption1Stronger>
+          <br />
+          <Body1>{v.Content}</Body1>
+        </div>
+        )}
+    </Field>
+
+    <CommentAppend OrderId={OrderId} Status={Status} Refresh={run} ParentLog={log} />
+  </>;
+}
diff --git a/src/Components/OrderInfo.tsx b/src/Components/OrderInfo.tsx
index 726c017a..8be239bb 100644
--- a/src/Components/OrderInfo.tsx
+++ b/src/Components/OrderInfo.tsx
@@ -27,7 +27,7 @@ const useStyles = makeStyles({
  */
 interface IOrderInfo {
   OrderId: number;
-  Order: OrderEntity.Order;
+  Order?: OrderEntity.Order;
   Admin?: true;
 }
 
diff --git a/src/Pages/Admin/Order/Append.tsx b/src/Pages/Admin/Order/Append.tsx
deleted file mode 100644
index 74dead5b..00000000
--- a/src/Pages/Admin/Order/Append.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Button, Field, Textarea, Toast, ToastTitle, makeStyles } from "@fluentui/react-components";
-import { useState } from "react";
-import { Logger } from "~/Helpers/Logger";
-import { Flex } from "~/Helpers/Styles";
-import { useErrorToast } from "~/Helpers/useToast";
-import { AdminHub } from "~/ShopNet/Admin";
-
-/**
- * @author Aloento
- * @since 0.5.0
- * @version 0.1.0
- */
-const useStyles = makeStyles({
-  body: {
-    ...Flex,
-    justifyContent: "space-between"
-  },
-});
-
-interface IAdminOrderAppend {
-  OrderId: number;
-  Refresh: () => void;
-}
-
-const log = new Logger("Admin", "Order", "Detail", "Append");
-
-/**
- * @author Aloento
- * @since 0.5.0
- * @version 0.2.2
- */
-export function AdminOrderAppend({ OrderId, Refresh }: IAdminOrderAppend) {
-  const style = useStyles();
-  const [cmt, setCmt] = useState<string>();
-
-  const { dispatch, dispatchToast } = useErrorToast(log);
-
-  const { run: append } = AdminHub.Order.Post.useAppend({
-    manual: true,
-    onError(e, params) {
-      dispatch({
-        Message: "Failed Append Comment",
-        Request: params,
-        Error: e
-      });
-    },
-    onSuccess() {
-      dispatchToast(
-        <Toast>
-          <ToastTitle>Comment Appended</ToastTitle>
-        </Toast>,
-        { intent: "success" }
-      );
-
-      Refresh();
-    }
-  });
-
-  const { run: close } = AdminHub.Order.Post.useClose({
-    manual: true,
-    onError(e, params) {
-      dispatch({
-        Message: "Failed Close Order",
-        Request: params,
-        Error: e
-      });
-    },
-    onSuccess() {
-      dispatchToast(
-        <Toast>
-          <ToastTitle>Order Closed</ToastTitle>
-        </Toast>,
-        { intent: "success" }
-      );
-
-      Refresh();
-    }
-  });
-
-  return <>
-    <Field label="Append" size="large">
-      <Textarea value={cmt} onChange={(_, v) => setCmt(v.value)} maxLength={1000} />
-    </Field>
-
-    <div className={style.body}>
-      <Button onClick={() => close(OrderId, cmt!)}>
-        Force Close with Reason
-      </Button>
-
-      <Button appearance="primary" onClick={() => append(OrderId, cmt!)}>
-        Add Comment
-      </Button>
-    </div>
-  </>;
-}
diff --git a/src/Pages/Admin/Order/Detail.tsx b/src/Pages/Admin/Order/Detail.tsx
index ae2060b9..50ce7a27 100644
--- a/src/Pages/Admin/Order/Detail.tsx
+++ b/src/Pages/Admin/Order/Detail.tsx
@@ -3,14 +3,14 @@ import { Drawer, DrawerBody, DrawerHeader, DrawerHeaderTitle } from "@fluentui/r
 import { DismissRegular, OpenRegular } from "@fluentui/react-icons";
 import { useBoolean, useRequest } from "ahooks";
 import { useEffect } from "react";
+import { CommentAppend } from "~/Components/Order/Append";
+import { OrderComment } from "~/Components/Order/Comment";
 import { OrderInfo } from "~/Components/OrderInfo";
 import { useRouter } from "~/Components/Router";
 import { Logger } from "~/Helpers/Logger";
 import { ColFlex } from "~/Helpers/Styles";
-import { OrderComment } from "~/Pages/History/Comment";
 import { AdminHub } from "~/ShopNet/Admin";
 import { AdminOrderAction } from "./Action";
-import { AdminOrderAppend } from "./Append";
 import { AdminOrderList } from "./List";
 import { Shipment } from "./Ship";
 
@@ -31,7 +31,7 @@ const log = new Logger("Admin", "Order", "Detail");
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.3.1
+ * @version 0.4.0
  */
 export function AdminOrderDetail({ OrderId }: { OrderId: number; }) {
   const style = useStyles();
@@ -104,7 +104,7 @@ export function AdminOrderDetail({ OrderId }: { OrderId: number; }) {
 
         <OrderComment Comments={data?.Comments} />
 
-        <AdminOrderAppend OrderId={OrderId} Refresh={run} />
+        <CommentAppend OrderId={OrderId} Status={order?.Status} Admin Refresh={run} ParentLog={log} />
 
         <AdminOrderAction OrderId={OrderId} Status={order?.Status} Refresh={run} />
       </DrawerBody>
diff --git a/src/Pages/History/Action.tsx b/src/Pages/History/Action.tsx
index 2fc866fa..56fd640b 100644
--- a/src/Pages/History/Action.tsx
+++ b/src/Pages/History/Action.tsx
@@ -1,7 +1,7 @@
 import { Button, Field, Toast, ToastTitle, makeStyles } from "@fluentui/react-components";
 import { useConst } from "@fluentui/react-hooks";
+import { IOrderComp } from "~/Components/Order/Comment";
 import { useRouter } from "~/Components/Router";
-import { ICompLog } from "~/Helpers/Logger";
 import { ColFlex } from "~/Helpers/Styles";
 import { useErrorToast } from "~/Helpers/useToast";
 import { Hub } from "~/ShopNet";
@@ -18,23 +18,12 @@ const useStyles = makeStyles({
   },
 });
 
-/**
- * @author Aloento
- * @since 1.0.0
- * @version 0.1.1
- */
-interface IOrderAction extends ICompLog {
-  OrderId: number;
-  Status?: string;
-  Refresh: () => void;
-}
-
 /**
  * @author Aloento
  * @since 1.0.0
  * @version 0.1.2
  */
-export function OrderAction({ OrderId, Status, Refresh, ParentLog }: IOrderAction) {
+export function OrderAction({ OrderId, Status, Refresh, ParentLog }: IOrderComp) {
   const log = useConst(() => ParentLog.With("Action"));
 
   const style = useStyles();
diff --git a/src/Pages/History/Comment.tsx b/src/Pages/History/Comment.tsx
deleted file mode 100644
index 195cc861..00000000
--- a/src/Pages/History/Comment.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Body1, Caption1Stronger, Field, Label } from "@fluentui/react-components";
-
-/**
- * @author Aloento
- * @since 1.0.0
- * @version 0.1.0
- */
-export interface IComment {
-  Content: string;
-  Time: Date;
-  User: string;
-}
-
-/**
- * @author Aloento
- * @since 1.0.0
- * @version 0.1.0
- */
-export function OrderComment({ Comments }: { Comments?: IComment[]; }) {
-  return (
-    <Field label="Comment" size="large">
-      {Comments?.length === 0
-        ?
-        <Label>No Comment</Label>
-        :
-        Comments?.map((v, i) => <div key={i}>
-          <Caption1Stronger>{v.User} {v.Time.toLocaleString()}</Caption1Stronger>
-          <br />
-          <Body1>{v.Content}</Body1>
-        </div>
-        )}
-    </Field>
-  );
-}
diff --git a/src/Pages/History/Detail.tsx b/src/Pages/History/Detail.tsx
index 545e557c..fce0f430 100644
--- a/src/Pages/History/Detail.tsx
+++ b/src/Pages/History/Detail.tsx
@@ -1,10 +1,11 @@
-import { Body1Strong, Button, Caption1, DataGridCell, DataGridHeaderCell, Link, TableColumnDefinition, createTableColumn, makeStyles, tokens } from "@fluentui/react-components";
+import { Body1Strong, Button, Caption1, DataGridCell, DataGridHeaderCell, Link, SkeletonItem, TableColumnDefinition, createTableColumn, makeStyles, tokens } from "@fluentui/react-components";
 import { Drawer, DrawerBody, DrawerHeader, DrawerHeaderTitle } from "@fluentui/react-components/unstable";
 import { useConst } from "@fluentui/react-hooks";
 import { DismissRegular, OpenRegular } from "@fluentui/react-icons";
-import { useBoolean, useRequest } from "ahooks";
-import { useEffect } from "react";
+import { useBoolean, useInViewport, useRequest } from "ahooks";
+import { useEffect, useRef } from "react";
 import { DelegateDataGrid } from "~/Components/DataGrid";
+import { IComment, OrderComment } from "~/Components/Order/Comment";
 import { OrderInfo } from "~/Components/OrderInfo";
 import { useRouter } from "~/Components/Router";
 import { ICartItem } from "~/Components/ShopCart";
@@ -13,8 +14,6 @@ import { ICompLog } from "~/Helpers/Logger";
 import { ColFlex } from "~/Helpers/Styles";
 import { Hub } from "~/ShopNet";
 import { OrderAction } from "./Action";
-import { OrderAppend } from "./Append";
-import { IComment, OrderComment } from "./Comment";
 
 /**
  * @author Aloento
@@ -91,42 +90,18 @@ export interface IOrderDetail {
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.3.5
+ * @version 1.0.0
  */
 export function OrderDetail({ OrderId, ParentLog }: { OrderId: number } & ICompLog) {
   const log = useConst(() => ParentLog.With("Detail"));
 
-  const style = useStyles();
-  const [open, { setTrue, setFalse }] = useBoolean();
-
+  const [open, { set }] = useBoolean();
   const { Nav, Paths } = useRouter();
   const curr = parseInt(Paths.at(1)!);
 
-  const { data, run: runDetail } = useRequest(() => Hub.Order.Get.Detail(OrderId, log), {
-    manual: true,
-    onError: log.error
-  });
-
-  const { data: order, run: runOrder } = useRequest(() => Hub.Order.Get.Order(OrderId), {
-    onError(e) {
-      Nav("History");
-      log.error(e);
-    },
-    manual: true
-  });
-
-  function run() {
-    runOrder();
-    runDetail();
-  }
-
-  useEffect(() => {
-    if (curr === OrderId) {
-      run();
-      setTrue();
-    } else
-      setFalse();
-  }, [curr]);
+  useEffect(() => set(curr === OrderId), [curr]);
+  const ref = useRef(null);
+  const [inViewport] = useInViewport(ref);
 
   return <>
     <Button
@@ -155,22 +130,51 @@ export function OrderDetail({ OrderId, ParentLog }: { OrderId: number } & ICompL
         </DrawerHeaderTitle>
       </DrawerHeader>
 
-      <DrawerBody>
-        <div className={style.body}>
-          <OrderInfo OrderId={OrderId} Order={order} />
+      <DrawerBody ref={ref}>
+        {inViewport && <DeferredBody OrderId={OrderId} ParentLog={log} />}
+      </DrawerBody>
+    </Drawer>
+  </>
+}
 
-          <DelegateDataGrid
-            Items={data?.ShopCart}
-            Columns={[MakeCoverCol(44, log), ...columns]}
-          />
+/**
+ * @author Aloento
+ * @since 1.3.5
+ * @version 0.1.0
+ */
+function DeferredBody({ OrderId, ParentLog }: { OrderId: number } & ICompLog) {
+  const style = useStyles();
+  const { Nav } = useRouter();
+
+  const { data: order, run: runOrder } = useRequest(() => Hub.Order.Get.Order(OrderId), {
+    onError(e) {
+      Nav("History");
+      ParentLog.error(e);
+    },
+    manual: true
+  });
 
-          <OrderComment Comments={data?.Comments} />
+  const { data: cart, run: runItems, loading } = Hub.Order.Get.useItems(OrderId, ParentLog);
 
-          <OrderAppend OrderId={OrderId} Status={order?.Status} Refresh={run} ParentLog={log} />
+  const run = () => {
+    runItems();
+    runOrder();
+  };
 
-          <OrderAction OrderId={OrderId} Status={order?.Status} Refresh={run} ParentLog={log} />
-        </div>
-      </DrawerBody>
-    </Drawer>
-  </>
+  return (
+    <div className={style.body}>
+      <OrderInfo OrderId={OrderId} Order={order} />
+
+      <DelegateDataGrid
+        Items={cart}
+        Columns={[MakeCoverCol(44, ParentLog), ...columns]}
+      />
+
+      {loading && <SkeletonItem size={48} />}
+
+      <OrderComment OrderId={OrderId} Status={order?.Status} Refresh={run} ParentLog={ParentLog} />
+
+      <OrderAction OrderId={OrderId} Status={order?.Status} Refresh={run} ParentLog={ParentLog} />
+    </div>
+  );
 }
diff --git a/src/ShopNet/Order/Entity.ts b/src/ShopNet/Order/Entity.ts
index ebbb059b..f33ba4d4 100644
--- a/src/ShopNet/Order/Entity.ts
+++ b/src/ShopNet/Order/Entity.ts
@@ -25,6 +25,7 @@ export abstract class OrderEntity extends ShopNet {
    * @author Aloento
    * @since 1.0.0
    * @version 0.1.0
+   * @liveSafe
    */
   public static Order(key: number): Promise<OrderEntity.Order> {
     this.EnsureLogin();
@@ -35,6 +36,7 @@ export abstract class OrderEntity extends ShopNet {
    * @author Aloento
    * @since 1.0.0
    * @version 0.1.0
+   * @liveSafe
    */
   public static Comment(key: number): Promise<OrderEntity.Comment> {
     this.EnsureLogin();
diff --git a/src/ShopNet/Order/Get.ts b/src/ShopNet/Order/Get.ts
index f7f3b28b..b9bdf05a 100644
--- a/src/ShopNet/Order/Get.ts
+++ b/src/ShopNet/Order/Get.ts
@@ -1,8 +1,10 @@
+import { useConst } from "@fluentui/react-hooks";
+import { useAsyncEffect } from "ahooks";
+import { useState } from "react";
+import { IComment } from "~/Components/Order/Comment";
 import { ICartItem } from "~/Components/ShopCart";
 import { Logger } from "~/Helpers/Logger";
 import { IOrderItem } from "~/Pages/History";
-import { IComment } from "~/Pages/History/Comment";
-import { IOrderDetail } from "~/Pages/History/Detail";
 import { ProductData } from "../Product/Data";
 import { ProductGet } from "../Product/Get";
 import { OrderEntity } from "./Entity";
@@ -69,76 +71,104 @@ export abstract class OrderGet extends OrderEntity {
     return items.sort((a, b) => b.OrderDate.getTime() - a.OrderDate.getTime());
   }
 
+  public static readonly items = "OrderGetItems";
   /**
    * @author Aloento
    * @since 0.5.0
-   * @version 1.0.1
+   * @version 2.0.0
    */
-  public static async Detail(orderId: number, pLog: Logger): Promise<IOrderDetail> {
-    this.EnsureLogin();
-    const log = pLog.With(...this.Log, "Detail");
+  public static useItems(orderId: number, pLog: Logger) {
+    const log = useConst(() => pLog.With(...this.Log, "Items"));
+    const [res, setRes] = useState<ICartItem[]>([]);
 
-    const meta = await this.GetTimeCache<
+    const req = this.useSWR<
       {
-        Items: {
-          Types: number[];
-          Quantity: number;
-        }[],
-        Comments: number[];
+        Types: number[];
+        Quantity: number;
+      }[]
+    >(
+      orderId,
+      this.items,
+      {
+        defaultParams: [orderId],
+        onError: log.error
       }
-    >(orderId, "OrderGetDetail", (x) => x.add(1, "m"), orderId);
+    );
 
-    const items: ICartItem[] = [];
-    let index = 0;
+    useAsyncEffect(async () => {
+      const meta = req.data;
+      if (!meta)
+        return;
 
-    for (const combo of meta.Items) {
-      const variType: Record<string, string> = {};
-      let prodId = 0;
+      const items: ICartItem[] = [];
+      let index = 0;
 
-      for (const typeId of combo.Types) {
-        const type = await ProductData.Type(typeId);
+      for (const combo of meta) {
+        const variType: Record<string, string> = {};
+        let prodId = 0;
 
-        if (!type) {
-          log.warn(`[Mismatch] Type ${typeId} not found. Order : ${orderId}`);
-          continue;
+        for (const typeId of combo.Types) {
+          const type = await ProductData.Type(typeId);
+
+          if (!type) {
+            log.warn(`[Mismatch] Type ${typeId} not found. Order : ${orderId}`);
+            continue;
+          }
+
+          const vari = await ProductData.Variant(type.VariantId);
+
+          if (!vari) {
+            log.warn(`[Mismatch] Variant ${type.VariantId} not found. Type : ${typeId}, Order : ${orderId}`);
+            continue;
+          }
+
+          variType[vari.Name] = type.Name;
+          prodId = vari.ProductId;
         }
 
-        const vari = await ProductData.Variant(type.VariantId);
+        const prod = await ProductData.Product(prodId);
 
-        if (!vari) {
-          log.warn(`[Mismatch] Variant ${type.VariantId} not found. Type : ${typeId}, Order : ${orderId}`);
+        if (!prod) {
+          log.warn(`[Mismatch] Product ${prodId} not found. Order : ${orderId}`);
           continue;
         }
 
-        variType[vari.Name] = type.Name;
-        prodId = vari.ProductId;
-      }
+        const [_, cover] = await ProductGet.PhotoList(prodId, log);
 
-      const prod = await ProductData.Product(prodId);
+        if (!cover)
+          log.warn(`Product ${prodId} has no photo`);
 
-      if (!prod) {
-        log.warn(`[Mismatch] Product ${prodId} not found. Order : ${orderId}`);
-        continue;
+        items.push({
+          Id: index++,
+          ProdId: prodId,
+          Cover: cover || "",
+          Name: prod.Name,
+          Type: variType,
+          Quantity: combo.Quantity,
+        });
       }
 
-      const [_, cover] = await ProductGet.PhotoList(prodId, log);
+      setRes(items);
+    }, [req.data]);
 
-      if (!cover)
-        log.warn(`Product ${prodId} has no photo`);
+    return {
+      ...req,
+      data: res
+    };
+  }
 
-      items.push({
-        Id: index++,
-        ProdId: prodId,
-        Cover: cover || "",
-        Name: prod.Name,
-        Type: variType,
-        Quantity: combo.Quantity,
-      });
-    }
+  /**
+   * @author Aloento
+   * @since 1.3.0
+   * @version 0.1.0
+   */
+  public static async Cmts(orderId: number, pLog: Logger): Promise<IComment[]> {
+    const log = pLog.With(...this.Log, "Cmts");
 
+    const cmts = await this.GetTimeCache<number[]>(orderId, "OrderGetCmts", (x) => x.add(1, "m"), orderId);
     const comments: IComment[] = [];
 
-    for (const cmtId of meta.Comments) {
+    for (const cmtId of cmts) {
       const cmt = await this.Comment(cmtId);
 
       if (!cmt) {
@@ -153,9 +183,6 @@ export abstract class OrderGet extends OrderEntity {
       });
     }
 
-    return {
-      ShopCart: items,
-      Comments: comments.sort((a, b) => a.Time.getTime() - b.Time.getTime())
-    };
+    return comments.sort((a, b) => a.Time.getTime() - b.Time.getTime());
   }
 }
diff --git a/src/ShopNet/Product/Get.ts b/src/ShopNet/Product/Get.ts
index eddcde9a..aab44ff7 100644
--- a/src/ShopNet/Product/Get.ts
+++ b/src/ShopNet/Product/Get.ts
@@ -105,13 +105,13 @@ export abstract class ProductGet extends ProductData {
     return this.GetTimeCache(prodId, "ProductGetComboList", (x) => x.add(1, "m"), prodId);
   }
 
+  public static readonly photoList = "ProductGetPhotoList";
   /**
    * @author Aloento
    * @since 1.0.0
    * @version 1.0.1
    * @liveSafe
    */
-  public static readonly photoList = "ProductGetPhotoList";
   public static async PhotoList(prodId: number, pLog: Logger): Promise<[ProductData.Photo[], string]> {
     const log = pLog.With(...this.Log, "PhotoList");
 
diff --git a/src/ShopNet/SignalR.ts b/src/ShopNet/SignalR.ts
index dbdfa4ff..821b414a 100644
--- a/src/ShopNet/SignalR.ts
+++ b/src/ShopNet/SignalR.ts
@@ -1,5 +1,9 @@
+import { useConst } from "@fluentui/react-hooks";
 import { HubConnectionState } from "@microsoft/signalr";
+import { useRequest } from "ahooks";
+import { Options } from "ahooks/lib/useRequest/src/types";
 import dayjs, { Dayjs } from "dayjs";
+import Dexie from "dexie";
 import { Subject } from "rxjs";
 import { EmptyResponseError, NotLoginError, NotTrueError } from "~/Helpers/Exceptions";
 import type { Logger } from "~/Helpers/Logger";
@@ -119,11 +123,19 @@ export abstract class SignalR {
     const index = this.Index(key, methodName);
     const find = await Shared.Get<T & { QueryExp: number }>(index);
 
+    // TODO：导致 LiveQuery 无限刷新
     const update = async () => {
-      const res = await Promise.resolve(this.Invoke<T | true | null>(methodName, key, find?.Version));
+      const res = await Dexie.waitFor(this.Invoke<T | true | null>(methodName, key, find?.Version));
+
+      function setCache(value: T) {
+        Shared.Set<T & { QueryExp: number; }>(index, {
+          ...value,
+          QueryExp: dayjs().add(10, "s").unix()
+        }, dayjs().add(1, "w"));
+      }
 
       if (res === true) {
-        setCache(find!);
+        setCache(find!)
         return find!;
       }
 
@@ -137,20 +149,37 @@ export abstract class SignalR {
     }
 
     if (find) {
-      if (find.QueryExp <= dayjs().unix())
+      if (find.QueryExp < dayjs().unix())
         update();
 
       return find;
     }
 
     return update();
+  }
 
-    function setCache(value: T) {
-      Shared.Set<T & { QueryExp: number; }>(index, {
-        ...value,
-        QueryExp: dayjs().add(5, "s").unix()
-      }, dayjs().add(1, "w"));
-    }
+  /**
+   * @author Aloento
+   * @since 1.3.5
+   * @version 0.1.0
+   */
+  protected static useSWR<T>(
+    this: INet, key: string | number, methodName: string, options: Options<T, any[]>
+  ) {
+    const index = useConst(() => this.Index(key, methodName));
+
+    const req = useRequest(
+      (...params) => this.Invoke<T>(methodName, ...params),
+      {
+        staleTime: 5000,
+        ...options,
+        cacheKey: index,
+        setCache: (data) => localStorage.setItem(index, JSON.stringify(data)),
+        getCache: () => JSON.parse(localStorage.getItem(index) || "{}"),
+      }
+    );
+
+    return req;
   }
 
   /**
diff --git a/src/ShopNet/Table.ts b/src/ShopNet/Table.ts
index d53179db..f7e0fac1 100644
--- a/src/ShopNet/Table.ts
+++ b/src/ShopNet/Table.ts
@@ -36,7 +36,7 @@ export class Table {
 
     if (find) {
       if (
-        (expire && await Promise.resolve(expire(find))) ||
+        (expire && await Dexie.waitFor(expire(find))) ||
         (typeof find.Exp === "number" && find.Exp < dayjs().unix())
       ) {
         await this.Sto.delete(key);
@@ -63,7 +63,7 @@ export class Table {
   ): Promise<T> {
     const res = await this.Get<T>(key, expire);
     if (res) return res;
-    return this.Set<T>(key, await Promise.resolve(fac()), exp);
+    return this.Set<T>(key, await Dexie.waitFor(fac()), exp);
   }
 
   /**
@@ -78,7 +78,8 @@ export class Table {
 
     if (exp === null) {
       await this.Sto.put({
-        Id: id, Exp: exp,
+        Id: id,
+        Exp: exp,
         Val: val
       });
 
@@ -90,7 +91,8 @@ export class Table {
       throw RangeError(`Expire time [${time}] cannot be less than now [${dayjs().unix()}]`);
 
     await this.Sto.put({
-      Id: id, Exp: time,
+      Id: id,
+      Exp: time,
       Val: val
     });
 
diff --git a/vite.config.ts b/vite.config.ts
index b3d0dbc0..abdb2024 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -6,7 +6,7 @@ import { defineConfig, splitVendorChunkPlugin } from "vite";
 export default defineConfig({
   plugins: [
     react(),
-    splitVendorChunkPlugin(),
+    splitVendorChunkPlugin()
   ],
   resolve: {
     alias: {
@@ -18,6 +18,6 @@ export default defineConfig({
     reportCompressedSize: false,
     modulePreload: {
       polyfill: false,
-    },
+    }
   },
 });