From 6ea230d6208c47eade3a44eccf6128c5150a1529 Mon Sep 17 00:00:00 2001 From: Yordis Prieto Date: Tue, 27 Aug 2024 22:32:50 -0400 Subject: [PATCH] chore: fix date handling --- apps/login/src/ui/SessionItem.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/login/src/ui/SessionItem.tsx b/apps/login/src/ui/SessionItem.tsx index f036fd01392..27bceeb4c39 100644 --- a/apps/login/src/ui/SessionItem.tsx +++ b/apps/login/src/ui/SessionItem.tsx @@ -6,6 +6,7 @@ import { Avatar } from "./Avatar"; import moment from "moment"; import { XCircleIcon } from "@heroicons/react/24/outline"; import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb"; +import { timestampDate } from "@zitadel/client"; export default function SessionItem({ session, @@ -16,8 +17,6 @@ export default function SessionItem({ reload: () => void; authRequestId?: string; }) { - // TODO: remove casting when bufbuild/protobuf-es@v2 is released - session = Session.fromJson(session as any); const [loading, setLoading] = useState(false); async function clearSession(id: string) { @@ -46,7 +45,7 @@ export default function SessionItem({ const validPassword = session?.factors?.password?.verifiedAt; const validPasskey = session?.factors?.webAuthN?.verifiedAt; const stillValid = session.expirationDate - ? session.expirationDate.toDate() > new Date() + ? timestampDate(session.expirationDate) > new Date() : true; const validDate = validPassword || validPasskey; @@ -106,7 +105,7 @@ export default function SessionItem({ {validUser && ( - {validDate && moment(validDate.toDate()).fromNow()} + {validDate && moment(timestampDate(validDate)).fromNow()} )}