Browse Source
fix: couple of UI updates, fix: add pre release support to release workflow (#609)
pull/610/head
Dan Ditomaso
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
8 additions and
7 deletions
-
.github/workflows/release.yml
-
src/components/UI/Toast.tsx
-
src/pages/Dashboard/index.tsx
-
src/pages/Messages.tsx
|
|
|
@ -2,7 +2,7 @@ name: Release |
|
|
|
|
|
|
|
on: |
|
|
|
release: |
|
|
|
types: [released] |
|
|
|
types: [released, prereleased] |
|
|
|
|
|
|
|
permissions: |
|
|
|
contents: write |
|
|
|
|
|
|
|
@ -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", |
|
|
|
}, |
|
|
|
|
|
|
|
@ -48,7 +48,7 @@ export const Dashboard = () => { |
|
|
|
> |
|
|
|
<div className="flex items-center justify-between"> |
|
|
|
<p className="truncate text-sm font-medium text-accent"> |
|
|
|
{device.nodes.get(device.hardware.myNodeNum)?.user |
|
|
|
{device.getNode(device.hardware.myNodeNum)?.user |
|
|
|
?.longName ?? "UNK"} |
|
|
|
</p> |
|
|
|
<div className="inline-flex w-24 justify-center gap-2 rounded-full bg-slate-100 py-1 text-xs font-semibold text-slate-900 transition-colors hover:bg-slate-700 hover:text-slate-50"> |
|
|
|
@ -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} |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
@ -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(), |
|
|
|
|