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

..

brainstorms

docs: desktop cache architecture brainstorm and plan

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

design

Minimizes the size of the banner

2026-03-26 14:35:18 -04:00

hashtags

turning hashtag icons into programmable vectors

2024-03-25 16:02:36 -04:00

plans

merge: resolve conflicts with upstream/main

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

screenshots

…

chess-engine-refactoring.md

feat(chess): add platform adapters and enhance lobby state (steps 5-6)

2026-02-10 12:14:34 +02:00

live-chess-implementation-status.md

docs: update chess implementation status

2026-02-10 12:10:39 +02:00

manual-testing-tor.md

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

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

namecoin-nip05-design.md

fix: route ElectrumX through Tor proxy, add onion server

2026-03-03 06:28:01 +11:00

opensats-progress-report-march-2026.md

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

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

secure-key-storage-migration.md

key storage

2026-01-06 06:49:59 +02:00

shared-ui-analysis.md

feat: Add relay connections, login, and feed view to desktop app

2025-12-26 14:02:44 +02:00

temp-file-cleanup-analysis.md

added progress and test plan to doc

2026-03-25 10:23:38 +01:00

TODO.md

feat(chats): per-message encryption badge — lock for NIP-17, lock-open for NIP-04

2026-03-19 09:23:06 +02:00