From 1c453e2981d0fa1de8c0e4a657a1c14bc67f8bdc Mon Sep 17 00:00:00 2001 From: Dan Ditomaso Date: Mon, 5 May 2025 11:47:36 -0400 Subject: [PATCH] fix: couple of UI updates, fix: add pre release support to release workflow (#609) --- .github/workflows/release.yml | 2 +- src/components/UI/Toast.tsx | 2 +- src/pages/Dashboard/index.tsx | 6 +++--- src/pages/Messages.tsx | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69a1e0ef..d6b3d15d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: release: - types: [released] + types: [released, prereleased] permissions: contents: write diff --git a/src/components/UI/Toast.tsx b/src/components/UI/Toast.tsx index 1762b03e..35e185e9 100644 --- a/src/components/UI/Toast.tsx +++ b/src/components/UI/Toast.tsx @@ -28,7 +28,7 @@ const toastVariants = cva( variants: { variant: { default: - "border bg-white text-slate-900 dark:text-slate-100 dark:bg-slate-800", + "border bg-white text-slate-900 dark:text-slate-100 dark:bg-slate-800 dark:border-slate-700", destructive: "group destructive bg-red-600 text-white dark:border-red-900 dark:bg-red-900 dark:text-red-50", }, diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx index 328fbc02..77541d0b 100644 --- a/src/pages/Dashboard/index.tsx +++ b/src/pages/Dashboard/index.tsx @@ -48,7 +48,7 @@ export const Dashboard = () => { >

- {device.nodes.get(device.hardware.myNodeNum)?.user + {device.getNode(device.hardware.myNodeNum)?.user ?.longName ?? "UNK"}

@@ -78,9 +78,9 @@ export const Dashboard = () => { className="text-slate-400" aria-hidden="true" /> - {device.nodes.size === 0 + {device.getNodesLength() === 0 ? 0 - : device.nodes.size - 1} + : device.getNodesLength() - 1}
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx index 13d91361..7236e6e5 100644 --- a/src/pages/Messages.tsx +++ b/src/pages/Messages.tsx @@ -19,6 +19,7 @@ import { } from "@core/stores/messageStore/index.ts"; import { useSidebar } from "@core/stores/sidebarStore.tsx"; import { Input } from "@components/UI/Input.tsx"; +import { randId } from "@core/utils/randId.ts"; type NodeInfoWithUnread = Protobuf.Mesh.NodeInfo & { unreadCount: number }; @@ -113,8 +114,8 @@ export const MessagesPage = () => { } catch (e: any) { console.error("Failed to send message:", e); // Note: messageId might be undefined here if the error occurred before it was assigned + const failedId = messageId ?? randId(); if (chatType === MessageType.Broadcast) { - const failedId = messageId ?? `failed-${Date.now()}`; setMessageState({ type: chatType, channelId: channelValue, @@ -122,7 +123,7 @@ export const MessagesPage = () => { newState: MessageState.Failed, }); } else { // MessageType.Direct - const failedId = messageId ?? `failed-${Date.now()}`; + const failedId = messageId ?? randId(); setMessageState({ type: chatType, nodeA: getMyNodeNum(),