Internationalize all bundled user-facing strings

Enables localization to non-English locales in the future
2023-01-01 23:35:30 -05:00
405 changed files with 4154 additions and 33119 deletions
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -1,31 +0,0 @@
-name: Run Test Suite 
-run-name: Testing ${{ github.ref }} by @${{ github.actor }}
-
-on:
-  push:
-    branches:
-      - "master"
-  pull_request:
-    branches:
-      - "*"
-
-
-jobs:
-  run_tests:
-    runs-on: macos-12
-    strategy:
-      matrix:
-        include:
-          - xcode: "14.2"
-            ios: "16.2"
-    
-    name: Test iOS (${{ matrix.ios }})
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Select Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: ${{ matrix.xcode }}
-      - name: Run Tests 
-        run: xcodebuild test -scheme damus -project damus.xcodeproj -destination 'platform=iOS Simulator,name=iPhone 14,OS=${{ matrix.ios }}' | xcpretty && exit ${PIPESTATUS[0]}
--- a/.rgignore
+++ b/.rgignore
@@ -1,2 +0,0 @@
-translations/
-*.lproj/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,775 +1,8 @@
-## [1.4.3-1] - 2023-04-15
-
-### Added
-
- Add deep links for local notifications (Swift + Will)
- Add thread muting (Terry Yiu)
- Preview media uploads when posting (Swift)
- Add QR Code in profiles (ericholguin)
-
-
-### Changed
-
- Ask permission before uploading media (Swift)
- Show DM message in local notification (William Casarin)
-
-
-### Fixed
-
- Fix tap area when mentioning users (OlegAba)
- Fix invalid DM author notifications (William Casarin)
- Fix relay signal indicator, properly show how many relays you are connected to (William Casarin)
-
-
-[1.4.3-1]: https://github.com/damus-io/damus/releases/tag/v1.4.3-1
-
-## [1.4.2-2] - 2023-04-12
-
-### Added
-
- Include #btc in custom #bitcoin hashtag (William Casarin)
- Make notification dots configurable (William Casarin)
-
-
-### Changed
-
- Display follows in most recent to oldest (Luis Cabrera)
-
-### Fixed
-
- Fix hitches caused by syncronous loading of cached images (William Casarin)
- Fix tabs sometimes not switching (William Casarin)
-
-
-[1.4.2-2]: https://github.com/damus-io/damus/releases/tag/v1.4.2-2
-
-## [1.4.1-8] - 2023-04-10
-
-### Added
-
- Add support for nostr: bech32 urls in posts and DMs (NIP19) (Bartholomew Joyce)
-
-### Fixed
-
- Don't leak mentions in DMs (William Casarin)
- Fix tap area when mentioning users (OlegAba)
-
-[1.4.1-8]: https://github.com/damus-io/damus/releases/tag/v1.4.1-8
-## [1.4.1-7] - 2023-04-07
-
-### Added
-
- Add #zap and #zapathon custom hashtags (William Casarin)
- Add custom #plebchain icon (William Casarin)
-
-
-### Changed
-
- Add validation to prevent whitespaces be inputted on NIP-05 input field (Terry Yiu)
- Change reply color from blue to purple. Blue is banned from Damus. (William Casarin)
-
-
-### Fixed
-
- Fix padding in post view (OlegAba)
- Show most recently bookmarked notes at the top (Bryan Montz)
-
-
-[1.4.1-7]: https://github.com/damus-io/damus/releases/tag/v1.4.1-7
-
-## [1.4.1-6] - 2023-04-06
-
-### Added
-
- Custom hashtags for #bitcoin, #nostr and #coffeechain (William Casarin)
-
-### Changed
-
- Disable translations in DMs by default (William Casarin)
-
-### Fixed
-
- Don't show Translating... if we're not actually translating (William Casarin)
-
-
-[1.4.1-6]: https://github.com/damus-io/damus/releases/tag/v1.4.1-6
-
-## [1.4.1-4] - 2023-04-06
-
-### Added
-
- Cache translations (William Casarin)
-
-### Fixed
-
- Fix translation text popping (William Casarin)
- Fix broken auto-translations (William Casarin)
- Fix extraneous padding on some image posts (William Casarin)
- Fix crash in relay list view (William Casarin)
-
-[1.4.1-4]: https://github.com/damus-io/damus/releases/tag/v1.4.1-4
-
-## [1.4.1-3] - 2023-04-05
-
-### Added
-
- Added text truncation settings (William Casarin)
-
-### Changed
-
- Rename block to mute (William Casarin)
-
-### Fixed
-
- Reduce chopping of images (mainvolume)
- Fix some notification settings not saving (William Casarin)
- Fix broken camera uploads (again) (Joel Klabo)
-
-
-[1.4.1-3]: https://github.com/damus-io/damus/releases/tag/v1.4.1-3
-
-## [1.4.1-2] - 2023-04-04
-
-### Added
-
- Reply counts (William Casarin)
- Add option to only show notification from people you follow (Swift)
- Added local notifications for other events (Swift)
- Show a custom view when tagged user isn't found (ericholguin)
- Show referenced notes in DMs (William Casarin)
-
-
-### Changed
-
- Show full bleed images on selected events in threads (William Casarin)
- Improvement to square image displaying (mainvolume)
-
-
-### Fixed
-
- Fix broken website links that have missing https:// prefixes (William Casarin)
- Get around CCP bootstrap relay banning by caching user's relays as their bootstrap relays (William Casarin)
-
-
-[1.4.1-2]: https://github.com/damus-io/damus/releases/tag/v1.4.1-2
-
-## [1.4.1] - 2023-04-03
-
-### Added
-
- Profile Picture Upload (Joel Klabo)
- Enable offline posting (William Casarin)
- Add auto-translation caching to ruduce api usage (Terry Yiu)
- Added support for gif uploads (Swift)
- Add a Divider in the Follows List for Large Screens (Joel Klabo)
- Upload Photos and Videos from Camera (Joel Klabo)
- Added ability to lookup users by nip05 identifiers (William Casarin)
-
-### Changed
-
- Only truncate timeline text if enabled in settings (William Casarin)
- Make mentions wide in notifications like in timeline (William Casarin)
- Broadcast events you are replying to (William Casarin)
- Broadcast now also broadcasts event user's profile (William Casarin)
- Improved look of reply view (ericholguin)
- Remove gradient in some places for visibility (ericholguin)
-
-
-### Fixed
-
- Fix cropped images (mainvolume)
- Truncate long text in notification items (William Casarin)
- Restore missing reply description on selected events (William Casarin)
- Show sent DMs immediately (William Casarin)
- Fixed size of translated text (William Casarin)
- Fix crash when reposting (William Casarin)
- Fix unclickable image dismiss button (OlegAba)
-
-
-[1.4.1]: https://github.com/damus-io/damus/releases/tag/v1.4.1
-## [1.4.0] - 2023-03-27
-
-### Added
-
- Local zap notifications (Swift)
- Add support for video uploads (Swift)
- Auto Translation (Terry Yiu)
- Portuguese (Brazil) translations (Andressa Munturo)
- Spanish (Spain) translations (Max Pleb)
- Vietnamese translations (ShiryoRyo)
-
-
-### Fixed
-
- Fixed small notification hit boxes (Terry Yiu)
-
-[1.4.0]: https://github.com/damus-io/damus/releases/tag/v1.4.0
-
-## [1.3.0-7] - 2023-03-24
-
- New experimental timeline view
-
-[1.3.0-7]: https://github.com/damus-io/damus/releases/tag/v1.3.0-7
-
-## [1.3.0-6] - 2023-03-21
-
-### Fixed
-
- Fix bug where nostr: links and QRs stopped working (William Casarin)
-
-
-[1.3.0-6]: https://github.com/damus-io/damus/releases/tag/v1.3.0-6
-
-## [1.3.0-5] - 2023-03-20
-
-### Added
-
- Add Time Ago to DM View (Joel Klabo)
-
-
-### Fixed
-
- Fixed internal links opening in other nostr clients (William Casarin)
- Remove authentication for copying npub (Swift)
-
-
-[1.3.0-5]: https://github.com/damus-io/damus/releases/tag/v1.3.0-5
-
-## [1.3.0-4] - 2023-03-17
-
-### Changed
-
- It's much easier to tag users in replies and posts (William Casarin)
-
-
-### Fixed
-
- Fix bug where small black text appears during image upload (William Casarin)
-
-
-[1.3.0-4]: https://github.com/damus-io/damus/releases/tag/v1.3.0-4
-
-## [1.3.0-3] - 2023-03-17
-
-### Fixed
-
- Fix image upload url delay after progress bar disappears (William Casarin)
- Fix issue where damus stops trying to reconnect (William Casarin)
-
-[1.3.0-3]: https://github.com/damus-io/damus/releases/tag/v1.3.0-3
-
-## [1.3.0-2] - 2023-03-16
-
-### Added
-
- Add image uploader (Swift)
- Add option to always show images (never blur) (William Casarin)
- Canadian French (Pierre - synoptic_okubo)
- Hungarian translations (Zoltan)
- Korean translations (sogoagain)
- Swedish translations (Pextar)
-
-
-### Changed
-
- Fixed embedded note popping (William Casarin)
- Bump notification limit from 100 to 500 (William Casarin)
-
-
-### Fixed
-
- Fix zap button preventing scrolling (William Casarin)
-
-
-[1.3.0-2]: https://github.com/damus-io/damus/releases/tag/v1.3.0-2
-
-## [1.3.0] - 2023-03-15
-
-### Added
-
- Extend user tagging search to all local profiles (William Casarin)
- Vibrate when a zap is received (Swift)
- New and Improved Share sheet (ericholguin)
- Bulgarian translations (elsat)
- Persian translations (Mahdi Taghizadeh)
- Ukrainian translations (Valeriia Khudiakova, Tony B)
-
-
-### Changed
-
- Reduce battery usage by using exp backoff on connections (Bryan Montz)
- Don't show both realname and username if they are the same (William Casarin)
- Show error on invalid lightning tip address (Swift)
- Make DM Content More Visible (Joel Klabo)
- Remove spaces from hashtag searches (gladiusKatana)
-
-
-### Fixed
-
- Show @ mentions for users with display_names and no username (William Casarin)
- Make user search case insensitive (William Casarin)
- Fix repost button sometimes not working (OlegAba)
- Don't show follows you for your own profile (benthecarman)
- Fix json appearing in profile searches (gladiusKatana)
- Fix unexpected font size when posting (Bryan Montz)
- Fix keyboard sticking issues (OlegAba)
- Fixed tab bar background color on macOS (Joel Klabo)
- Fix some links getting interpreted as images (gladiusKatana)
-
-
-[1.3.0]: https://github.com/damus-io/damus/releases/tag/v1.3.0
-
-## [1.2.0-4] - 2023-03-05
-
-### Added
-
- Add ellipsis button to notes (ericholguin)
-
-
-### Changed
-
- Immediately search for events and profiles (William Casarin)
- Use long-press for custom zaps (William Casarin)
- Make shaka animation smoother (Swift)
-
-
-### Fixed
-
- Fixed hit detection bugs on profile page (OlegAba)
- Fix disappearing text on Thread view (Bryan Montz)
- Render links in notification summaries (Joel Klabo)
- Don't show notifications from ourselves (William Casarin)
- Fix issue where navbar back button would show the wrong text (Jack Chakany)
- Fix case sensitivity when searching hashtags (randymcmillan)
- Fix issue where opening reposts shows json (William Casarin)
-
-
-[1.2.0-4]: https://github.com/damus-io/damus/releases/tag/v1.2.0-4
-
-## [1.2.0-3] - 2023-03-04
-
-### Added
-
- Add additional info to recommended relay view (ericholguin)
- Add shaka animation (Swift)
- Add option to disable image animation (OlegAba)
- Add additional warning when deleting account (ericholguin)
- Threads now load instantly and are cached (William Casarin)
-
-
-### Fixed
-
- Wrap long profile display names (OlegAba)
- Fixed weird scaling on profile pictures (OlegAba)
- Fixed width of copy pubkey on profile page (Joel Klabo)
- Make damus purple use more consistent in mentions (Joel Klabo)
-
-
-
-[1.2.0-3]: https://github.com/damus-io/damus/releases/tag/v1.2.0-3
-
-## [1.1.0-10] - 2023-03-01
-
-### Added
-
- Truncate large posts and add a show more button (OlegAba)
- Private Zaps (William Casarin)
-
-
-### Fixed
-
- Fix default zap amount setting not getting updated (William Casarin)
- Fix issue where keyboard covers custom zap comment (William Casarin)
-
-
-[1.1.0-10]: https://github.com/damus-io/damus/releases/tag/v1.1.0-10
-
-## [1.1.0-9] - 2023-02-26
-
-### Added
-
- Customized zaps (William Casarin)
- Add new Notifications View (William Casarin)
- Bookmarking (Joel Klabo)
- Chinese, Traditional (Hong Kong) translations (rasputin)
- Chinese, Traditional (Taiwan) translations (rasputin)
-
-### Changed
-
- No more inline npubs when tagging users (Swift)
-
-
-### Fixed
-
- Fix alignment of side menu labels (Joel Klabo)
- Fix duplicated participants in reply-to view (Joel Klabo)
- Load missing profiles in Zaps view (William Casarin)
- Fix memory leak with inline videos (William Casarin)
- Eliminate popping when scrolling (William Casarin)
-
-
-[1.1.0-9]: https://github.com/damus-io/damus/releases/tag/v1.1.0-9
-
-## [1.1.0-3] - 2023-02-20
-
-### Added
-
- Add a "load more" button instead of always inserting events in timelines (William Casarin)
- Added the ability to select text on posts (OlegAba)
- Added Posts or Post & Replies selector to Profile (ericholguin)
- Improved profile navbar (OlegAba)
- Czech translations (Martin Gabrhel)
- Indonesian translations (johnybergzy)
- Russian translations (Tony B)
-
-
-### Changed
-
- Rename global feed to universe (William Casarin)
- Improve look of post view (ericholguin)
- Added a 20MB content length limit for all image files (OlegAba)
- Improved EventActionBar button spacing (Bryan Montz)
- Polished profile key copy buttons, added animation (Bryan Montz)
- Format large numbers of action bar actions (Joel Klabo)
- Improved blur on images, especially in dark mode (Bryan Montz)
-
-
-### Fixed
-
- Remove trailing slash when adding a relay (middlingphys)
- Scroll to top of events instead of the bottom (OlegAba)
- Fix lag on startup when you have lots of DMs (William Casarin)
- Fix an issues where dm notifications appear without any new events (William Casarin)
- Fix some hangs when scrolling by images (OlegAba)
- Force default zap amount text field to accept only numbers (Terry Yiu)
-
-
-
-[1.1.0-3]: https://github.com/damus-io/damus/releases/tag/v1.1.0-3
-
-## [1.1.0-2] - 2023-02-14
-
-### Added
-
- Save drafts to posts, replies and DMs (Terry Yiu)
-
-### Fixed
-
- Ensure stats get updated in realtime on action bars (William Casarin)
- Fix reposts not getting counted properly (William Casarin)
- Fix a bug where zaps on other people's posts weren't showing (William Casarin)
- Fix punctuation getting included in some urls (Gert Goet)
- Improve language detection (Terry Yiu)
- Fix some animated image crashes (William Casarin)
-
-
-[1.1.0-2]: https://github.com/damus-io/damus/releases/tag/v1.1.0-2
-## [1.0.0-15] - 2023-02-10
-
-### Added
-
- Relay Filtering (William Casarin)
- Add password autofill on account login and creation (Terry Yiu)
- Show if relay is paid (William Casarin)
- Add "Follows You" indicator on profile (William Casarin)
- Add screen to select individual relays when posting/broadcasting (Andrii Sievrikov)
- Relay Detail View (Joel Klabo)
- Warn when attempting to post an nsec key (Terry Yiu)
- DeepL translation integration (Terry Yiu)
- Use local authentication (faceid) to access private key (Andrii Sievrikov)
- Add accessibility labels to action bar (Bryan Montz)
- Copy invoice button (Joel Klabo)
- Receive Lightning Zaps (William Casarin)
- Allow text selection in bio (Suhail Saqan)
- Chinese, Simplified (China mainland) translations (haolong, rasputin)
- Dutch translations (Heimen Stoffels - Vistaus)
- Greek translations (milicode)
- Japanese translations (akiomik, foxytanuki, Guetsu Ren - Nighthaven, h3y6e, middlingphys)
-
-
-### Changed
-
- Show "Follow Back" button on profile page (William Casarin)
- When on your profile page, open relay view instead for your own relays (Terry Yiu)
- Updated QR code view, include profile image, etc (ericholguin)
- Clicking relay numbers now goes to relay config (radixrat)
-
-### Fixed
-
- Load zaps, likes and reposts when you open a thread (William Casarin)
- Fix bug where sidebar navigation fails to pop when switching timelines (William Casarin)
- Use lnaddress before lnurl for tip addresses to avoid Anigma scamming (William Casarin)
- Fix sidebar navigation bugs (OlegAba)
- Fix issue where navigation fails pop to root when switching timelines (William Casarin)
- Make @ mentions case insensitive (William Casarin)
- Fix some lnurls not getting decoded properly (William Casarin)
- Hide incoming DMs from blocked users (William Casarin)
- Hide blocked users from search results (William Casarin)
- Fix Cash App invoice payments (Rob Seward)
- DM Padding (OlegAba)
- Check for broken lnurls (William Casarin)
-
-
-
-[1.0.0-15]: https://github.com/damus-io/damus/releases/tag/v1.0.0-15
-## [1.0.0-13] - 2023-01-30
-
-### Added
-
- LibreTranslate note translations (Terry Yiu)
- Added support for account deletion (William Casarin)
- User tagging and autocompletion in posts (Swift)
- Polish translations (pysiak)
-
-
-### Changed
-
- Remove redundant logout button from settings (Jonathan Milligan)
- Moved relay config to its own sidebar entry (William Casarin)
- New stylized tabs (ericholguin)
-
-
-### Fixed
-
- Fix hidden profile action sheet when clicking ... (William Casarin)
- Fixed height of DM input (Terry Yiu)
- Fixed bug where copying pubkey from context menu only copied your own pubkey (Terry Yiu)
-
-
-
-[1.0.0-13]: https://github.com/damus-io/damus/releases/tag/v1.0.0-13
-## [1.0.0-12] - 2023-01-28
-
-### Added
-
- Arabic translations (Barodane)
- Portuguese translations (Antonio Chagas)
- Add QRCode view for sharing your pubkey (ericholguin)
- Added nostr: uri handling (William Casarin)
-
-### Changed
-
- Remove markdown link support from posts (Joel Klabo)
-
-
-### Fixed
-
- Fixed crash on some SVG profile pictures (OlegAba)
- Localization fixes
- Don't allow blocking yourself (Terry)
- Hide muted users from global (William Casarin)
- Fixed profiles sometimes not loading from other clients (William Casarin)
- Fixed bug where `spam` was always the report type (William Casarin)
-
-
-
-[1.0.0-12]: https://github.com/damus-io/damus/releases/tag/v1.0.0-12
-
-## [1.0.0-11] - 2023-01-25
-
-### Added
-
- Reposts view (Terry Yiu)
- Italian translations (Nicolò Carcagnì)
- Latvian translations (SYX)
- Added ability to block users (William Casarin)
- Added a way to report content (William Casarin)
- Stretchable profile cover header (Swift)
-
-
-### Changed
-
- Bump pfp/banner animated fize size limit to 5MiB/20MiB (William Casarin)
- Updated default boostrap relays (Ricardo Arturo Cabral Mejía)
-
-
-### Fixed
-
- allow ws:// relays again (Steven Briscoe)
-
-
-
-[1.0.0-11]: https://github.com/damus-io/damus/releases/tag/v1.0.0-11
-
-
-## [1.0.0-8] - 2023-01-22
-
-### Added
-
- Show website on profiles (William Casarin)
- Add the ability to choose participants when replying (Joel Klabo)
- German translations (Gregor, Peter Gerstbach)
- Turkish translations (Taylan Benli)
- French (France) translations (Solobalbo)
- Add DM Message Requests (William Casarin)
-
-
-### Fixed
-
- Fix commands and emojis getting included in hashtags (William Casarin)
- Fix duplicate post buttons when swiping tabs (Thomas Rademaker)
- Show embedded note references (William Casarin)
-
-
-[1.0.0-8]: https://github.com/damus-io/damus/releases/tag/v1.0.0-8
-
-
-## [1.0.0-7] - 2023-01-20
-
-### Added
-
- Drastically improved image viewer (OlegAba)
- Added pinch to zoom on images (Swift)
- Add Latin American Spanish translations (Nicolás Valencia)
- Added SVG profile picture support (OlegAba)
-
-
-### Changed
-
- Makes both name and username clickable in sidebar to go to profile (Zach Hendel)
- Clicking pfp in sidebar opens profile as well (radixrat)
- Don't blur images if your friend boosted it (ericholguin)
-
-
-### Fixed
-
- Fix ... when too many likes/reposts (Joel Klabo)
- Don't show report alert if logged in as a pubkey (Swift)
- Fix padding issue at top of home timeline (Ben Weeks)
- Fix absurdly large sidebar on Mac/iPad (John Bethancourt)
- Fix tab views moving after selecting from search result (OlegAba)
- Make follow/unfollow button a consistent width (OlegAba)
- Don't add events to notifications from buggy relays (William Casarin)
- Fixed some crashes with large images (OlegAba)
- Fix DM sorting on incoming messages (William Casarin)
- Fix text getting truncated next to link previews (William Casarin)
-
-
-[1.0.0-7]: https://github.com/damus-io/damus/releases/tag/v1.0.0-7
-
-
-## [1.0.0-6] - 2023-01-13
-
-### Added
-
- Profile banner images (Jason Jōb)
- Added Reactions View (William Casarin)
- Left hand option for post button (Jonathan Milligan)
- Damus icon at the top (Ben Weeks)
- Make purple badges on profile page tappable (Joel Klabo)
-
-
-### Changed
-
- Make Shaka button purple when liked (Joel Klabo)
- Move counts to right side like Birdsite (Joel Klabo)
- Use custom icon for shaka button (Joel Klabo)
- Renamed boost to repost (William Casarin)
- Removed nip05 domain from boosts/reposts (William Casarin)
- Make DMs only take up 80% of screen width (Jonathan Milligan)
- Hide Recommended Relays Section if Empty (Joel Klabo)
-
-
-### Fixed
-
- Fixed shaka moving when you press it (Joel Klabo)
- Fixed issue with relays not keeping in sync when adding (Fredrik Olofsson)
-
-
-
-[1.0.0-6]: https://github.com/damus-io/damus/releases/tag/v1.0.0-6
-
-
-## [1.0.0-5] - 2023-01-06
-
-### Added
-
- Added share button to profile (William Casarin)
- Added universal link sharing of notes (William Casarin)
- Added clear cache button to wipe pfp/image cache (OlegAba)
- Allow Adding Relay Without wss:// Prefix (Joel Klabo)
- Allow Saving Images to Library (Joel Klabo)
-
-
-### Changed
-
- Added damus gradient to post button (Ben Weeks)
- Center the Post Button (Thomas)
- Switch yellow nip05 check to gray (William Casarin)
- Switch from bluecheck to purplecheck (William Casarin)
-
-
-### Fixed
-
- Add system background color to profile pics (OlegAba)
- High res color pubkey on profile page (William Casarin)
- Don't spin forever if we're temporarily disconnected (William Casarin)
- Fixed a few issues with avatars not animating (OlegAba)
- Scroll to bottom when new DM received (Aidan O'Loan)
- Make reply view scrollable (Joel Klabo)
- Hide profile edit button when logged in with pubkey (Swift)
-
-
-[1.0.0-5]: https://github.com/damus-io/damus/releases/tag/v1.0.0-5
-
-## [1.0.0-4] - 2023-01-04
-
-### Added
-
- Added NIP05 Verification (William Casarin)
- Downscale images if they are unreasonably large (OlegAba)
-
-
-### Changed
-
- Revert to old style ln/dm buttons (William Casarin)
-
-
-### Fixed
-
- Fix ascii shrug guy (Lionello Lunesu)
- Fix navigation popping in threads (William Casarin)
-
-
-[1.0.0-4]: https://github.com/damus-io/damus/releases/tag/v1.0.0-4
-
-## [1.0.0-2] - 2023-01-03
-
-### Added
-
- Cache link previews (William Casarin)
- Added brb.io to recommended relay list (William Casarin)
- Add Blixt Wallet to Wallet Selector (Benjamin Hakes)
- Add River Wallet to Wallet Selector (Benjamin Hakes)
-
-
-### Changed
-
- Added muted shaka images instead of thumbs up (CutClout)
- Updated profile page look and feel (Ben Weeks)
- Filter replies from global feed (Nitesh Balusu)
- Show non-image links inline (William Casarin)
- Add swipe gesture to switch between tabs (Thomas Rademaker)
- Parse links in profiles (Lionello Lunesu) (Lio李歐)
-
-
-### Fixed
-
- Fix detection of email addresses in profiles (Lionello Lunesu)
- Fix padding on search results view (OlegAba)
- Fix home view moving after selecting from search result (OlegAba)
- Fix bug where boost event is loaded in the thread instead of the boosted event (William Casarin)
- Hide edit button on profile page when no private key (Swift)
- Fixed follows and relays getting out of sync on profile pages (William Casarin)
-
-
-
-[1.0.0-2]: https://github.com/damus-io/damus/releases/tag/v1.0.0-2
 ## [1.0.0] - 2023-01-01

 ### Added

- Parse links in profiles (Lionello Lunesu)
+- Parse links in profiles (William Casarin)
 - Added Breez wallet to wallet selector (Lee Salminen)
 - Added Bitcoin Beach wallet to wallet selector (Lee Salminen)
 - Added ability to copy relay urls (Matt Ward)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-[![Run Test Suite](https://github.com/damus-io/damus/actions/workflows/run-tests.yaml/badge.svg?branch=master)](https://github.com/damus-io/damus/actions/workflows/run-tests.yaml)

 # damus

@@ -26,7 +25,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 ## Getting Started on Damus 

 ### Damus iOS
-1) Get the Damus app on the iOS App Store: https://apps.apple.com/ca/app/damus/id1628663131
+1) Get the Damus app on Testflight: https://testflight.apple.com/join/CLwjLxWl

 #### ⚙️ Settings (gear icon, top right)
 - Relays: You can add more relays to send your notes to by tapping the "+". 
@@ -49,7 +48,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
  4. Add @ direcly followed by the pubkey (e.g., `@npub1xtscya34g58tk0z605fvr788k263gsu6cy9x0mhnm87echrgufzsevkk5s`)
 - You can also long-press a Note to grab their User ID aka pubkey or Note ID to link directly to a Note.
 - Currently you can't delete your Notes in the iOS app
- Share images by pasting the image url which you can grab from imgbb, imgur, etc. (i.e., `https://i.ibb.co/2SHZbwm/alpha60.jpg`). Currently images only load for people you follow in the 🏠 Personal Feed. Images are not automatically loaded in 🔍 Global Feed
+- Share images by pasting the image url which you can grab from imgbb, imgur, etc. (i.e., `(https://i.ibb.co/2SHZbwm/alpha60.jpg)`). Currently images only load for people you follow in the 🏠 Personal Feed. Images are not automatically loaded in 🔍 Global Feed
 - Engaging with Notes
  - 💬 Replying to a Note: Tap the chat icon underneath the note. This will show up in the users’ notifications and in your 🏠 Personal and 🔍 Global Feeds
  - ♺ Reposts: Tap the repost icon which will show up in your 🏠 Personal and 🔍 Global Feeds
@@ -57,8 +56,8 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 - Formatting Notes (may not format as intended in other web clients)
  - Italics: 1 asterisk `*italic*`
  - Bold: 2 asterisk `**bold**`
-  - Strikethrough: 1 tildes `~strikethrough~`
-  - Code: 1 back-tick `` `code` ``
+  - Strikethrough: 2 tildes `~~strikethrough~~`
+  - Code: 1 back-tick ``code``

 #### 💬 Encrypted DMs (chat app, bottom navigation)
 - Tap the chat icon and you'll notice there's nothing to see at first. Go to a user profile and tap the 💬 chat icon next to the follow button to begin a DM
@@ -92,23 +91,15 @@ damus implements the following [Nostr Implementation Possibilities][nips]

 ## Contributing

-Contributors welcome!
-
-### Code
-
-[Email patches][git-send-email] to jb55@jb55.com are preferred, but I accept PRs on GitHub as well.
+Contributors welcome! [Email patches][git-send-email] to jb55@jb55.com are preferred, but I accept PRs on github as well.

 [git-send-email]: http://git-send-email.io

-### Translations
+## git log bot

-Translators welcome! Join the [Transifex][transifex] project.
+npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas

-All user-facing strings must have a comment in order to provide context to translators. If a SwiftUI component has a `comment` parameter, use that. Otherwise, wrap your string with `NSLocalizedString` with the `comment` field populated.
-
-[transifex]: https://explore.transifex.com/damus/damus-ios/
-
-### Awards
+### Awards 

 There may be nostr badges awarded for contributors in the future... :)

@@ -116,7 +107,3 @@ First contributors:

 1. @randymcmillan
 2. @jcarucci27
-
-### git log bot
-
-npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas
--- a/damus-c/bech32.c
+++ b/damus-c/bech32.c
@@ -91,12 +91,13 @@ int bech32_encode(char *output, const char *hrp, const uint8_t *data, size_t dat
    return 1;
 }

-bech32_encoding bech32_decode_len(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t input_len) {
+bech32_encoding bech32_decode(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t max_input_len) {
    uint32_t chk = 1;
    size_t i;
+    size_t input_len = strlen(input);
    size_t hrp_len;
    int have_lower = 0, have_upper = 0;
-    if (input_len < 8) {
+    if (input_len < 8 || input_len > max_input_len) {
        return BECH32_ENCODING_NONE;
    }
    *data_len = 0;
@@ -153,14 +154,6 @@ bech32_encoding bech32_decode_len(char* hrp, uint8_t *data, size_t *data_len, co
    }
 }

-bech32_encoding bech32_decode(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t max_input_len) {
-    size_t len = strlen(input);
-    if (len > max_input_len) {
-        return BECH32_ENCODING_NONE;
-    }
-    return bech32_decode_len(hrp, data, data_len, input, len);
-}
-
 int bech32_convert_bits(uint8_t* out, size_t* outlen, int outbits, const uint8_t* in, size_t inlen, int inbits, int pad) {
    uint32_t val = 0;
    int bits = 0;
--- a/damus-c/bech32.h
+++ b/damus-c/bech32.h
@@ -118,14 +118,6 @@ bech32_encoding bech32_decode(
    size_t max_input_len
 );

-bech32_encoding bech32_decode_len(
-    char *hrp,
-    uint8_t *data,
-    size_t *data_len,
-    const char *input,
-    size_t input_len
-);
-
 /* Helper from bech32: translates inbits-bit bytes to outbits-bit bytes.
 * @outlen is incremented as bytes are added.
 * @pad is true if we're to pad, otherwise truncate last byte if necessary
--- a/damus-c/block.h
+++ b/damus-c/block.h
@@ -1,56 +0,0 @@
-//
-//  block.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef block_h
-#define block_h
-
-#include "nostr_bech32.h"
-#include "str_block.h"
-
-#define MAX_BLOCKS 1024
-
-enum block_type {
-    BLOCK_HASHTAG = 1,
-    BLOCK_TEXT = 2,
-    BLOCK_MENTION_INDEX = 3,
-    BLOCK_MENTION_BECH32 = 4,
-    BLOCK_URL = 5,
-    BLOCK_INVOICE = 6,
-};
-
-
-typedef struct invoice_block {
-    struct str_block invstr;
-    union {
-        struct bolt11 *bolt11;
-    };
-} invoice_block_t;
-
-typedef struct mention_bech32_block {
-    struct str_block str;
-    struct nostr_bech32 bech32;
-} mention_bech32_block_t;
-
-typedef struct block {
-    enum block_type type;
-    union {
-        struct str_block str;
-        struct invoice_block invoice;
-        struct mention_bech32_block mention_bech32;
-        int mention_index;
-    } block;
-} block_t;
-
-typedef struct blocks {
-    int num_blocks;
-    struct block *blocks;
-} blocks_t;
-
-void blocks_init(struct blocks *blocks);
-void blocks_free(struct blocks *blocks);
-
-#endif /* block_h */
--- a/damus-c/cursor.h
+++ b/damus-c/cursor.h
@@ -1,171 +0,0 @@
-//
-//  cursor.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef cursor_h
-#define cursor_h
-
-#include <ctype.h>
-#include <string.h>
-
-typedef unsigned char u8;
-
-struct cursor {
-    const u8 *p;
-    const u8 *start;
-    const u8 *end;
-};
-
-static inline int is_whitespace(char c) {
-    return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
-}
-
-static inline int is_boundary(char c) {
-    return !isalnum(c);
-}
-
-static inline int is_invalid_url_ending(char c) {
-    return c == '!' || c == '?' || c == ')' || c == '.' || c == ',' || c == ';';
-}
-
-static inline int is_alphanumeric(char c) {
-    return (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9');
-}
-
-static inline void make_cursor(struct cursor *c, const u8 *content, size_t len)
-{
-    c->start = content;
-    c->end = content + len;
-    c->p = content;
-}
-
-static inline int consume_until_boundary(struct cursor *cur) {
-    char c;
-    
-    while (cur->p < cur->end) {
-        c = *cur->p;
-        
-        if (is_boundary(c))
-            return 1;
-        
-        cur->p++;
-    }
-    
-    return 1;
-}
-
-static inline int consume_until_whitespace(struct cursor *cur, int or_end) {
-    char c;
-    int consumedAtLeastOne = 0;
-    
-    while (cur->p < cur->end) {
-        c = *cur->p;
-        
-        if (is_whitespace(c))
-            return consumedAtLeastOne;
-        
-        cur->p++;
-        consumedAtLeastOne = 1;
-    }
-    
-    return or_end;
-}
-
-static inline int consume_until_non_alphanumeric(struct cursor *cur, int or_end) {
-    char c;
-    int consumedAtLeastOne = 0;
-
-    while (cur->p < cur->end) {
-        c = *cur->p;
-
-        if (!is_alphanumeric(c))
-            return consumedAtLeastOne;
-
-        cur->p++;
-        consumedAtLeastOne = 1;
-    }
-
-    return or_end;
-}
-
-static inline int parse_char(struct cursor *cur, char c) {
-    if (cur->p >= cur->end)
-        return 0;
-        
-    if (*cur->p == c) {
-        cur->p++;
-        return 1;
-    }
-    
-    return 0;
-}
-
-static inline int peek_char(struct cursor *cur, int ind) {
-    if ((cur->p + ind < cur->start) || (cur->p + ind >= cur->end))
-        return -1;
-    
-    return *(cur->p + ind);
-}
-
-static int parse_digit(struct cursor *cur, int *digit) {
-    int c;
-    if ((c = peek_char(cur, 0)) == -1)
-        return 0;
-    
-    c -= '0';
-    
-    if (c >= 0 && c <= 9) {
-        *digit = c;
-        cur->p++;
-        return 1;
-    }
-    return 0;
-}
-
-
-static inline int pull_byte(struct cursor *cur, u8 *byte) {
-    if (cur->p >= cur->end)
-        return 0;
-        
-    *byte = *cur->p;
-    cur->p++;
-    return 1;
-}
-
-static inline int pull_bytes(struct cursor *cur, int count, const u8 **bytes) {
-    if (cur->p + count > cur->end)
-        return 0;
-    
-    *bytes = cur->p;
-    cur->p += count;
-    return 1;
-}
-
-static inline int parse_str(struct cursor *cur, const char *str) {
-    int i;
-    char c, cs;
-    unsigned long len;
-    
-    len = strlen(str);
-    
-    if (cur->p + len >= cur->end)
-        return 0;
-    
-    for (i = 0; i < len; i++) {
-        c = tolower(cur->p[i]);
-        cs = tolower(str[i]);
-        
-        if (c != cs)
-            return 0;
-    }
-    
-    cur->p += len;
-    
-    return 1;
-}
-
-
-#endif /* cursor_h */
--- a/damus-c/damus.c
+++ b/damus-c/damus.c
@@ -6,13 +6,102 @@
 //

 #include "damus.h"
-#include "cursor.h"
 #include "bolt11.h"
-#include "bech32.h"
 #include <stdlib.h>
 #include <string.h>

-static int parse_mention_index(struct cursor *cur, struct block *block) {
+typedef unsigned char u8;
+
+struct cursor {
+    const u8 *p;
+    const u8 *start;
+    const u8 *end;
+};
+
+static inline int is_whitespace(char c) {
+    return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
+}
+
+static void make_cursor(struct cursor *c, const u8 *content, size_t len)
+{
+    c->start = content;
+    c->end = content + len;
+    c->p = content;
+}
+
+static int consume_until_whitespace(struct cursor *cur, int or_end) {
+    char c;
+    
+    while (cur->p < cur->end) {
+        c = *cur->p;
+        
+        if (is_whitespace(c))
+            return 1;
+        
+        cur->p++;
+    }
+    
+    return or_end;
+}
+
+static int parse_char(struct cursor *cur, char c) {
+    if (cur->p >= cur->end)
+        return 0;
+        
+    if (*cur->p == c) {
+        cur->p++;
+        return 1;
+    }
+    
+    return 0;
+}
+
+static inline int peek_char(struct cursor *cur, int ind) {
+    if ((cur->p + ind < cur->start) || (cur->p + ind >= cur->end))
+        return -1;
+    
+    return *(cur->p + ind);
+}
+
+static int parse_digit(struct cursor *cur, int *digit) {
+    int c;
+    if ((c = peek_char(cur, 0)) == -1)
+        return 0;
+    
+    c -= '0';
+    
+    if (c >= 0 && c <= 9) {
+        *digit = c;
+        cur->p++;
+        return 1;
+    }
+    return 0;
+}
+
+static int parse_str(struct cursor *cur, const char *str) {
+    int i;
+    char c, cs;
+    unsigned long len;
+    
+    len = strlen(str);
+    
+    if (cur->p + len >= cur->end)
+        return 0;
+    
+    for (i = 0; i < len; i++) {
+        c = tolower(cur->p[i]);
+        cs = tolower(str[i]);
+        
+        if (c != cs)
+            return 0;
+    }
+    
+    cur->p += len;
+    
+    return 1;
+}
+
+static int parse_mention(struct cursor *cur, struct block *block) {
    int d1, d2, d3, ind;
    const u8 *start = cur->p;
    
@@ -37,8 +126,8 @@ static int parse_mention_index(struct cursor *cur, struct block *block) {
        return 0;
    }
    
-    block->type = BLOCK_MENTION_INDEX;
-    block->block.mention_index = ind;
+    block->type = BLOCK_MENTION;
+    block->block.mention = ind;
    
    return 1;
 }
@@ -56,7 +145,7 @@ static int parse_hashtag(struct cursor *cur, struct block *block) {
        return 0;
    }
    
-    consume_until_boundary(cur);
+    consume_until_whitespace(cur, 1);
    
    block->type = BLOCK_HASHTAG;
    block->block.str.start = (const char*)(start + 1);
@@ -111,9 +200,6 @@ static int parse_url(struct cursor *cur, struct block *block) {
        return 0;
    }
    
-    // strip any unwanted characters
-    while(is_invalid_url_ending(peek_char(cur, -1))) cur->p--;
-    
    block->type = BLOCK_URL;
    block->block.str.start = (const char *)start;
    block->block.str.end = (const char *)cur->p;
@@ -160,27 +246,6 @@ static int parse_invoice(struct cursor *cur, struct block *block) {
    return 1;
 }

-
-static int parse_mention_bech32(struct cursor *cur, struct block *block) {
-    const u8 *start = cur->p;
-    
-    if (!parse_str(cur, "nostr:"))
-        return 0;
-    
-    block->block.str.start = (const char *)cur->p;
-    
-    if (!parse_nostr_bech32(cur, &block->block.mention_bech32.bech32)) {
-        cur->p = start;
-        return 0;
-    }
-    
-    block->block.str.end = (const char *)cur->p;
-    
-    block->type = BLOCK_MENTION_BECH32;
-
-    return 1;
-}
-
 static int add_text_then_block(struct cursor *cur, struct blocks *blocks, struct block block, const u8 **start, const u8 *pre_mention)
 {
    if (!add_text_block(blocks, *start, pre_mention))
@@ -210,7 +275,7 @@ int damus_parse_content(struct blocks *blocks, const char *content) {
        
        pre_mention = cur.p;
        if (cp == -1 || is_whitespace(cp)) {
-            if (c == '#' && (parse_mention_index(&cur, &block) || parse_hashtag(&cur, &block))) {
+            if (c == '#' && (parse_mention(&cur, &block) || parse_hashtag(&cur, &block))) {
                if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                    return 0;
                continue;
@@ -222,10 +287,6 @@ int damus_parse_content(struct blocks *blocks, const char *content) {
                if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                    return 0;
                continue;
-            } else if (c == 'n' && parse_mention_bech32(&cur, &block)) {
-                if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
-                    return 0;
-                continue;
            }
        }
        
@@ -246,17 +307,8 @@ void blocks_init(struct blocks *blocks) {
 }

 void blocks_free(struct blocks *blocks) {
-    if (!blocks->blocks) {
-        return;
+    if (blocks->blocks) {
+        free(blocks->blocks);
+        blocks->num_blocks = 0;
    }
-    
-    for (int i = 0; i < blocks->num_blocks; ++i) {
-        if (blocks->blocks[i].type == BLOCK_MENTION_BECH32) {
-            free(blocks->blocks[i].block.mention_bech32.bech32.buffer);
-            blocks->blocks[i].block.mention_bech32.bech32.buffer = NULL;
-        }
-    }
-
-    free(blocks->blocks);
-    blocks->num_blocks = 0;
 }
--- a/damus-c/damus.h
+++ b/damus-c/damus.h
@@ -9,10 +9,45 @@
 #define damus_h

 #include <stdio.h>
-#include "nostr_bech32.h"
-#include "block.h"
-typedef unsigned char u8;

+#define MAX_BLOCKS 1024
+
+enum block_type {
+    BLOCK_HASHTAG = 1,
+    BLOCK_TEXT = 2,
+    BLOCK_MENTION = 3,
+    BLOCK_URL = 4,
+    BLOCK_INVOICE = 5,
+};
+
+typedef struct str_block {
+    const char *start;
+    const char *end;
+} str_block_t;
+
+typedef struct invoice_block {
+    struct str_block invstr;
+    union {
+        struct bolt11 *bolt11;
+    };
+} invoice_block_t;
+
+typedef struct block {
+    enum block_type type;
+    union {
+        struct str_block str;
+        struct invoice_block invoice;
+        int mention;
+    } block;
+} block_t;
+
+typedef struct blocks {
+    int num_blocks;
+    struct block *blocks;
+} blocks_t;
+
+void blocks_init(struct blocks *blocks);
+void blocks_free(struct blocks *blocks);
 int damus_parse_content(struct blocks *blocks, const char *content);

 #endif /* damus_h */
--- a/damus-c/nostr_bech32.c
+++ b/damus-c/nostr_bech32.c
@@ -1,295 +0,0 @@
-//
-//  nostr_bech32.c
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#include "nostr_bech32.h"
-#include <stdlib.h>
-#include "cursor.h"
-#include "bech32.h"
-
-#define MAX_TLVS 16
-
-#define TLV_SPECIAL 0
-#define TLV_RELAY 1
-#define TLV_AUTHOR 2
-#define TLV_KIND 3
-#define TLV_KNOWN_TLVS 4
-
-struct nostr_tlv {
-    u8 type;
-    u8 len;
-    const u8 *value;
-};
-
-struct nostr_tlvs {
-    struct nostr_tlv tlvs[MAX_TLVS];
-    int num_tlvs;
-};
-
-static int parse_nostr_tlv(struct cursor *cur, struct nostr_tlv *tlv) {
-    // get the tlv tag
-    if (!pull_byte(cur, &tlv->type))
-        return 0;
-    
-    // unknown, fail!
-    if (tlv->type >= TLV_KNOWN_TLVS)
-        return 0;
-    
-    // get the length
-    if (!pull_byte(cur, &tlv->len))
-        return 0;
-    
-    // is the reported length greater then our buffer? if so fail
-    if (cur->p + tlv->len > cur->end)
-        return 0;
-    
-    tlv->value = cur->p;
-    cur->p += tlv->len;
-    
-    return 1;
-}
-
-static int parse_nostr_tlvs(struct cursor *cur, struct nostr_tlvs *tlvs) {
-    int i;
-    tlvs->num_tlvs = 0;
-    
-    for (i = 0; i < MAX_TLVS; i++) {
-        if (parse_nostr_tlv(cur, &tlvs->tlvs[i])) {
-            tlvs->num_tlvs++;
-        } else {
-            break;
-        }
-    }
-    
-    if (tlvs->num_tlvs == 0)
-        return 0;
-    
-    return 1;
-}
-
-static int find_tlv(struct nostr_tlvs *tlvs, u8 type, struct nostr_tlv **tlv) {
-    *tlv = NULL;
-    
-    for (int i = 0; i < tlvs->num_tlvs; i++) {
-        if (tlvs->tlvs[i].type == type) {
-            *tlv = &tlvs->tlvs[i];
-            return 1;
-        }
-    }
-    
-    return 0;
-}
-
-static int parse_nostr_bech32_type(const char *prefix, enum nostr_bech32_type *type) {
-    // Parse type
-    if (strcmp(prefix, "note") == 0) {
-        *type = NOSTR_BECH32_NOTE;
-        return 1;
-    } else if (strcmp(prefix, "npub") == 0) {
-        *type = NOSTR_BECH32_NPUB;
-        return 1;
-    } else if (strcmp(prefix, "nprofile") == 0) {
-        *type = NOSTR_BECH32_NPROFILE;
-        return 1;
-    } else if (strcmp(prefix, "nevent") == 0) {
-        *type = NOSTR_BECH32_NEVENT;
-        return 1;
-    } else if (strcmp(prefix, "nrelay") == 0) {
-        *type = NOSTR_BECH32_NRELAY;
-        return 1;
-    } else if (strcmp(prefix, "naddr") == 0) {
-        *type = NOSTR_BECH32_NADDR;
-        return 1;
-    }
-    
-    return 0;
-}
-
-static int parse_nostr_bech32_note(struct cursor *cur, struct bech32_note *note) {
-    return pull_bytes(cur, 32, &note->event_id);
-}
-
-static int parse_nostr_bech32_npub(struct cursor *cur, struct bech32_npub *npub) {
-    return pull_bytes(cur, 32, &npub->pubkey);
-}
-
-static int tlvs_to_relays(struct nostr_tlvs *tlvs, struct relays *relays) {
-    struct nostr_tlv *tlv;
-    struct str_block *str;
-    
-    relays->num_relays = 0;
-    
-    for (int i = 0; i < tlvs->num_tlvs; i++) {
-        tlv = &tlvs->tlvs[i];
-        if (tlv->type != TLV_RELAY)
-            continue;
-        
-        if (relays->num_relays + 1 > MAX_RELAYS)
-            break;
-        
-        str = &relays->relays[relays->num_relays++];
-        str->start = (const char*)tlv->value;
-        str->end = (const char*)(tlv->value + tlv->len);
-    }
-    
-    return 1;
-}
-
-static int parse_nostr_bech32_nevent(struct cursor *cur, struct bech32_nevent *nevent) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    if (tlv->len != 32)
-        return 0;
-    
-    nevent->event_id = tlv->value;
-    
-    if (find_tlv(&tlvs, TLV_AUTHOR, &tlv)) {
-        nevent->pubkey = tlv->value;
-    } else {
-        nevent->pubkey = NULL;
-    }
-    
-    return tlvs_to_relays(&tlvs, &nevent->relays);
-}
-
-static int parse_nostr_bech32_naddr(struct cursor *cur, struct bech32_naddr *naddr) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    naddr->identifier.start = (const char*)tlv->value;
-    naddr->identifier.end = (const char*)tlv->value + tlv->len;
-    
-    if (!find_tlv(&tlvs, TLV_AUTHOR, &tlv))
-        return 0;
-    
-    naddr->pubkey = tlv->value;
-    
-    return tlvs_to_relays(&tlvs, &naddr->relays);
-}
-
-static int parse_nostr_bech32_nprofile(struct cursor *cur, struct bech32_nprofile *nprofile) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    if (tlv->len != 32)
-        return 0;
-    
-    nprofile->pubkey = tlv->value;
-    
-    return tlvs_to_relays(&tlvs, &nprofile->relays);
-}
-
-static int parse_nostr_bech32_nrelay(struct cursor *cur, struct bech32_nrelay *nrelay) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    nrelay->relay.start = (const char*)tlv->value;
-    nrelay->relay.end = (const char*)tlv->value + tlv->len;
-    
-    return 1;
-}
-
-int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj) {
-    const u8 *start, *end;
-    
-    start = cur->p;
-    
-    if (!consume_until_non_alphanumeric(cur, 1)) {
-        cur->p = start;
-        return 0;
-    }
-    
-    end = cur->p;
-    
-    size_t data_len;
-    size_t input_len = end - start;
-    if (input_len < 10 || input_len > 10000) {
-        return 0;
-    }
-    
-    obj->buffer = malloc(input_len * 2);
-    if (!obj->buffer)
-        return 0;
-    
-    u8 data[input_len];
-    char prefix[input_len];
-    
-    if (bech32_decode_len(prefix, data, &data_len, (const char*)start, input_len) == BECH32_ENCODING_NONE) {
-        cur->p = start;
-        return 0;
-    }
-    
-    obj->buflen = 0;
-    if (!bech32_convert_bits(obj->buffer, &obj->buflen, 8, data, data_len, 5, 0)) {
-        goto fail;
-    }
-    
-    if (!parse_nostr_bech32_type(prefix, &obj->type)) {
-        goto fail;
-    }
-    
-    struct cursor bcur;
-    make_cursor(&bcur, obj->buffer, obj->buflen);
-    
-    switch (obj->type) {
-        case NOSTR_BECH32_NOTE:
-            if (!parse_nostr_bech32_note(&bcur, &obj->data.note))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NPUB:
-            if (!parse_nostr_bech32_npub(&bcur, &obj->data.npub))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NEVENT:
-            if (!parse_nostr_bech32_nevent(&bcur, &obj->data.nevent))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NADDR:
-            if (!parse_nostr_bech32_naddr(&bcur, &obj->data.naddr))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NPROFILE:
-            if (!parse_nostr_bech32_nprofile(&bcur, &obj->data.nprofile))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NRELAY:
-            if (!parse_nostr_bech32_nrelay(&bcur, &obj->data.nrelay))
-                goto fail;
-            break;
-    }
-    
-    return 1;
-
-fail:
-    free(obj->buffer);
-    cur->p = start;
-    return 0;
-}
--- a/damus-c/nostr_bech32.h
+++ b/damus-c/nostr_bech32.h
@@ -1,78 +0,0 @@
-//
-//  nostr_bech32.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef nostr_bech32_h
-#define nostr_bech32_h
-
-#include <stdio.h>
-#include "str_block.h"
-#include "cursor.h"
-typedef unsigned char u8;
-#define MAX_RELAYS 10
-
-struct relays {
-    struct str_block relays[MAX_RELAYS];
-    int num_relays;
-};
-
-enum nostr_bech32_type {
-    NOSTR_BECH32_NOTE = 1,
-    NOSTR_BECH32_NPUB = 2,
-    NOSTR_BECH32_NPROFILE = 3,
-    NOSTR_BECH32_NEVENT = 4,
-    NOSTR_BECH32_NRELAY = 5,
-    NOSTR_BECH32_NADDR = 6,
-};
-
-struct bech32_note {
-    const u8 *event_id;
-};
-
-struct bech32_npub {
-    const u8 *pubkey;
-};
-
-struct bech32_nevent {
-    struct relays relays;
-    const u8 *event_id;
-    const u8 *pubkey; // optional
-};
-
-struct bech32_nprofile {
-    struct relays relays;
-    const u8 *pubkey;
-};
-
-struct bech32_naddr {
-    struct relays relays;
-    struct str_block identifier;
-    const u8 *pubkey;
-};
-
-struct bech32_nrelay {
-    struct str_block relay;
-};
-
-typedef struct nostr_bech32 {
-    enum nostr_bech32_type type;
-    u8 *buffer; // holds strings and tlv stuff
-    size_t buflen;
-    
-    union {
-        struct bech32_note note;
-        struct bech32_npub npub;
-        struct bech32_nevent nevent;
-        struct bech32_nprofile nprofile;
-        struct bech32_naddr naddr;
-        struct bech32_nrelay nrelay;
-    } data;
-} nostr_bech32_t;
-
-
-int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj);
-
-#endif /* nostr_bech32_h */
--- a/damus-c/str_block.h
+++ b/damus-c/str_block.h
@@ -1,16 +0,0 @@
-//
-//  str_block.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef str_block_h
-#define str_block_h
-
-typedef struct str_block {
-    const char *start;
-    const char *end;
-} str_block_t;
-
-#endif /* str_block_h */
--- a/damus.xcodeproj/project.pbxproj
+++ b/damus.xcodeproj/project.pbxproj
--- a/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/onevcat/Kingfisher",
      "state" : {
-        "revision" : "415b1d97fb38bda1e5a6b2dde63354720832110b",
-        "version" : "7.6.1"
+        "revision" : "017f94ccfdacabb1ae7f45b75b4217b24c06e6ac",
+        "version" : "7.4.0"
      }
    },
    {
@@ -17,6 +17,15 @@
        "revision" : "40b4b38b3b1c83f7088c76189a742870e0ca06a9"
      }
    },
+    {
+      "identity" : "shimmer",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/joshuajhomann/Shimmer",
+      "state" : {
+        "branch" : "master",
+        "revision" : "2fde687b3f1d9c5409c53da095d3686361e41343"
+      }
+    },
    {
      "identity" : "starscream",
      "kind" : "remoteSourceControl",
--- a/damus.xcodeproj/xcshareddata/xcschemes/damus.xcscheme
+++ b/damus.xcodeproj/xcshareddata/xcschemes/damus.xcscheme
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1420"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-               BuildableName = "damus.app"
-               BlueprintName = "damus"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEF227F7A08200C66700"
-               BuildableName = "damusTests.xctest"
-               BlueprintName = "damusTests"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEFC27F7A08200C66700"
-               BuildableName = "damusUITests.xctest"
-               BlueprintName = "damusUITests"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
--- a/damus/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/damus/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -1,15 +1,6 @@
 {
  "colors" : [
    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xC5",
-          "green" : "0x43",
-          "red" : "0xCC"
-        }
-      },
      "idiom" : "universal"
    }
  ],
--- a/damus/Assets.xcassets/Colors/Contents.json
+++ b/damus/Assets.xcassets/Colors/Contents.json
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusAdaptableGrey.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusAdaptableGrey.colorset/Contents.json
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xF4",
-          "green" : "0xEE",
-          "red" : "0xEE"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x1E",
-          "green" : "0x1C",
-          "red" : "0x1C"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusBlack.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusBlack.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusBlue.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusBlue.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0x4D",
-          "red" : "0x4B"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusBrown.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusBrown.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "red" : "0xBE",
-          "green" : "0x5F",
-          "blue" : "0x00"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusDarkGrey.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusDarkGrey.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x1E",
-          "green" : "0x1C",
-          "red" : "0x1C"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusDeepPurple.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusDeepPurple.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xED",
-          "green" : "0x26",
-          "red" : "0xBF"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusGreen.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusGreen.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x4F",
-          "green" : "0xC3",
-          "red" : "0x66"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusLightGrey.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusLightGrey.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xF4",
-          "green" : "0xEE",
-          "red" : "0xEE"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusMediumGrey.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusMediumGrey.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x5F",
-          "green" : "0x5F",
-          "red" : "0x5F"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusPurple.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusPurple.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xC5",
-          "green" : "0x43",
-          "red" : "0xCC"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusWhite.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusWhite.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Colors/DamusYellow.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusYellow.colorset/Contents.json
@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x05",
-          "green" : "0xDF",
-          "red" : "0xFA"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Hashtags/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/Contents.json
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/Contents.json
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "bitcoin-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "bitcoin-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "bitcoin-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/bitcoin-hashtag.svg
+++ b/damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/bitcoin-hashtag.svg
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="12.843903"
-   height="17"
-   viewBox="0 0 12.843902 16.999999"
-   version="1.1"
-   id="svg2"
-   sodipodi:docname="bitcoin-hashtag.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="namedview2"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="31.12"
-     inkscape:cx="4.2577121"
-     inkscape:cy="7.535347"
-     inkscape:window-width="1526"
-     inkscape:window-height="957"
-     inkscape:window-x="1637"
-     inkscape:window-y="10"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <g
-     id="surface1"
-     transform="matrix(0.94507527,0,0,0.94507527,-4.5943665,-3.2875042)">
-    <path
-       style="fill:#f59119;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40637"
-       d="M 18.388175,10.742602 C 18.668352,8.874761 17.240002,7.8694225 15.295251,7.193703 L 15.927019,4.6611305 14.383304,4.2765743 13.768015,6.7432244 C 13.361486,6.644338 12.943967,6.545453 12.531944,6.4520613 L 13.152726,3.9689298 11.609011,3.584375 10.977241,6.1169476 C 10.642129,6.0400371 10.312509,5.9686201 9.988384,5.886215 L 9.993834,5.880715 7.8623408,5.3478364 7.4558114,6.9959316 c 0,0 1.1426793,0.2636953 1.1207046,0.2801765 0.6207823,0.1538223 0.7361485,0.5658464 0.714174,0.8954659 l -0.7196673,2.889659 c 0.043949,0.01099 0.098885,0.02747 0.1648089,0.04944 L 8.5710227,11.072223 7.5601911,15.11555 c -0.076912,0.192277 -0.26919,0.477948 -0.7031873,0.368073 0.010984,0.02198 -1.1261994,-0.280174 -1.1261994,-0.280174 l -0.7636164,1.76346 2.0106754,0.505417 c 0.3735682,0.0934 0.7361485,0.186784 1.0987301,0.280176 l -0.6427568,2.565534 1.5437155,0.384556 0.6317701,-2.538067 c 0.4230107,0.115364 0.8295407,0.219746 1.2305777,0.318632 l -0.63177,2.527079 1.543716,0.384557 0.637263,-2.560042 c 2.631459,0.499922 4.614667,0.296656 5.444208,-2.082094 0.670226,-1.917284 -0.03296,-3.021507 -1.417363,-3.741176 1.010832,-0.236227 1.768957,-0.895465 1.972221,-2.268877 z m -3.526922,4.944286 c -0.477949,1.917283 -3.702721,0.884477 -4.752008,0.620782 l 0.851514,-3.395075 c 1.043795,0.2582 4.394922,0.774604 3.900494,2.774293 z M 15.3392,10.715134 c -0.433999,1.74698 -3.120394,0.857008 -3.993884,0.642757 l 0.769111,-3.081939 c 0.87349,0.219746 3.675252,0.620784 3.224773,2.439182 z m 0,0"
-       id="path2" />
-  </g>
-</svg>
--- a/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/Contents.json
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "coffee.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "coffee.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "coffee.svg",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee.svg
+++ b/damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee.svg
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-
-<svg
-   version="1.1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 13.999999 18"
-   enable-background="new 0 0 1000 1000"
-   xml:space="preserve"
-   id="svg4"
-   sodipodi:docname="coffee.svg"
-   width="14"
-   height="18"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs4" /><sodipodi:namedview
-   id="namedview4"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="10.680141"
-   inkscape:cx="-17.181421"
-   inkscape:cy="4.07298"
-   inkscape:window-width="1368"
-   inkscape:window-height="947"
-   inkscape:window-x="1764"
-   inkscape:window-y="58"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="svg4" />
-<metadata
-   id="metadata1"> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g
-   id="g4"
-   transform="matrix(0.01779387,0,0,0.01779387,-1.8340539,0.04465199)"><g
-     transform="matrix(0.1,0,0,-0.1,0,511)"
-     id="g3"><path
-       d="m 4302.6,4870.6 c 149.5,-177.8 240.5,-319.3 347.6,-545.6 119.2,-254.6 169.7,-448.6 183.9,-699.2 22.2,-462.7 -137.4,-778 -539.5,-1060.9 -474.9,-335.4 -685,-739.6 -687,-1315.5 0,-260.7 38.4,-501.1 115.2,-739.6 50.5,-149.5 56.6,-159.6 60.6,-97 18.2,234.4 56.6,476.9 101,626.4 121.2,422.3 305.1,622.4 885.1,959.8 424.3,248.5 575.9,487 575.9,905.3 -2,501.1 -359.7,1295.3 -798.2,1768.1 -82.8,88.9 -198,202.1 -256.6,250.6 l -105.1,86.9 z"
-       id="path1"
-       style="fill:#be5f00;fill-opacity:1" /><path
-       d="m 5981.8,3577.3 c 272.8,-369.8 309.2,-846.7 90.9,-1192.2 -147.5,-232.4 -373.8,-406.2 -822.4,-638.5 -592,-303.1 -854.7,-683 -854.7,-1232.6 0,-276.8 14.2,-343.5 72.7,-343.5 38.4,0 48.5,16.2 68.7,111.1 34.4,167.7 135.4,349.6 262.7,476.9 147.5,145.5 349.6,244.5 838.6,412.2 503.2,171.8 725.4,280.9 846.7,416.3 210.1,232.4 276.8,535.5 202.1,903.2 -76.8,373.8 -216.2,618.3 -537.5,943.7 -155.7,155.6 -214.3,206.1 -167.8,143.4 z"
-       id="path2"
-       style="fill:#be5f00;fill-opacity:1" /><path
-       d="M 2748.7,592.8 C 2158.7,507.9 1732.3,352.3 1542.4,156.3 1415.1,25 1409,-11.4 1427.2,-445.8 c 34.3,-832.5 181.9,-1729.7 462.7,-2829 153.6,-600.1 309.2,-1113.4 351.6,-1159.9 56.6,-62.6 272.8,-157.6 476.9,-210.1 668.8,-173.8 2172.2,-196 2960.3,-42.4 357.7,68.7 604.2,163.7 731.5,278.9 68.7,60.6 84.9,92.9 107.1,198 64.7,335.4 56.6,319.3 131.3,319.3 107.1,0 438.5,92.9 602.2,167.7 220.3,103.1 363.7,202.1 567.8,398.1 470.8,452.6 759.8,1149.8 761.8,1840.8 0,398.1 -72.7,614.3 -274.8,818.4 -220.3,222.3 -466.8,309.2 -937.6,325.4 l -309.2,12.1 14.2,218.2 14.2,218.2 -56.6,52.5 C 6866.9,314 6274.9,499.9 5696.9,582.7 L 5614,594.8 5533.2,457.4 5450.4,322 5565.6,305.8 c 588,-84.9 868.9,-159.6 978,-256.6 56.6,-50.5 60.6,-62.6 44.5,-113.2 -80.8,-226.3 -1000.2,-371.8 -2329.8,-371.8 -1220.5,0 -2097.5,123.3 -2295.5,321.3 -52.5,54.5 -56.6,66.7 -36.4,111.1 48.5,107.1 341.5,206.1 822.4,276.8 143.5,20.2 301.1,38.4 349.6,38.4 46.5,0 84.9,4 84.9,8.1 0,8.1 -175.8,295 -185.9,305.1 -4.2,2.1 -115.3,-12 -248.7,-32.2 z m 4797.1,-1614.5 c 153.6,-26.3 272.8,-82.8 317.2,-153.6 56.6,-84.9 60.6,-400.1 8.1,-652.7 -111.1,-545.6 -404.1,-996.2 -788.1,-1220.5 -139.4,-80.8 -333.4,-151.5 -355.6,-129.3 -8.1,8.1 18.2,216.2 58.6,462.7 78.8,482.9 159.6,1073 202.1,1450.8 l 24.2,232.4 70.7,12.1 c 115.3,20.3 325.4,20.3 462.8,-1.9 z"
-       id="path3"
-       style="fill:#be5f00;fill-opacity:1" /></g></g>
-</svg>
--- a/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/Contents.json
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "nostr-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "nostr-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "nostr-hashtag.svg",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/nostr-hashtag.svg
+++ b/damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/nostr-hashtag.svg
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.0"
-   width="18pt"
-   height="18.199053pt"
-   viewBox="0 0 18 18.199053"
-   preserveAspectRatio="xMidYMid"
-   id="svg1"
-   sodipodi:docname="nostr-hashtag.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="pt"
-     showgrid="false"
-     inkscape:zoom="5.4017383"
-     inkscape:cx="50.354161"
-     inkscape:cy="-13.514168"
-     inkscape:window-width="1497"
-     inkscape:window-height="866"
-     inkscape:window-x="1747"
-     inkscape:window-y="96"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1" />
-  <metadata
-     id="metadata1">
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-</metadata>
-  <g
-     transform="matrix(0.00138509,0,0,-0.00138509,0.3,17.927982)"
-     fill="#000000"
-     stroke="none"
-     id="g1">
-    <path
-       d="m 11315,12756 c -49,-23 -135,-71 -190,-106 -128,-81 -170,-100 -222,-100 -37,0 -43,-3 -43,-22 0,-11 12,-36 26,-55 l 26,-34 -20,-37 c -128,-248 -171,-359 -212,-547 -56,-262 -43,-645 36,-1045 48,-244 104,-451 234,-865 158,-503 280,-942 320,-1145 27,-140 60,-448 60,-559 0,-164 -39,-366 -92,-478 -57,-123 -176,-222 -286,-239 -49,-8 -50,-23 -5,-38 18,-6 34,-14 38,-18 13,-13 -25,-66 -97,-134 -121,-115 -267,-174 -432,-174 -200,0 -327,87 -732,507 -233,240 -541,529 -604,567 -31,18 -32,18 -27,0 3,-11 9,-36 13,-56 8,-49 -5,-49 -65,1 -75,62 -168,118 -250,150 -134,51 -214,63 -481,70 l -245,6 -65,41 c -100,63 -125,68 -295,66 -186,-3 -262,7 -484,64 -279,71 -341,67 -780,-61 -334,-97 -442,-118 -761,-150 -200,-19 -365,-19 -496,1 -58,9 -107,14 -111,11 -3,-4 6,-22 21,-41 l 27,-35 -23,-5 c -13,-3 -61,-8 -106,-11 -113,-9 -157,-26 -219,-87 -50,-49 -54,-51 -140,-64 -60,-10 -108,-25 -153,-48 -304,-157 -331,-166 -471,-166 -48,0 -120,7 -160,15 -40,9 -74,13 -78,10 -3,-3 0,-20 7,-37 6,-18 10,-34 7,-36 -2,-3 -24,0 -47,7 -24,6 -103,16 -176,23 -163,15 -350,1 -521,-40 l -114,-26 51,-23 c 53,-23 76,-50 66,-77 -3,-8 -51,-38 -105,-66 -251,-129 -515,-384 -727,-703 -110,-166 -208,-325 -217,-355 -6,-21 -5,-22 34,-16 36,6 41,4 41,-12 0,-11 -15,-45 -34,-76 -46,-75 -76,-161 -127,-359 -78,-307 -137,-444 -243,-569 -38,-44 -51,-67 -43,-72 7,-4 40,-8 75,-8 37,0 62,-4 62,-11 0,-6 -12,-26 -27,-45 -32,-43 -24,-53 48,-60 108,-11 103,-6 95,-82 -4,-37 -11,-128 -15,-202 -5,-74 -16,-164 -26,-200 -22,-85 -75,-190 -136,-269 -27,-35 -49,-67 -49,-72 0,-4 17,-11 38,-14 20,-3 49,-8 64,-10 64,-10 285,31 408,76 101,37 249,117 348,188 54,38 110,75 126,80 15,6 70,11 123,11 267,0 582,98 766,239 34,26 72,53 83,59 25,13 31,8 58,-46 21,-40 38,-32 57,26 30,93 97,200 141,223 25,14 38,3 98,-86 27,-38 73,-95 104,-125 31,-30 56,-63 56,-75 0,-11 -20,-60 -45,-110 -42,-84 -81,-202 -70,-213 3,-3 27,16 54,41 50,47 81,59 81,34 0,-8 -10,-49 -21,-93 -26,-97 -32,-275 -10,-313 l 14,-25 36,41 c 42,48 118,88 251,131 102,33 185,47 345,57 55,4 159,13 230,21 292,34 285,35 368,-56 66,-72 122,-115 170,-130 20,-6 37,-15 37,-19 0,-12 -22,-35 -75,-77 -27,-21 -151,-133 -275,-248 -424,-394 -462,-415 -864,-486 -65,-12 -145,-29 -177,-39 -191,-60 -348,-213 -554,-541 -103,-165 -162,-241 -292,-383 -176,-190 -332,-333 -778,-711 -497,-422 -750,-737 -895,-1113 -64,-165 -104,-203 -216,-203 -38,0 -94,7 -124,15 -74,20 -244,20 -301,0 -27,-10 -61,-33 -87,-62 -41,-45 -43,-46 -89,-39 -25,3 -67,18 -92,33 C 457,781 369,812 175,813 49,814 0,786 0,713 0,669 31,628 122,557 204,491 254,434 469,153 527,77 549,57 597,33 652,7 662,5 780,6 c 69,0 150,6 180,14 30,7 132,32 225,56 281,72 308,76 511,84 181,6 195,8 247,34 76,37 137,107 231,267 230,392 287,481 394,626 219,293 469,581 756,869 284,284 368,342 641,439 164,59 295,123 410,199 101,68 257,219 295,286 14,24 56,76 93,116 100,106 177,142 437,203 165,40 229,62 390,133 191,85 220,94 460,143 118,24 239,49 267,56 29,7 56,10 59,6 4,-3 15,-50 26,-104 14,-73 21,-159 25,-331 6,-265 -3,-385 -47,-605 -50,-247 -105,-393 -222,-592 -59,-98 -74,-167 -58,-256 23,-126 61,-177 174,-232 95,-47 169,-52 357,-28 125,16 244,22 505,26 667,12 1011,-35 1799,-241 277,-73 308,-86 376,-161 72,-79 113,-170 175,-388 19,-66 42,-130 50,-143 42,-63 155,-112 261,-112 109,0 124,57 54,206 -48,102 -53,149 -17,165 31,15 73,-5 102,-48 12,-18 45,-87 75,-153 57,-132 106,-197 173,-233 35,-18 56,-21 136,-20 73,2 110,-3 159,-19 89,-29 333,-32 403,-5 114,44 140,145 60,231 -23,24 -112,72 -272,143 -71,32 -199,124 -250,179 -71,78 -111,140 -224,343 -132,236 -172,297 -262,391 -58,61 -94,89 -148,115 -113,56 -85,53 -866,85 -223,9 -616,36 -656,45 -11,2 -86,12 -165,20 -179,20 -595,95 -712,130 -145,42 -319,139 -371,208 -32,42 -53,102 -67,187 -22,144 48,316 261,640 125,190 193,317 230,428 31,95 60,282 60,392 0,76 4,102 16,114 20,20 25,18 192,-102 73,-52 168,-114 210,-137 83,-47 132,-82 132,-95 0,-4 -14,-17 -32,-28 l -32,-21 29,-11 c 108,-41 305,-52 707,-39 186,6 345,9 353,5 8,-3 15,-15 15,-27 0,-20 3,-21 54,-15 110,13 266,81 426,187 89,58 99,63 170,69 161,14 229,78 523,495 88,124 143,185 169,185 2,0 2,-27 0,-60 -2,-33 0,-60 5,-60 23,0 140,145 212,263 117,192 165,317 271,712 106,394 111,410 135,410 15,0 22,-10 29,-40 13,-53 12,-52 42,-24 40,36 103,133 154,234 25,50 50,90 55,90 6,0 11,-17 13,-37 2,-21 7,-38 12,-38 19,0 93,101 139,190 29,56 87,206 140,363 50,147 114,318 142,380 132,288 199,526 246,867 25,190 25,756 0,975 -23,195 -53,379 -78,485 -46,194 -152,515 -233,706 -130,306 -218,564 -260,764 -48,228 -48,572 1,770 31,128 82,204 166,246 64,33 118,83 187,174 120,158 184,199 503,321 250,96 347,153 347,204 0,41 -42,57 -174,68 -112,9 -385,70 -439,99 -10,5 -27,29 -37,54 -23,53 -99,137 -159,176 -56,35 -72,36 -40,1 24,-26 23,-26 -13,3 -21,16 -42,41 -47,56 -9,26 -14,28 -60,28 -50,0 -101,16 -101,32 0,4 -42,8 -92,7 -88,0 -98,-3 -183,-43 z m 550,-126 c 10,-11 16,-20 13,-20 -3,0 -13,9 -23,20 -10,11 -16,20 -13,20 3,0 13,-9 23,-20 z"
-       id="path1"
-       style="fill:#cc43c5;fill-opacity:1" />
-  </g>
-</svg>
--- a/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/Contents.json
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "plebchain.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "plebchain.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "plebchain.svg",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain.svg
+++ b/damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain.svg
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 21.315096 18"
-   width="21.315096"
-   height="18"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="plebchain.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs21" />
-  <sodipodi:namedview
-     id="namedview21"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="19.666667"
-     inkscape:cx="12.762712"
-     inkscape:cy="12.991525"
-     inkscape:window-width="1418"
-     inkscape:window-height="883"
-     inkscape:window-x="1745"
-     inkscape:window-y="10"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg21" />
-  <path
-     d="M 18.625339,11.886754 C 17.668676,9.87076 15.553749,8.748431 12.298294,7.531368 12.258627,7.5164347 11.514296,7.2747022 10.649566,6.9942364 9.6532356,6.6713042 8.5682391,6.7520372 7.6316422,7.220569 L 5.7999816,8.136166 13.616623,17.9338 h 4.316652 l 0.703264,-1.662727 c 0.593598,-1.401862 0.641198,-3.009057 -0.0112,-4.384319 z"
-     id="path5"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="M 16.627546,5.1089093 C 16.710146,4.5484447 16.797412,3.95578 16.838479,3.6790475 17.083011,2.0219197 15.937348,0.48005806 14.28022,0.23552546 12.623092,-0.00900704 11.081231,1.1366559 10.836698,2.7937838 c -0.0406,0.2762657 -0.128333,0.8689305 -0.210932,1.4298619 -0.282799,0.058333 -0.513332,0.2851324 -0.558132,0.5870648 -0.0658,0.441465 0.084,1.0145298 0.370999,1.2072625 0.09707,1.4303286 1.118596,2.778524 2.547992,2.989457 1.429395,0.210933 2.796257,-0.785398 3.302589,-2.1265932 0.330399,-0.1021996 0.639331,-0.6071313 0.703731,-1.0490632 0.0434,-0.302399 -0.111533,-0.5856647 -0.365399,-0.7228643 z"
-     id="path10"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="m 21.193864,14.872477 c -0.0392,-0.501665 -0.310799,-0.956663 -0.684131,-1.294529 l -1.900727,-1.723394 c 0,0 0.172666,0.346732 0.332732,1.276796 L 15.53415,11.550288 c -0.878731,-0.405999 -1.835861,-0.616465 -2.804191,-0.616465 h -0.807331 c -0.87733,0 -1.681394,-0.553464 -1.9338602,-1.393928 C 9.8926348,9.220696 9.819835,8.832897 9.7904351,8.363432 V 8.362965 C 10.503966,7.7651672 10.944031,6.8285703 10.968765,5.8700401 11.247364,5.6651742 11.372897,5.0865094 11.28843,4.648311 11.230564,4.3482453 10.990698,4.1317127 10.706032,4.0850462 10.599632,3.5283147 10.487633,2.93985 10.435366,2.6654509 10.121301,1.0199896 8.5327726,-0.05940684 6.8873113,0.25419216 5.2418501,0.56779106 4.1624536,2.1567859 4.4760526,3.8022471 4.5283191,4.0766462 4.6407854,4.665111 4.7467184,5.2218423 4.4989192,5.3697751 4.355653,5.6595742 4.4125861,5.9596399 4.4956525,6.3983051 4.8255848,6.8901701 5.159717,6.9779032 5.2950499,7.2952355 5.4798493,7.5892345 5.7015152,7.8510336 L 5.7999816,8.136166 5.2171168,11.699621 3.2925898,12.11822 C 3.041524,12.177953 2.8109914,12.278752 2.6061254,12.411752 1.8342613,12.912484 1.5458622,13.865414 1.7731282,14.725478 1.8309946,14.943877 2.8833245,17.9338 2.8833245,17.9338 H 15.133284 l 0.408332,-1.691661 3.480855,0.605265 c 1.184397,0.211399 2.267993,-0.748064 2.171393,-1.974927 z"
-     id="path16"
-     style="fill:#f59119;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="m 12.589026,15.06801 -2.251659,-0.776531 c 0,0 0.96693,-0.1106 0.95853,-0.625798 -4.67e-4,-0.03687 -0.01213,-0.240332 -0.307999,-0.210932 -0.0812,0.0079 -0.734064,0.07327 -1.1927962,0.118999 -0.3028657,0.03033 -0.6015314,0.09007 -0.8927304,0.178733 l -0.1591328,0.04853 -3.5256551,-2.101393 c 0,0 0,0 0.3495322,-0.763464 C 6.1779803,9.600561 5.8004482,8.136166 5.8004482,8.136166 L 1.324663,10.373825 C 0.63539857,10.718224 0.2,11.422889 0.2,12.193819 c 0,0.939397 0.64306455,1.756528 1.5558615,1.977727 l 6.4357789,1.371062 2.5834586,0.955731 c 0.167999,0.0532 0.329932,0.0602 0.517065,0.0033 0.187599,-0.05693 0.246399,-0.09847 0.337398,-0.165199 0.2464,-0.180133 0.706065,-0.536665 1.037864,-0.795664 0.170799,-0.133933 0.125533,-0.402266 -0.0784,-0.472732 z"
-     id="path21"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-</svg>
--- a/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/Contents.json
+++ b/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/Contents.json
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "zapathon.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "zapathon.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "zapathon.svg",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zapathon.svg
+++ b/damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zapathon.svg
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="11.106925"
-   height="18"
-   viewBox="0 0 2.9387073 4.7624999"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   sodipodi:docname="zapathon.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="16"
-     inkscape:cx="16.96875"
-     inkscape:cy="9.96875"
-     inkscape:window-width="1406"
-     inkscape:window-height="767"
-     inkscape:window-x="1741"
-     inkscape:window-y="214"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-10.993855,-8.058313)">
-    <g
-       transform="matrix(0.01604881,0,0,-0.01604881,10.573102,13.422443)"
-       id="g10"
-       inkscape:label="Bolt"
-       style="display:inline">
-      <path
-         id="path14"
-         style="fill:#c98f19;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
-         d="m 94.833712,155.13322 -8.129016,18.00903 -55.167069,-3.59001 18.868958,-24.19503 44.825648,2.77303 z m 83.691438,80.98476 -8.89814,-11.93085 -11.755,-16.519 -1.505,-2.114 -43.191,-60.691 L 63.081111,74.14633 79.705774,38.853232 C 121.34411,95.870625 162.2814,153.39008 203.27601,210.87013 Z m -22.57414,11.14115 12.32197,61.15287 -21.22997,22.33399 -17.432,-69.53486 -7.0256,-30.70796 27.52164,-9.9823 5.84396,26.73826"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path16"
-         style="fill:#fadf05;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
-         d="m 178.78514,236.43412 -5.679,-0.377 -8.065,-0.533 -5.9,-0.389 -33.394,-2.212 6.162,29.388 6.223,29.667 8.95029,38.92409 -54.426393,-75.90909 -61.5969,-86.55 44.1332,2.921 8.9137,0.589 -6.1723,-29.396 -0.9867,-4.71 -1.5106,-7.209 -11.7273,-55.917704 16.3074,22.9175 37.169603,52.234204 43.189,60.693 1.505,2.113 16.907,23.756 h -0.002"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-    </g>
-  </g>
-</svg>
--- a/damus/Assets.xcassets/Profile/Contents.json
+++ b/damus/Assets.xcassets/Profile/Contents.json
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json
+++ b/damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "profile-banner.jpeg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/Profile/profile-banner.imageset/profile-banner.jpeg
+++ b/damus/Assets.xcassets/Profile/profile-banner.imageset/profile-banner.jpeg
--- a/damus/Assets.xcassets/bbw.imageset/Contents.json
+++ b/damus/Assets.xcassets/bbw.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "bbw.jpg",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/bitcoin-logo.imageset/Contents.json
+++ b/damus/Assets.xcassets/bitcoin-logo.imageset/Contents.json
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "bitcoin-logo.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/bitcoin-logo.imageset/bitcoin-logo.svg
+++ b/damus/Assets.xcassets/bitcoin-logo.imageset/bitcoin-logo.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="20px" viewBox="0 0 20 20" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(96.862745%,57.647059%,10.196078%);fill-opacity:1;" d="M 19.699219 12.417969 C 18.363281 17.777344 12.9375 21.035156 7.582031 19.699219 C 2.226562 18.363281 -1.035156 12.9375 0.300781 7.582031 C 1.636719 2.222656 7.0625 -1.035156 12.417969 0.300781 C 17.773438 1.632812 21.035156 7.0625 19.699219 12.417969 Z M 19.699219 12.417969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 14.410156 8.574219 C 14.609375 7.246094 13.59375 6.53125 12.210938 6.050781 L 12.660156 4.25 L 11.5625 3.976562 L 11.125 5.730469 C 10.835938 5.660156 10.539062 5.589844 10.246094 5.523438 L 10.6875 3.757812 L 9.589844 3.484375 L 9.140625 5.285156 C 8.902344 5.230469 8.667969 5.179688 8.4375 5.121094 L 8.441406 5.117188 L 6.925781 4.738281 L 6.636719 5.910156 C 6.636719 5.910156 7.449219 6.097656 7.433594 6.109375 C 7.875 6.21875 7.957031 6.511719 7.941406 6.746094 L 7.429688 8.800781 C 7.460938 8.808594 7.5 8.820312 7.546875 8.835938 L 7.429688 8.808594 L 6.710938 11.683594 C 6.65625 11.820312 6.519531 12.023438 6.210938 11.945312 C 6.21875 11.960938 5.410156 11.746094 5.410156 11.746094 L 4.867188 13 L 6.296875 13.359375 C 6.5625 13.425781 6.820312 13.492188 7.078125 13.558594 L 6.621094 15.382812 L 7.71875 15.65625 L 8.167969 13.851562 C 8.46875 13.933594 8.757812 14.007812 9.042969 14.078125 L 8.59375 15.875 L 9.691406 16.148438 L 10.144531 14.328125 C 12.015625 14.683594 13.425781 14.539062 14.015625 12.847656 C 14.492188 11.484375 13.992188 10.699219 13.007812 10.1875 C 13.726562 10.019531 14.265625 9.550781 14.410156 8.574219 Z M 11.902344 12.089844 C 11.5625 13.453125 9.269531 12.71875 8.523438 12.53125 L 9.128906 10.117188 C 9.871094 10.300781 12.253906 10.667969 11.902344 12.089844 Z M 12.242188 8.554688 C 11.933594 9.796875 10.023438 9.164062 9.402344 9.011719 L 9.949219 6.820312 C 10.570312 6.976562 12.5625 7.261719 12.242188 8.554688 Z M 12.242188 8.554688 "/>
-</g>
-</svg>
--- a/damus/Assets.xcassets/bitcoin-p2p.imageset/Contents.json
+++ b/damus/Assets.xcassets/bitcoin-p2p.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "bitcoin-p2p.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/blixt-wallet.imageset/Contents.json
+++ b/damus/Assets.xcassets/blixt-wallet.imageset/Contents.json
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "blixt-wallet.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/blixt-wallet.imageset/blixt-wallet.png
+++ b/damus/Assets.xcassets/blixt-wallet.imageset/blixt-wallet.png
--- a/damus/Assets.xcassets/bluewallet.imageset/Contents.json
+++ b/damus/Assets.xcassets/bluewallet.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "bluewallet.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/breez.imageset/Contents.json
+++ b/damus/Assets.xcassets/breez.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "breez.jpg",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/cashapp.imageset/Contents.json
+++ b/damus/Assets.xcassets/cashapp.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "cashapp.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/damus-home.imageset/Contents.json
+++ b/damus/Assets.xcassets/damus-home.imageset/Contents.json
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "damus-home@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "damus-home@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "damus-home@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/damus-home.imageset/damus-home@1x.png
+++ b/damus/Assets.xcassets/damus-home.imageset/damus-home@1x.png
--- a/damus/Assets.xcassets/damus-home.imageset/damus-home@2x.png
+++ b/damus/Assets.xcassets/damus-home.imageset/damus-home@2x.png
--- a/damus/Assets.xcassets/damus-home.imageset/damus-home@3x.png
+++ b/damus/Assets.xcassets/damus-home.imageset/damus-home@3x.png
--- a/damus/Assets.xcassets/digital-nomad.imageset/Contents.json
+++ b/damus/Assets.xcassets/digital-nomad.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "digital-nomad.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/encrypted-message.imageset/Contents.json
+++ b/damus/Assets.xcassets/encrypted-message.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "encrypted-message.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/lnlink.imageset/Contents.json
+++ b/damus/Assets.xcassets/lnlink.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "lnlink.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/logo-nobg.imageset/Contents.json
+++ b/damus/Assets.xcassets/logo-nobg.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "damus-nobg.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/muun.imageset/Contents.json
+++ b/damus/Assets.xcassets/muun.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "muun.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/phoenix.imageset/Contents.json
+++ b/damus/Assets.xcassets/phoenix.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "phoenix.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/river.imageset/Contents.json
+++ b/damus/Assets.xcassets/river.imageset/Contents.json
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "river.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/damus/Assets.xcassets/river.imageset/river.png
+++ b/damus/Assets.xcassets/river.imageset/river.png
--- a/damus/Assets.xcassets/shaka-full.imageset/Contents.json
+++ b/damus/Assets.xcassets/shaka-full.imageset/Contents.json
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "shaka-full.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
--- a/damus/Assets.xcassets/shaka-full.imageset/shaka-full.pdf
+++ b/damus/Assets.xcassets/shaka-full.imageset/shaka-full.pdf
@@ -1,88 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 0.000000 -0.073975 cm
-1.000000 1.000000 1.000000 scn
-1.295334 8.661732 m
-3.613694 8.367855 l
-4.475733 8.733568 5.268113 9.771931 5.474915 10.327032 c
-6.083156 11.959681 5.507567 14.604573 5.474915 15.061715 c
-5.448792 15.427428 6.008246 15.693006 6.291239 15.780080 c
-7.571236 15.858447 8.508359 14.876789 8.642253 13.984165 c
-8.740212 13.331103 8.576948 11.752880 8.381030 10.849482 c
-8.979668 10.936556 10.980525 10.901726 11.868687 10.849482 c
-12.756847 10.797236 13.474895 10.196423 14.193260 9.412750 c
-14.767952 8.237244 13.953805 7.725680 13.474895 7.616838 c
-13.834077 7.257654 l
-14.781013 5.918882 13.649043 5.178749 13.115711 5.004600 c
-13.474895 4.743376 l
-14.487136 3.763786 13.246323 2.751544 13.017752 2.882155 c
-11.058574 3.176033 l
-15.499378 1.673996 l
-16.054478 0.400530 15.074889 0.073999 14.781013 0.073999 c
-8.576947 1.673996 l
-6.291239 1.673996 5.311650 1.869914 4.299407 2.163791 c
-4.157911 2.131138 3.659409 1.987464 2.797370 1.673996 c
-1.935332 1.360527 1.219143 2.087601 0.968804 2.490320 c
-0.285071 4.083785 -0.467927 7.257655 1.295334 8.661732 c
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1149
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 15.666626 15.710510 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001239 00000 n
-0000001262 00000 n
-0000001435 00000 n
-0000001509 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1568
-%%EOF
--- a/damus/Assets.xcassets/shaka-line.imageset/Contents.json
+++ b/damus/Assets.xcassets/shaka-line.imageset/Contents.json
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "shaka-line.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
--- a/damus/Assets.xcassets/shaka-line.imageset/shaka-line.pdf
+++ b/damus/Assets.xcassets/shaka-line.imageset/shaka-line.pdf
@@ -1,323 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 0.474731 -0.563965 cm
-1.000000 1.000000 1.000000 scn
-3.613694 9.332577 m
-3.553993 8.861599 l
-3.637261 8.851044 3.721838 8.862753 3.799107 8.895533 c
-3.613694 9.332577 l
-h
-1.295334 9.626453 m
-1.355035 10.097433 l
-1.227973 10.113539 1.099794 10.077623 0.999601 9.997839 c
-1.295334 9.626453 l
-h
-0.968804 3.455042 m
-1.372000 3.705677 l
-1.362764 3.720535 1.352713 3.734872 1.341894 3.748621 c
-0.968804 3.455042 l
-h
-4.299407 3.128512 m
-4.431771 3.584435 l
-4.353942 3.607030 4.271623 3.609325 4.192656 3.591103 c
-4.299407 3.128512 l
-h
-8.576947 2.638718 m
-8.695503 3.098424 l
-8.656776 3.108411 8.616942 3.113465 8.576947 3.113465 c
-8.576947 2.638718 l
-h
-14.781013 1.038721 m
-14.662457 0.579016 l
-14.701184 0.569027 14.741018 0.563974 14.781013 0.563974 c
-14.781013 1.038721 l
-h
-15.499378 2.638718 m
-15.934578 2.828420 l
-15.881091 2.951125 15.778289 3.045548 15.651489 3.088437 c
-15.499378 2.638718 l
-h
-11.058574 4.140755 m
-11.128998 4.610250 l
-10.885809 4.646729 10.655017 4.491467 10.597156 4.252461 c
-10.539293 4.013455 10.673516 3.769826 10.906463 3.691035 c
-11.058574 4.140755 l
-h
-13.017752 3.846877 m
-13.253292 4.259073 l
-13.202273 4.288227 13.146286 4.307655 13.088176 4.316372 c
-13.017752 3.846877 l
-h
-13.474895 5.708097 m
-13.805044 6.049252 l
-13.789093 6.064689 13.772079 6.078987 13.754128 6.092043 c
-13.474895 5.708097 l
-h
-13.115711 5.969321 m
-12.968349 6.420619 l
-12.798800 6.365256 12.674588 6.219535 12.646772 6.043359 c
-12.618958 5.867183 12.692234 5.690281 12.836478 5.585376 c
-13.115711 5.969321 l
-h
-13.834077 8.222376 m
-14.221668 8.496526 l
-14.206144 8.518474 14.188784 8.539063 14.169774 8.558073 c
-13.834077 8.222376 l
-h
-13.474895 8.581559 m
-13.369680 9.044500 l
-13.201114 9.006190 13.066693 8.879284 13.018762 8.713197 c
-12.970830 8.547110 13.016963 8.368095 13.139197 8.245862 c
-13.474895 8.581559 l
-h
-14.193260 10.377472 m
-14.619765 10.585986 l
-14.599768 10.626891 14.573989 10.664707 14.543221 10.698271 c
-14.193260 10.377472 l
-h
-8.381030 11.814203 m
-7.917068 11.914822 l
-7.884080 11.762714 7.927746 11.604099 8.033934 11.490305 c
-8.140121 11.376513 8.295343 11.321997 8.449365 11.344399 c
-8.381030 11.814203 l
-h
-8.642253 14.948887 m
-9.111748 15.019311 l
-8.642253 14.948887 l
-h
-6.291239 16.744801 m
-6.262227 17.218662 l
-6.224693 17.216364 6.187564 17.209614 6.151623 17.198555 c
-6.291239 16.744801 l
-h
-5.474915 16.026436 m
-5.948456 16.060261 l
-5.474915 16.026436 l
-h
-5.474915 11.291754 m
-5.030037 11.457493 l
-5.474915 11.291754 l
-h
-3.673396 9.803555 m
-1.355035 10.097433 l
-1.235632 9.155476 l
-3.553993 8.861599 l
-3.673396 9.803555 l
-h
-0.999601 9.997839 m
-0.029049 9.178730 -0.454726 7.875908 -0.474048 6.619066 c
-0.493367 5.362488 -0.110331 4.058727 0.595713 3.161463 c
-1.341894 3.748621 l
-0.794064 4.444821 0.458734 5.524729 0.475334 6.604470 c
-0.491930 7.683949 0.856455 8.670100 1.591066 9.255068 c
-0.999601 9.997839 l
-h
-0.565608 3.204407 m
-0.721970 2.952868 1.013515 2.611341 1.407507 2.372385 c
-1.811404 2.127421 2.357187 1.973489 2.959612 2.192553 c
-2.635129 3.084882 l
-2.375515 2.990478 2.132184 3.043347 1.899893 3.184233 c
-1.657696 3.331126 1.465977 3.554496 1.372000 3.705677 c
-0.565608 3.204407 l
-h
-2.959612 2.192553 m
-3.816493 2.504146 4.293336 2.639887 4.406158 2.665923 c
-4.192656 3.591103 l
-4.022485 3.551832 3.502325 3.400227 2.635129 3.084882 c
-2.959612 2.192553 l
-h
-4.167043 2.672591 m
-5.229115 2.364247 6.254152 2.163970 8.576947 2.163970 c
-8.576947 3.113465 l
-6.328326 3.113465 5.394184 3.305025 4.431771 3.584435 c
-4.167043 2.672591 l
-h
-8.458392 2.179011 m
-14.662457 0.579016 l
-14.899569 1.498427 l
-8.695503 3.098424 l
-8.458392 2.179011 l
-h
-14.781013 0.563974 m
-15.036198 0.563974 15.495326 0.684875 15.814721 1.047266 c
-16.180891 1.462728 16.264221 2.072176 15.934578 2.828420 c
-15.064179 2.449016 l
-15.289635 1.931793 15.160722 1.741243 15.102402 1.675073 c
-15.055794 1.622190 14.990156 1.579316 14.916806 1.549556 c
-14.881134 1.535082 14.847747 1.525430 14.820526 1.519657 c
-14.791491 1.513498 14.777695 1.513469 14.781013 1.513469 c
-14.781013 0.563974 l
-h
-15.651489 3.088437 m
-11.210685 4.590474 l
-10.906463 3.691035 l
-15.347267 2.188998 l
-15.651489 3.088437 l
-h
-10.988150 3.671260 m
-12.947328 3.377382 l
-13.088176 4.316372 l
-11.128998 4.610250 l
-10.988150 3.671260 l
-h
-12.782211 3.434681 m
-12.991495 3.315090 13.204453 3.370091 13.288217 3.396689 c
-13.400116 3.432221 13.506123 3.490767 13.598186 3.554502 c
-13.783985 3.683133 13.977411 3.877748 14.120350 4.119644 c
-14.264680 4.363894 14.369576 4.678114 14.335162 5.031647 c
-14.300108 5.391746 14.125634 5.739002 13.805044 6.049252 c
-13.144745 5.366943 l
-13.330275 5.187398 13.380290 5.040778 13.390134 4.939653 c
-13.400617 4.831963 13.370820 4.717613 13.302905 4.602680 c
-13.233600 4.485394 13.137231 4.390213 13.057724 4.335170 c
-13.017135 4.307070 12.996612 4.300308 13.000857 4.301657 c
-13.003194 4.302399 13.024761 4.309311 13.061064 4.310122 c
-13.095938 4.310902 13.170414 4.306433 13.253292 4.259073 c
-12.782211 3.434681 l
-h
-13.754128 6.092043 m
-13.394944 6.353267 l
-12.836478 5.585376 l
-13.195662 5.324152 l
-13.754128 6.092043 l
-h
-13.263074 5.518023 m
-13.593105 5.625790 14.123367 5.907292 14.433812 6.409482 c
-14.595931 6.671733 14.696482 6.993351 14.669847 7.364054 c
-14.643518 7.730516 14.495621 8.109214 14.221668 8.496526 c
-13.446486 7.948226 l
-13.646002 7.666152 13.711709 7.450294 13.722795 7.296009 c
-13.733575 7.145966 13.695351 7.020646 13.626177 6.908748 c
-13.474038 6.662641 13.171650 6.487002 12.968349 6.420619 c
-13.263074 5.518023 l
-h
-14.169774 8.558073 m
-13.810592 8.917255 l
-13.139197 8.245862 l
-13.498380 7.886679 l
-14.169774 8.558073 l
-h
-13.580109 8.118617 m
-13.896242 8.190466 14.344993 8.395787 14.624650 8.816864 c
-14.929440 9.275781 14.963785 9.882310 14.619765 10.585986 c
-13.766754 10.168959 l
-13.997427 9.697128 13.912044 9.460121 13.833706 9.342171 c
-13.730235 9.186377 13.532457 9.081495 13.369680 9.044500 c
-13.580109 8.118617 l
-h
-14.543221 10.698271 m
-13.820906 11.486253 12.989320 12.223852 11.896564 12.288132 c
-11.840808 11.340275 l
-12.524374 11.300065 13.128883 10.836036 13.843298 10.056674 c
-14.543221 10.698271 l
-h
-11.896564 12.288132 m
-11.441970 12.314873 10.711069 12.336796 10.019300 12.341186 c
-9.341933 12.345484 8.654247 12.333687 8.312695 12.284006 c
-8.449365 11.344399 l
-8.706450 11.381794 9.318512 11.396118 10.013274 11.391710 c
-10.693633 11.387392 11.407242 11.365778 11.840808 11.340275 c
-11.896564 12.288132 l
-h
-8.844993 11.713585 m
-8.948084 12.188952 9.040332 12.829445 9.094679 13.432834 c
-9.147870 14.023395 9.169946 14.631327 9.111748 15.019311 c
-8.172758 14.878462 l
-8.212520 14.613384 8.201942 14.105675 8.149012 13.518009 c
-8.097237 12.943172 8.009893 12.342852 7.917068 11.914822 c
-8.844993 11.713585 l
-h
-9.111748 15.019311 m
-8.944062 16.137217 7.805658 17.313158 6.262227 17.218662 c
-6.320251 16.270941 l
-7.336813 16.333179 8.072657 15.545805 8.172758 14.878462 c
-9.111748 15.019311 l
-h
-6.151623 17.198555 m
-5.976391 17.144638 5.715709 17.036982 5.490986 16.876261 c
-5.292936 16.734617 4.969444 16.439627 5.001374 15.992612 c
-5.948456 16.060261 l
-5.951383 16.019283 5.934667 15.999795 5.943361 16.012491 c
-5.954769 16.029152 5.984430 16.061831 6.043331 16.103956 c
-6.162553 16.189222 6.323094 16.257891 6.430855 16.291048 c
-6.151623 17.198555 l
-h
-5.001374 15.992612 m
-5.011176 15.855374 5.059216 15.566318 5.104405 15.255149 c
-5.152757 14.922197 5.207128 14.509316 5.241940 14.062993 c
-5.312967 13.152368 5.295928 12.171200 5.030037 11.457493 c
-5.919792 11.126015 l
-6.262142 12.044956 6.261431 13.202559 6.188560 14.136827 c
-6.151423 14.612950 6.093790 15.049047 6.044043 15.391605 c
-5.991133 15.755945 5.954979 15.968927 5.948456 16.060261 c
-5.001374 15.992612 l
-h
-5.030037 11.457493 m
-4.953650 11.252455 4.742510 10.903708 4.434547 10.555828 c
-4.127778 10.209298 3.769400 9.914337 3.428282 9.769621 c
-3.799107 8.895533 l
-4.320028 9.116529 4.788858 9.523607 5.145489 9.926461 c
-5.500926 10.327968 5.789377 10.775953 5.919792 11.126015 c
-5.030037 11.457493 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  7995
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 16.615845 16.660034 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000008085 00000 n
-0000008108 00000 n
-0000008281 00000 n
-0000008355 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-8414
-%%EOF
--- a/damus/Assets.xcassets/strike.imageset/Contents.json
+++ b/damus/Assets.xcassets/strike.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "strike.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/undercover.imageset/Contents.json
+++ b/damus/Assets.xcassets/undercover.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "undercover.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/walletofsatoshi.imageset/Contents.json
+++ b/damus/Assets.xcassets/walletofsatoshi.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "walletofsatoshi.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/zebedee.imageset/Contents.json
+++ b/damus/Assets.xcassets/zebedee.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "zebedee.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Assets.xcassets/zeusln.imageset/Contents.json
+++ b/damus/Assets.xcassets/zeusln.imageset/Contents.json
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "zeus.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
--- a/damus/Components/CustomPicker.swift
+++ b/damus/Components/CustomPicker.swift
@@ -1,61 +0,0 @@
-//
-//  CustomPicker.swift
-//  damus
-//
-//  Created by Eric Holguin on 1/22/23.
-//
-
-import SwiftUI
-
-let RECTANGLE_GRADIENT = LinearGradient(gradient: Gradient(colors: [
-    DamusColors.purple,
-    DamusColors.blue
-]), startPoint: .leading, endPoint: .trailing)
-
-struct CustomPicker<SelectionValue: Hashable, Content: View>: View {
-    
-    @Environment(\.colorScheme) var colorScheme
-    
-    @Namespace var picker
-    @Binding var selection: SelectionValue
-    @ViewBuilder let content: Content
-    
-    public var body: some View {
-        let contentMirror = Mirror(reflecting: content)
-        let blocksCount = Mirror(reflecting: contentMirror.descendant("value")!).children.count
-        HStack {
-            ForEach(0..<blocksCount, id: \.self) { index in
-                let tupleBlock = contentMirror.descendant("value", ".\(index)")
-                let text = Mirror(reflecting: tupleBlock!).descendant("content") as! Text
-                let tag = Mirror(reflecting: tupleBlock!).descendant("modifier", "value", "tagged") as! SelectionValue
-                
-                Button {
-                    withAnimation(.spring()) {
-                        selection = tag
-                    }
-                } label: {
-                    text
-                        .padding(EdgeInsets(top: 15, leading: 0, bottom: 10, trailing: 0))
-                        .font(.system(size: 14, weight: .heavy))
-                }
-                .background(
-                    Group {
-                        if tag == selection {
-                            Rectangle().fill(RECTANGLE_GRADIENT).frame(height: 2.5)
-                                .matchedGeometryEffect(id: "selector", in: picker)
-                                .cornerRadius(2.5)
-                        }
-                    },
-                    alignment: .bottom
-                )
-                .frame(maxWidth: .infinity)
-                .accentColor(tag == selection ? textColor() : .gray)
-            }
-        }
-        .background(Color(UIColor.systemBackground))
-    }
-    
-    func textColor() -> Color {
-        colorScheme == .light ? DamusColors.black : DamusColors.white
-    }
-}
--- a/damus/Components/DamusColors.swift
+++ b/damus/Components/DamusColors.swift
@@ -1,25 +0,0 @@
-//
-//  DamusColors.swift
-//  damus
-//
-//  Created by William Casarin on 2023-03-27.
-//
-
-import Foundation
-import SwiftUI
-
-class DamusColors {
-    static let adaptableGrey = Color("DamusAdaptableGrey")
-    static let white = Color("DamusWhite")
-    static let black = Color("DamusBlack")
-    static let brown = Color("DamusBrown")
-    static let yellow = Color("DamusYellow")
-    static let lightGrey = Color("DamusLightGrey")
-    static let mediumGrey = Color("DamusMediumGrey")
-    static let darkGrey = Color("DamusDarkGrey")
-    static let green = Color("DamusGreen")
-    static let purple = Color("DamusPurple")
-    static let deepPurple = Color("DamusDeepPurple")
-    static let blue = Color("DamusBlue")
-}
-
--- a/damus/Components/Highlight.swift
+++ b/damus/Components/Highlight.swift
@@ -1,39 +0,0 @@
-//
-//  Highlight.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-23.
-//
-
-import Foundation
-import SwiftUI
-
-
-enum Highlight {
-    case none
-    case main
-    case reply
-    case custom(Color, Float)
-
-    var is_main: Bool {
-        if case .main = self {
-            return true
-        }
-        return false
-    }
-
-    var is_none: Bool {
-        if case .none = self {
-            return true
-        }
-        return false
-    }
-
-    var is_replied_to: Bool {
-        switch self {
-        case .reply: return true
-        default: return false
-        }
-    }
-}
-
--- a/damus/Components/IconLabel.swift
+++ b/damus/Components/IconLabel.swift
@@ -1,44 +0,0 @@
-//
-//  IconLabel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-05.
-//
-
-import SwiftUI
-import UIKit
-
-struct IconLabel: View {
-    let text: String
-    let img_name: String
-    let img_color: Color
-    
-    init(_ text: String, img_name: String, color: Color) {
-        self.text = text
-        self.img_name = img_name
-        self.img_color = color
-    }
-    
-    var body: some View {
-        HStack(spacing: 0) {
-            Image(systemName: img_name)
-                .foregroundColor(img_color)
-                .frame(width: 20)
-                .padding([.trailing], 20)
-            Text(text)
-        }
-    }}
-
-struct IconLabel_Previews: PreviewProvider {
-    static var previews: some View {
-        Form {
-            Section {
-                IconLabel(NSLocalizedString("Keys", comment: "Settings section for managing keys"), img_name: "key.fill", color: .orange)
-            
-                IconLabel(NSLocalizedString("Local Notifications", comment: "Section header for damus local notifications user configuration"), img_name: "bell.fill", color: .blue)
-            
-                IconLabel(NSLocalizedString("Appearance", comment: "Section header for text and appearance settings"), img_name: "textformat", color: .red)
-            }
-        }
-    }
-}
--- a/damus/Components/ImageCarousel.swift
+++ b/damus/Components/ImageCarousel.swift
@@ -12,14 +12,14 @@ import Kingfisher
 struct ShareSheet: UIViewControllerRepresentable {
    typealias Callback = (_ activityType: UIActivity.ActivityType?, _ completed: Bool, _ returnedItems: [Any]?, _ error: Error?) -> Void
    
-    let activityItems: [URL?]
+    let activityItems: [URL]
    let callback: Callback? = nil
    let applicationActivities: [UIActivity]? = nil
    let excludedActivityTypes: [UIActivity.ActivityType]? = nil
    
    func makeUIViewController(context: Context) -> UIActivityViewController {
        let controller = UIActivityViewController(
-            activityItems: activityItems as [Any],
+            activityItems: activityItems,
            applicationActivities: applicationActivities)
        controller.excludedActivityTypes = excludedActivityTypes
        controller.completionWithItemsHandler = callback
@@ -31,43 +31,92 @@ struct ShareSheet: UIViewControllerRepresentable {
    }
 }

-
-enum ImageShape {
-    case square
-    case landscape
-    case portrait
-    case unknown
+struct ImageContextMenuModifier: ViewModifier {
+    let url: URL
+    let image: UIImage?
+    @Binding var showShareSheet: Bool
+    
+    func body(content: Content) -> some View {
+        return content.contextMenu {
+            Button {
+                UIPasteboard.general.url = url
+            } label: {
+                Label("Copy Image URL", systemImage: "doc.on.doc")
+            }
+            if let someImage = image {
+                Button {
+                    UIPasteboard.general.image = someImage
+                } label: {
+                    Label("Copy Image", systemImage: "photo.on.rectangle")
+                }
+            }
+            Button {
+                showShareSheet = true
+            } label: {
+                Label("Share", systemImage: "square.and.arrow.up")
+            }
+        }
+    }
 }

+struct ImageViewer: View {
+    let urls: [URL]
+    
+    private struct ImageHandler: ImageModifier {
+        @Binding var handler: UIImage?
+        
+        func modify(_ image: UIImage) -> UIImage {
+            handler = image
+            return image
+        }
+    }
+
+    @State private var image: UIImage?
+    @State private var showShareSheet = false
+    
+    func onShared(completed: Bool) -> Void {
+        if (completed) {
+            showShareSheet = false
+        }
+    }
+    
+    var body: some View {
+        TabView {
+            ForEach(urls, id: \.absoluteString) { url in
+                VStack{
+                    Text(url.lastPathComponent)
+                    
+                    KFAnimatedImage(url)
+                        .configure { view in
+                            view.framePreloadCount = 3
+                        }
+                        .cacheOriginalImage()
+                        .imageModifier(ImageHandler(handler: $image))
+                        .loadDiskFileSynchronously()
+                        .scaleFactor(UIScreen.main.scale)
+                        .fade(duration: 0.1)
+                        .aspectRatio(contentMode: .fit)
+                        .tabItem {
+                            Text(url.absoluteString)
+                        }
+                        .id(url.absoluteString)
+                        .modifier(ImageContextMenuModifier(url: url, image: image, showShareSheet: $showShareSheet))
+                        .sheet(isPresented: $showShareSheet) {
+                            ShareSheet(activityItems: [url])
+                        }
+
+                }
+            }
+        }
+        .tabViewStyle(PageTabViewStyle())
+    }
+}

 struct ImageCarousel: View {
    var urls: [URL]
    
-    let evid: String
-    let previews: PreviewCache
-    
-    @State private var open_sheet: Bool = false
-    @State private var current_url: URL? = nil
-    @State private var image_fill: ImageFill? = nil
-    @State private var fillHeight: CGFloat = 350
-    @State private var maxHeight: CGFloat = UIScreen.main.bounds.height * 0.85
-    
-    init(previews: PreviewCache, evid: String, urls: [URL]) {
-        _open_sheet = State(initialValue: false)
-        _current_url = State(initialValue: nil)
-        _image_fill = State(initialValue: previews.lookup_image_meta(evid))
-        self.urls = urls
-        self.evid = evid
-        self.previews = previews
-    }
-    
-    var filling: Bool {
-        image_fill?.filling == true
-    }
-    
-    var height: CGFloat {
-        image_fill?.height ?? 0
-    }
+    @State var open_sheet: Bool = false
+    @State var current_url: URL? = nil
    
    var body: some View {
        TabView {
@@ -75,32 +124,32 @@ struct ImageCarousel: View {
                Rectangle()
                    .foregroundColor(Color.clear)
                    .overlay {
-                        GeometryReader { geo in
-                            KFAnimatedImage(url)
-                                .callbackQueue(.dispatch(.global(qos:.background)))
-                                .backgroundDecode(true)
-                                .imageContext(.note)
-                                .cancelOnDisappear(true)
-                                .configure { view in
-                                    view.framePreloadCount = 3
+                        KFAnimatedImage(url)
+                            .configure { view in
+                                view.framePreloadCount = 3
+                            }
+                            .cacheOriginalImage()
+                            .loadDiskFileSynchronously()
+                            .scaleFactor(UIScreen.main.scale)
+                            .fade(duration: 0.1)
+                            .aspectRatio(contentMode: .fit)
+                            .tabItem {
+                                Text(url.absoluteString)
+                            }
+                            .id(url.absoluteString)
+                            .contextMenu {
+                                Button("Copy Image") {
+                                    UIPasteboard.general.string = url.absoluteString
                                }
-                                .imageFill(for: geo.size, max: maxHeight, fill: fillHeight) { fill in
-                                    previews.cache_image_meta(evid: evid, image_fill: fill)
-                                    image_fill = fill
-                                }
-                                .aspectRatio(contentMode: filling ? .fill : .fit)
-                                .tabItem {
-                                    Text(url.absoluteString)
-                                }
-                                .id(url.absoluteString)
-                        }
+                            }
                    }
            }
        }
-        .fullScreenCover(isPresented: $open_sheet) {
-            ImageView(urls: urls)
+        .cornerRadius(10)
+        .sheet(isPresented: $open_sheet) {
+            ImageViewer(urls: urls)
        }
-        .frame(height: height)
+        .frame(height: 200)
        .onTapGesture {
            open_sheet = true
        }
@@ -108,71 +157,8 @@ struct ImageCarousel: View {
    }
 }

-// MARK: - Image Modifier
-extension KFOptionSetter {
-    /// Sets a block to get image size
-    ///
-    /// - Parameter block: The block which is used to read the image object.
-    /// - Returns: `Self` value after read size
-    public func imageFill(for size: CGSize, max: CGFloat, fill: CGFloat, block: @escaping (ImageFill) throws -> Void) -> Self {
-        let modifier = AnyImageModifier { image -> KFCrossPlatformImage in
-            let img_size = image.size
-            let geo_size = size
-            let fill = ImageFill.calculate_image_fill(geo_size: geo_size,
-                                                      img_size: img_size,
-                                                      maxHeight: max,
-                                                      fillHeight: fill)
-            DispatchQueue.main.async { [block, fill] in
-                try? block(fill)
-            }
-            return image
-        }
-        options.imageModifier = modifier
-        return self
-    }
-}
-
-
-public struct ImageFill {
-    let filling: Bool?
-    let height: CGFloat
-        
-    
-    static func determine_image_shape(_ size: CGSize) -> ImageShape {
-        guard size.height > 0 else {
-            return .unknown
-        }
-        let imageRatio = size.width / size.height
-        switch imageRatio {
-            case 1.0: return .square
-            case ..<1.0: return .portrait
-            case 1.0...: return .landscape
-            default: return .unknown
-        }
-    }
-    
-    static func calculate_image_fill(geo_size: CGSize, img_size: CGSize, maxHeight: CGFloat, fillHeight: CGFloat) -> ImageFill {
-        let shape = determine_image_shape(img_size)
-
-        let xfactor = geo_size.width / img_size.width
-        let scaled = img_size.height * xfactor
-        // calculate scaled image height
-        // set scale factor and constrain images to minimum 150
-        // and animations to scaled factor for dynamic size adjustment
-        switch shape {
-        case .portrait, .landscape:
-            let filling = scaled > maxHeight
-            let height = filling ? fillHeight : scaled
-            return ImageFill(filling: filling, height: height)
-        case .square, .unknown:
-            return ImageFill(filling: nil, height: scaled)
-        }
-    }
-}
-
 struct ImageCarousel_Previews: PreviewProvider {
    static var previews: some View {
-        ImageCarousel(previews: test_damus_state().previews, evid: "evid", urls: [URL(string: "https://jb55.com/red-me.jpg")!,URL(string: "https://jb55.com/red-me.jpg")!])
+        ImageCarousel(urls: [URL(string: "https://jb55.com/red-me.jpg")!])
    }
 }
-
--- a/damus/Components/InvoiceView.swift
+++ b/damus/Components/InvoiceView.swift
@@ -7,52 +7,43 @@

 import SwiftUI

+func open_with_wallet(wallet: Wallet.Model, invoice: String) {
+    if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
+        UIApplication.shared.open(url)
+    } else {
+        if let url = URL(string: wallet.appStoreLink), UIApplication.shared.canOpenURL(url) {
+            UIApplication.shared.open(url)
+        }
+    }
+}
+
 struct InvoiceView: View {
    @Environment(\.colorScheme) var colorScheme
    @Environment(\.openURL) private var openURL
-    let our_pubkey: String
+    
    let invoice: Invoice
    @State var showing_select_wallet: Bool = false
-    @State var copied = false
-    
-    var CopyButton: some View {
-        Button {
-            copied = true
-            DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-                copied = false
-            }
-            UIImpactFeedbackGenerator(style: .medium).impactOccurred()
-            UIPasteboard.general.string = invoice.string
-        } label: {
-            if !copied {
-                Image(systemName: "doc.on.clipboard")
-                    .foregroundColor(.gray)
-            } else {
-                Image(systemName: "checkmark.circle")
-                    .foregroundColor(DamusColors.green)
-            }
-        }
-    }
+    @ObservedObject var user_settings = UserSettingsStore()
    
    var PayButton: some View {
        Button {
-            if should_show_wallet_selector(our_pubkey) {
+            if user_settings.show_wallet_selector {
                showing_select_wallet = true
            } else {
-                open_with_wallet(wallet: get_default_wallet(our_pubkey).model, invoice: invoice.string)
+                open_with_wallet(wallet: user_settings.default_wallet.model, invoice: invoice.string)
            }
        } label: {
-            RoundedRectangle(cornerRadius: 20, style: .circular)
+            RoundedRectangle(cornerRadius: 20)
                .foregroundColor(colorScheme == .light ? .black : .white)
                .overlay {
-                    Text("Pay", comment: "Button to pay a Lightning invoice.")
+                    Text("Pay")
                        .fontWeight(.medium)
                        .foregroundColor(colorScheme == .light ? .white : .black)
                }
        }
+        //.buttonStyle(.bordered)
        .onTapGesture {
            // Temporary solution so that the "pay" button can be clicked (Yes we need an empty tap gesture)
-            print("pay button tap")
        }
    }
    
@@ -65,12 +56,10 @@ struct InvoiceView: View {
                HStack {
                    Label("", systemImage: "bolt.fill")
                        .foregroundColor(.orange)
-                    Text("Lightning Invoice", comment: "Indicates that the view is for paying a Lightning invoice.")
-                    Spacer()
-                    CopyButton
+                    Text("Lightning Invoice")
                }
                Divider()
-                Text(invoice.description_string)
+                Text(invoice.description)
                Text(invoice.amount.amount_sats_str())
                    .font(.title)
                PayButton
@@ -80,38 +69,16 @@ struct InvoiceView: View {
            .padding(30)
        }
        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
-            SelectWalletView(showingSelectWallet: $showing_select_wallet, our_pubkey: our_pubkey, invoice: invoice.string)
+            SelectWalletView(showingSelectWallet: $showing_select_wallet, invoice: invoice.string).environmentObject(user_settings)
        }
    }
 }

-func open_with_wallet(wallet: Wallet.Model, invoice: String) {
-    if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
-        UIApplication.shared.open(url)
-    } else {
-        guard let store_link = wallet.appStoreLink else {
-            // TODO: do something here if we don't have an appstore link
-            return
-        }
-        
-        guard let url = URL(string: store_link) else {
-            return
-        }
-        
-        guard UIApplication.shared.canOpenURL(url) else {
-            return
-        }
-        
-        UIApplication.shared.open(url)
-    }
-}
-
-
-let test_invoice = Invoice(description: .description("this is a description"), amount: .specific(10000), string: "lnbc100n1p357sl0sp5t9n56wdztun39lgdqlr30xqwksg3k69q4q2rkr52aplujw0esn0qpp5mrqgljk62z20q4nvgr6lzcyn6fhylzccwdvu4k77apg3zmrkujjqdpzw35xjueqd9ejqcfqv3jhxcmjd9c8g6t0dcxqyjw5qcqpjrzjqt56h4gvp5yx36u2uzqa6qwcsk3e2duunfxppzj9vhypc3wfe2wswz607uqq3xqqqsqqqqqqqqqqqlqqyg9qyysgqagx5h20aeulj3gdwx3kxs8u9f4mcakdkwuakasamm9562ffyr9en8yg20lg0ygnr9zpwp68524kmda0t5xp2wytex35pu8hapyjajxqpsql29r", expiry: 604800, payment_hash: Data(), created_at: 1666139119)
+let test_invoice = Invoice(description: "this is a description", amount: .specific(10000), string: "lnbc100n1p357sl0sp5t9n56wdztun39lgdqlr30xqwksg3k69q4q2rkr52aplujw0esn0qpp5mrqgljk62z20q4nvgr6lzcyn6fhylzccwdvu4k77apg3zmrkujjqdpzw35xjueqd9ejqcfqv3jhxcmjd9c8g6t0dcxqyjw5qcqpjrzjqt56h4gvp5yx36u2uzqa6qwcsk3e2duunfxppzj9vhypc3wfe2wswz607uqq3xqqqsqqqqqqqqqqqlqqyg9qyysgqagx5h20aeulj3gdwx3kxs8u9f4mcakdkwuakasamm9562ffyr9en8yg20lg0ygnr9zpwp68524kmda0t5xp2wytex35pu8hapyjajxqpsql29r", expiry: 604800, payment_hash: Data(), created_at: 1666139119)

 struct InvoiceView_Previews: PreviewProvider {
    static var previews: some View {
-        InvoiceView(our_pubkey: "", invoice: test_invoice)
-            .frame(width: 300, height: 200)
+        InvoiceView(invoice: test_invoice)
+            .frame(width: 200, height: 200)
    }
 }
--- a/damus/Components/InvoicesView.swift
+++ b/damus/Components/InvoicesView.swift
@@ -8,7 +8,6 @@
 import SwiftUI

 struct InvoicesView: View {
-    let our_pubkey: String
    var invoices: [Invoice]
    
    @State var open_sheet: Bool = false
@@ -17,7 +16,7 @@ struct InvoicesView: View {
    var body: some View {
        TabView {
            ForEach(invoices, id: \.string) { invoice in
-                InvoiceView(our_pubkey: our_pubkey, invoice: invoice)
+                InvoiceView(invoice: invoice)
                .tabItem {
                    Text(invoice.string)
                }
@@ -31,7 +30,7 @@ struct InvoicesView: View {

 struct InvoicesView_Previews: PreviewProvider {
    static var previews: some View {
-        InvoicesView(our_pubkey: "", invoices: [Invoice.init(description: .description("description"), amount: .specific(10000), string: "invstr", expiry: 100000, payment_hash: Data(), created_at: 1000000)])
+        InvoicesView(invoices: [Invoice.init(description: "description", amount: .specific(10000), string: "invstr", expiry: 100000, payment_hash: Data(), created_at: 1000000)])
            .frame(width: 300)
    }
 }
--- a/damus/Components/NIP05Badge.swift
+++ b/damus/Components/NIP05Badge.swift
@@ -1,90 +0,0 @@
-//
-//  NIP05Badge.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import SwiftUI
-
-struct NIP05Badge: View {
-    let nip05: NIP05
-    let pubkey: String
-    let contacts: Contacts
-    let show_domain: Bool
-    let clickable: Bool
-    
-    @Environment(\.openURL) var openURL
-    
-    init (nip05: NIP05, pubkey: String, contacts: Contacts, show_domain: Bool, clickable: Bool) {
-        self.nip05 = nip05
-        self.pubkey = pubkey
-        self.contacts = contacts
-        self.show_domain = show_domain
-        self.clickable = clickable
-    }
-    
-    var nip05_color: Bool {
-       return use_nip05_color(pubkey: pubkey, contacts: contacts)
-    }
-    
-    var Seal: some View {
-        Group {
-            if nip05_color {
-                LINEAR_GRADIENT
-                    .mask(Image(systemName: "checkmark.seal.fill")
-                        .resizable()
-                    ).frame(width: 14, height: 14)
-            } else {
-                Image(systemName: "checkmark.seal.fill")
-                    .font(.footnote)
-                    .foregroundColor(.gray)
-            }
-        }
-    }
-    
-    var body: some View {
-        HStack(spacing: 2) {
-            Seal
-            
-            if show_domain {
-                if clickable {
-                    Text(nip05.host)
-                        .nip05_colorized(gradient: nip05_color)
-                        .onTapGesture {
-                            if let nip5url = nip05.siteUrl {
-                                openURL(nip5url)
-                            }
-                        }
-                } else {
-                    Text(nip05.host)
-                        .foregroundColor(.gray)
-                }
-            }
-        }
-
-    }
-}
-
-extension View {
-    func nip05_colorized(gradient: Bool) -> some View {
-        if gradient {
-            return AnyView(self.foregroundStyle(LINEAR_GRADIENT))
-        } else {
-            return AnyView(self.foregroundColor(.gray))
-        }
-        
-    }
-}
-
-func use_nip05_color(pubkey: String, contacts: Contacts) -> Bool {
-    return contacts.is_friend_or_self(pubkey) ? true : false
-}
-
-struct NIP05Badge_Previews: PreviewProvider {
-    static var previews: some View {
-        let test_state = test_damus_state()
-        NIP05Badge(nip05: NIP05(username: "jb55", host: "jb55.com"), pubkey: test_state.pubkey, contacts: test_state.contacts, show_domain: true, clickable: false)
-    }
-}
-
--- a/damus/Components/Reposted.swift
+++ b/damus/Components/Reposted.swift
@@ -1,32 +0,0 @@
-//
-//  Reposted.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import SwiftUI
-
-struct Reposted: View {
-    let damus: DamusState
-    let pubkey: String
-    let profile: Profile?
-    
-    var body: some View {
-        HStack(alignment: .center) {
-            Image(systemName: "arrow.2.squarepath")
-                .foregroundColor(Color.gray)
-            ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, show_nip5_domain: false)
-                    .foregroundColor(Color.gray)
-            Text("Reposted", comment: "Text indicating that the post was reposted (i.e. re-shared).")
-                .foregroundColor(Color.gray)
-        }
-    }
-}
-
-struct Reposted_Previews: PreviewProvider {
-    static var previews: some View {
-        let test_state = test_damus_state()
-        Reposted(damus: test_state, pubkey: test_state.pubkey, profile: make_test_profile())
-    }
-}
--- a/damus/Components/SelectableText.swift
+++ b/damus/Components/SelectableText.swift
@@ -1,102 +0,0 @@
-//
-//  SelectableText.swift
-//  damus
-//
-//  Created by Oleg Abalonski on 2/16/23.
-//
-
-import UIKit
-import SwiftUI
-
-struct SelectableText: View {
-    
-    let attributedString: AttributedString
-    
-    @State private var selectedTextHeight: CGFloat = .zero
-    @State private var selectedTextWidth: CGFloat = .zero
-    
-    let size: EventViewKind
-    
-    var body: some View {
-        GeometryReader { geo in
-            TextViewRepresentable(
-                attributedString: attributedString,
-                textColor: UIColor.label,
-                font: eventviewsize_to_uifont(size),
-                fixedWidth: selectedTextWidth,
-                height: $selectedTextHeight
-            )
-            .padding([.leading, .trailing], -1.0)
-            .onAppear {
-                self.selectedTextWidth = geo.size.width
-            }
-            .onChange(of: geo.size) { newSize in
-                self.selectedTextWidth = newSize.width
-            }
-        }
-        .frame(height: selectedTextHeight)
-    }
-}
-
- fileprivate struct TextViewRepresentable: UIViewRepresentable {
-
-    let attributedString: AttributedString
-    let textColor: UIColor
-    let font: UIFont
-    let fixedWidth: CGFloat
-
-    @Binding var height: CGFloat
-
-    func makeUIView(context: UIViewRepresentableContext<Self>) -> UITextView {
-        let view = UITextView()
-        view.isEditable = false
-        view.dataDetectorTypes = .all
-        view.isSelectable = true
-        view.backgroundColor = .clear
-        view.textContainer.lineFragmentPadding = 0
-        view.textContainerInset = .zero
-        view.textContainerInset.left = 1.0
-        view.textContainerInset.right = 1.0
-        return view
-    }
-
-    func updateUIView(_ uiView: UITextView, context: UIViewRepresentableContext<Self>) {
-        let mutableAttributedString = createNSAttributedString()
-        uiView.attributedText = mutableAttributedString
-
-        let newHeight = mutableAttributedString.height(containerWidth: fixedWidth)
-
-        DispatchQueue.main.async {
-            height = newHeight
-        }
-    }
-
-    func createNSAttributedString() -> NSMutableAttributedString {
-        let mutableAttributedString = NSMutableAttributedString(attributedString)
-        let myAttribute = [
-            NSAttributedString.Key.font: font,
-            NSAttributedString.Key.foregroundColor: textColor
-        ]
-
-        mutableAttributedString.addAttributes(
-            myAttribute,
-            range: NSRange.init(location: 0, length: mutableAttributedString.length)
-        )
-
-        return mutableAttributedString
-    }
-}
-
-fileprivate extension NSAttributedString {
-
-    func height(containerWidth: CGFloat) -> CGFloat {
-
-        let rect = self.boundingRect(
-            with: CGSize.init(width: containerWidth, height: CGFloat.greatestFiniteMagnitude),
-            options: [.usesLineFragmentOrigin, .usesFontLeading],
-            context: nil
-        )
-
-        return ceil(rect.size.height)
-    }
-}
--- a/damus/Components/TextFieldAlert.swift
+++ b/damus/Components/TextFieldAlert.swift
@@ -20,7 +20,7 @@ struct TextFieldAlert<Presenting>: View where Presenting: View {
                    .disabled(isShowing)
                VStack {
                    Text(self.title)
-                    TextField(NSLocalizedString("Relay", comment: "Text field for relay server. Used for testing purposes."), text: self.$text)
+                    TextField("Relay", text: self.$text)
                    Divider()
                    HStack {
                        Button(action: {
@@ -28,7 +28,7 @@ struct TextFieldAlert<Presenting>: View where Presenting: View {
                                self.isShowing.toggle()
                            }
                        }) {
-                            Text("Dismiss", comment: "Button to dismiss a text field alert.")
+                            Text("Dismiss")
                        }
                    }
                }
--- a/damus/Components/ThiccDivider.swift
+++ b/damus/Components/ThiccDivider.swift
@@ -1,22 +0,0 @@
-//
-//  ThiccDivider.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-03.
-//
-
-import SwiftUI
-
-struct ThiccDivider: View {
-    var body: some View {
-        Rectangle()
-            .frame(height: 4)
-            .foregroundColor(DamusColors.adaptableGrey)
-    }
-}
-
-struct ThiccDivider_Previews: PreviewProvider {
-    static var previews: some View {
-        ThiccDivider()
-    }
-}
--- a/damus/Components/TranslateView.swift
+++ b/damus/Components/TranslateView.swift
@@ -1,191 +0,0 @@
-//
-//  TranslateButton.swift
-//  damus
-//
-//  Created by William Casarin on 2023-02-02.
-//
-
-import SwiftUI
-import NaturalLanguage
-
-
-struct Translated: Equatable {
-    let artifacts: NoteArtifacts
-    let language: String
-}
-
-enum TranslateStatus: Equatable {
-    case havent_tried
-    case trying
-    case translating
-    case translated(Translated)
-    case not_needed
-}
-
-struct TranslateView: View {
-    let damus_state: DamusState
-    let event: NostrEvent
-    let size: EventViewKind
-    let currentLanguage: String
-    
-    @State var translated: TranslateStatus
-    
-    init(damus_state: DamusState, event: NostrEvent, size: EventViewKind) {
-        self.damus_state = damus_state
-        self.event = event
-        self.size = size
-        
-        if #available(iOS 16, *) {
-            self.currentLanguage = Locale.current.language.languageCode?.identifier ?? "en"
-        } else {
-            self.currentLanguage = Locale.current.languageCode ?? "en"
-        }
-
-        if damus_state.pubkey == event.pubkey && damus_state.is_privkey_user {
-            // Do not translate self-authored notes if logged in with a private key
-            // as we can assume the user can understand their own notes.
-            // The detected language prediction could be incorrect and not in the list of preferred languages.
-            // Offering a translation in this case is definitely incorrect so let's avoid it altogether.
-            self._translated = State(initialValue: .not_needed)
-        } else if let cached = damus_state.events.lookup_translated_artifacts(evid: event.id) {
-            self._translated = State(initialValue: cached)
-        } else {
-            let initval: TranslateStatus = self.damus_state.settings.auto_translate ? .trying : .havent_tried
-            self._translated = State(initialValue: initval)
-        }
-    }
-    
-    let preferredLanguages = Set(Locale.preferredLanguages.map { localeToLanguage($0) })
-    
-    var TranslateButton: some View {
-        Button(NSLocalizedString("Translate Note", comment: "Button to translate note from different language.")) {
-            self.translated = .trying
-        }
-        .translate_button_style()
-    }
-    
-    func TranslatedView(lang: String?, artifacts: NoteArtifacts) -> some View {
-        return VStack(alignment: .leading) {
-            Text(String(format: NSLocalizedString("Translated from %@", comment: "Button to indicate that the note has been translated from a different language."), lang ?? "ja"))
-                .foregroundColor(.gray)
-                .font(.footnote)
-                .padding([.top, .bottom], 10)
-            
-            if self.size == .selected {
-                SelectableText(attributedString: artifacts.content.attributed, size: self.size)
-            } else {
-                artifacts.content.text
-                    .font(eventviewsize_to_font(self.size))
-            }
-        }
-    }
-    
-    func failed_attempt() {
-        DispatchQueue.main.async {
-            self.translated = .not_needed
-            damus_state.events.store_translation_artifacts(evid: event.id, translated: .not_needed)
-        }
-    }
-    
-    func attempt_translation() async {
-        guard case .trying = translated else {
-            return
-        }
-        
-        guard damus_state.settings.can_translate(damus_state.pubkey) else {
-            return
-        }
-        
-        let note_lang = event.note_language(damus_state.keypair.privkey) ?? currentLanguage
-        
-        // Don't translate if its in our preferred languages
-        guard !preferredLanguages.contains(note_lang) else {
-            failed_attempt()
-            return
-        }
-        
-        DispatchQueue.main.async {
-            self.translated = .translating
-        }
-        
-        // If the note language is different from our preferred languages, send a translation request.
-        let translator = Translator(damus_state.settings)
-        let originalContent = event.get_content(damus_state.keypair.privkey)
-        let translated_note = try? await translator.translate(originalContent, from: note_lang, to: currentLanguage)
-        
-        guard let translated_note else {
-            // if its the same, give up and don't retry
-            failed_attempt()
-            return
-        }
-        
-        guard originalContent != translated_note else {
-            // if its the same, give up and don't retry
-            failed_attempt()
-            return
-        }
-
-        // Render translated note
-        let translated_blocks = event.get_blocks(content: translated_note)
-        let artifacts = render_blocks(blocks: translated_blocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
-        
-        // and cache it
-        DispatchQueue.main.async {
-            self.translated = .translated(Translated(artifacts: artifacts, language: note_lang))
-            damus_state.events.store_translation_artifacts(evid: event.id, translated: self.translated)
-        }
-    }
-    
-    var body: some View {
-        Group {
-            switch translated {
-            case .havent_tried:
-                if damus_state.settings.auto_translate {
-                    Text("")
-                } else {
-                    TranslateButton
-                }
-            case .trying:
-                Text("")
-            case .translating:
-                Text("Translating...", comment: "Text to display when waiting for the translation of a note to finish processing before showing it.")
-                    .foregroundColor(.gray)
-                    .font(.footnote)
-                    .padding([.top, .bottom], 10)
-            case .translated(let translated):
-                let languageName = Locale.current.localizedString(forLanguageCode: translated.language)
-                TranslatedView(lang: languageName, artifacts: translated.artifacts)
-            case .not_needed:
-                Text("")
-            }
-        }
-        .onChange(of: translated) { val in
-            guard case .trying = translated else {
-                return
-            }
-            
-            Task {
-                await attempt_translation()
-            }
-        }
-        .task {
-            await attempt_translation()
-        }
-    }
-}
-
-extension View {
-    func translate_button_style() -> some View {
-        return self
-            .font(.footnote)
-            .contentShape(Rectangle())
-            .padding([.top, .bottom], 10)
-    }
-}
-
-struct TranslateView_Previews: PreviewProvider {
-    static var previews: some View {
-        let ds = test_damus_state()
-        TranslateView(damus_state: ds, event: test_event, size: .normal)
-    }
-}
--- a/damus/Components/TruncatedText.swift
+++ b/damus/Components/TruncatedText.swift
@@ -1,53 +0,0 @@
-//
-//  TruncatedText.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-06.
-//
-
-import SwiftUI
-
-struct TruncatedText: View {
-    let text: CompatibleText
-    let maxChars: Int = 280
-    
-    var body: some View {
-        let truncatedAttributedString: AttributedString? = getTruncatedString()
-        
-        if let truncatedAttributedString {
-            Text(truncatedAttributedString)
-                .fixedSize(horizontal: false, vertical: true)
-        } else {
-            text.text
-                .fixedSize(horizontal: false, vertical: true)
-        }
-        
-        if truncatedAttributedString != nil {
-            Spacer()
-            Button(NSLocalizedString("Show more", comment: "Button to show entire note.")) { }
-                .allowsHitTesting(false)
-        }
-    }
-    
-    func getTruncatedString() -> AttributedString? {
-        let nsAttributedString = NSAttributedString(text.attributed)
-        if nsAttributedString.length < maxChars { return nil }
-        
-        let range = NSRange(location: 0, length: maxChars)
-        let truncatedAttributedString = nsAttributedString.attributedSubstring(from: range)
-        
-        return AttributedString(truncatedAttributedString) + "..."
-    }
-}
-
-struct TruncatedText_Previews: PreviewProvider {
-    static var previews: some View {
-        VStack(spacing: 100) {
-            TruncatedText(text: CompatibleText(stringLiteral: "hello\nthere\none\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\neleven"))
-                .frame(width: 200, height: 200)
-            
-            TruncatedText(text: CompatibleText(stringLiteral: "hello\nthere\none\ntwo\nthree\nfour"))
-                .frame(width: 200, height: 200)
-        }
-    }
-}
--- a/damus/Components/UserView.swift
+++ b/damus/Components/UserView.swift
@@ -1,62 +0,0 @@
-//
-//  UserView.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-25.
-//
-
-import SwiftUI
-
-struct UserViewRow: View {
-    let damus_state: DamusState
-    let pubkey: String
-    
-    @State var navigating: Bool = false
-    
-    var body: some View {
-        let dest = ProfileView(damus_state: damus_state, pubkey: pubkey)
-        
-        UserView(damus_state: damus_state, pubkey: pubkey)
-            .contentShape(Rectangle())
-            .background(
-                NavigationLink(destination: dest, isActive: $navigating) {
-                    EmptyView()
-                }
-            )
-            .onTapGesture {
-                navigating = true
-            }
-    }
-}
-
-struct UserView: View {
-    let damus_state: DamusState
-    let pubkey: String
-    
-    var body: some View {
-        
-        VStack {
-            HStack {
-                ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
-            
-                VStack(alignment: .leading) {
-                    let profile = damus_state.profiles.lookup(id: pubkey)
-                    ProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_friend_confirmed: false, show_nip5_domain: false)
-                    if let about = profile?.about {
-                        Text(about)
-                            .lineLimit(3)
-                            .font(.footnote)
-                    }
-                }
-                
-                Spacer()
-            }
-        }
-    }
-}
-
-struct UserView_Previews: PreviewProvider {
-    static var previews: some View {
-        UserView(damus_state: test_damus_state(), pubkey: "pk")
-    }
-}
--- a/damus/Components/WebsiteLink.swift
+++ b/damus/Components/WebsiteLink.swift
@@ -1,39 +0,0 @@
-//
-//  WebsiteLink.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-22.
-//
-
-import SwiftUI
-
-struct WebsiteLink: View {
-    let url: URL
-    @Environment(\.openURL) var openURL
-
-    var body: some View {
-        HStack {
-            Image(systemName: "link")
-                .foregroundColor(.gray)
-                .font(.footnote)
-            
-            Button(action: {
-                openURL(url)
-            }, label: {
-                Text(link_text)
-                    .font(.footnote)
-                    .foregroundColor(.accentColor)
-            })
-        }
-    }
-    
-    var link_text: String {
-        url.host ?? url.absoluteString
-    }
-}
-
-struct WebsiteLink_Previews: PreviewProvider {
-    static var previews: some View {
-        WebsiteLink(url: URL(string: "https://jb55.com")!)
-    }
-}
--- a/damus/Components/ZapButton.swift
+++ b/damus/Components/ZapButton.swift
@@ -1,194 +0,0 @@
-//
-//  ZapButton.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-17.
-//
-
-import SwiftUI
-
-enum ZappingEventType {
-    case failed(ZappingError)
-    case got_zap_invoice(String)
-}
-
-enum ZappingError {
-    case fetching_invoice
-    case bad_lnurl
-}
-
-struct ZappingEvent {
-    let is_custom: Bool
-    let type: ZappingEventType
-    let event: NostrEvent
-}
-
-struct ZapButton: View {
-    let damus_state: DamusState
-    let event: NostrEvent
-    let lnurl: String
-    
-    @ObservedObject var bar: ActionBarModel
-    
-    @State var zapping: Bool = false
-    @State var invoice: String = ""
-    @State var slider_value: Double = 0.0
-    @State var slider_visible: Bool = false
-    @State var showing_select_wallet: Bool = false
-    @State var showing_zap_customizer: Bool = false
-    @State var is_charging: Bool = false
-    
-    var zap_img: String {
-        if bar.zapped {
-            return "bolt.fill"
-        }
-        
-        if !zapping {
-            return "bolt"
-        }
-        
-        return "bolt.horizontal.fill"
-    }
-    
-    var zap_color: Color? {
-        if bar.zapped {
-            return Color.orange
-        }
-        
-        if is_charging {
-            return Color.yellow
-        }
-        
-        if !zapping {
-            return nil
-        }
-        
-        return Color.yellow
-    }
-    
-    var body: some View {
-        HStack(spacing: 4) {
-            Button(action: {
-            }, label: {
-                Image(systemName: zap_img)
-                    .foregroundColor(zap_color == nil ? Color.gray : zap_color!)
-                    .font(.footnote.weight(.medium))
-            })
-            .simultaneousGesture(LongPressGesture().onEnded {_  in
-                guard !zapping else {
-                    return
-                }
-                
-                self.showing_zap_customizer = true
-            })
-            .highPriorityGesture(TapGesture().onEnded {_  in
-                guard !zapping else {
-                    return
-                }
-                
-                send_zap(damus_state: damus_state, event: event, lnurl: lnurl, is_custom: false, comment: nil, amount_sats: nil, zap_type: ZapType.pub)
-                self.zapping = true
-            })
-            .accessibilityLabel(NSLocalizedString("Zap", comment: "Accessibility label for zap button"))
-
-            if bar.zap_total > 0 {
-                Text(verbatim: format_msats_abbrev(bar.zap_total))
-                    .font(.footnote)
-                    .foregroundColor(bar.zapped ? Color.orange : Color.gray)
-            }
-        }
-        .sheet(isPresented: $showing_zap_customizer) {
-            CustomizeZapView(state: damus_state, event: event, lnurl: lnurl)
-        }
-        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
-            SelectWalletView(showingSelectWallet: $showing_select_wallet, our_pubkey: damus_state.pubkey, invoice: invoice)
-        }
-        .onReceive(handle_notify(.zapping)) { notif in
-            let zap_ev = notif.object as! ZappingEvent
-            
-            guard zap_ev.event.id == self.event.id else {
-                return
-            }
-            
-            guard !zap_ev.is_custom else {
-                return
-            }
-            
-            switch zap_ev.type {
-            case .failed:
-                break
-            case .got_zap_invoice(let inv):
-                if should_show_wallet_selector(damus_state.pubkey) {
-                    self.invoice = inv
-                    self.showing_select_wallet = true
-                } else {
-                    open_with_wallet(wallet: get_default_wallet(damus_state.pubkey).model, invoice: inv)
-                }
-            }
-            
-            self.zapping = false
-        }
-    }
-}
-
-
-struct ZapButton_Previews: PreviewProvider {
-    static var previews: some View {
-        let bar = ActionBarModel(likes: 0, boosts: 0, zaps: 10, zap_total: 15623414, replies: 2, our_like: nil, our_boost: nil, our_zap: nil, our_reply: nil)
-        ZapButton(damus_state: test_damus_state(), event: test_event, lnurl: "lnurl", bar: bar)
-    }
-}
-
-
-
-func send_zap(damus_state: DamusState, event: NostrEvent, lnurl: String, is_custom: Bool, comment: String?, amount_sats: Int?, zap_type: ZapType) {
-    guard let keypair = damus_state.keypair.to_full() else {
-        return
-    }
-    
-    // Only take the first 10 because reasons
-    let relays = Array(damus_state.pool.descriptors.prefix(10))
-    let target = ZapTarget.note(id: event.id, author: event.pubkey)
-    let content = comment ?? ""
-    
-    let zapreq = make_zap_request_event(keypair: keypair, content: content, relays: relays, target: target, zap_type: zap_type)
-    
-    Task {
-        var mpayreq = damus_state.lnurls.lookup(target.pubkey)
-        if mpayreq == nil {
-            mpayreq = await fetch_static_payreq(lnurl)
-        }
-        
-        guard let payreq = mpayreq else {
-            // TODO: show error
-            DispatchQueue.main.async {
-                let typ = ZappingEventType.failed(.bad_lnurl)
-                let ev = ZappingEvent(is_custom: is_custom, type: typ, event: event)
-                notify(.zapping, ev)
-            }
-            return
-        }
-        
-        DispatchQueue.main.async {
-            damus_state.lnurls.endpoints[target.pubkey] = payreq
-        }
-        
-        let zap_amount = amount_sats ?? get_default_zap_amount(pubkey: damus_state.pubkey) ?? 1000
-        
-        guard let inv = await fetch_zap_invoice(payreq, zapreq: zapreq, sats: zap_amount, zap_type: zap_type, comment: comment) else {
-            DispatchQueue.main.async {
-                let typ = ZappingEventType.failed(.fetching_invoice)
-                let ev = ZappingEvent(is_custom: is_custom, type: typ, event: event)
-                notify(.zapping, ev)
-            }
-            return
-        }
-        
-        DispatchQueue.main.async {
-            let ev = ZappingEvent(is_custom: is_custom, type: .got_zap_invoice(inv), event: event)
-            notify(.zapping, ev)
-        }
-    }
-    
-    return
-}
--- a/damus/Components/ZoomableScrollView.swift
+++ b/damus/Components/ZoomableScrollView.swift
@@ -1,152 +0,0 @@
-//
-//  ZoomableScrollView.swift
-//  damus
-//
-//  Created by Oleg Abalonski on 1/25/23.
-//
-
-import SwiftUI
-
-struct ZoomableScrollView<Content: View>: UIViewRepresentable {
-    
-    private var content: Content
-
-    init(@ViewBuilder content: () -> Content) {
-        self.content = content()
-    }
-
-    func makeUIView(context: Context) -> UIScrollView {
-        let scrollView = GesturedScrollView()
-        scrollView.delegate = context.coordinator
-        scrollView.maximumZoomScale = 20
-        scrollView.minimumZoomScale = 1
-        scrollView.bouncesZoom = true
-        scrollView.showsVerticalScrollIndicator = false
-        scrollView.showsHorizontalScrollIndicator = false
-
-        let hostedView = context.coordinator.hostingController.view!
-        hostedView.translatesAutoresizingMaskIntoConstraints = true
-        hostedView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        hostedView.frame = scrollView.bounds
-        hostedView.backgroundColor = .clear
-        scrollView.addSubview(hostedView)
-
-        return scrollView
-    }
-
-    func makeCoordinator() -> Coordinator {
-        return Coordinator(hostingController: UIHostingController(rootView: self.content, ignoreSafeArea: true))
-    }
-
-    func updateUIView(_ uiView: UIScrollView, context: Context) {
-        context.coordinator.hostingController.rootView = self.content
-        assert(context.coordinator.hostingController.view.superview == uiView)
-    }
-
-    class Coordinator: NSObject, UIScrollViewDelegate {
-        var hostingController: UIHostingController<Content>
-
-        init(hostingController: UIHostingController<Content>) {
-            self.hostingController = hostingController
-        }
-
-        func viewForZooming(in scrollView: UIScrollView) -> UIView? {
-            return hostingController.view
-        }
-        
-        func scrollViewDidZoom(_ scrollView: UIScrollView) {
-            let viewSize = hostingController.view.frame.size
-            guard let imageSize = scrollView.subviews[0].subviews.last?.frame.size else { return }
-            
-            if scrollView.zoomScale > 1 {
-
-                let ratioW = viewSize.width / imageSize.width
-                let ratioH = viewSize.height / imageSize.height
-
-                let ratio = ratioW < ratioH ? ratioW:ratioH
-
-                let newWidth = imageSize.width * ratio
-                let newHeight = imageSize.height * ratio
-
-                let left = 0.5 * (newWidth * scrollView.zoomScale > viewSize.width ? (newWidth - viewSize.width) : (scrollView.frame.width - scrollView.contentSize.width))
-                let top = 0.5 * (newHeight * scrollView.zoomScale > viewSize.height ? (newHeight - viewSize.height) : (scrollView.frame.height - scrollView.contentSize.height))
-
-                scrollView.contentInset = UIEdgeInsets(top: top, left: left, bottom: top, right: left)
-            } else {
-                scrollView.contentInset = .zero
-            }
-        }
-    }
-}
-
-fileprivate class GesturedScrollView: UIScrollView, UIGestureRecognizerDelegate {
-    
-    let doubleTapGesture: UITapGestureRecognizer
-    
-    override init(frame: CGRect) {
-        doubleTapGesture = UITapGestureRecognizer()
-        super.init(frame: frame)
-        doubleTapGesture.addTarget(self, action: #selector(handleDoubleTap))
-        doubleTapGesture.numberOfTapsRequired = 2
-        addGestureRecognizer(doubleTapGesture)
-        doubleTapGesture.delegate = self
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    @objc func handleDoubleTap(_ gesture: UITapGestureRecognizer) {
-        if self.zoomScale == 1 {
-            let pointInView = gesture.location(in: self.subviews.first)
-            let newZoomScale = self.maximumZoomScale / 4.0
-            let scrollViewSize = self.bounds.size
-            let width = scrollViewSize.width / newZoomScale
-            let height = scrollViewSize.height / newZoomScale
-            let originX = pointInView.x - (width / 2.0)
-            let originY = pointInView.y - (height / 2.0)
-            let zoomRect = CGRect(x: originX, y: originY, width: width, height: height)
-            self.zoom(to: zoomRect, animated: true)
-        } else {
-            self.setZoomScale(self.minimumZoomScale, animated: true)
-        }
-    }
-    
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        return gestureRecognizer == doubleTapGesture
-    }
-}
-
-fileprivate extension UIHostingController {
-    
-    convenience init(rootView: Content, ignoreSafeArea: Bool) {
-        self.init(rootView: rootView)
-        
-        if ignoreSafeArea {
-            disableSafeArea()
-        }
-    }
-    
-    func disableSafeArea() {
-        guard let viewClass = object_getClass(view) else { return }
-        
-        let viewSubclassName = String(cString: class_getName(viewClass)).appending("_IgnoreSafeArea")
-        if let viewSubclass = NSClassFromString(viewSubclassName) {
-            object_setClass(view, viewSubclass)
-        }
-        else {
-            guard let viewClassNameUtf8 = (viewSubclassName as NSString).utf8String else { return }
-            guard let viewSubclass = objc_allocateClassPair(viewClass, viewClassNameUtf8, 0) else { return }
-            
-            if let method = class_getInstanceMethod(UIView.self, #selector(getter: UIView.safeAreaInsets)) {
-                let safeAreaInsets: @convention(block) (AnyObject) -> UIEdgeInsets = { _ in
-                    return .zero
-                }
-                class_addMethod(viewSubclass, #selector(getter: UIView.safeAreaInsets), imp_implementationWithBlock(safeAreaInsets), method_getTypeEncoding(method))
-            }
-            
-            objc_registerClassPair(viewSubclass)
-            object_setClass(view, viewSubclass)
-        }
-    }
-}
--- a/damus/ContentView.swift
+++ b/damus/ContentView.swift
@@ -7,27 +7,31 @@

 import SwiftUI
 import Starscream
+import Kingfisher
+
+var BOOTSTRAP_RELAYS = [
+    "wss://relay.damus.io",
+    "wss://nostr-relay.wlvs.space",
+    "wss://nostr.fmt.wiz.biz",
+    "wss://relay.nostr.bg",
+    "wss://nostr.oxtr.dev",
+    "wss://nostr.v0l.io",
+    "wss://nostr-2.zebedee.cloud",
+]

 struct TimestampedProfile {
    let profile: Profile
    let timestamp: Int64
-    let event: NostrEvent
 }

 enum Sheets: Identifiable {
    case post
-    case report(ReportTarget)
    case reply(NostrEvent)
-    case event(NostrEvent)
-    case filter

    var id: String {
        switch self {
-        case .report: return "report"
        case .post: return "post"
        case .reply(let ev): return "reply-" + ev.id
-        case .event(let ev): return "event-" + ev.id
-        case .filter: return "filter"
        }
    }
 }
@@ -40,15 +44,6 @@ enum ThreadState {
 enum FilterState : Int {
    case posts_and_replies = 1
    case posts = 0
-    
-    func filter(ev: NostrEvent) -> Bool {
-        switch self {
-        case .posts:
-            return !ev.is_reply(nil)
-        case .posts_and_replies:
-            return true
-        }
-    }
 }

 struct ContentView: View {
@@ -66,65 +61,44 @@ struct ContentView: View {
    @State var active_sheet: Sheets? = nil
    @State var damus_state: DamusState? = nil
    @State var selected_timeline: Timeline? = .home
-    @State var is_deleted_account: Bool = false
+    @State var is_thread_open: Bool = false
    @State var is_profile_open: Bool = false
    @State var event: NostrEvent? = nil
    @State var active_profile: String? = nil
    @State var active_search: NostrFilter? = nil
-    @State var active_event: NostrEvent? = nil
+    @State var active_event_id: String? = nil
    @State var profile_open: Bool = false
    @State var thread_open: Bool = false
    @State var search_open: Bool = false
-    @State var muting: String? = nil
-    @State var confirm_mute: Bool = false
-    @State var user_muted_confirm: Bool = false
-    @State var confirm_overwrite_mutelist: Bool = false
-    @State var current_boost: NostrEvent? = nil
    @State var filter_state : FilterState = .posts_and_replies
-    @State private var isSideBarOpened = false
    @StateObject var home: HomeModel = HomeModel()
-    
+    @StateObject var user_settings = UserSettingsStore()
+
    // connect retry timer
    let timer = Timer.publish(every: 4, on: .main, in: .common).autoconnect()

    let sub_id = UUID().description
    
    @Environment(\.colorScheme) var colorScheme
-    
-    var mystery: some View {
-        Text("Are you lost?", comment: "Text asking the user if they are lost in the app.")
-        .id("what")
-    }
-    
+
    var PostingTimelineView: some View {
-        VStack {
+        VStack{
            ZStack {
-                TabView(selection: $filter_state) {
-                    // This is needed or else there is a bug when switching from the 3rd or 2nd tab to first. no idea why.
-                    mystery
-                    
-                    contentTimelineView(filter: FilterState.posts.filter)
-                        .tag(FilterState.posts)
-                        .id(FilterState.posts)
-                    contentTimelineView(filter: FilterState.posts_and_replies.filter)
-                        .tag(FilterState.posts_and_replies)
-                        .id(FilterState.posts_and_replies)
+                if let damus = self.damus_state {
+                    TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter_event)
                }
-                .tabViewStyle(.page(indexDisplayMode: .never))
-                
                if privkey != nil {
-                    PostButtonContainer(is_left_handed: damus_state?.settings.left_handed ?? false) {
+                    PostButtonContainer {
                        self.active_sheet = .post
                    }
                }
-            }
+            }.ignoresSafeArea(.keyboard, edges: .bottom)
        }
-        .safeAreaInset(edge: .top, spacing: 0) {
+        .safeAreaInset(edge: .top) {
            VStack(spacing: 0) {
-                CustomPicker(selection: $filter_state, content: {
-                    Text("Posts", comment: "Label for filter for seeing only posts (instead of posts and replies).").tag(FilterState.posts)
-                    Text("Posts & Replies", comment: "Label for filter for seeing posts and replies (instead of only posts).").tag(FilterState.posts_and_replies)
-                })
+                FiltersView
+                    //.frame(maxWidth: 275)
+                    .padding()
                Divider()
                    .frame(height: 1)
            }
@@ -132,24 +106,22 @@ struct ContentView: View {
        }
    }
    
-    func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
-        ZStack {
-            if let damus = self.damus_state {
-                TimelineView(events: home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
+    var FiltersView: some View {
+        VStack{
+            Picker("Filter State", selection: $filter_state) {
+                Text("Posts").tag(FilterState.posts)
+                Text("Posts & Replies").tag(FilterState.posts_and_replies)
            }
+            .pickerStyle(.segmented)
        }
    }
    
-    func popToRoot() {
-        profile_open = false
-        thread_open = false
-        search_open = false
-        isSideBarOpened = false
-    }
-    
-    var timelineNavItem: Text {
-        return Text(timeline_name(selected_timeline))
-            .bold()
+    func filter_event(_ ev: NostrEvent) -> Bool {
+        if self.filter_state == .posts {
+            return !ev.is_reply(nil)
+        }
+        
+        return true
    }
    
    func MainContent(damus: DamusState) -> some View {
@@ -157,63 +129,48 @@ struct ContentView: View {
            NavigationLink(destination: MaybeProfileView, isActive: $profile_open) {
                EmptyView()
            }
-            if let active_event {
-                let thread = ThreadModel(event: active_event, damus_state: damus_state!)
-                NavigationLink(destination: ThreadView(state: damus_state!, thread: thread), isActive: $thread_open) {
-                    EmptyView()
-                }
+            NavigationLink(destination: MaybeThreadView, isActive: $thread_open) {
+                EmptyView()
            }
            NavigationLink(destination: MaybeSearchView, isActive: $search_open) {
                EmptyView()
            }
            switch selected_timeline {
            case .search:
-                if #available(iOS 16.0, *) {
-                    SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
-                        .scrollDismissesKeyboard(.immediately)
-                } else {
-                    // Fallback on earlier versions
-                    SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
-                }
+                SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
                
            case .home:
                PostingTimelineView
                
            case .notifications:
-                NotificationsView(state: damus, notifications: home.notifications)
+                TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
+                    .navigationTitle("Notifications")
                
            case .dms:
-                DirectMessagesView(damus_state: damus_state!, model: damus_state!.dms)
+                DirectMessagesView(damus_state: damus_state!)
+                    .environmentObject(home.dms)
            
            case .none:
                EmptyView()
            }
        }
-        .navigationBarTitle(timeline_name(selected_timeline), displayMode: .inline)
-        .toolbar {
-            ToolbarItem(placement: .principal) {
-                VStack {
-                    if selected_timeline == .home {
-                        Image("damus-home")
-                            .resizable()
-                            .frame(width:30,height:30)
-                            .shadow(color: DamusColors.purple, radius: 2)
-                            .opacity(isSideBarOpened ? 0 : 1)
-                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
-                    } else {
-                        timelineNavItem
-                            .opacity(isSideBarOpened ? 0 : 1)
-                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
-                    }
-                }
-            }
-        }
+        .navigationBarTitle(selected_timeline == .home ?  "Home" : "Global", displayMode: .inline)
    }
    
    var MaybeSearchView: some View {
        Group {
            if let search = self.active_search {
-                SearchView(appstate: damus_state!, search: SearchModel(contacts: damus_state!.contacts, pool: damus_state!.pool, search: search))
+                SearchView(appstate: damus_state!, search: SearchModel(pool: damus_state!.pool, search: search))
+            } else {
+                EmptyView()
+            }
+        }
+    }
+    
+    var MaybeThreadView: some View {
+        Group {
+            if let evid = self.active_event_id {
+                BuildThreadV2View(damus: damus_state!, event_id: evid)
            } else {
                EmptyView()
            }
@@ -231,100 +188,63 @@ struct ContentView: View {
            }
        }
    }
-    
-    func MaybeReportView(target: ReportTarget) -> some View {
-        Group {
-            if let damus_state {
-                if let sec = damus_state.keypair.privkey {
-                    ReportView(postbox: damus_state.postbox, target: target, privkey: sec)
-                } else {
-                    EmptyView()
-                }
-            } else {
-                EmptyView()
-            }
-        }
-    }
-    
-    func open_event(ev: NostrEvent) {
-        self.active_event = ev
-        self.thread_open = true
-    }
-    
+
    var body: some View {
        VStack(alignment: .leading, spacing: 0) {
            if let damus = self.damus_state {
                NavigationView {
-                    TabView { // Prevents navbar appearance change on scroll
-                        MainContent(damus: damus)
-                            .toolbar() {
-                                ToolbarItem(placement: .navigationBarLeading) {
-                                    Button {
-                                        isSideBarOpened.toggle()
-                                    } label: {
-                                        ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
-                                            .opacity(isSideBarOpened ? 0 : 1)
-                                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
+                    MainContent(damus: damus)
+                        .toolbar {
+                            ToolbarItem(placement: .navigationBarLeading) {
+                                let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!)
+                                let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey)
+                                let prof_dest = ProfileView(damus_state: damus_state!, profile: profile_model, followers: followers_model)
+
+                                NavigationLink(destination: prof_dest) {
+                                    /// Verify that the user has a profile picture, if not display a generic SF Symbol
+                                    /// (Resolves an in-app error where ``Robohash`` pictures are not generated so the button dissapears
+                                    if let picture = damus_state?.profiles.lookup(id: pubkey)?.picture {
+                                        ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles, picture: picture)
+                                    } else {
+                                        Image(systemName: "person.fill")
                                    }
-                                    .disabled(isSideBarOpened)
                                }
-                                
-                                ToolbarItem(placement: .navigationBarTrailing) {
-                                    HStack(alignment: .center) {
-                                        SignalView(state: damus_state!, signal: home.signal)
-                                        
-                                        // maybe expand this to other timelines in the future
-                                        if selected_timeline == .search {
-                                            Button(action: {
-                                                //isFilterVisible.toggle()
-                                                self.active_sheet = .filter
-                                            }) {
-                                                // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
-                                                Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), systemImage: "line.3.horizontal.decrease")
-                                                    .foregroundColor(.gray)
-                                                    //.contentShape(Rectangle())
-                                            }
-                                        }
+                                .buttonStyle(PlainButtonStyle())
+                            }
+
+                            ToolbarItem(placement: .navigationBarTrailing) {
+                                HStack(alignment: .center) {
+                                    if home.signal.signal != home.signal.max_signal {
+                                        Text("\(home.signal.signal)/\(home.signal.max_signal)")
+                                            .font(.callout)
+                                            .foregroundColor(.gray)
                                    }
+
+                                    NavigationLink(destination: ConfigView(state: damus_state!).environmentObject(user_settings)) {
+                                        Label("", systemImage: "gear")
+                                    }
+                                    .buttonStyle(PlainButtonStyle())
                                }
                            }
-                    }
-                    .tabViewStyle(.page(indexDisplayMode: .never))
-                    .overlay(
-                        SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
-                    )
+                        }
                }
                .navigationViewStyle(.stack)
-            
-                TabBar(new_events: $home.new_events, selected: $selected_timeline, settings: damus.settings, action: switch_timeline)
-                    .padding([.bottom], 8)
-                    .background(Color(uiColor: .systemBackground).ignoresSafeArea())
            }
+
+            TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline)
+                .padding([.bottom], 8)
        }
-        .ignoresSafeArea(.keyboard)
        .onAppear() {
            self.connect()
+            //KingfisherManager.shared.cache.clearDiskCache()
            setup_notifications()
        }
        .sheet(item: $active_sheet) { item in
            switch item {
-            case .report(let target):
-                MaybeReportView(target: target)
            case .post:
-                PostView(replying_to: nil, damus_state: damus_state!)
+                PostView(replying_to: nil, references: [])
            case .reply(let event):
-                PostView(replying_to: event, damus_state: damus_state!)
-            case .event:
-                EventDetailView()
-            case .filter:
-                let timeline = selected_timeline ?? .home
-                if #available(iOS 16.0, *) {
-                    RelayFilterView(state: damus_state!, timeline: timeline)
-                        .presentationDetents([.height(550)])
-                        .presentationDragIndicator(.visible)
-                } else {
-                    RelayFilterView(state: damus_state!, timeline: timeline)
-                }
+                ReplyView(replying_to: event, damus: damus_state!)
            }
        }
        .onOpenURL { url in
@@ -338,11 +258,8 @@ struct ContentView: View {
                    active_profile = ref.ref_id
                    profile_open = true
                } else if ref.key == "e" {
-                    find_event(state: damus_state!, evid: ref.ref_id, search_type: .event, find_from: nil) { ev in
-                        if let ev {
-                            open_event(ev: ev)
-                        }
-                    }
+                    active_event_id = ref.ref_id
+                    thread_open = true
                }
            case .filter(let filt):
                active_search = filt
@@ -353,7 +270,18 @@ struct ContentView: View {
            
        }
        .onReceive(handle_notify(.boost)) { notif in
-            current_boost = (notif.object as? NostrEvent)
+            guard let privkey = self.privkey else {
+                return
+            }
+
+            let ev = notif.object as! NostrEvent
+            let boost = make_boost_event(pubkey: pubkey, privkey: privkey, boosted: ev)
+            self.damus_state?.pool.send(.event(boost))
+        }
+        .onReceive(handle_notify(.open_thread)) { obj in
+            //let ev = obj.object as! NostrEvent
+            //thread.set_active_event(ev)
+            //is_thread_open = true
        }
        .onReceive(handle_notify(.reply)) { notif in
            let ev = notif.object as! NostrEvent
@@ -361,27 +289,9 @@ struct ContentView: View {
        }
        .onReceive(handle_notify(.like)) { like in
        }
-        .onReceive(handle_notify(.deleted_account)) { notif in
-            self.is_deleted_account = true
-        }
-        .onReceive(handle_notify(.report)) { notif in
-            let target = notif.object as! ReportTarget
-            self.active_sheet = .report(target)
-        }
-        .onReceive(handle_notify(.mute)) { notif in
-            let pubkey = notif.object as! String
-            self.muting = pubkey
-            self.confirm_mute = true
-        }
        .onReceive(handle_notify(.broadcast_event)) { obj in
            let ev = obj.object as! NostrEvent
-            guard let ds = self.damus_state else {
-                return
-            }
-            ds.postbox.send(ev)
-            if let profile = ds.profiles.profiles[ev.pubkey] {
-                ds.postbox.send(profile.event)
-            }
+            self.damus_state?.pool.send(.event(ev))
        }
        .onReceive(handle_notify(.unfollow)) { notif in
            guard let privkey = self.privkey else {
@@ -395,11 +305,11 @@ struct ContentView: View {
            let target = notif.object as! FollowTarget
            let pk = target.pubkey
            
-            if let ev = unfollow_user(postbox: damus.postbox,
-                                      our_contacts: damus.contacts.event,
-                                      pubkey: damus.pubkey,
-                                      privkey: privkey,
-                                      unfollow: pk) {
+            if let ev = unfollow_user(pool: damus.pool,
+                             our_contacts: damus.contacts.event,
+                             pubkey: damus.pubkey,
+                             privkey: privkey,
+                             unfollow: pk) {
                notify(.unfollowed, pk)
                
                damus.contacts.event = ev
@@ -418,10 +328,10 @@ struct ContentView: View {
            }
            
            if let ev = follow_user(pool: damus.pool,
-                                    our_contacts: damus.contacts.event,
-                                    pubkey: damus.pubkey,
-                                    privkey: privkey,
-                                    follow: ReferencedId(ref_id: fnotify.pubkey, relay_id: nil, key: "p")) {
+                           our_contacts: damus.contacts.event,
+                           pubkey: damus.pubkey,
+                           privkey: privkey,
+                           follow: ReferencedId(ref_id: fnotify.pubkey, relay_id: nil, key: "p")) {
                notify(.followed, fnotify.pubkey)
                
                damus_state?.contacts.event = ev
@@ -442,20 +352,9 @@ struct ContentView: View {
            let post_res = obj.object as! NostrPostResult
            switch post_res {
            case .post(let post):
-                //let post = tup.0
-                //let to_relays = tup.1
                print("post \(post.content)")
                let new_ev = post_to_event(post: post, privkey: privkey, pubkey: pubkey)
-                guard let ds = self.damus_state else {
-                    return
-                }
-                ds.postbox.send(new_ev)
-                for eref in new_ev.referenced_ids.prefix(3) {
-                    // also broadcast at most 3 referenced events
-                    if let ev = ds.events.lookup(eref.ref_id) {
-                        ds.postbox.send(ev)
-                    }
-                }
+                self.damus_state?.pool.send(.event(new_ev))
            case .cancel:
                active_sheet = nil
                print("post cancelled")
@@ -464,143 +363,9 @@ struct ContentView: View {
        .onReceive(timer) { n in
            self.damus_state?.pool.connect_to_disconnected()
        }
-        .onReceive(handle_notify(.new_mutes)) { notif in
-            home.filter_muted()
-        }
-        .onReceive(handle_notify(.mute_thread)) { notif in
-            home.filter_muted()
-        }
-        .onReceive(handle_notify(.unmute_thread)) { notif in
-            home.filter_muted()
-        }
-        .onReceive(handle_notify(.local_notification)) { notif in
-            let local = notif.object as! LossyLocalNotification
-            
-            guard let damus_state else {
-                return
-            }
-            
-            guard let target = damus_state.events.lookup(local.event_id) else {
-                return
-            }
-            
-            switch local.type {
-            case .dm:
-                selected_timeline = .dms
-                damus_state.dms.open_dm_by_pk(target.pubkey)
-                
-            case .like: fallthrough
-            case .zap: fallthrough
-            case .mention: fallthrough
-            case .repost:
-                open_event(ev: target)
-            }
-        }
-        .alert(NSLocalizedString("Deleted Account", comment: "Alert message to indicate this is a deleted account"), isPresented: $is_deleted_account) {
-            Button(NSLocalizedString("Logout", comment: "Button to close the alert that informs that the current account has been deleted.")) {
-                is_deleted_account = false
-                notify(.logout, ())
-            }
-        }
-        .alert(NSLocalizedString("User muted", comment: "Alert message to indicate the user has been muted"), isPresented: $user_muted_confirm, actions: {
-            Button(NSLocalizedString("Thanks!", comment: "Button to close out of alert that informs that the action to muted a user was successful.")) {
-                user_muted_confirm = false
-            }
-        }, message: {
-            if let pubkey = self.muting {
-                let profile = damus_state!.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
-                Text("\(name) has been muted", comment: "Alert message that informs a user was muted.")
-            } else {
-                Text("User has been muted", comment: "Alert message that informs a user was d.")
-            }
-        })
-        .alert(NSLocalizedString("Create new mutelist", comment: "Title of alert prompting the user to create a new mutelist."), isPresented: $confirm_overwrite_mutelist, actions: {
-            Button(NSLocalizedString("Cancel", comment: "Button to cancel out of alert that creates a new mutelist.")) {
-                confirm_overwrite_mutelist = false
-                confirm_mute = false
-            }
-
-            Button(NSLocalizedString("Yes, Overwrite", comment: "Text of button that confirms to overwrite the existing mutelist.")) {
-                guard let ds = damus_state else {
-                    return
-                }
-                
-                guard let keypair = ds.keypair.to_full() else {
-                    return
-                }
-                
-                guard let pubkey = muting else {
-                    return
-                }
-                
-                guard let mutelist = create_or_update_mutelist(keypair: keypair, mprev: nil, to_add: pubkey) else {
-                    return
-                }
-                
-                damus_state?.contacts.set_mutelist(mutelist)
-                ds.postbox.send(mutelist)
-
-                confirm_overwrite_mutelist = false
-                confirm_mute = false
-                user_muted_confirm = true
-            }
-        }, message: {
-            Text("No mute list found, create a new one? This will overwrite any previous mute lists.", comment: "Alert message prompt that asks if the user wants to create a new mute list, overwriting previous mute lists.")
-        })
-        .alert(NSLocalizedString("Mute User", comment: "Title of alert for muting a user."), isPresented: $confirm_mute, actions: {
-            Button(NSLocalizedString("Cancel", comment: "Alert button to cancel out of alert for muting a user."), role: .cancel) {
-                confirm_mute = false
-            }
-            Button(NSLocalizedString("Mute", comment: "Alert button to mute a user."), role: .destructive) {
-                guard let ds = damus_state else {
-                    return
-                }
-
-                if ds.contacts.mutelist == nil {
-                    confirm_overwrite_mutelist = true
-                } else {
-                    guard let keypair = ds.keypair.to_full() else {
-                        return
-                    }
-                    guard let pubkey = muting else {
-                        return
-                    }
-
-                    guard let ev = create_or_update_mutelist(keypair: keypair, mprev: ds.contacts.mutelist, to_add: pubkey) else {
-                        return
-                    }
-                    damus_state?.contacts.set_mutelist(ev)
-                    ds.postbox.send(ev)
-                }
-            }
-        }, message: {
-            if let pubkey = muting {
-                let profile = damus_state?.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
-                Text("Mute \(name)?", comment: "Alert message prompt to ask if a user should be muted.")
-            } else {
-                Text("Could not find user to mute...", comment: "Alert message to indicate that the muted user could not be found.")
-            }
-        })
-        .alert(NSLocalizedString("Repost", comment: "Title of alert for confirming to repost a post."), isPresented: $current_boost.mappedToBool()) {
-            Button(NSLocalizedString("Cancel", comment: "Button to cancel out of reposting a post.")) {
-                current_boost = nil
-            }
-            Button(NSLocalizedString("Repost", comment: "Button to confirm reposting a post.")) {
-                if let current_boost {
-                    self.damus_state?.postbox.send(current_boost)
-                }
-            }
-        } message: {
-            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
-        }
    }
    
    func switch_timeline(_ timeline: Timeline) {
-        self.isSideBarOpened = false
-        
-        self.popToRoot()
        NotificationCenter.default.post(name: .switched_timeline, object: timeline)
        
        if timeline == self.selected_timeline {
@@ -626,40 +391,20 @@ struct ContentView: View {

    func connect() {
        let pool = RelayPool()
-        let metadatas = RelayMetadatas()
-        let relay_filters = RelayFilters(our_pubkey: pubkey)
-        let bootstrap_relays = load_bootstrap_relays(pubkey: pubkey)
        
-        let new_relay_filters = load_relay_filters(pubkey) == nil
-        for relay in bootstrap_relays {
-            if let url = URL(string: relay) {
-                add_new_relay(relay_filters: relay_filters, metadatas: metadatas, pool: pool, url: url, info: .rw, new_relay_filters: new_relay_filters)
-            }
+        for relay in BOOTSTRAP_RELAYS {
+            add_relay(pool, relay)
        }
        
        pool.register_handler(sub_id: sub_id, handler: home.handle_event)

-        self.damus_state = DamusState(pool: pool,
-                                      keypair: keypair,
-                                      likes: EventCounter(our_pubkey: pubkey),
-                                      boosts: EventCounter(our_pubkey: pubkey),
-                                      contacts: Contacts(our_pubkey: pubkey),
-                                      tips: TipCounter(our_pubkey: pubkey),
-                                      profiles: Profiles(),
-                                      dms: home.dms,
-                                      previews: PreviewCache(),
-                                      zaps: Zaps(our_pubkey: pubkey),
-                                      lnurls: LNUrls(),
-                                      settings: UserSettingsStore(),
-                                      relay_filters: relay_filters,
-                                      relay_metadata: metadatas,
-                                      drafts: Drafts(),
-                                      events: EventCache(),
-                                      bookmarks: BookmarksManager(pubkey: pubkey),
-                                      postbox: PostBox(pool: pool),
-                                      bootstrap_relays: bootstrap_relays,
-                                      replies: ReplyCounter(our_pubkey: pubkey),
-                                      muted_threads: MutedThreadsManager(keypair: keypair)
+        self.damus_state = DamusState(pool: pool, keypair: keypair,
+                                likes: EventCounter(our_pubkey: pubkey),
+                                boosts: EventCounter(our_pubkey: pubkey),
+                                contacts: Contacts(),
+                                tips: TipCounter(our_pubkey: pubkey),
+                                profiles: Profiles(),
+                                dms: home.dms
        )
        home.damus_state = self.damus_state!
        
@@ -675,6 +420,7 @@ struct ContentView_Previews: PreviewProvider {
    }
 }

+
 func get_since_time(last_event: NostrEvent?) -> Int64? {
    if let last_event = last_event {
        return last_event.created_at - 60 * 10
@@ -808,69 +554,3 @@ func setup_notifications() {
    }
 }

-func find_event(state: DamusState, evid: String, search_type: SearchType, find_from: [String]?, callback: @escaping (NostrEvent?) -> ()) {
-    if let ev = state.events.lookup(evid) {
-        callback(ev)
-        return
-    }
-    
-    let subid = UUID().description
-    
-    var has_event = false
-    
-    var filter = search_type == .event ? NostrFilter.filter_ids([ evid ]) : NostrFilter.filter_authors([ evid ])
-    
-    if search_type == .profile {
-        filter.kinds = [0]
-    }
-    
-    filter.limit = 1
-    var attempts = 0
-    
-    state.pool.subscribe_to(sub_id: subid, filters: [filter], to: find_from) { relay_id, res  in
-        guard case .nostr_event(let ev) = res else {
-            return
-        }
-        
-        guard ev.subid == subid else {
-            return
-        }
-        
-        switch ev {
-        case .ok:
-            break
-        case .event(_, let ev):
-            has_event = true
-            callback(ev)
-            state.pool.unsubscribe(sub_id: subid)
-        case .eose:
-            if !has_event {
-                attempts += 1
-                if attempts == state.pool.descriptors.count / 2 {
-                    callback(nil)
-                }
-                state.pool.unsubscribe(sub_id: subid, to: [relay_id])
-            }
-        case .notice(_):
-            break
-        }
-
-    }
-}
-
-
-func timeline_name(_ timeline: Timeline?) -> String {
-    guard let timeline else {
-        return ""
-    }
-    switch timeline {
-    case .home:
-        return NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.")
-    case .notifications:
-        return NSLocalizedString("Notifications", comment: "Toolbar label for Notifications view.")
-    case .search:
-        return NSLocalizedString("Universe 🛸", comment: "Toolbar label for the universal view where posts from all connected relay servers appear.")
-    case .dms:
-        return NSLocalizedString("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
-    }
-}
--- a/damus/Info.plist
+++ b/damus/Info.plist
@@ -14,41 +14,26 @@
 				<string>nostr</string>
 			</array>
 		</dict>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>CFBundleURLName</key>
-			<string>io.damus</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>damus</string>
-			</array>
-		</dict>
 	</array>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
-		<string>river</string>
 		<string>bitcoinbeach</string>
 		<string>breez</string>
 		<string>muun</string>
 		<string>zeusln</string>
 		<string>zebedee</string>
 		<string>lightning</string>
+		<string>squarecash</string>
 		<string>phoenix</string>
 		<string>lnlink</string>
 		<string>strike</string>
 		<string>bluewallet</string>
 		<string>walletofsatoshi</string>
-		<string>blixtwallet</string>
 	</array>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
-	<key>NSCameraUsageDescription</key>
-	<string>Damus needs access to your camera if you want to upload photos from it</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>Damus needs access to your microphone if you want to upload recorded videos from it</string>
 </dict>
 </plist>
--- a/damus/Models/ActionBarModel.swift
+++ b/damus/Models/ActionBarModel.swift
@@ -11,59 +11,28 @@ import Foundation
 class ActionBarModel: ObservableObject {
    @Published var our_like: NostrEvent?
    @Published var our_boost: NostrEvent?
-    @Published var our_reply: NostrEvent?
-    @Published var our_zap: Zap?
+    @Published var our_tip: NostrEvent?
    @Published var likes: Int
    @Published var boosts: Int
-    @Published var zaps: Int
-    @Published var zap_total: Int64
-    @Published var replies: Int
+    @Published var tips: Int64
    
-    static func empty() -> ActionBarModel {
-        return ActionBarModel(likes: 0, boosts: 0, zaps: 0, zap_total: 0, replies: 0, our_like: nil, our_boost: nil, our_zap: nil, our_reply: nil)
-    }
-    
-    init(likes: Int, boosts: Int, zaps: Int, zap_total: Int64, replies: Int, our_like: NostrEvent?, our_boost: NostrEvent?, our_zap: Zap?, our_reply: NostrEvent?) {
+    init(likes: Int, boosts: Int, tips: Int64, our_like: NostrEvent?, our_boost: NostrEvent?, our_tip: NostrEvent?) {
        self.likes = likes
        self.boosts = boosts
-        self.zaps = zaps
-        self.replies = replies
-        self.zap_total = zap_total
+        self.tips = tips
        self.our_like = our_like
        self.our_boost = our_boost
-        self.our_zap = our_zap
-        self.our_reply = our_reply
+        self.our_tip = our_tip
    }
    
-    func update(damus: DamusState, evid: String) {
-        self.likes = damus.likes.counts[evid] ?? 0
-        self.boosts = damus.boosts.counts[evid] ?? 0
-        self.zaps = damus.zaps.event_counts[evid] ?? 0
-        self.replies = damus.replies.get_replies(evid)
-        self.zap_total = damus.zaps.event_totals[evid] ?? 0
-        self.our_like = damus.likes.our_events[evid]
-        self.our_boost = damus.boosts.our_events[evid]
-        self.our_zap = damus.zaps.our_zaps[evid]?.first
-        self.our_reply = damus.replies.our_reply(evid)
-        self.objectWillChange.send()
-    }
-    
-    var is_empty: Bool {
-        return likes == 0 && boosts == 0 && zaps == 0
-    }
-    
-    var zapped: Bool {
-        return our_zap != nil
+    var tipped: Bool {
+        return our_tip != nil
    }
    
    var liked: Bool {
        return our_like != nil
    }
    
-    var replied: Bool {
-        return our_reply != nil
-    }
-    
    var boosted: Bool {
        return our_boost != nil
    }
--- a/damus/Models/BookmarksManager.swift
+++ b/damus/Models/BookmarksManager.swift
@@ -1,71 +0,0 @@
-//
-//  BookmarksManager.swift
-//  damus
-//
-//  Created by Joel Klabo on 2/18/23.
-//
-
-import Foundation
-
-fileprivate func get_bookmarks_key(pubkey: String) -> String {
-    pk_setting_key(pubkey, key: "bookmarks")
-}
-
-func load_bookmarks(pubkey: String) -> [NostrEvent] {
-    let key = get_bookmarks_key(pubkey: pubkey)
-    return (UserDefaults.standard.stringArray(forKey: key) ?? []).compactMap {
-        event_from_json(dat: $0)
-    }
-}
-
-func save_bookmarks(pubkey: String, current_value: [NostrEvent], value: [NostrEvent]) -> Bool {
-    let uniq_bookmarks = Array(Set(value))
-    
-    if uniq_bookmarks != current_value {
-        let encoded = uniq_bookmarks.map(event_to_json)
-        UserDefaults.standard.set(encoded, forKey: get_bookmarks_key(pubkey: pubkey))
-        return true
-    }
-    
-    return false
-}
-
-class BookmarksManager: ObservableObject {
-    
-    private let userDefaults = UserDefaults.standard
-    private let pubkey: String
-    
-    private var _bookmarks: [NostrEvent]
-    var bookmarks: [NostrEvent] {
-        get {
-            return _bookmarks
-        }
-        set {
-            if save_bookmarks(pubkey: pubkey, current_value: _bookmarks, value: newValue) {
-                self._bookmarks = newValue
-                self.objectWillChange.send()
-            }
-        }
-    }
-    
-    init(pubkey: String) {
-        self._bookmarks = load_bookmarks(pubkey: pubkey)
-        self.pubkey = pubkey
-    }
-    
-    func isBookmarked(_ ev: NostrEvent) -> Bool {
-        return bookmarks.contains(ev)
-    }
-    
-    func updateBookmark(_ ev: NostrEvent) {
-        if isBookmarked(ev) {
-            bookmarks = bookmarks.filter { $0 != ev }
-        } else {
-            bookmarks.insert(ev, at: 0)
-        }
-    }
-    
-    func clearAll() {
-        bookmarks = []
-    }
-}
--- a/damus/Models/Contacts.swift
+++ b/damus/Models/Contacts.swift
@@ -11,50 +11,7 @@ import Foundation
 class Contacts {
    private var friends: Set<String> = Set()
    private var friend_of_friends: Set<String> = Set()
-    private var muted: Set<String> = Set()
-    
-    let our_pubkey: String
    var event: NostrEvent?
-    var mutelist: NostrEvent?
-    
-    init(our_pubkey: String) {
-        self.our_pubkey = our_pubkey
-    }
-    
-    func is_muted(_ pk: String) -> Bool {
-        return muted.contains(pk)
-    }
-    
-    func set_mutelist(_ ev: NostrEvent) {
-        let oldlist = self.mutelist
-        self.mutelist = ev
-        
-        let old = Set(oldlist?.referenced_pubkeys.map({ $0.ref_id }) ?? [])
-        let new = Set(ev.referenced_pubkeys.map({ $0.ref_id }))
-        let diff = old.symmetricDifference(new)
-        
-        var new_mutes = Array<String>()
-        var new_unmutes = Array<String>()
-        
-        for d in diff {
-            if new.contains(d) {
-                new_mutes.append(d)
-            } else {
-                new_unmutes.append(d)
-            }
-        }
-        
-        // TODO: set local mutelist here
-        self.muted = Set(ev.referenced_pubkeys.map({ $0.ref_id }))
-        
-        if new_mutes.count > 0 {
-            notify(.new_mutes, new_mutes)
-        }
-        
-        if new_unmutes.count > 0 {
-            notify(.new_unmutes, new_unmutes)
-        }
-    }
    
    func get_friendosphere() -> [String] {
        var fs = get_friend_list()
@@ -99,10 +56,6 @@ class Contacts {
        return friends.contains(pubkey)
    }
    
-    func is_friend_or_self(_ pubkey: String) -> Bool {
-        return pubkey == our_pubkey || is_friend(pubkey)
-    }
-    
    func follow_state(_ pubkey: String) -> FollowState {
        return is_friend(pubkey) ? .follows : .unfollows
    }
@@ -140,7 +93,7 @@ func follow_user(pool: RelayPool, our_contacts: NostrEvent?, pubkey: String, pri
    return ev
 }

-func unfollow_user(postbox: PostBox, our_contacts: NostrEvent?, pubkey: String, privkey: String, unfollow: String) -> NostrEvent? {
+func unfollow_user(pool: RelayPool, our_contacts: NostrEvent?, pubkey: String, privkey: String, unfollow: String) -> NostrEvent? {
    guard let cs = our_contacts else {
        return nil
    }
@@ -149,7 +102,7 @@ func unfollow_user(postbox: PostBox, our_contacts: NostrEvent?, pubkey: String,
    ev.calculate_id()
    ev.sign(privkey: privkey)
    
-    postbox.send(ev)
+    pool.send(.event(ev))
    
    return ev
 }
--- a/damus/Models/CreateAccountModel.swift
+++ b/damus/Models/CreateAccountModel.swift
@@ -14,7 +14,6 @@ class CreateAccountModel: ObservableObject {
    @Published var about: String = ""
    @Published var pubkey: String = ""
    @Published var privkey: String = ""
-    @Published var profile_image: String? = nil
    
    var pubkey_bech32: String {
        return bech32_pubkey(self.pubkey) ?? ""
--- a/damus/Models/DamusState.swift
+++ b/damus/Models/DamusState.swift
@@ -6,7 +6,6 @@
 //

 import Foundation
-import LinkPresentation

 struct DamusState {
    let pool: RelayPool
@@ -17,28 +16,12 @@ struct DamusState {
    let tips: TipCounter
    let profiles: Profiles
    let dms: DirectMessagesModel
-    let previews: PreviewCache
-    let zaps: Zaps
-    let lnurls: LNUrls
-    let settings: UserSettingsStore
-    let relay_filters: RelayFilters
-    let relay_metadata: RelayMetadatas
-    let drafts: Drafts
-    let events: EventCache
-    let bookmarks: BookmarksManager
-    let postbox: PostBox
-    let bootstrap_relays: [String]
-    let replies: ReplyCounter
-    let muted_threads: MutedThreadsManager
    
    var pubkey: String {
        return keypair.pubkey
    }
    
-    var is_privkey_user: Bool {
-        keypair.privkey != nil
-    }
-    
    static var empty: DamusState {
-        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts(), events: EventCache(), bookmarks: BookmarksManager(pubkey: ""), postbox: PostBox(pool: RelayPool()), bootstrap_relays: [], replies: ReplyCounter(our_pubkey: ""), muted_threads: MutedThreadsManager(keypair: Keypair(pubkey: "", privkey: nil))) }
+        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel())
+    }
 }
--- a/damus/Models/DeepLPlan.swift
+++ b/damus/Models/DeepLPlan.swift
@@ -1,35 +0,0 @@
-//
-//  DeepLPlan.swift
-//  damus
-//
-//  Created by Terry Yiu on 2/3/23.
-//
-
-import Foundation
-
-enum DeepLPlan: String, CaseIterable, Identifiable {
-    var id: String { self.rawValue }
-
-    struct Model: Identifiable, Hashable {
-        var id: String { self.tag }
-        var tag: String
-        var displayName: String
-        var url: String
-    }
-
-    case free
-    case pro
-
-    var model: Model {
-        switch self {
-        case .free:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("Free", comment: "Dropdown option for selecting Free plan for DeepL translation service."), url: "https://api-free.deepl.com")
-        case .pro:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("Pro", comment: "Dropdown option for selecting Pro plan for DeepL translation service."), url: "https://api.deepl.com")
-        }
-    }
-
-    static var allModels: [Model] {
-        return Self.allCases.map { $0.model }
-    }
-}
--- a/Show More
+++ b/Show More