nrobi144 fd34105439 merge: resolve conflicts with upstream/main ...

Merge upstream main into feat/desktop-multi-account, resolving:
- Main.kt: Surface wrapper + CompositionLocalProvider + nip11Fetcher from upstream, multi-account DeckSidebar/LoginScreen from HEAD
- FeedScreen.kt: viewport-aware scroll from HEAD + contentPadding from upstream
- DeckSidebar.kt: merged imports (multi-account + titleBarInsetTop + MaterialSymbols)
- Migrated AccountSwitcherDropdown + AddAccountDialog from material.icons to MaterialSymbols

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-05-04 07:29:20 +03:00

..

2026-03-05-fix-nip46-relay-isolation-and-init-plan.md

…

2026-03-05-nip46-bunker-login-deepened.md

…

2026-03-05-nip46-improvements-plan.md

…

2026-03-05-nip46-tdd-tests-plan.md

Moves EmptyNostrClient to a class to avoid auto-import issues

2026-03-22 15:14:49 -04:00

2026-03-10-feat-desktop-advanced-search-plan.md

…

2026-03-16-desktop-media-manual-testing-plan.md

feat(media): encrypted file sharing in desktop DMs (NIP-17 Phase 6)

2026-03-19 06:53:36 +02:00

2026-03-16-feat-desktop-media-full-parity-plan.md

…

2026-03-18-feat-desktop-cache-navigation-persistence-plan.md

docs: deepen cache plan — BoundedLargeCache, FeedNoteCard rewrite details

2026-03-26 07:12:46 +02:00

2026-03-18-feat-desktop-dm-encrypted-media-plan.md

feat(media): encrypted file sharing in desktop DMs (NIP-17 Phase 6)

2026-03-19 06:53:36 +02:00

2026-03-19-feat-deck-messages-stacked-layout-plan.md

feat(chats): stacked messages layout in deck columns

2026-03-19 07:49:36 +02:00

2026-03-20-feat-remote-signer-loading-error-ux-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-03-22-feat-clean-cache-single-source-of-truth-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-03-24-feat-article-highlights-notes-plan.md

feat(highlights): add article highlights and note-taking system

2026-03-24 12:16:54 +02:00

2026-03-24-feat-weakref-cache-state-extraction-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-03-24-long-form-reads-manual-testing.md

refactor(reads): address all review findings — security, performance, simplicity

2026-03-24 11:03:29 +02:00

2026-03-30-feat-app-drawer-v1a-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-03-30-feat-desktop-tor-support-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-04-01-fix-tor-traffic-leaks-plan.md

fix(tor): close 8 network traffic leaks — fail-closed when Tor expected

2026-04-13 07:25:45 +03:00

2026-04-02-feat-tor-toggle-restart-ux-plan.md

fix(tor): remove broken runtime reconnect, add evictConnections

2026-04-13 07:25:45 +03:00

2026-04-17-feat-customizable-nav-bar-v1b-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-04-17-feat-workspace-management-ux-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-04-17-feat-workspaces-v1c-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-04-17-test-desktop-distribution.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-04-20-feat-relay-power-tools-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-04-21-feat-relay-config-parity-plan.md

feat(desktop): relay power tools — dashboard, config editors, subscription wiring

2026-04-22 10:15:44 +03:00

2026-04-21-feat-relay-subscription-wiring-plan.md

feat(desktop): relay power tools — dashboard, config editors, subscription wiring

2026-04-22 10:15:44 +03:00

2026-04-22-feat-relay-persistence-counts-per-screen-picker-plan.md

feat(desktop): relay config persistence, correct counts, per-screen picker

2026-04-23 12:00:03 +03:00

2026-04-22-feat-relay-subscription-wiring-plan.md

feat(desktop): relay power tools — dashboard, config editors, subscription wiring

2026-04-22 10:15:44 +03:00

2026-04-22-nip-audio-rooms-draft.md

docs(audio-rooms): refresh against shipped state + nostrnests gap audit

2026-04-26 19:23:41 +00:00

2026-04-22-pure-kotlin-quic-webtransport-plan.md

docs(quic-plan): lock in new top-level :quic module (Option A)

2026-04-22 13:20:33 +00:00

2026-04-23-feat-desktop-multi-account-support-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-04-23-feat-desktop-relay-config-single-source-plan.md

feat(desktop): relay config persistence, correct counts, per-screen picker

2026-04-23 12:00:03 +03:00

2026-04-27-fix-deb-libicu-dependency-plan.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00

2026-04-28-multi-account-testing-sheet.md

feat(multi-account): display names, middle-truncated npub, npub-only account fix

2026-04-29 09:35:33 +03:00