GRIN/goblin
1
0
Fork 0
forked from GRIN/grim
Code Pull Requests Activity

Build 76: split mixnet vs nostr status; tidy the identity chips

Browse Source 
- The profile card drops the duplicate npub line and shows two statuses: the
  mixnet ("Connected over Nym", ~instant) and under it the nostr relay
  ("Connected to nostr" / "Connecting to relays…"). The relay connection is the
  slower step, not the mixnet.
- New cheap cached nym::is_ready() flag backs the mixnet status (no per-frame
  TCP probe), set when the SOCKS5 proxy comes up.
- Sidebar identity chip: smaller handle so the npub stays on one line, with a
  matching Nym/relay status.
This commit is contained in:
2ro
2026-06-14 18:23:00 -04:00
parent fb4f27a88f
commit 8e1b3ce847
3 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/goblin/mod.rs
+26 -25
View File
@@ -631,18 +631,21 @@ impl GoblinWalletView {
w::avatar_any(ui, &handle, &npub_hex, 36.0, hue, tex.as_ref());
ui.add_space(10.0);
ui.vertical(|ui| {
// Smaller so the npub/handle stays on one line.
ui.label(
RichText::new(&handle)
.font(FontId::new(14.0, fonts::semibold()))
.font(FontId::new(12.0, fonts::semibold()))
.color(t.surface_text),
);
ui.label(
RichText::new(if connected {
"synced · Nym"
"Connected over Nym"
} else if crate::nym::is_ready() {
"Nym ready · relays…"
} else {
"connecting…"
"Connecting to Nym…"
})
.font(FontId::new(12.0, fonts::regular()))
.font(FontId::new(11.0, fonts::regular()))
.color(t.surface_text_mute),
);
});
@@ -1859,34 +1862,32 @@ impl GoblinWalletView {
.font(FontId::new(17.0, fonts::bold()))
.color(t.surface_text),
);
if !npub.is_empty() {
// Full npub when it fits on one line, else head…tail.
let full = ui.painter().layout_no_wrap(
npub.clone(),
FontId::new(11.0, fonts::mono()),
t.surface_text_mute,
);
let text = if full.size().x <= ui.available_width() {
npub.clone()
} else {
format!("{}…{}", &npub[..12], &npub[npub.len() - 6..])
};
ui.label(
RichText::new(text)
.font(FontId::new(11.0, fonts::mono()))
.color(t.surface_text_mute),
);
}
let status = if connected {
// Mixnet status (fast) in place of the redundant second npub line.
let mixnet = if crate::nym::is_ready() {
"Connected over Nym"
} else {
"Connecting…"
"Connecting to Nym…"
};
ui.label(
RichText::new(status)
RichText::new(mixnet)
.font(FontId::new(13.0, fonts::regular()))
.color(t.surface_text_dim),
);
// nostr relay status — the slower step (a relay reached over Nym).
let nostr = if connected {
"Connected to nostr"
} else {
"Connecting to relays…"
};
ui.label(
RichText::new(nostr)
.font(FontId::new(12.0, fonts::regular()))
.color(t.surface_text_mute),
);
if !crate::nym::is_ready() || !connected {
ui.ctx()
.request_repaint_after(std::time::Duration::from_millis(600));
}
});
});
if avatar_busy {