Portal 240617 (#1902)

* chore: fix time * chore: expired session key
rooch-network · Jun 17, 2024 · c63a38d · c63a38d
1 parent 054710c
commit c63a38d
Show file tree

Hide file tree

Showing 4 changed files with 226 additions and 252 deletions.
diff --git a/infra/rooch-portal/package.json b/infra/rooch-portal/package.json
@@ -39,7 +39,6 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
     "cmdk": "^0.2.1",
-    "dayjs": "^1.11.11",
     "i18next": "^23.8.2",
     "lucide-react": "^0.321.0",
     "react": "^18.2.0",

diff --git a/infra/rooch-portal/src/pages/settings/components/manage-sessions.tsx b/infra/rooch-portal/src/pages/settings/components/manage-sessions.tsx
@@ -28,9 +28,8 @@ interface ExpandableRowProps {
 }
 
 const isSessionExpired = (createTime: number, maxInactiveInterval: number) => {
-  const currentTime = Date.now()
-  const expirationTime = createTime + maxInactiveInterval * 1000
-  return currentTime > expirationTime
+  const expirationTime = new Date(createTime).getTime() + maxInactiveInterval * 1000
+  return Date.now() > expirationTime
 }
 
 export const ManageSessions: React.FC = () => {
@@ -51,9 +50,7 @@ export const ManageSessions: React.FC = () => {
     async (authKey: string) => {
       setLoading(authKey)
       try {
-        await removeSession({
-          authKey: authKey,
-        })
+        await removeSession({ authKey })
         await refetch()
       } catch (error) {
         console.error(error)
@@ -98,8 +95,6 @@ export const ManageSessions: React.FC = () => {
     )
   }
 
-  console.log(sessionKeys)
-
   return (
     <div className="rounded-lg border w-full">
       <Table>
@@ -135,11 +130,7 @@ const ExpandableRow: React.FC<ExpandableRowProps> = ({ session, remove, loading
 
   const handleCopy = (key: string) => {
     copyToClipboard(key, (value) => {
-      if (value) {
-        setCopiedKeys((prev) => [...prev, key])
-      } else {
-        setCopiedKeys((prev) => prev.filter((item) => item !== key))
-      }
+      setCopiedKeys((prev) => (value ? [...prev, key] : prev.filter((item) => item !== key)))
     })
   }
 
@@ -163,11 +154,9 @@ const ExpandableRow: React.FC<ExpandableRowProps> = ({ session, remove, loading
         </TableCell>
         <TableCell className="text-muted-foreground">
           {formatTimestamp(session.createTime)}
-          {/*{session.createTime}*/}
         </TableCell>
         <TableCell className="text-muted-foreground">
           {formatTimestamp(session.lastActiveTime)}
-          {/*{session.lastActiveTime}*/}
         </TableCell>
         <TableCell className="text-muted-foreground">{session.maxInactiveInterval}</TableCell>
         <TableCell className="text-center">
@@ -221,3 +210,5 @@ const ExpandableRow: React.FC<ExpandableRowProps> = ({ session, remove, loading
     </>
   )
 }
+
+export default ManageSessions
diff --git a/infra/rooch-portal/src/utils/format.ts b/infra/rooch-portal/src/utils/format.ts
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PaymentTypes } from '@/common/interface'
-import dayjs from 'dayjs'
 
-export const formatTimestamp = (timestamp: number) => {
-  console.log('Raw Timestamp:', timestamp)
-  const formatted = dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')
-  console.log('Formatted Timestamp:', formatted)
-  return formatted
+export const formatTimestamp = (timestamp: number): string => {
+  if (timestamp < 1e10) {
+    timestamp *= 1000
+  }
+  const date = new Date(timestamp)
+  return date.toLocaleString('en-US')
 }
 
 export const formatCoin = (balance: number, decimals: number, precision = 2) => {