Fix relative time test

2023-01-02 12:21:20 -05:00
246 changed files with 1734 additions and 38183 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/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,251 +1,3 @@
 ## [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)
 ### 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
 - Added Arabic and Portuguese translations (Barodane, 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)
 - Translations for it_IT, it_CH, fr_FR, de_DE, de_AT and lv_LV (Nicolò Carcagnì, Solobalbo, Gregor, Peter Gerstbach, 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)
 - Translations for de_AT, de_DE, tr_TR, fr_FR (Gregor, Peter Gerstbach, Taylan Benli, 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
@@ -514,5 +266,3 @@
 [0.1.2]: https://github.com/damus-io/damus/releases/tag/v0.1.2
--- 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~`
+  - Strikethrough: 2 tildes `~~strikethrough~~`
-  - Code: 1 back-tick `` `code` ``
+  - 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,41 +91,15 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 ## Contributing
-Contributors welcome!
+Contributors welcome! [Email patches][git-send-email] to jb55@jb55.com are preferred, but I accept PRs on github as well.
 ### Code
 [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.
+### Awards 
 [transifex]: https://explore.transifex.com/damus/damus-ios/
 #### Export Source Translations
 If user-facing strings have been added or changed, please export them for translation as part of your pull request or commit by running:
 ```zsh
 ./devtools/export-source-translation.sh
 ```
 This command will export source translations to `translations/en-US.xcloc/Localized Contents/en-US.xliff`, which the Transifex integration will read from the `master` branch and allow translators to translate those strings.
 #### Import Translations
 Once 100% of strings have been translated for a given locale, Transifex will open up a pull request with the `translations/<locale>.xliff` file changed. Currently, it must be manually imported into the project before merging the pull request by running:
 ```zsh
 ./devtools/import-translation.sh <locale_code_in_snake_case>
 ```
 ### Awards
 There may be nostr badges awarded for contributors in the future... :)
@@ -134,7 +107,3 @@ First contributors:
 1. @randymcmillan
 2. @jcarucci27
 ### git log bot
 npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas
--- a/damus-c/damus.c
+++ b/damus-c/damus.c
@@ -22,10 +22,6 @@ 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 void make_cursor(struct cursor *c, const u8 *content, size_t len)
 {
    c->start = content;
@@ -33,33 +29,16 @@ static void make_cursor(struct cursor *c, const u8 *content, size_t len)
    c->p = content;
 }
 static 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 int consume_until_whitespace(struct cursor *cur, int or_end) {
    char c;
    bool consumedAtLeastOne = false;
    while (cur->p < cur->end) {
        c = *cur->p;
-        if (is_whitespace(c) && consumedAtLeastOne)
+        if (is_whitespace(c))
            return 1;
        cur->p++;
        consumedAtLeastOne = true;
    }
    return or_end;
@@ -166,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);
--- a/damus.xcodeproj/project.pbxproj
+++ b/damus.xcodeproj/project.pbxproj
@@ -12,13 +12,7 @@
 		3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3169CAEC294FCCFC00EE4006 /* Constants.swift */; };
 		31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D2E846295218AF006D67F8 /* Shimmer.swift */; };
 		3A4325A82961E11400BFCD9D /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */; };
 		3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FC297E3CFF0090C62D /* RepostsModel.swift */; };
 		3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FE297E3D900090C62D /* RepostsView.swift */; };
 		3AA24802297E3DC20090C62D /* RepostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA24801297E3DC20090C62D /* RepostView.swift */; };
 		3ACB685C297633BC00C46468 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685A297633BC00C46468 /* InfoPlist.strings */; };
 		3ACB685F297633BC00C46468 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685D297633BC00C46468 /* Localizable.strings */; };
 		3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */; };
 		3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */; };
 		4C06670128FC7C5900038D2A /* RelayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670028FC7C5900038D2A /* RelayView.swift */; };
 		4C06670428FC7EC500038D2A /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 4C06670328FC7EC500038D2A /* Kingfisher */; };
 		4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670528FCB08600038D2A /* ImageCarousel.swift */; };
@@ -28,6 +22,7 @@
 		4C0A3F8F280F640A000448DE /* ThreadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F8E280F640A000448DE /* ThreadModel.swift */; };
 		4C0A3F91280F6528000448DE /* ChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F90280F6528000448DE /* ChatView.swift */; };
 		4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F92280F66F5000448DE /* ReplyMap.swift */; };
 		4C0A3F95280F6C78000448DE /* ReplyQuoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F94280F6C78000448DE /* ReplyQuoteView.swift */; };
 		4C0A3F97280F8E02000448DE /* ThreadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F96280F8E02000448DE /* ThreadView.swift */; };
 		4C216F32286E388800040376 /* DMChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F31286E388800040376 /* DMChatView.swift */; };
 		4C216F34286F5ACD00040376 /* DMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F33286F5ACD00040376 /* DMView.swift */; };
@@ -56,7 +51,6 @@
 		4C363AA428296DEE006E126D /* SearchModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363AA328296DEE006E126D /* SearchModel.swift */; };
 		4C363AA828297703006E126D /* InsertSort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363AA728297703006E126D /* InsertSort.swift */; };
 		4C3A1D332960DB0500558C0F /* Markdown.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3A1D322960DB0500558C0F /* Markdown.swift */; };
 		4C3A1D3729637E0500558C0F /* PreviewCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3A1D3629637E0500558C0F /* PreviewCache.swift */; };
 		4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3AC79A28306D7B00E1F516 /* Contacts.swift */; };
 		4C3AC79D2833036D00E1F516 /* FollowingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3AC79C2833036D00E1F516 /* FollowingView.swift */; };
 		4C3AC79F2833115300E1F516 /* FollowButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3AC79E2833115300E1F516 /* FollowButtonView.swift */; };
@@ -69,8 +63,6 @@
 		4C3BEFDA281DCA1400B3DE84 /* LikeCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BEFD9281DCA1400B3DE84 /* LikeCounter.swift */; };
 		4C3BEFDC281DCE6100B3DE84 /* Liked.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BEFDB281DCE6100B3DE84 /* Liked.swift */; };
 		4C3BEFE0281DE1ED00B3DE84 /* DamusState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BEFDF281DE1ED00B3DE84 /* DamusState.swift */; };
 		4C3D52B6298DB4E6001C5831 /* ZapEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D52B5298DB4E6001C5831 /* ZapEvent.swift */; };
 		4C3D52B8298DB5C6001C5831 /* TextEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D52B7298DB5C6001C5831 /* TextEvent.swift */; };
 		4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA63C28FF52D600C48A62 /* bolt11.c */; };
 		4C3EA64128FF553900C48A62 /* hash_u5.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA64028FF553900C48A62 /* hash_u5.c */; };
 		4C3EA64428FF558100C48A62 /* sha256.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA64328FF558100C48A62 /* sha256.c */; };
@@ -87,7 +79,6 @@
 		4C3EA67B28FF7B3900C48A62 /* InvoiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67A28FF7B3900C48A62 /* InvoiceTests.swift */; };
 		4C3EA67D28FFBBA300C48A62 /* InvoicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */; };
 		4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */; };
 		4C42812C298C848200DBF26F /* TranslateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C42812B298C848200DBF26F /* TranslateView.swift */; };
 		4C477C9E282C3A4800033AA3 /* TipCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C477C9D282C3A4800033AA3 /* TipCounter.swift */; };
 		4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5C7E67284ED36500A22DF5 /* SearchHomeModel.swift */; };
 		4C5C7E6A284EDE2E00A22DF5 /* SearchResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5C7E69284EDE2E00A22DF5 /* SearchResultsView.swift */; };
@@ -119,36 +110,10 @@
 		4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C987B56283FD07F0042CE38 /* FollowersModel.swift */; };
 		4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */; };
 		4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */; };
 		4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAD8AC298851D000060CEA /* AccountDeletion.swift */; };
 		4CAAD8B029888AD200060CEA /* RelayConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */; };
 		4CACA9D5280C31E100D9BBE8 /* ReplyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */; };
 		4CACA9DC280C38C000D9BBE8 /* Profiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CACA9DB280C38C000D9BBE8 /* Profiles.swift */; };
 		4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */; };
 		4CB55EF5295E679D007FD187 /* UserRelaysView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB55EF4295E679D007FD187 /* UserRelaysView.swift */; };
 		4CB8838629656C8B00DC99E7 /* NIP05.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838529656C8B00DC99E7 /* NIP05.swift */; };
 		4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */; };
 		4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */; };
 		4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838C296F710400DC99E7 /* Reposted.swift */; };
 		4CB8838F296F781C00DC99E7 /* ReactionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838E296F781C00DC99E7 /* ReactionsView.swift */; };
 		4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88392296F798300DC99E7 /* ReactionsModel.swift */; };
 		4CB88396296F7F8B00DC99E7 /* ReactionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88395296F7F8B00DC99E7 /* ReactionView.swift */; };
 		4CB8839A297322D200DC99E7 /* DMTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88399297322D200DC99E7 /* DMTests.swift */; };
 		4CB883A62975F83C00DC99E7 /* LNUrlPayRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883A52975F83C00DC99E7 /* LNUrlPayRequest.swift */; };
 		4CB883A82975FC1800DC99E7 /* Zaps.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883A72975FC1800DC99E7 /* Zaps.swift */; };
 		4CB883AA297612FF00DC99E7 /* ZapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883A9297612FF00DC99E7 /* ZapTests.swift */; };
 		4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883AD2976FA9300DC99E7 /* FormatTests.swift */; };
 		4CB883B0297705DD00DC99E7 /* ZapButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883AF297705DD00DC99E7 /* ZapButton.swift */; };
 		4CB883B6297730E400DC99E7 /* LNUrls.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883B5297730E400DC99E7 /* LNUrls.swift */; };
 		4CBCA930297DB57F00EC6B2F /* WebsiteLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */; };
 		4CC7AAE7297EFA7B00430951 /* Zap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAE6297EFA7B00430951 /* Zap.swift */; };
 		4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */; };
 		4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEC297F0B9E00430951 /* Highlight.swift */; };
 		4CC7AAF0297F11C700430951 /* SelectedEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEF297F11C700430951 /* SelectedEventView.swift */; };
 		4CC7AAF2297F129C00430951 /* EmbeddedEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF1297F129C00430951 /* EmbeddedEventView.swift */; };
 		4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF3297F18B400430951 /* ReplyDescription.swift */; };
 		4CC7AAF6297F1A6A00430951 /* EventBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF5297F1A6A00430951 /* EventBody.swift */; };
 		4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF7297F1CEE00430951 /* EventProfile.swift */; };
 		4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF9297F64AC00430951 /* EventMenu.swift */; };
 		4CD7641B28A1641400B6928F /* EndBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7641A28A1641400B6928F /* EndBlock.swift */; };
 		4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F8CC281352B30009DFBB /* Notifications.swift */; };
 		4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */; };
@@ -170,38 +135,12 @@
 		4CEE2AF7280B2DEA00AB5EEF /* ProfileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */; };
 		4CEE2AF9280B2EAC00AB5EEF /* PowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AF8280B2EAC00AB5EEF /* PowView.swift */; };
 		4CEE2B02280B39E800AB5EEF /* EventActionBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */; };
 		4CF0ABD42980996B00D66079 /* Report.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABD32980996B00D66079 /* Report.swift */; };
 		4CF0ABD629817F5B00D66079 /* ReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABD529817F5B00D66079 /* ReportView.swift */; };
 		4CF0ABD82981980C00D66079 /* Lists.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABD72981980C00D66079 /* Lists.swift */; };
 		4CF0ABDC2981A19E00D66079 /* ListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABDB2981A19E00D66079 /* ListTests.swift */; };
 		4CF0ABDE2981A69500D66079 /* MutelistModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABDD2981A69500D66079 /* MutelistModel.swift */; };
 		4CF0ABE12981A83900D66079 /* MutelistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE02981A83900D66079 /* MutelistView.swift */; };
 		4CF0ABE32981BC7D00D66079 /* UserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE22981BC7D00D66079 /* UserView.swift */; };
 		4CF0ABE52981EE0C00D66079 /* EULAView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE42981EE0C00D66079 /* EULAView.swift */; };
 		4CF0ABE7298444FD00D66079 /* MutedEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE6298444FC00D66079 /* MutedEventView.swift */; };
 		4CF0ABE929844AF100D66079 /* AnyCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE829844AF100D66079 /* AnyCodable.swift */; };
 		4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABEB29844B4700D66079 /* AnyDecodable.swift */; };
 		4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABED29844B5500D66079 /* AnyEncodable.swift */; };
 		4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABEF29857E9200D66079 /* Bech32Object.swift */; };
 		4CF0ABF62985CD5500D66079 /* UserSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABF52985CD5500D66079 /* UserSearch.swift */; };
 		4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FE60CDC295E1C5E00105A1F /* Wallet.swift */; };
 		5C513FBA297F72980072348F /* CustomPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FB9297F72980072348F /* CustomPicker.swift */; };
 		5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FCB2984ACA60072348F /* QRCodeView.swift */; };
 		6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6439E013296790CF0020672B /* ProfileZoomView.swift */; };
 		647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D9A8C2968520300A295DE /* SideMenuView.swift */; };
 		64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FBD06E296255C400D9D3B2 /* Theme.swift */; };
 		6C7DE41F2955169800E66263 /* Vault in Frameworks */ = {isa = PBXBuildFile; productRef = 6C7DE41E2955169800E66263 /* Vault */; };
 		7C45AE71297353390031D7BC /* KFImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C45AE70297353390031D7BC /* KFImageModel.swift */; };
 		7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C60CAEE298471A1009C80D6 /* CoreSVG.swift */; };
 		7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */; };
 		9609F058296E220800069BF3 /* BannerImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9609F057296E220800069BF3 /* BannerImageView.swift */; };
 		BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA693073295D649800ADDB87 /* UserSettingsStore.swift */; };
 		BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */; };
 		DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */; };
 		E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990020E2955F837003BBC5A /* EditMetadataView.swift */; };
 		E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */; };
 		F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */; };
 		F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA262978E54D009531F3 /* ParicipantsView.swift */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -226,45 +165,8 @@
 		3169CAE5294E69C000EE4006 /* EmptyTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyTimelineView.swift; sourceTree = "<group>"; };
 		3169CAEC294FCCFC00EE4006 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Constants.swift; path = damus/Util/Constants.swift; sourceTree = SOURCE_ROOT; };
 		31D2E846295218AF006D67F8 /* Shimmer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shimmer.swift; sourceTree = "<group>"; };
-		3A185A04297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A4325A92961E11400BFCD9D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3A185A05297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A185A06297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "lv-LV"; path = "lv-LV.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A2B8B0A296A8982009CC16D /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "en-US"; path = "en-US.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A4F3320297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A4F3321297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A4F3322297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "fr-FR"; path = "fr-FR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A5C4575296A879E0032D398 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "es-419"; path = "es-419.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A5CAE1D298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A5CAE1E298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A5CAE1F298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-CN"; path = "zh-CN.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A929C20297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A929C21297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A929C22297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "it-IT"; path = "it-IT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A93342929884CA600D6A8F3 /* pl-PL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pl-PL"; path = "pl-PL.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A93342A29884CA600D6A8F3 /* pl-PL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pl-PL"; path = "pl-PL.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A93342B29884CA600D6A8F3 /* pl-PL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "pl-PL"; path = "pl-PL.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A96D41A298DA94500388A2A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3A96D41B298DA94500388A2A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A96D41C298DA94500388A2A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = nl; path = nl.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3AA247FC297E3CFF0090C62D /* RepostsModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RepostsModel.swift; sourceTree = "<group>"; };
 		3AA247FE297E3D900090C62D /* RepostsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostsView.swift; sourceTree = "<group>"; };
 		3AA24801297E3DC20090C62D /* RepostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostView.swift; sourceTree = "<group>"; };
 		3AB5B86A2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3AB5B86B2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3AB5B86C2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3AC524EE298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3AC524EF298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3AC524F0298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ar; path = ar.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3ACB685B297633BC00C46468 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3ACB685E297633BC00C46468 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeAgoTests.swift; sourceTree = "<group>"; };
 		3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibreTranslateServer.swift; sourceTree = "<group>"; };
 		3AEB8003297CCEA800713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "tr-TR"; path = "tr-TR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3AEB8004297CCEA800713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "tr-TR"; path = "tr-TR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3AEB8005297CCEA900713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "tr-TR"; path = "tr-TR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3AF6336829884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3AF6336929884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3AF6336A29884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "pt-PT"; path = "pt-PT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		4C06670028FC7C5900038D2A /* RelayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayView.swift; sourceTree = "<group>"; };
 		4C06670528FCB08600038D2A /* ImageCarousel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCarousel.swift; sourceTree = "<group>"; };
 		4C06670828FDE64700038D2A /* damus-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "damus-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -276,6 +178,7 @@
 		4C0A3F8E280F640A000448DE /* ThreadModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadModel.swift; sourceTree = "<group>"; };
 		4C0A3F90280F6528000448DE /* ChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatView.swift; sourceTree = "<group>"; };
 		4C0A3F92280F66F5000448DE /* ReplyMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyMap.swift; sourceTree = "<group>"; };
 		4C0A3F94280F6C78000448DE /* ReplyQuoteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyQuoteView.swift; sourceTree = "<group>"; };
 		4C0A3F96280F8E02000448DE /* ThreadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadView.swift; sourceTree = "<group>"; };
 		4C216F31286E388800040376 /* DMChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMChatView.swift; sourceTree = "<group>"; };
 		4C216F33286F5ACD00040376 /* DMView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMView.swift; sourceTree = "<group>"; };
@@ -304,7 +207,6 @@
 		4C363AA328296DEE006E126D /* SearchModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchModel.swift; sourceTree = "<group>"; };
 		4C363AA728297703006E126D /* InsertSort.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InsertSort.swift; sourceTree = "<group>"; };
 		4C3A1D322960DB0500558C0F /* Markdown.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Markdown.swift; sourceTree = "<group>"; };
 		4C3A1D3629637E0500558C0F /* PreviewCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewCache.swift; sourceTree = "<group>"; };
 		4C3AC79A28306D7B00E1F516 /* Contacts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contacts.swift; sourceTree = "<group>"; };
 		4C3AC79C2833036D00E1F516 /* FollowingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowingView.swift; sourceTree = "<group>"; };
 		4C3AC79E2833115300E1F516 /* FollowButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowButtonView.swift; sourceTree = "<group>"; };
@@ -317,8 +219,6 @@
 		4C3BEFD9281DCA1400B3DE84 /* LikeCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LikeCounter.swift; sourceTree = "<group>"; };
 		4C3BEFDB281DCE6100B3DE84 /* Liked.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Liked.swift; sourceTree = "<group>"; };
 		4C3BEFDF281DE1ED00B3DE84 /* DamusState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusState.swift; sourceTree = "<group>"; };
 		4C3D52B5298DB4E6001C5831 /* ZapEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapEvent.swift; sourceTree = "<group>"; };
 		4C3D52B7298DB5C6001C5831 /* TextEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEvent.swift; sourceTree = "<group>"; };
 		4C3EA63B28FF52D600C48A62 /* bolt11.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bolt11.h; sourceTree = "<group>"; };
 		4C3EA63C28FF52D600C48A62 /* bolt11.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = bolt11.c; sourceTree = "<group>"; };
 		4C3EA63E28FF54BD00C48A62 /* short_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = short_types.h; sourceTree = "<group>"; };
@@ -364,7 +264,6 @@
 		4C3EA67A28FF7B3900C48A62 /* InvoiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoiceTests.swift; sourceTree = "<group>"; };
 		4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoicesView.swift; sourceTree = "<group>"; };
 		4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoiceView.swift; sourceTree = "<group>"; };
 		4C42812B298C848200DBF26F /* TranslateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslateView.swift; sourceTree = "<group>"; };
 		4C477C9D282C3A4800033AA3 /* TipCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipCounter.swift; sourceTree = "<group>"; };
 		4C4A3A5A288A1B2200453788 /* damus.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = damus.entitlements; sourceTree = "<group>"; };
 		4C5C7E67284ED36500A22DF5 /* SearchHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHomeModel.swift; sourceTree = "<group>"; };
@@ -397,36 +296,10 @@
 		4C987B56283FD07F0042CE38 /* FollowersModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowersModel.swift; sourceTree = "<group>"; };
 		4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatroomMetadata.swift; sourceTree = "<group>"; };
 		4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineView.swift; sourceTree = "<group>"; };
 		4CAAD8AC298851D000060CEA /* AccountDeletion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDeletion.swift; sourceTree = "<group>"; };
 		4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayConfigView.swift; sourceTree = "<group>"; };
 		4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyView.swift; sourceTree = "<group>"; };
 		4CACA9DB280C38C000D9BBE8 /* Profiles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Profiles.swift; sourceTree = "<group>"; };
 		4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendedRelayView.swift; sourceTree = "<group>"; };
 		4CB55EF4295E679D007FD187 /* UserRelaysView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserRelaysView.swift; sourceTree = "<group>"; };
 		4CB8838529656C8B00DC99E7 /* NIP05.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP05.swift; sourceTree = "<group>"; };
 		4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailBar.swift; sourceTree = "<group>"; };
 		4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP05Badge.swift; sourceTree = "<group>"; };
 		4CB8838C296F710400DC99E7 /* Reposted.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Reposted.swift; sourceTree = "<group>"; };
 		4CB8838E296F781C00DC99E7 /* ReactionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionsView.swift; sourceTree = "<group>"; };
 		4CB88392296F798300DC99E7 /* ReactionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionsModel.swift; sourceTree = "<group>"; };
 		4CB88395296F7F8B00DC99E7 /* ReactionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionView.swift; sourceTree = "<group>"; };
 		4CB88399297322D200DC99E7 /* DMTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMTests.swift; sourceTree = "<group>"; };
 		4CB883A52975F83C00DC99E7 /* LNUrlPayRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LNUrlPayRequest.swift; sourceTree = "<group>"; };
 		4CB883A72975FC1800DC99E7 /* Zaps.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Zaps.swift; sourceTree = "<group>"; };
 		4CB883A9297612FF00DC99E7 /* ZapTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapTests.swift; sourceTree = "<group>"; };
 		4CB883AD2976FA9300DC99E7 /* FormatTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormatTests.swift; sourceTree = "<group>"; };
 		4CB883AF297705DD00DC99E7 /* ZapButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapButton.swift; sourceTree = "<group>"; };
 		4CB883B5297730E400DC99E7 /* LNUrls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LNUrls.swift; sourceTree = "<group>"; };
 		4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteLink.swift; sourceTree = "<group>"; };
 		4CC7AAE6297EFA7B00430951 /* Zap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Zap.swift; sourceTree = "<group>"; };
 		4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuilderEventView.swift; sourceTree = "<group>"; };
 		4CC7AAEC297F0B9E00430951 /* Highlight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Highlight.swift; sourceTree = "<group>"; };
 		4CC7AAEF297F11C700430951 /* SelectedEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectedEventView.swift; sourceTree = "<group>"; };
 		4CC7AAF1297F129C00430951 /* EmbeddedEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmbeddedEventView.swift; sourceTree = "<group>"; };
 		4CC7AAF3297F18B400430951 /* ReplyDescription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDescription.swift; sourceTree = "<group>"; };
 		4CC7AAF5297F1A6A00430951 /* EventBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventBody.swift; sourceTree = "<group>"; };
 		4CC7AAF7297F1CEE00430951 /* EventProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventProfile.swift; sourceTree = "<group>"; };
 		4CC7AAF9297F64AC00430951 /* EventMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventMenu.swift; sourceTree = "<group>"; };
 		4CD7641A28A1641400B6928F /* EndBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndBlock.swift; sourceTree = "<group>"; };
 		4CE4F8CC281352B30009DFBB /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
 		4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigView.swift; sourceTree = "<group>"; };
@@ -451,37 +324,11 @@
 		4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileName.swift; sourceTree = "<group>"; };
 		4CEE2AF8280B2EAC00AB5EEF /* PowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowView.swift; sourceTree = "<group>"; };
 		4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventActionBar.swift; sourceTree = "<group>"; };
 		4CF0ABD32980996B00D66079 /* Report.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Report.swift; sourceTree = "<group>"; };
 		4CF0ABD529817F5B00D66079 /* ReportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportView.swift; sourceTree = "<group>"; };
 		4CF0ABD72981980C00D66079 /* Lists.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Lists.swift; sourceTree = "<group>"; };
 		4CF0ABDB2981A19E00D66079 /* ListTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTests.swift; sourceTree = "<group>"; };
 		4CF0ABDD2981A69500D66079 /* MutelistModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutelistModel.swift; sourceTree = "<group>"; };
 		4CF0ABE02981A83900D66079 /* MutelistView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutelistView.swift; sourceTree = "<group>"; };
 		4CF0ABE22981BC7D00D66079 /* UserView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserView.swift; sourceTree = "<group>"; };
 		4CF0ABE42981EE0C00D66079 /* EULAView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EULAView.swift; sourceTree = "<group>"; };
 		4CF0ABE6298444FC00D66079 /* MutedEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutedEventView.swift; sourceTree = "<group>"; };
 		4CF0ABE829844AF100D66079 /* AnyCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyCodable.swift; sourceTree = "<group>"; };
 		4CF0ABEB29844B4700D66079 /* AnyDecodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyDecodable.swift; sourceTree = "<group>"; };
 		4CF0ABED29844B5500D66079 /* AnyEncodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyEncodable.swift; sourceTree = "<group>"; };
 		4CF0ABEF29857E9200D66079 /* Bech32Object.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bech32Object.swift; sourceTree = "<group>"; };
 		4CF0ABF52985CD5500D66079 /* UserSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSearch.swift; sourceTree = "<group>"; };
 		4FE60CDC295E1C5E00105A1F /* Wallet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wallet.swift; sourceTree = "<group>"; };
 		5C513FB9297F72980072348F /* CustomPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPicker.swift; sourceTree = "<group>"; };
 		5C513FCB2984ACA60072348F /* QRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeView.swift; sourceTree = "<group>"; };
 		6439E013296790CF0020672B /* ProfileZoomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileZoomView.swift; sourceTree = "<group>"; };
 		647D9A8C2968520300A295DE /* SideMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuView.swift; sourceTree = "<group>"; };
 		64FBD06E296255C400D9D3B2 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
 		7C45AE70297353390031D7BC /* KFImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KFImageModel.swift; sourceTree = "<group>"; };
 		7C60CAEE298471A1009C80D6 /* CoreSVG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreSVG.swift; sourceTree = "<group>"; };
 		7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomableScrollView.swift; sourceTree = "<group>"; };
 		9609F057296E220800069BF3 /* BannerImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerImageView.swift; sourceTree = "<group>"; };
 		BA693073295D649800ADDB87 /* UserSettingsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettingsStore.swift; sourceTree = "<group>"; };
 		BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectWalletView.swift; sourceTree = "<group>"; };
 		DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownTests.swift; sourceTree = "<group>"; };
 		E990020E2955F837003BBC5A /* EditMetadataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMetadataView.swift; sourceTree = "<group>"; };
 		E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadV2View.swift; sourceTree = "<group>"; };
 		F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeToDismiss.swift; sourceTree = "<group>"; };
 		F7F0BA262978E54D009531F3 /* ParicipantsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParicipantsView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -521,14 +368,6 @@
 			path = "Empty Views";
 			sourceTree = "<group>";
 		};
 		3AA24800297E3DAE0090C62D /* Reposts */ = {
 			isa = PBXGroup;
 			children = (
 				3AA24801297E3DC20090C62D /* RepostView.swift */,
 			);
 			path = Reposts;
 			sourceTree = "<group>";
 		};
 		4C06670728FDE62900038D2A /* damus-c */ = {
 			isa = PBXGroup;
 			children = (
@@ -586,7 +425,6 @@
 		4C0A3F8D280F63FF000448DE /* Models */ = {
 			isa = PBXGroup;
 			children = (
 				3AA247FC297E3CFF0090C62D /* RepostsModel.swift */,
 				4C0A3F8E280F640A000448DE /* ThreadModel.swift */,
 				4C0A3F92280F66F5000448DE /* ReplyMap.swift */,
 				4C3BEFD12819DB9B00B3DE84 /* ProfileModel.swift */,
@@ -616,11 +454,6 @@
 				4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */,
 				BA693073295D649800ADDB87 /* UserSettingsStore.swift */,
 				4FE60CDC295E1C5E00105A1F /* Wallet.swift */,
 				4CB88392296F798300DC99E7 /* ReactionsModel.swift */,
 				7C45AE70297353390031D7BC /* KFImageModel.swift */,
 				4CF0ABD32980996B00D66079 /* Report.swift */,
 				4CF0ABDD2981A69500D66079 /* MutelistModel.swift */,
 				3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -628,61 +461,49 @@
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				4CAAD8AE29888A9B00060CEA /* Relays */,
+				3169CAE4294E699400EE4006 /* Empty Views */,
-				4CF0ABF42985CD4200D66079 /* Posting */,
+				4C75EFA327FA577B0006080F /* PostView.swift */,
-				4CF0ABDF2981A83000D66079 /* Muting */,
+				4C75EFAC28049CFB0006080F /* PostButton.swift */,
-				4CC7AAEE297F11B300430951 /* Events */,
+				4C75EFB82804A2740006080F /* EventView.swift */,
-				3AA24800297E3DAE0090C62D /* Reposts */,
+				4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */,
-				4CB88394296F7F8100DC99E7 /* Reactions */,
+				4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */,
-				4CB88387296AF97C00DC99E7 /* ActionBar */,
+				4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */,
-				4CE4F9E228528C5200C00DD9 /* AddRelayView.swift */,
+				4CEE2AF8280B2EAC00AB5EEF /* PowView.swift */,
-				4C363A8728236948006E126D /* BlocksView.swift */,
+				4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */,
-				4C285C8128385570008A31F1 /* CarouselView.swift */,
+				4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */,
 				4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */,
 				4C0A3F8B280F5FCA000448DE /* ChatroomView.swift */,
 				4C0A3F90280F6528000448DE /* ChatView.swift */,
-				4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */,
+				4C0A3F94280F6C78000448DE /* ReplyQuoteView.swift */,
 				4C0A3F96280F8E02000448DE /* ThreadView.swift */,
 				4C8682862814DE470026224F /* ProfileView.swift */,
 				4C363A8728236948006E126D /* BlocksView.swift */,
 				4C363A8928236B57006E126D /* MentionView.swift */,
 				4C363A8B28236B92006E126D /* PubkeyView.swift */,
 				4C363A8D28236FE4006E126D /* NoteContentView.swift */,
 				4C363AA128296A7E006E126D /* SearchView.swift */,
 				4C3AC79C2833036D00E1F516 /* FollowingView.swift */,
 				4C3AC79E2833115300E1F516 /* FollowButtonView.swift */,
 				4C3AC7A02835A81400E1F516 /* SetupView.swift */,
 				4C3AC7A42836987600E1F516 /* MainTabView.swift */,
 				4C3AC7A628369BA200E1F516 /* SearchHomeView.swift */,
 				4C285C8128385570008A31F1 /* CarouselView.swift */,
 				4C285C8328385690008A31F1 /* CreateAccountView.swift */,
 				4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */,
 				4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */,
 				4C90BD17283A9EE5008EE7EF /* LoginView.swift */,
 				4C5C7E69284EDE2E00A22DF5 /* SearchResultsView.swift */,
 				4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */,
 				4CE4F9E228528C5200C00DD9 /* AddRelayView.swift */,
 				4C64987B286D03E000EAE2B3 /* DirectMessagesView.swift */,
 				4C216F31286E388800040376 /* DMChatView.swift */,
 				4C216F33286F5ACD00040376 /* DMView.swift */,
 				4C06670028FC7C5900038D2A /* RelayView.swift */,
 				E990020E2955F837003BBC5A /* EditMetadataView.swift */,
 				3169CAE4294E699400EE4006 /* Empty Views */,
 				4C75EFB82804A2740006080F /* EventView.swift */,
 				4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */,
 				4C3AC79E2833115300E1F516 /* FollowButtonView.swift */,
 				4C3AC79C2833036D00E1F516 /* FollowingView.swift */,
 				4C90BD17283A9EE5008EE7EF /* LoginView.swift */,
 				4C363A8928236B57006E126D /* MentionView.swift */,
 				4C363A8D28236FE4006E126D /* NoteContentView.swift */,
 				4C75EFAC28049CFB0006080F /* PostButton.swift */,
 				4C75EFA327FA577B0006080F /* PostView.swift */,
 				4CEE2AF8280B2EAC00AB5EEF /* PowView.swift */,
 				4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */,
 				4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */,
 				4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */,
 				4C8682862814DE470026224F /* ProfileView.swift */,
 				4C3AC7A42836987600E1F516 /* MainTabView.swift */,
 				4C363A8B28236B92006E126D /* PubkeyView.swift */,
 				4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */,
 				F7F0BA262978E54D009531F3 /* ParicipantsView.swift */,
 				4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */,
 				4C3AC7A628369BA200E1F516 /* SearchHomeView.swift */,
 				4C5C7E69284EDE2E00A22DF5 /* SearchResultsView.swift */,
 				4C363AA128296A7E006E126D /* SearchView.swift */,
 				BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */,
 				4C3AC7A02835A81400E1F516 /* SetupView.swift */,
 				E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */,
-				4C0A3F96280F8E02000448DE /* ThreadView.swift */,
+				4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */,
 				4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */,
 				4CB55EF4295E679D007FD187 /* UserRelaysView.swift */,
 				647D9A8C2968520300A295DE /* SideMenuView.swift */,
 				9609F057296E220800069BF3 /* BannerImageView.swift */,
 				4CB8838E296F781C00DC99E7 /* ReactionsView.swift */,
 				6439E013296790CF0020672B /* ProfileZoomView.swift */,
 				4CF0ABD529817F5B00D66079 /* ReportView.swift */,
 				4CF0ABE42981EE0C00D66079 /* EULAView.swift */,
 				3AA247FE297E3D900090C62D /* RepostsView.swift */,
 				5C513FCB2984ACA60072348F /* QRCodeView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -710,8 +531,6 @@
 		4C7FF7D628233637009601DB /* Util */ = {
 			isa = PBXGroup;
 			children = (
 				4CF0ABEA29844B2F00D66079 /* AnyCodable */,
 				4CC7AAE6297EFA7B00430951 /* Zap.swift */,
 				4C3A1D322960DB0500558C0F /* Markdown.swift */,
 				4CEE2AF4280B29E600AB5EEF /* TimeAgo.swift */,
 				4CE4F8CC281352B30009DFBB /* Notifications.swift */,
@@ -723,64 +542,10 @@
 				4C216F352870A9A700040376 /* InputDismissKeyboard.swift */,
 				3169CAEC294FCCFC00EE4006 /* Constants.swift */,
 				3165648A295B70D500C64604 /* LinkView.swift */,
 				4C3A1D3629637E0500558C0F /* PreviewCache.swift */,
 				64FBD06E296255C400D9D3B2 /* Theme.swift */,
 				4CB8838529656C8B00DC99E7 /* NIP05.swift */,
 				4CF0ABD72981980C00D66079 /* Lists.swift */,
 				4CF0ABEF29857E9200D66079 /* Bech32Object.swift */,
 				7C60CAEE298471A1009C80D6 /* CoreSVG.swift */,
 				4CAAD8AC298851D000060CEA /* AccountDeletion.swift */,
 				4CB883A52975F83C00DC99E7 /* LNUrlPayRequest.swift */,
 				4CB883A72975FC1800DC99E7 /* Zaps.swift */,
 				4CB883B5297730E400DC99E7 /* LNUrls.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
 		};
 		4CAAD8AE29888A9B00060CEA /* Relays */ = {
 			isa = PBXGroup;
 			children = (
 				4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */,
 				4C06670028FC7C5900038D2A /* RelayView.swift */,
 				4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */,
 			);
 			path = Relays;
 			sourceTree = "<group>";
 		};
 		4CB88387296AF97C00DC99E7 /* ActionBar */ = {
 			isa = PBXGroup;
 			children = (
 				4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */,
 				4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */,
 			);
 			path = ActionBar;
 			sourceTree = "<group>";
 		};
 		4CB88394296F7F8100DC99E7 /* Reactions */ = {
 			isa = PBXGroup;
 			children = (
 				4CB88395296F7F8B00DC99E7 /* ReactionView.swift */,
 			);
 			path = Reactions;
 			sourceTree = "<group>";
 		};
 		4CC7AAEE297F11B300430951 /* Events */ = {
 			isa = PBXGroup;
 			children = (
 				4CC7AAEF297F11C700430951 /* SelectedEventView.swift */,
 				4CC7AAF1297F129C00430951 /* EmbeddedEventView.swift */,
 				4CC7AAF3297F18B400430951 /* ReplyDescription.swift */,
 				4CC7AAF5297F1A6A00430951 /* EventBody.swift */,
 				4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */,
 				4CC7AAF7297F1CEE00430951 /* EventProfile.swift */,
 				4CC7AAF9297F64AC00430951 /* EventMenu.swift */,
 				4CF0ABE6298444FC00D66079 /* MutedEventView.swift */,
 				4C3D52B5298DB4E6001C5831 /* ZapEvent.swift */,
 				4C3D52B7298DB5C6001C5831 /* TextEvent.swift */,
 			);
 			path = Events;
 			sourceTree = "<group>";
 		};
 		4CE4F9DF285287A000C00DD9 /* Components */ = {
 			isa = PBXGroup;
 			children = (
@@ -790,15 +555,6 @@
 				4C06670528FCB08600038D2A /* ImageCarousel.swift */,
 				4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */,
 				4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */,
 				4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */,
 				4CB8838C296F710400DC99E7 /* Reposted.swift */,
 				4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */,
 				4CC7AAEC297F0B9E00430951 /* Highlight.swift */,
 				5C513FB9297F72980072348F /* CustomPicker.swift */,
 				4CF0ABE22981BC7D00D66079 /* UserView.swift */,
 				7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */,
 				4CB883AF297705DD00DC99E7 /* ZapButton.swift */,
 				4C42812B298C848200DBF26F /* TranslateView.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -828,15 +584,12 @@
 		4CE6DEE527F7A08100C66700 /* damus */ = {
 			isa = PBXGroup;
 			children = (
 				F7F0BA23297892AE009531F3 /* Modifiers */,
 				4C4A3A5A288A1B2200453788 /* damus.entitlements */,
 				4CE4F9DF285287A000C00DD9 /* Components */,
 				4C7FF7D628233637009601DB /* Util */,
 				4C0A3F8D280F63FF000448DE /* Models */,
 				4C75EFAB28049CC80006080F /* Nostr */,
 				4C75EFA72804823E0006080F /* Info.plist */,
 				3ACB685D297633BC00C46468 /* Localizable.strings */,
 				3ACB685A297633BC00C46468 /* InfoPlist.strings */,
 				4C75EFA227FA576C0006080F /* Views */,
 				4CE6DEE627F7A08100C66700 /* damusApp.swift */,
 				4CE6DEE827F7A08100C66700 /* ContentView.swift */,
@@ -858,17 +611,12 @@
 		4CE6DEF627F7A08200C66700 /* damusTests */ = {
 			isa = PBXGroup;
 			children = (
 				DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */,
 				4C90BD1B283AC38E008EE7EF /* Bech32Tests.swift */,
 				4C363A9F2828A8DD006E126D /* LikeTests.swift */,
 				4C363A9D2828A822006E126D /* ReplyTests.swift */,
 				4CE6DEF727F7A08200C66700 /* damusTests.swift */,
 				4C3EA67A28FF7B3900C48A62 /* InvoiceTests.swift */,
 				3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */,
 				4CB88399297322D200DC99E7 /* DMTests.swift */,
 				4CF0ABDB2981A19E00D66079 /* ListTests.swift */,
 				4CB883A9297612FF00DC99E7 /* ZapTests.swift */,
 				4CB883AD2976FA9300DC99E7 /* FormatTests.swift */,
 			);
 			path = damusTests;
 			sourceTree = "<group>";
@@ -890,40 +638,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		4CF0ABDF2981A83000D66079 /* Muting */ = {
 			isa = PBXGroup;
 			children = (
 				4CF0ABE02981A83900D66079 /* MutelistView.swift */,
 			);
 			path = Muting;
 			sourceTree = "<group>";
 		};
 		4CF0ABEA29844B2F00D66079 /* AnyCodable */ = {
 			isa = PBXGroup;
 			children = (
 				4CF0ABE829844AF100D66079 /* AnyCodable.swift */,
 				4CF0ABEB29844B4700D66079 /* AnyDecodable.swift */,
 				4CF0ABED29844B5500D66079 /* AnyEncodable.swift */,
 			);
 			path = AnyCodable;
 			sourceTree = "<group>";
 		};
 		4CF0ABF42985CD4200D66079 /* Posting */ = {
 			isa = PBXGroup;
 			children = (
 				4CF0ABF52985CD5500D66079 /* UserSearch.swift */,
 			);
 			path = Posting;
 			sourceTree = "<group>";
 		};
 		F7F0BA23297892AE009531F3 /* Modifiers */ = {
 			isa = PBXGroup;
 			children = (
 				F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */,
 			);
 			path = Modifiers;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
@@ -1012,28 +726,18 @@
 			};
 			buildConfigurationList = 4CE6DEDE27F7A08100C66700 /* Build configuration list for PBXProject "damus" */;
 			compatibilityVersion = "Xcode 13.0";
-			developmentRegion = "en-US";
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
 				"es-419",
 				"en-US",
 				"tr-TR",
 				"fr-FR",
 				"lv-LV",
 				"it-IT",
 				de,
 				"pt-PT",
 				"pl-PL",
 				ar,
 				nl,
 				"zh-CN",
 			);
 			mainGroup = 4CE6DEDA27F7A08100C66700;
 			packageReferences = (
 				4CE6DF1027F7A2B300C66700 /* XCRemoteSwiftPackageReference "Starscream" */,
 				4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */,
 				4C06670228FC7EC500038D2A /* XCRemoteSwiftPackageReference "Kingfisher" */,
 				3169CAE9294FCABA00EE4006 /* XCRemoteSwiftPackageReference "Shimmer" */,
 				6C7DE41D2955169800E66263 /* XCRemoteSwiftPackageReference "Vault" */,
 			);
 			productRefGroup = 4CE6DEE427F7A08100C66700 /* Products */;
@@ -1052,9 +756,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				3ACB685F297633BC00C46468 /* Localizable.strings in Resources */,
 				4CE6DEEE27F7A08200C66700 /* Preview Assets.xcassets in Resources */,
 				3ACB685C297633BC00C46468 /* InfoPlist.strings in Resources */,
 				4CE6DEEB27F7A08200C66700 /* Assets.xcassets in Resources */,
 				3A4325A82961E11400BFCD9D /* Localizable.stringsdict in Resources */,
 			);
@@ -1088,48 +790,32 @@
 				4C216F34286F5ACD00040376 /* DMView.swift in Sources */,
 				4C3EA64428FF558100C48A62 /* sha256.c in Sources */,
 				4CE4F9E1285287B800C00DD9 /* TextFieldAlert.swift in Sources */,
 				4CF0ABF62985CD5500D66079 /* UserSearch.swift in Sources */,
 				4C363AA828297703006E126D /* InsertSort.swift in Sources */,
 				4C285C86283892E7008A31F1 /* CreateAccountModel.swift in Sources */,
 				4C64987C286D03E000EAE2B3 /* DirectMessagesView.swift in Sources */,
 				7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */,
 				4C363A8C28236B92006E126D /* PubkeyView.swift in Sources */,
 				4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */,
 				4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
 				4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */,
 				4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */,
 				4C3EA67728FF7A9800C48A62 /* talstr.c in Sources */,
 				4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
 				4CEE2AF5280B29E600AB5EEF /* TimeAgo.swift in Sources */,
 				4C75EFAD28049CFB0006080F /* PostButton.swift in Sources */,
 				4CB55EF5295E679D007FD187 /* UserRelaysView.swift in Sources */,
 				4C363AA228296A7E006E126D /* SearchView.swift in Sources */,
 				4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */,
 				4C285C8A2838B985008A31F1 /* ProfilePictureSelector.swift in Sources */,
 				4C75EFB92804A2740006080F /* EventView.swift in Sources */,
 				3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */,
 				4CB883B6297730E400DC99E7 /* LNUrls.swift in Sources */,
 				4C7FF7D52823313F009601DB /* Mentions.swift in Sources */,
 				4C633350283D40E500B1C9C3 /* HomeModel.swift in Sources */,
 				4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */,
 				4C363A9028247A1D006E126D /* NostrLink.swift in Sources */,
 				4C0A3F8C280F5FCA000448DE /* ChatroomView.swift in Sources */,
 				4C477C9E282C3A4800033AA3 /* TipCounter.swift in Sources */,
 				4C3D52B6298DB4E6001C5831 /* ZapEvent.swift in Sources */,
 				647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */,
 				F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */,
 				4C0A3F91280F6528000448DE /* ChatView.swift in Sources */,
 				4CF0ABE32981BC7D00D66079 /* UserView.swift in Sources */,
 				4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */,
 				4C3D52B8298DB5C6001C5831 /* TextEvent.swift in Sources */,
 				4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */,
 				4C216F382871EDE300040376 /* DirectMessageModel.swift in Sources */,
 				4C75EFA627FF87A20006080F /* Nostr.swift in Sources */,
 				4CB883A62975F83C00DC99E7 /* LNUrlPayRequest.swift in Sources */,
 				4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */,
 				4C285C8E28399BFE008A31F1 /* SaveKeysView.swift in Sources */,
 				F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */,
 				4CB8838F296F781C00DC99E7 /* ReactionsView.swift in Sources */,
 				4C649844285A952100EAE2B3 /* LocalUserConfig.swift in Sources */,
 				4C75EFB328049D640006080F /* NostrEvent.swift in Sources */,
 				4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */,
@@ -1138,79 +824,50 @@
 				4C363A9A28283854006E126D /* Reply.swift in Sources */,
 				BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */,
 				4C90BD18283A9EE5008EE7EF /* LoginView.swift in Sources */,
 				4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */,
 				4C3EA66828FF5F9900C48A62 /* hex.c in Sources */,
 				E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */,
 				4C3BEFDC281DCE6100B3DE84 /* Liked.swift in Sources */,
 				4CF0ABE7298444FD00D66079 /* MutedEventView.swift in Sources */,
 				4CF0ABE12981A83900D66079 /* MutelistView.swift in Sources */,
 				4CB883A82975FC1800DC99E7 /* Zaps.swift in Sources */,
 				4C75EFB128049D510006080F /* NostrResponse.swift in Sources */,
 				4CEE2AF7280B2DEA00AB5EEF /* ProfileName.swift in Sources */,
 				4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */,
 				31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */,
 				4C285C8228385570008A31F1 /* CarouselView.swift in Sources */,
 				4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */,
 				4CEE2B02280B39E800AB5EEF /* EventActionBar.swift in Sources */,
 				4C3BEFE0281DE1ED00B3DE84 /* DamusState.swift in Sources */,
 				7C45AE71297353390031D7BC /* KFImageModel.swift in Sources */,
 				4CF0ABE929844AF100D66079 /* AnyCodable.swift in Sources */,
 				4C0A3F8F280F640A000448DE /* ThreadModel.swift in Sources */,
 				4CC7AAF2297F129C00430951 /* EmbeddedEventView.swift in Sources */,
 				4C3AC79F2833115300E1F516 /* FollowButtonView.swift in Sources */,
 				4CC7AAE7297EFA7B00430951 /* Zap.swift in Sources */,
 				4C3BEFD22819DB9B00B3DE84 /* ProfileModel.swift in Sources */,
 				4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */,
 				BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */,
 				3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */,
 				4CC7AAF0297F11C700430951 /* SelectedEventView.swift in Sources */,
 				4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */,
 				64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */,
 				4C3EA64928FF597700C48A62 /* bech32.c in Sources */,
 				4C90BD162839DB54008EE7EF /* NostrMetadata.swift in Sources */,
 				4C3A1D3729637E0500558C0F /* PreviewCache.swift in Sources */,
 				4C3EA67528FF7A5A00C48A62 /* take.c in Sources */,
 				4C3AC7A12835A81400E1F516 /* SetupView.swift in Sources */,
 				4C06670128FC7C5900038D2A /* RelayView.swift in Sources */,
 				4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */,
 				4CACA9DC280C38C000D9BBE8 /* Profiles.swift in Sources */,
 				4C633352283D419F00B1C9C3 /* SignalModel.swift in Sources */,
 				9609F058296E220800069BF3 /* BannerImageView.swift in Sources */,
 				4C363A94282704FA006E126D /* Post.swift in Sources */,
 				4C216F32286E388800040376 /* DMChatView.swift in Sources */,
 				4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */,
 				4C3EA67928FF7ABF00C48A62 /* list.c in Sources */,
 				4C64987E286D082C00EAE2B3 /* DirectMessagesModel.swift in Sources */,
 				4C363A8828236948006E126D /* BlocksView.swift in Sources */,
 				4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */,
 				4C75EFAF28049D350006080F /* NostrFilter.swift in Sources */,
 				4C3EA64C28FF59AC00C48A62 /* bech32_util.c in Sources */,
 				4C42812C298C848200DBF26F /* TranslateView.swift in Sources */,
 				4C363A9C282838B9006E126D /* EventRef.swift in Sources */,
 				3AA24802297E3DC20090C62D /* RepostView.swift in Sources */,
 				4CD7641B28A1641400B6928F /* EndBlock.swift in Sources */,
 				4C3EA66528FF5F6800C48A62 /* mem.c in Sources */,
 				4CF0ABE52981EE0C00D66079 /* EULAView.swift in Sources */,
 				4CBCA930297DB57F00EC6B2F /* WebsiteLink.swift in Sources */,
 				4CAAD8B029888AD200060CEA /* RelayConfigView.swift in Sources */,
 				4C3EA64128FF553900C48A62 /* hash_u5.c in Sources */,
 				5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */,
 				4C3EA64F28FF59F200C48A62 /* tal.c in Sources */,
 				4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */,
 				4CB88396296F7F8B00DC99E7 /* ReactionView.swift in Sources */,
 				4C8682872814DE470026224F /* ProfileView.swift in Sources */,
 				4C5F9114283D694D0052CD1C /* FollowTarget.swift in Sources */,
 				4CF0ABD629817F5B00D66079 /* ReportView.swift in Sources */,
 				4CB8838629656C8B00DC99E7 /* NIP05.swift in Sources */,
 				4CF0ABD82981980C00D66079 /* Lists.swift in Sources */,
 				4C5C7E6A284EDE2E00A22DF5 /* SearchResultsView.swift in Sources */,
 				7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */,
 				6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */,
 				4CE6DF1627F8DEBF00C66700 /* RelayConnection.swift in Sources */,
 				4C3BEFD6281D995700B3DE84 /* ActionBarModel.swift in Sources */,
 				4C363AA428296DEE006E126D /* SearchModel.swift in Sources */,
 				4CEE2AF3280B25C500AB5EEF /* ProfilePicView.swift in Sources */,
 				4CC7AAF6297F1A6A00430951 /* EventBody.swift in Sources */,
 				4CEE2AF9280B2EAC00AB5EEF /* PowView.swift in Sources */,
 				3165648B295B70D500C64604 /* LinkView.swift in Sources */,
 				4C3BEFD42819DE8F00B3DE84 /* NostrKind.swift in Sources */,
@@ -1222,35 +879,26 @@
 				4C06670E28FDEAA000038D2A /* utf8.c in Sources */,
 				4C3EA66D28FF782800C48A62 /* amount.c in Sources */,
 				4C3AC7A728369BA200E1F516 /* SearchHomeView.swift in Sources */,
 				4CB883B0297705DD00DC99E7 /* ZapButton.swift in Sources */,
 				4C363A922825FCF2006E126D /* ProfileUpdate.swift in Sources */,
 				4C0A3F95280F6C78000448DE /* ReplyQuoteView.swift in Sources */,
 				4C3BEFDA281DCA1400B3DE84 /* LikeCounter.swift in Sources */,
 				4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */,
 				4CF0ABDE2981A69500D66079 /* MutelistModel.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
 				4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */,
 				4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */,
 				4C5F9118283D88E40052CD1C /* FollowingModel.swift in Sources */,
 				4C3EA67D28FFBBA300C48A62 /* InvoicesView.swift in Sources */,
 				4C363A8E28236FE4006E126D /* NoteContentView.swift in Sources */,
 				4C90BD1A283AA67F008EE7EF /* Bech32.swift in Sources */,
 				E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */,
 				5C513FBA297F72980072348F /* CustomPicker.swift in Sources */,
 				4CACA9D5280C31E100D9BBE8 /* ReplyView.swift in Sources */,
 				4C3A1D332960DB0500558C0F /* Markdown.swift in Sources */,
 				4CF0ABD42980996B00D66079 /* Report.swift in Sources */,
 				4C0A3F97280F8E02000448DE /* ThreadView.swift in Sources */,
 				4C06670B28FDE64700038D2A /* damus.c in Sources */,
 				4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */,
 				3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */,
 				3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */,
 				4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */,
 				4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */,
 				4C75EFA427FA577B0006080F /* PostView.swift in Sources */,
 				4C75EFB528049D790006080F /* Relay.swift in Sources */,
 				4CEE2AF1280B216B00AB5EEF /* EventDetailView.swift in Sources */,
 				4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */,
 				4C75EFBB2804A34C0006080F /* ProofOfWork.swift in Sources */,
 				4C3AC7A52836987600E1F516 /* MainTabView.swift in Sources */,
 				3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */,
@@ -1262,16 +910,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */,
 				DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */,
 				4C3EA67B28FF7B3900C48A62 /* InvoiceTests.swift in Sources */,
 				4C363A9E2828A822006E126D /* ReplyTests.swift in Sources */,
 				4CB883AA297612FF00DC99E7 /* ZapTests.swift in Sources */,
 				4CB8839A297322D200DC99E7 /* DMTests.swift in Sources */,
 				4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */,
 				4C363AA02828A8DD006E126D /* LikeTests.swift in Sources */,
 				4C90BD1C283AC38E008EE7EF /* Bech32Tests.swift in Sources */,
 				4CE6DEF827F7A08200C66700 /* damusTests.swift in Sources */,
 				4CF0ABDC2981A19E00D66079 /* ListTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1303,58 +946,11 @@
 		3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */ = {
 			isa = PBXVariantGroup;
 			children = (
-				3A5C4575296A879E0032D398 /* es-419 */,
+				3A4325A92961E11400BFCD9D /* en */,
 				3A2B8B0A296A8982009CC16D /* en-US */,
 				3AEB8005297CCEA900713A25 /* tr-TR */,
 				3A4F3322297CCFEE004B5F72 /* fr-FR */,
 				3A185A06297F2C3800F4BDC0 /* lv-LV */,
 				3A929C22297F2CF80090925E /* it-IT */,
 				3AB5B86C2986D8A3006599D2 /* de */,
 				3AF6336A29884C6B0005672A /* pt-PT */,
 				3A93342B29884CA600D6A8F3 /* pl-PL */,
 				3AC524F0298C000B00693EBF /* ar */,
 				3A96D41C298DA94500388A2A /* nl */,
 				3A5CAE1F298DC0DB00B5334F /* zh-CN */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
 		};
 		3ACB685A297633BC00C46468 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
 				3ACB685B297633BC00C46468 /* es-419 */,
 				3AEB8003297CCEA800713A25 /* tr-TR */,
 				3A4F3320297CCFEE004B5F72 /* fr-FR */,
 				3A185A04297F2C3800F4BDC0 /* lv-LV */,
 				3A929C20297F2CF80090925E /* it-IT */,
 				3AB5B86A2986D8A3006599D2 /* de */,
 				3AF6336829884C6B0005672A /* pt-PT */,
 				3A93342929884CA600D6A8F3 /* pl-PL */,
 				3AC524EE298C000B00693EBF /* ar */,
 				3A96D41A298DA94500388A2A /* nl */,
 				3A5CAE1D298DC0DB00B5334F /* zh-CN */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
 		3ACB685D297633BC00C46468 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
 				3ACB685E297633BC00C46468 /* es-419 */,
 				3AEB8004297CCEA800713A25 /* tr-TR */,
 				3A4F3321297CCFEE004B5F72 /* fr-FR */,
 				3A185A05297F2C3800F4BDC0 /* lv-LV */,
 				3A929C21297F2CF80090925E /* it-IT */,
 				3AB5B86B2986D8A3006599D2 /* de */,
 				3AF6336929884C6B0005672A /* pt-PT */,
 				3A93342A29884CA600D6A8F3 /* pl-PL */,
 				3AC524EF298C000B00693EBF /* ar */,
 				3A96D41B298DA94500388A2A /* nl */,
 				3A5CAE1E298DC0DB00B5334F /* zh-CN */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
 /* Begin XCBuildConfiguration section */
@@ -1362,7 +958,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -1416,7 +1011,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
@@ -1425,7 +1019,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -1472,7 +1065,6 @@
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1486,7 +1078,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1494,7 +1086,6 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -1527,7 +1118,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1535,7 +1126,6 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -1677,6 +1267,14 @@
 /* End XCConfigurationList section */
 /* Begin XCRemoteSwiftPackageReference section */
 		3169CAE9294FCABA00EE4006 /* XCRemoteSwiftPackageReference "Shimmer" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/joshuajhomann/Shimmer";
 			requirement = {
 				branch = master;
 				kind = branch;
 			};
 		};
 		4C06670228FC7EC500038D2A /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/onevcat/Kingfisher";
--- a/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -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,33 +1,6 @@
 {
  "colors" : [
    {
      "color" : {
        "color-space" : "srgb",
        "components" : {
          "alpha" : "1.000",
          "blue" : "0xC5",
          "green" : "0x43",
          "red" : "0xCC"
        }
      },
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "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/DamusBlack.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusBlack.colorset/Contents.json
@@ -1,38 +0,0 @@
 {
  "colors" : [
    {
      "color" : {
        "color-space" : "srgb",
        "components" : {
          "alpha" : "1.000",
          "blue" : "0x00",
          "green" : "0x00",
          "red" : "0x00"
        }
      },
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "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,38 +0,0 @@
 {
  "colors" : [
    {
      "color" : {
        "color-space" : "srgb",
        "components" : {
          "alpha" : "1.000",
          "blue" : "0xFF",
          "green" : "0x4D",
          "red" : "0x4B"
        }
      },
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "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/DamusDarkGrey.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusDarkGrey.colorset/Contents.json
@@ -1,38 +0,0 @@
 {
  "colors" : [
    {
      "color" : {
        "color-space" : "srgb",
        "components" : {
          "alpha" : "1.000",
          "blue" : "0x1E",
          "green" : "0x1C",
          "red" : "0x1C"
        }
      },
      "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/DamusGreen.colorset/Contents.json
+++ b/damus/Assets.xcassets/Colors/DamusGreen.colorset/Contents.json
@@ -1,38 +0,0 @@
 {
  "colors" : [
    {
      "color" : {
        "color-space" : "srgb",
        "components" : {
          "alpha" : "1.000",
          "blue" : "0x4F",
          "green" : "0xC3",
          "red" : "0x66"
        }
      },
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "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,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" : "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,38 +0,0 @@
 {
  "colors" : [
    {
      "color" : {
        "color-space" : "srgb",
        "components" : {
          "alpha" : "1.000",
          "blue" : "0x5F",
          "green" : "0x5F",
          "red" : "0x5F"
        }
      },
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "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,38 +0,0 @@
 {
  "colors" : [
    {
      "color" : {
        "color-space" : "srgb",
        "components" : {
          "alpha" : "1.000",
          "blue" : "0xC5",
          "green" : "0x43",
          "red" : "0xCC"
        }
      },
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "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,38 +0,0 @@
 {
  "colors" : [
    {
      "color" : {
        "color-space" : "srgb",
        "components" : {
          "alpha" : "1.000",
          "blue" : "0xFF",
          "green" : "0xFF",
          "red" : "0xFF"
        }
      },
      "idiom" : "universal"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "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/Profile/Contents.json
+++ b/damus/Assets.xcassets/Profile/Contents.json
@@ -1,6 +0,0 @@
 {
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
 }
--- a/damus/Assets.xcassets/Profile/ic-copy.imageset/Contents.json
+++ b/damus/Assets.xcassets/Profile/ic-copy.imageset/Contents.json
@@ -1,21 +0,0 @@
 {
  "images" : [
    {
      "filename" : "ic-copy.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
 }
--- a/damus/Assets.xcassets/Profile/ic-copy.imageset/ic-copy.png
+++ b/damus/Assets.xcassets/Profile/ic-copy.imageset/ic-copy.png
--- a/damus/Assets.xcassets/Profile/ic-key.imageset/Contents.json
+++ b/damus/Assets.xcassets/Profile/ic-key.imageset/Contents.json
@@ -1,21 +0,0 @@
 {
  "images" : [
    {
      "filename" : "ic-key.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
 }
--- a/damus/Assets.xcassets/Profile/ic-key.imageset/ic-key.png
+++ b/damus/Assets.xcassets/Profile/ic-key.imageset/ic-key.png
--- a/damus/Assets.xcassets/Profile/ic-message.imageset/Contents.json
+++ b/damus/Assets.xcassets/Profile/ic-message.imageset/Contents.json
@@ -1,52 +0,0 @@
 {
  "images" : [
    {
      "filename" : "ic-message-black.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "filename" : "ic-message-white 1.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    },
    {
      "appearances" : [
        {
          "appearance" : "luminosity",
          "value" : "dark"
        }
      ],
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
 }
--- a/damus/Assets.xcassets/Profile/ic-message.imageset/ic-message-black.png
+++ b/damus/Assets.xcassets/Profile/ic-message.imageset/ic-message-black.png
--- a/damus/Assets.xcassets/Profile/ic-message.imageset/ic-message-white
+++ b/damus/Assets.xcassets/Profile/ic-message.imageset/ic-message-white
--- a/damus/Assets.xcassets/Profile/ic-nipverified.imageset/Contents.json
+++ b/damus/Assets.xcassets/Profile/ic-nipverified.imageset/Contents.json
@@ -1,21 +0,0 @@
 {
  "images" : [
    {
      "filename" : "ic-nipverified.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
 }
--- a/damus/Assets.xcassets/Profile/ic-nipverified.imageset/ic-nipverified.png
+++ b/damus/Assets.xcassets/Profile/ic-nipverified.imageset/ic-nipverified.png
--- a/damus/Assets.xcassets/Profile/ic-qr.imageset/Contents.json
+++ b/damus/Assets.xcassets/Profile/ic-qr.imageset/Contents.json
@@ -1,21 +0,0 @@
 {
  "images" : [
    {
      "filename" : "ic-qr.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
 }
--- a/damus/Assets.xcassets/Profile/ic-qr.imageset/ic-qr.png
+++ b/damus/Assets.xcassets/Profile/ic-qr.imageset/ic-qr.png
--- a/damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json
+++ b/damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json
@@ -1,21 +0,0 @@
 {
  "images" : [
    {
      "filename" : "profile-banner.jpeg",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "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/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/ic-lightning.imageset/Contents.json
+++ b/damus/Assets.xcassets/ic-lightning.imageset/Contents.json
@@ -1,21 +0,0 @@
 {
  "images" : [
    {
      "filename" : "ic-lightning.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
 }
--- a/damus/Assets.xcassets/ic-lightning.imageset/ic-lightning.png
+++ b/damus/Assets.xcassets/ic-lightning.imageset/ic-lightning.png
--- a/damus/Assets.xcassets/ic-tick.imageset/Contents.json
+++ b/damus/Assets.xcassets/ic-tick.imageset/Contents.json
@@ -1,21 +0,0 @@
 {
  "images" : [
    {
      "filename" : "ic-tick.png",
      "idiom" : "universal",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
      "scale" : "3x"
    }
  ],
  "info" : {
    "author" : "xcode",
    "version" : 1
  }
 }
--- a/damus/Assets.xcassets/ic-tick.imageset/ic-tick.png
+++ b/damus/Assets.xcassets/ic-tick.imageset/ic-tick.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/Components/CustomPicker.swift
+++ b/damus/Components/CustomPicker.swift
@@ -1,60 +0,0 @@
 //
 //  CustomPicker.swift
 //  damus
 //
 //  Created by Eric Holguin on 1/22/23.
 //
 import SwiftUI
 let RECTANGLE_GRADIENT = LinearGradient(gradient: Gradient(colors: [
    Color("DamusPurple"),
    Color("DamusBlue")
 ]), 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)
            }
        }
    }
    func textColor() -> Color {
        colorScheme == .light ? Color("DamusBlack") : Color("DamusWhite")
    }
 }
--- 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/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
@@ -32,7 +32,7 @@ struct ShareSheet: UIViewControllerRepresentable {
 }
 struct ImageContextMenuModifier: ViewModifier {
-    let url: URL?
+    let url: URL
    let image: UIImage?
    @Binding var showShareSheet: Bool
@@ -41,44 +41,26 @@ struct ImageContextMenuModifier: ViewModifier {
            Button {
                UIPasteboard.general.url = url
            } label: {
-                Label(NSLocalizedString("Copy Image URL", comment: "Context menu option to copy the URL of an image into clipboard."), systemImage: "doc.on.doc")
+                Label("Copy Image URL", systemImage: "doc.on.doc")
            }
            if let someImage = image {
                Button {
                    UIPasteboard.general.image = someImage
                } label: {
-                    Label(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image into clipboard."), systemImage: "photo.on.rectangle")
+                    Label("Copy Image", systemImage: "photo.on.rectangle")
                }
                Button {
                    UIImageWriteToSavedPhotosAlbum(someImage, nil, nil, nil)
                } label: {
                    Label(NSLocalizedString("Save Image", comment: "Context menu option to save an image."), systemImage: "square.and.arrow.down")
                }
            }
            Button {
                showShareSheet = true
            } label: {
-                Label(NSLocalizedString("Share", comment: "Button to share an image."), systemImage: "square.and.arrow.up")
+                Label("Share", systemImage: "square.and.arrow.up")
            }
        }
    }
 }
-private struct ImageContainerView: View {
+struct ImageViewer: View {
-    
+    let urls: [URL]
    @ObservedObject var imageModel: KFImageModel
    @State private var image: UIImage?
    @State private var showShareSheet = false
    init(url: URL?) {
        self.imageModel = KFImageModel(
            url: url,
            fallbackUrl: nil,
            maxByteSize: 2000000, // 2 MB
            downsampleSize: CGSize(width: 400, height: 400)
        )
    }
    private struct ImageHandler: ImageModifier {
        @Binding var handler: UIImage?
@@ -88,131 +70,45 @@ private struct ImageContainerView: View {
            return image
        }
    }
    var body: some View {
        KFAnimatedImage(imageModel.url)
            .callbackQueue(.dispatch(.global(qos: .background)))
            .processingQueue(.dispatch(.global(qos: .background)))
            .cacheOriginalImage()
            .configure { view in
                view.framePreloadCount = 1
            }
            .scaleFactor(UIScreen.main.scale)
            .loadDiskFileSynchronously()
            .fade(duration: 0.1)
            .imageModifier(ImageHandler(handler: $image))
            .onFailure { _ in
                imageModel.downloadFailed()
            }
            .id(imageModel.refreshID)
            .clipped()
            .modifier(ImageContextMenuModifier(url: imageModel.url, image: image, showShareSheet: $showShareSheet))
            .sheet(isPresented: $showShareSheet) {
                ShareSheet(activityItems: [imageModel.url])
            }
        // TODO: Update ImageCarousel with serializer and processor
        // .serialize(by: imageModel.serializer)
        // .setProcessor(imageModel.processor)
    }
 }
-struct ImageView: View {
+    @State private var image: UIImage?
    @State private var showShareSheet = false
-    let urls: [URL?]
+    func onShared(completed: Bool) -> Void {
-    
+        if (completed) {
-    @Environment(\.presentationMode) var presentationMode
+            showShareSheet = false
    @State private var selectedIndex = 0
    @State var showMenu = true
    var safeAreaInsets: UIEdgeInsets? {
        return UIApplication
                .shared
                .connectedScenes
                .flatMap { ($0 as? UIWindowScene)?.windows ?? [] }
                .first { $0.isKeyWindow }?.safeAreaInsets
    }
    var navBarView: some View {
        VStack {
            HStack {
                Text(urls[selectedIndex]?.lastPathComponent ?? "")
                    .bold()
                Spacer()
                Button(action: {
                    presentationMode.wrappedValue.dismiss()
                }, label: {
                    Image(systemName: "xmark")
                })
            }
            .padding()
            Divider()
                .ignoresSafeArea()
        }
        .background(.regularMaterial)
    }
    var tabViewIndicator: some View {
        HStack(spacing: 10) {
            ForEach(urls.indices, id: \.self) { index in
                Capsule()
                    .fill(index == selectedIndex ? Color(UIColor.label) : Color.secondary)
                    .frame(width: 7, height: 7)
            }
        }
        .padding()
        .background(.regularMaterial)
        .clipShape(Capsule())
    }
    var body: some View {
-        ZStack {
+        TabView {
-            Color(.systemBackground)
+            ForEach(urls, id: \.absoluteString) { url in
-                .ignoresSafeArea()
+                VStack{
-            
+                    Text(url.lastPathComponent)
-            TabView(selection: $selectedIndex) {
+                    
-                ForEach(urls.indices, id: \.self) { index in
+                    KFAnimatedImage(url)
-                    ZoomableScrollView {
+                        .configure { view in
-                        ImageContainerView(url: urls[index])
+                            view.framePreloadCount = 3
-                            .aspectRatio(contentMode: .fit)
+                        }
-                            .padding(.top, safeAreaInsets?.top)
+                        .cacheOriginalImage()
-                            .padding(.bottom, safeAreaInsets?.bottom)
+                        .imageModifier(ImageHandler(handler: $image))
-                    }
+                        .loadDiskFileSynchronously()
-                    .modifier(SwipeToDismissModifier(minDistance: 50, onDismiss: {
+                        .scaleFactor(UIScreen.main.scale)
-                        presentationMode.wrappedValue.dismiss()
+                        .fade(duration: 0.1)
-                    }))
+                        .aspectRatio(contentMode: .fit)
-                    .ignoresSafeArea()
+                        .tabItem {
-                    .tag(index)
+                            Text(url.absoluteString)
                        }
                        .id(url.absoluteString)
                        .modifier(ImageContextMenuModifier(url: url, image: image, showShareSheet: $showShareSheet))
                        .sheet(isPresented: $showShareSheet) {
                            ShareSheet(activityItems: [url])
                        }
                }
            }
            .ignoresSafeArea()
            .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never))
            .gesture(TapGesture(count: 2).onEnded {
                // Prevents menu from hiding on double tap
            })
            .gesture(TapGesture(count: 1).onEnded {
                showMenu.toggle()
            })
            .overlay(
                VStack {
                    if showMenu {
                        navBarView
                        Spacer()
                        if (urls.count > 1) {
                            tabViewIndicator
                        }
                    }
                }
                .animation(.easeInOut, value: showMenu)
                .padding(.bottom, safeAreaInsets?.bottom)
            )
        }
        .tabViewStyle(PageTabViewStyle())
    }
 }
@@ -229,22 +125,20 @@ struct ImageCarousel: View {
                    .foregroundColor(Color.clear)
                    .overlay {
                        KFAnimatedImage(url)
-                            .callbackQueue(.dispatch(.global(qos: .background)))
+                            .configure { view in
-                            .processingQueue(.dispatch(.global(qos: .background)))
+                                view.framePreloadCount = 3
                            }
                            .cacheOriginalImage()
                            .loadDiskFileSynchronously()
                            .scaleFactor(UIScreen.main.scale)
                            .fade(duration: 0.1)
                            .configure { view in
                                view.framePreloadCount = 3
                            }
                            .aspectRatio(contentMode: .fit)
                            .tabItem {
                                Text(url.absoluteString)
                            }
                            .id(url.absoluteString)
                            .contextMenu {
-                                Button(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image to clipboard.")) {
+                                Button("Copy Image") {
                                    UIPasteboard.general.string = url.absoluteString
                                }
                            }
@@ -252,8 +146,8 @@ struct ImageCarousel: View {
            }
        }
        .cornerRadius(10)
-        .fullScreenCover(isPresented: $open_sheet) {
+        .sheet(isPresented: $open_sheet) {
-            ImageView(urls: urls)
+            ImageViewer(urls: urls)
        }
        .frame(height: 200)
        .onTapGesture {
@@ -265,6 +159,6 @@ struct ImageCarousel: View {
 struct ImageCarousel_Previews: PreviewProvider {
    static var previews: some View {
-        ImageCarousel(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,84 +7,6 @@
 import SwiftUI
 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(Color("DamusGreen"))
            }
        }
    }
    var PayButton: some View {
        Button {
            if should_show_wallet_selector(our_pubkey) {
                showing_select_wallet = true
            } else {
                open_with_wallet(wallet: get_default_wallet(our_pubkey).model, invoice: invoice.string)
            }
        } label: {
            RoundedRectangle(cornerRadius: 20, style: .circular)
                .foregroundColor(colorScheme == .light ? .black : .white)
                .overlay {
                    Text("Pay", comment: "Button to pay a Lightning invoice.")
                        .fontWeight(.medium)
                        .foregroundColor(colorScheme == .light ? .white : .black)
                }
        }
        .onTapGesture {
            // Temporary solution so that the "pay" button can be clicked (Yes we need an empty tap gesture)
            print("pay button tap")
        }
    }
    var body: some View {
        ZStack {
            RoundedRectangle(cornerRadius: 10)
                .foregroundColor(.secondary.opacity(0.1))
            VStack(alignment: .leading, spacing: 12) {
                HStack {
                    Label("", systemImage: "bolt.fill")
                        .foregroundColor(.orange)
                    Text("Lightning Invoice", comment: "Indicates that the view is for paying a Lightning invoice.")
                    Spacer()
                    CopyButton
                }
                Divider()
                Text(invoice.description_string)
                Text(invoice.amount.amount_sats_str())
                    .font(.title)
                PayButton
                    .frame(height: 50)
                    .zIndex(10.0)
            }
            .padding(30)
        }
        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
            SelectWalletView(showingSelectWallet: $showing_select_wallet, our_pubkey: our_pubkey, invoice: invoice.string)
        }
    }
 }
 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)
@@ -106,12 +28,68 @@ func open_with_wallet(wallet: Wallet.Model, invoice: String) {
    }
 }
 struct InvoiceView: View {
    @Environment(\.colorScheme) var colorScheme
    @Environment(\.openURL) private var openURL
    let invoice: Invoice
    @State var showing_select_wallet: Bool = false
    @ObservedObject var user_settings = UserSettingsStore()
    var PayButton: some View {
        Button {
            if user_settings.show_wallet_selector {
                showing_select_wallet = true
            } else {
                open_with_wallet(wallet: user_settings.default_wallet.model, invoice: invoice.string)
            }
        } label: {
            RoundedRectangle(cornerRadius: 20)
                .foregroundColor(colorScheme == .light ? .black : .white)
                .overlay {
                    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)
        }
    }
    var body: some View {
        ZStack {
            RoundedRectangle(cornerRadius: 10)
                .foregroundColor(.secondary.opacity(0.1))
            VStack(alignment: .leading, spacing: 12) {
                HStack {
                    Label("", systemImage: "bolt.fill")
                        .foregroundColor(.orange)
                    Text("Lightning Invoice")
                }
                Divider()
                Text(invoice.description)
                Text(invoice.amount.amount_sats_str())
                    .font(.title)
                PayButton
                    .frame(height: 50)
                    .zIndex(10.0)
            }
            .padding(30)
        }
        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
            SelectWalletView(showingSelectWallet: $showing_select_wallet, invoice: invoice.string).environmentObject(user_settings)
        }
    }
 }
-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)
+        InvoiceView(invoice: test_invoice)
-            .frame(width: 300, height: 200)
+            .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,65 +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: Color {
       return get_nip05_color(pubkey: pubkey, contacts: contacts)
    }
    var body: some View {
        HStack(spacing: 2) {
            Image(systemName: "checkmark.seal.fill")
                .font(.footnote)
                .foregroundColor(nip05_color)
            if show_domain {
                if clickable {
                    Text(nip05.host)
                        .foregroundColor(nip05_color)
                        .onTapGesture {
                            if let nip5url = nip05.siteUrl {
                                openURL(nip5url)
                            }
                        }
                } else {
                    Text(nip05.host)
                        .foregroundColor(nip05_color)
                }
            }
        }
    }
 }
 func get_nip05_color(pubkey: String, contacts: Contacts) -> Color {
    return contacts.is_friend_or_self(pubkey) ? .accentColor : .gray
 }
 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,34 +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")
                .font(.footnote)
                .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).")
                .font(.footnote)
                .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/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/TranslateView.swift
+++ b/damus/Components/TranslateView.swift
@@ -1,139 +0,0 @@
 //
 //  TranslateButton.swift
 //  damus
 //
 //  Created by William Casarin on 2023-02-02.
 //
 import SwiftUI
 import NaturalLanguage
 struct TranslateView: View {
    let damus_state: DamusState
    let event: NostrEvent
    let size: EventViewKind
    @State var checkingTranslationStatus: Bool = false
    @State var currentLanguage: String = "en"
    @State var noteLanguage: String? = nil
    @State var translated_note: String? = nil
    @State var show_translated_note: Bool = false
    @State var translated_artifacts: NoteArtifacts? = nil
    var TranslateButton: some View {
        Button(NSLocalizedString("Translate Note", comment: "Button to translate note from different language.")) {
            show_translated_note = true
        }
        .translate_button_style()
    }
    func Translated(lang: String, artifacts: NoteArtifacts) -> some View {
        return Group {
            Button(NSLocalizedString("Translated from \(lang)", comment: "Button to indicate that the note has been translated from a different language.")) {
                show_translated_note = false
            }
            .translate_button_style()
            Text(artifacts.content)
                .font(eventviewsize_to_font(size))
                .fixedSize(horizontal: false, vertical: true)
        }
    }
    func CheckingStatus(lang: String) -> some View {
        return Button(NSLocalizedString("Translating from \(lang)...", comment: "Button to indicate that the note is in the process of being translated from a different language.")) {
            show_translated_note = false
        }
        .translate_button_style()
    }
    func MainContent(note_lang: String) -> some View {
        return Group {
            let languageName = Locale.current.localizedString(forLanguageCode: note_lang)
            if let lang = languageName, show_translated_note {
                if checkingTranslationStatus {
                    CheckingStatus(lang: lang)
                } else if let artifacts = translated_artifacts {
                    Translated(lang: lang, artifacts: artifacts)
                }
            } else {
                TranslateButton
            }
        }
    }
    var body: some View {
        Group {
            if let note_lang = noteLanguage, noteLanguage != currentLanguage {
                MainContent(note_lang: note_lang)
            } else {
                Text("")
            }
        }
        .task {
            let translate_url = damus_state.settings.libretranslate_url
            let api_key = damus_state.settings.libretranslate_api_key
            guard noteLanguage == nil && !checkingTranslationStatus && translate_url != "" else {
                return
            }
            checkingTranslationStatus = true
            if #available(iOS 16, *) {
                currentLanguage = Locale.current.language.languageCode?.identifier ?? "en"
            } else {
                currentLanguage = Locale.current.languageCode ?? "en"
            }
            // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in.
            let content = event.get_content(damus_state.keypair.privkey)
            noteLanguage = NLLanguageRecognizer.dominantLanguage(for: content)?.rawValue ?? currentLanguage
            if let lang = noteLanguage, noteLanguage != currentLanguage {
                // If the detected dominant language is a variant, remove the variant component and just take the language part as LibreTranslate typically only supports the variant-less language.
                if #available(iOS 16, *) {
                    noteLanguage = Locale.LanguageCode(stringLiteral: lang).identifier(.alpha2)
                } else {
                    noteLanguage = Locale.canonicalLanguageIdentifier(from: lang)
                }
            }
            guard let note_lang = noteLanguage else {
                noteLanguage = currentLanguage
                translated_note = nil
                checkingTranslationStatus = false
                return
            }
            if note_lang != currentLanguage {
                do {
                    // If the note language is different from our language, send a translation request.
                    let translator = Translator(translate_url, apiKey: api_key)
                    translated_note = try await translator.translate(content, from: note_lang, to: currentLanguage)
                } catch {
                    // If for whatever reason we're not able to figure out the language of the note, or translate the note, fail gracefully and do not retry. It's not the end of the world. Don't want to take down someone's translation server with an accidental denial of service attack.
                    noteLanguage = currentLanguage
                    translated_note = nil
                }
            }
            if let translated = translated_note {
                // Render translated note.
                let blocks = event.get_blocks(content: translated)
                let show_images = should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
                translated_artifacts = render_blocks(blocks: blocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey, show_images: show_images)
            }
            checkingTranslationStatus = false
        }
    }
 }
 struct TranslateView_Previews: PreviewProvider {
    static var previews: some View {
        let ds = test_damus_state()
        TranslateView(damus_state: ds, event: test_event, size: .selected)
    }
 }
--- a/damus/Components/UserView.swift
+++ b/damus/Components/UserView.swift
@@ -1,42 +0,0 @@
 //
 //  UserView.swift
 //  damus
 //
 //  Created by William Casarin on 2023-01-25.
 //
 import SwiftUI
 struct UserView: View {
    let damus_state: DamusState
    let pubkey: String
    var body: some View {
        let pmodel = ProfileModel(pubkey: pubkey, damus: damus_state)
        let followers = FollowersModel(damus_state: damus_state, target: pubkey)
        let pv = ProfileView(damus_state: damus_state, profile: pmodel, followers: followers)
        NavigationLink(destination: pv) {
            ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles, contacts: damus_state.contacts)
            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()
        }
        .buttonStyle(PlainButtonStyle())
    }
 }
 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,38 +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)
            })
        }
    }
    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,129 +0,0 @@
 //
 //  ZapButton.swift
 //  damus
 //
 //  Created by William Casarin on 2023-01-17.
 //
 import SwiftUI
 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
    func send_zap() {
        guard let privkey = damus_state.keypair.privkey 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)
        // TODO: gather comment?
        let content = ""
        let zapreq = make_zap_request_event(pubkey: damus_state.pubkey, privkey: privkey, content: content, relays: relays, target: target)
        zapping = true
        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 {
                    zapping = false
                }
                return
            }
            DispatchQueue.main.async {
                damus_state.lnurls.endpoints[target.pubkey] = payreq
            }
            guard let inv = await fetch_zap_invoice(payreq, zapreq: zapreq, amount: 1000000) else {
                DispatchQueue.main.async {
                    zapping = false
                }
                return
            }
            DispatchQueue.main.async {
                zapping = false
                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)
                }
            }
        }
        //damus_state.pool.send(.event(zapreq))
    }
    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 !zapping {
            return nil
        }
        return Color.yellow
    }
    var body: some View {
        ZStack {
            EventActionButton(img: zap_img, col: zap_color) {
                if bar.zapped {
                    //notify(.delete, bar.our_tip)
                } else if !zapping {
                    send_zap()
                }
            }
            Text("\(bar.zap_total > 0 ? "\(format_msats_abbrev(bar.zap_total))" : "")")
                .offset(x: 22)
                .font(.footnote)
                .foregroundColor(bar.zapped ? Color.orange : Color.gray)
        }
        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
            SelectWalletView(showingSelectWallet: $showing_select_wallet, our_pubkey: damus_state.pubkey, invoice: invoice)
        }
    }
 }
 struct ZapButton_Previews: PreviewProvider {
    static var previews: some View {
        let bar = ActionBarModel(likes: 0, boosts: 0, zaps: 10, zap_total: 15623414, our_like: nil, our_boost: nil, our_zap: nil)
        ZapButton(damus_state: test_damus_state(), event: test_event, lnurl: "lnurl", bar: bar)
    }
 }
--- 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
@@ -11,11 +11,11 @@ import Kingfisher
 var BOOTSTRAP_RELAYS = [
    "wss://relay.damus.io",
-    "wss://eden.nostr.land",
+    "wss://nostr-relay.wlvs.space",
-    "wss://relay.snort.social",
+    "wss://nostr.fmt.wiz.biz",
-    "wss://nostr.orangepill.dev",
+    "wss://relay.nostr.bg",
-    "wss://nos.lol",
+    "wss://nostr.oxtr.dev",
-    "wss://relay.current.fyi",
+    "wss://nostr.v0l.io",
    "wss://brb.io",
 ]
@@ -26,12 +26,10 @@ struct TimestampedProfile {
 enum Sheets: Identifiable {
    case post
    case report(ReportTarget)
    case reply(NostrEvent)
    var id: String {
        switch self {
        case .report: return "report"
        case .post: return "post"
        case .reply(let ev): return "reply-" + ev.id
        }
@@ -46,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 {
@@ -73,7 +62,6 @@ struct ContentView: View {
    @State var damus_state: DamusState? = nil
    @State var selected_timeline: Timeline? = .home
    @State var is_thread_open: Bool = false
    @State var is_deleted_account: Bool = false
    @State var is_profile_open: Bool = false
    @State var event: NostrEvent? = nil
    @State var active_profile: String? = nil
@@ -82,13 +70,9 @@ struct ContentView: View {
    @State var profile_open: Bool = false
    @State var thread_open: Bool = false
    @State var search_open: Bool = false
    @State var blocking: String? = nil
    @State var confirm_block: Bool = false
    @State var user_blocked_confirm: Bool = false
    @State var confirm_overwrite_mutelist: Bool = false
    @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()
@@ -99,30 +83,19 @@ struct ContentView: View {
    var PostingTimelineView: some View {
        VStack {
-            ZStack {
+            TabView(selection: $filter_state) {
-                TabView(selection: $filter_state) {
+                ContentTimelineView
-                    contentTimelineView(filter: FilterState.posts.filter)
+                    .tag(FilterState.posts)
-                        .tag(FilterState.posts)
+                ContentTimelineView
-                        .id(FilterState.posts)
+                    .tag(FilterState.posts_and_replies)
                    contentTimelineView(filter: FilterState.posts_and_replies.filter)
                        .tag(FilterState.posts_and_replies)
                        .id(FilterState.posts_and_replies)
                }
                .tabViewStyle(.page(indexDisplayMode: .never))
                if privkey != nil {
                    PostButtonContainer(is_left_handed: damus_state?.settings.left_handed ?? false) {
                        self.active_sheet = .post
                    }
                }
            }
            .tabViewStyle(.page(indexDisplayMode: .never))
        }
-        .safeAreaInset(edge: .top, spacing: 0) {
+        .safeAreaInset(edge: .top) {
            VStack(spacing: 0) {
-                CustomPicker(selection: $filter_state, content: {
+                FiltersView
-                    Text("Posts", comment: "Label for filter for seeing only posts (instead of posts and replies).").tag(FilterState.posts)
+                    //.frame(maxWidth: 275)
-                    Text("Posts & Replies", comment: "Label for filter for seeing posts and replies (instead of only posts).").tag(FilterState.posts_and_replies)
+                    .padding()
                })
                Divider()
                    .frame(height: 1)
            }
@@ -130,14 +103,37 @@ struct ContentView: View {
        }
    }
-    func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
+    var ContentTimelineView: some View {
        ZStack {
            if let damus = self.damus_state {
-                TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
+                TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter_event)
            }
            if privkey != nil {
                PostButtonContainer {
                    self.active_sheet = .post
                }
            }
        }
    }
    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 filter_event(_ ev: NostrEvent) -> Bool {
        if self.filter_state == .posts {
            return !ev.is_reply(nil)
        }
        return true
    }
    func MainContent(damus: DamusState) -> some View {
        VStack {
            NavigationLink(destination: MaybeProfileView, isActive: $profile_open) {
@@ -158,7 +154,7 @@ struct ContentView: View {
            case .notifications:
                TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
-                    .navigationTitle(NSLocalizedString("Notifications", comment: "Navigation title for notifications."))
+                    .navigationTitle("Notifications")
            case .dms:
                DirectMessagesView(damus_state: damus_state!)
@@ -168,30 +164,7 @@ struct ContentView: View {
                EmptyView()
            }
        }
-        .navigationBarTitle(selected_timeline == .home ?  NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") : NSLocalizedString("Global", comment: "Navigation bar title for Global view where posts from all connected relay servers appear."), displayMode: .inline)
+        .navigationBarTitle(selected_timeline == .home ?  "Home" : "Global", displayMode: .inline)
        .toolbar {
            ToolbarItem(placement: .principal) {
                switch selected_timeline {
                case .home:
                    Image("damus-home")
                    .resizable()
                    .frame(width:30,height:30)
                    .shadow(color: Color("DamusPurple"), radius: 2)
                case .dms:
                    Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
                        .bold()
                case .notifications:
                    Text("Notifications", comment: "Toolbar label for Notifications view.")
                        .bold()
                case .search:
                    Text("Global", comment: "Toolbar label for Global view where posts from all connected relay servers appear.")
                        .bold()
                case .none:
                    Text("", comment: "Toolbar label for unknown views. This label would be displayed only if a new timeline view is added but a toolbar label was not explicitly assigned to it yet.")
                }
            }
        }
        .ignoresSafeArea(.keyboard)
    }
    var MaybeSearchView: some View {
@@ -225,65 +198,51 @@ struct ContentView: View {
            }
        }
    }
-    
+
    func MaybeReportView(target: ReportTarget) -> some View {
        Group {
            if let ds = damus_state {
                if let sec = ds.keypair.privkey {
                    ReportView(pool: ds.pool, target: target, privkey: sec)
                } else {
                    EmptyView()
                }
            } else {
                EmptyView()
            }
        }
    }
    var body: some View {
        VStack(alignment: .leading, spacing: 0) {
            if let damus = self.damus_state {
                NavigationView {
-                    ZStack {
+                    MainContent(damus: damus)
-                        VStack {
+                        .toolbar {
-                            MainContent(damus: damus)
+                            ToolbarItem(placement: .navigationBarLeading) {
-                                .toolbar() {
+                                let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!)
-                                    ToolbarItem(placement: .navigationBarLeading) {
+                                let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey)
-                                        Button {
+                                let prof_dest = ProfileView(damus_state: damus_state!, profile: profile_model, followers: followers_model)
                                            isSideBarOpened.toggle()
                                        } label: {
                                            ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles, contacts: damus_state!.contacts)
                                        }
                                    }
                                    ToolbarItem(placement: .navigationBarTrailing) {
                                        HStack(alignment: .center) {
                                            if home.signal.signal != home.signal.max_signal {
                                                NavigationLink(destination: RelayConfigView(state: damus_state!)) {
                                                    Text("\(home.signal.signal)/\(home.signal.max_signal)", comment: "Fraction of how many of the user's relay servers that are operational.")
                                                        .font(.callout)
                                                        .foregroundColor(.gray)
                                                }
                                            }
-                                        }
+                                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")
                                    }
                                }
                                .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())
                                }
                            }
                        }
                        Color.clear
                        .overlay(
                            SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened)
                        )
                    }
                    .navigationBarHidden(isSideBarOpened ? true: false) // Would prefer a different way of doing this.
                }
                .navigationViewStyle(.stack)
                TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
                    .padding([.bottom], 8)
            }
            TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline)
                .padding([.bottom], 8)
        }
        .onAppear() {
            self.connect()
@@ -292,10 +251,8 @@ struct ContentView: View {
        }
        .sheet(item: $active_sheet) { item in
            switch item {
            case .report(let target):
                MaybeReportView(target: target)
            case .post:
-                PostView(replying_to: nil, references: [], damus_state: damus_state!)
+                PostView(replying_to: nil, references: [])
            case .reply(let event):
                ReplyView(replying_to: event, damus: damus_state!)
            }
@@ -326,6 +283,7 @@ struct ContentView: View {
            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))
@@ -341,18 +299,6 @@ 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(.block)) { notif in
            let pubkey = notif.object as! String
            self.blocking = pubkey
            self.confirm_block = true
        }
        .onReceive(handle_notify(.broadcast_event)) { obj in
            let ev = obj.object as! NostrEvent
            self.damus_state?.pool.send(.event(ev))
@@ -370,10 +316,10 @@ struct ContentView: View {
            let pk = target.pubkey
            if let ev = unfollow_user(pool: damus.pool,
-                                      our_contacts: damus.contacts.event,
+                             our_contacts: damus.contacts.event,
-                                      pubkey: damus.pubkey,
+                             pubkey: damus.pubkey,
-                                      privkey: privkey,
+                             privkey: privkey,
-                                      unfollow: pk) {
+                             unfollow: pk) {
                notify(.unfollowed, pk)
                damus.contacts.event = ev
@@ -392,10 +338,10 @@ struct ContentView: View {
            }
            if let ev = follow_user(pool: damus.pool,
-                                    our_contacts: damus.contacts.event,
+                           our_contacts: damus.contacts.event,
-                                    pubkey: damus.pubkey,
+                           pubkey: damus.pubkey,
-                                    privkey: privkey,
+                           privkey: privkey,
-                                    follow: ReferencedId(ref_id: fnotify.pubkey, relay_id: nil, key: "p")) {
+                           follow: ReferencedId(ref_id: fnotify.pubkey, relay_id: nil, key: "p")) {
                notify(.followed, fnotify.pubkey)
                damus_state?.contacts.event = ev
@@ -427,96 +373,6 @@ struct ContentView: View {
        .onReceive(timer) { n in
            self.damus_state?.pool.connect_to_disconnected()
        }
        .onReceive(handle_notify(.new_mutes)) { notif in
            home.filter_muted()
        }
        .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 blocked", comment: "Alert message to indicate the user has been blocked"), isPresented: $user_blocked_confirm, actions: {
            Button(NSLocalizedString("Thanks!", comment: "Button to close out of alert that informs that the action to block a user was successful.")) {
                user_blocked_confirm = false
            }
        }, message: {
            if let pubkey = self.blocking {
                let profile = damus_state!.profiles.lookup(id: pubkey)
                let name = Profile.displayName(profile: profile, pubkey: pubkey)
                Text("\(name) has been blocked", comment: "Alert message that informs a user was blocked.")
            } else {
                Text("User has been blocked", comment: "Alert message that informs a user was blocked.")
            }
        })
        .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_block = 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 = blocking 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.pool.send(.event(mutelist))
                confirm_overwrite_mutelist = false
                confirm_block = false
                user_blocked_confirm = true
            }
        }, message: {
            Text("No block list found, create a new one? This will overwrite any previous block lists.", comment: "Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists.")
        })
        .alert(NSLocalizedString("Block User", comment: "Title of alert for blocking a user."), isPresented: $confirm_block, actions: {
            Button(NSLocalizedString("Cancel", comment: "Alert button to cancel out of alert for blocking a user."), role: .cancel) {
                confirm_block = false
            }
            Button(NSLocalizedString("Block", comment: "Alert button to block 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 = blocking 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.pool.send(.event(ev))
                }
            }
        }, message: {
            if let pubkey = blocking {
                let profile = damus_state?.profiles.lookup(id: pubkey)
                let name = Profile.displayName(profile: profile, pubkey: pubkey)
                Text("Block \(name)?", comment: "Alert message prompt to ask if a user should be blocked.")
            } else {
                Text("Could not find user to block...", comment: "Alert message to indicate that the blocked user could not be found.")
            }
        })
    }
    func switch_timeline(_ timeline: Timeline) {
@@ -555,14 +411,10 @@ struct ContentView: View {
        self.damus_state = DamusState(pool: pool, keypair: keypair,
                                likes: EventCounter(our_pubkey: pubkey),
                                boosts: EventCounter(our_pubkey: pubkey),
-                                contacts: Contacts(our_pubkey: pubkey),
+                                contacts: Contacts(),
                                tips: TipCounter(our_pubkey: pubkey),
                                profiles: Profiles(),
-                                dms: home.dms,
+                                dms: home.dms
                                previews: PreviewCache(),
                                zaps: Zaps(our_pubkey: pubkey),
                                lnurls: LNUrls(),
                                settings: UserSettingsStore()
        )
        home.damus_state = self.damus_state!
@@ -578,6 +430,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
--- a/damus/Info.plist
+++ b/damus/Info.plist
@@ -24,6 +24,7 @@
 		<string>zeusln</string>
 		<string>zebedee</string>
 		<string>lightning</string>
 		<string>squarecash</string>
 		<string>phoenix</string>
 		<string>lnlink</string>
 		<string>strike</string>
--- a/damus/Models/ActionBarModel.swift
+++ b/damus/Models/ActionBarModel.swift
@@ -11,32 +11,22 @@ import Foundation
 class ActionBarModel: ObservableObject {
    @Published var our_like: NostrEvent?
    @Published var our_boost: 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 tips: Int64
    @Published var zap_total: Int64
-    static func empty() -> ActionBarModel {
+    init(likes: Int, boosts: Int, tips: Int64, our_like: NostrEvent?, our_boost: NostrEvent?, our_tip: NostrEvent?) {
        return ActionBarModel(likes: 0, boosts: 0, zaps: 0, zap_total: 0, our_like: nil, our_boost: nil, our_zap: nil)
    }
    init(likes: Int, boosts: Int, zaps: Int, zap_total: Int64, our_like: NostrEvent?, our_boost: NostrEvent?, our_zap: Zap?) {
        self.likes = likes
        self.boosts = boosts
-        self.zaps = zaps
+        self.tips = tips
        self.zap_total = zap_total
        self.our_like = our_like
        self.our_boost = our_boost
-        self.our_zap = our_zap
+        self.our_tip = our_tip
    }
-    var is_empty: Bool {
+    var tipped: Bool {
-        return likes == 0 && boosts == 0 && zaps == 0
+        return our_tip != nil
    }
    var zapped: Bool {
        return our_zap != nil
    }
    var liked: Bool {
--- 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
    }
--- a/damus/Models/DamusState.swift
+++ b/damus/Models/DamusState.swift
@@ -6,7 +6,6 @@
 //
 import Foundation
 import LinkPresentation
 struct DamusState {
    let pool: RelayPool
@@ -17,21 +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
    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())
+        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/DirectMessageModel.swift
+++ b/damus/Models/DirectMessageModel.swift
@@ -8,34 +8,13 @@
 import Foundation
 class DirectMessageModel: ObservableObject {
-    @Published var events: [NostrEvent] {
+    @Published var events: [NostrEvent]
        didSet {
            is_request = determine_is_request()
        }
    }
-    var is_request: Bool
+    init(events: [NostrEvent]) {
    var our_pubkey: String
    func determine_is_request() -> Bool {
        for event in events {
            if event.pubkey == our_pubkey {
                return false
            }
        }
        return true
    }
    init(events: [NostrEvent], our_pubkey: String) {
        self.events = events
        self.is_request = false
        self.our_pubkey = our_pubkey
    }
-    init(our_pubkey: String) {
+    init() {
        self.events = []
        self.is_request = false
        self.our_pubkey = our_pubkey
    }
 }
--- a/damus/Models/DirectMessagesModel.swift
+++ b/damus/Models/DirectMessagesModel.swift
@@ -10,26 +10,13 @@ import Foundation
 class DirectMessagesModel: ObservableObject {
    @Published var dms: [(String, DirectMessageModel)] = []
    @Published var loading: Bool = false
    let our_pubkey: String
    init(our_pubkey: String) {
        self.our_pubkey = our_pubkey
    }
    var message_requests: [(String, DirectMessageModel)] {
        return dms.filter { dm in dm.1.is_request }
    }
    var friend_dms: [(String, DirectMessageModel)] {
        return dms.filter { dm in !dm.1.is_request }
    }
    func lookup_or_create(_ pubkey: String) -> DirectMessageModel {
        if let dm = lookup(pubkey) {
            return dm
        }
-        let new = DirectMessageModel(our_pubkey: our_pubkey)
+        let new = DirectMessageModel()
        dms.append((pubkey, new))
        return new
    }
--- a/damus/Models/FollowersModel.swift
+++ b/damus/Models/FollowersModel.swift
@@ -18,11 +18,11 @@ class FollowersModel: ObservableObject {
    let sub_id: String = UUID().description
    let profiles_id: String = UUID().description
-    var count: Int? {
+    var count_display: String {
        guard let contacts = self.contacts else {
-            return nil
+            return "?"
        }
-        return contacts.count
+        return "\(contacts.count)";
    }
    init(damus_state: DamusState, target: String) {
@@ -73,30 +73,31 @@ class FollowersModel: ObservableObject {
    }
    func handle_event(relay_id: String, ev: NostrConnectionEvent) {
-        guard case .nostr_event(let nev) = ev else {
+        switch ev {
-            return
+        case .ws_event:
-        }
+            break
-        
+        case .nostr_event(let nev):
-        switch nev {
+            switch nev {
-        case .event(let sub_id, let ev):
+            case .event(let sub_id, let ev):
-            guard sub_id == self.sub_id || sub_id == self.profiles_id else {
+                guard sub_id == self.sub_id || sub_id == self.profiles_id else {
-                return
+                    return
-            }
+                }
-            
+                
-            if ev.known_kind == .contacts {
+                if ev.known_kind == .contacts {
-                handle_contact_event(ev)
+                    handle_contact_event(ev)
-            } else if ev.known_kind == .metadata {
+                } else if ev.known_kind == .metadata {
-                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                    process_metadata_event(profiles: damus_state.profiles, ev: ev)
-            }
+                }
-            
+                
-        case .notice(let msg):
+            case .notice(let msg):
-            print("followingmodel notice: \(msg)")
+                print("followingmodel notice: \(msg)")
-            
+                
-        case .eose(let sub_id):
+            case .eose(let sub_id):
-            if sub_id == self.sub_id {
+                if sub_id == self.sub_id {
-                load_profiles(relay_id: relay_id)
+                    load_profiles(relay_id: relay_id)
-            } else if sub_id == self.profiles_id {
+                } else if sub_id == self.profiles_id {
-                damus_state.pool.unsubscribe(sub_id: profiles_id, to: [relay_id])
+                    damus_state.pool.unsubscribe(sub_id: profiles_id, to: [relay_id])
                }
            }
        }
    }
--- a/damus/Models/FollowingModel.swift
+++ b/damus/Models/FollowingModel.swift
@@ -60,7 +60,7 @@ class FollowingModel {
            switch nev {
            case .event(_, let ev):
                if ev.kind == 0 {
-                    process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                    process_metadata_event(profiles: damus_state.profiles, ev: ev)
                }
            case .notice(let msg):
                print("followingmodel notice: \(msg)")
--- a/damus/Models/HomeModel.swift
+++ b/damus/Models/HomeModel.swift
@@ -48,19 +48,17 @@ class HomeModel: ObservableObject {
    @Published var new_events: NewEventsBits = NewEventsBits()
    @Published var notifications: [NostrEvent] = []
-    @Published var dms: DirectMessagesModel
+    @Published var dms: DirectMessagesModel = DirectMessagesModel()
    @Published var events: [NostrEvent] = []
    @Published var loading: Bool = false
    @Published var signal: SignalModel = SignalModel()
    init() {
        self.damus_state = DamusState.empty
        self.dms = DirectMessagesModel(our_pubkey: damus_state.pubkey)
    }
    init(damus_state: DamusState) {
        self.damus_state = damus_state
        self.dms = DirectMessagesModel(our_pubkey: damus_state.pubkey)
    }
    var pool: RelayPool {
@@ -98,8 +96,6 @@ class HomeModel: ObservableObject {
            handle_contact_event(sub_id: sub_id, relay_id: relay_id, ev: ev)
        case .metadata:
            handle_metadata_event(ev)
        case .list:
            handle_list_event(ev)
        case .boost:
            handle_boost_event(sub_id: sub_id, ev)
        case .like:
@@ -112,61 +108,9 @@ class HomeModel: ObservableObject {
            handle_channel_create(ev)
        case .channel_meta:
            handle_channel_meta(ev)
        case .zap:
            handle_zap_event(ev)
        }
    }
    func handle_zap_event_with_zapper(_ ev: NostrEvent, zapper: String) {
        guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper) else {
            return
        }
        damus_state.zaps.add_zap(zap: zap)
        if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
            return
        }
        handle_last_event(ev: ev, timeline: .notifications)
        return
    }
    func handle_zap_event(_ ev: NostrEvent) {
        // These are zap notifications
        guard let ptag = event_tag(ev, name: "p") else {
            return
        }
        guard ptag == damus_state.pubkey else {
            return
        }
        if let local_zapper = damus_state.profiles.lookup_zapper(pubkey: damus_state.pubkey) {
            handle_zap_event_with_zapper(ev, zapper: local_zapper)
            return
        }
        guard let profile = damus_state.profiles.lookup(id: damus_state.pubkey) else {
            return
        }
        guard let lnurl = profile.lnurl else {
            return
        }
        Task {
            guard let zapper = await fetch_zapper_from_lnurl(lnurl) else {
                return
            }
            DispatchQueue.main.async {
                self.handle_zap_event_with_zapper(ev, zapper: zapper)
            }
        }
    }
    func handle_channel_create(_ ev: NostrEvent) {
        guard ev.is_valid else {
            return
@@ -178,12 +122,6 @@ class HomeModel: ObservableObject {
    func handle_channel_meta(_ ev: NostrEvent) {
    }
    func filter_muted() {
        self.events = events.filter { !damus_state.contacts.is_muted($0.pubkey) }
        self.dms.dms = dms.dms.filter { !damus_state.contacts.is_muted($0.0) }
        self.notifications = notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
    }
    func handle_delete_event(_ ev: NostrEvent) {
        guard ev.is_valid else {
            return
@@ -286,7 +224,7 @@ class HomeModel: ObservableObject {
            switch ev {
            case .event(let sub_id, let ev):
                // globally handle likes
-                let always_process = sub_id == notifications_subid || sub_id == contacts_subid || sub_id == home_subid || sub_id == dms_subid || sub_id == init_subid || ev.known_kind == .like || ev.known_kind == .zap || ev.known_kind == .contacts || ev.known_kind == .metadata
+                let always_process = sub_id == notifications_subid || sub_id == contacts_subid || sub_id == home_subid || sub_id == dms_subid || sub_id == init_subid || ev.known_kind == .like || ev.known_kind == .contacts || ev.known_kind == .metadata
                if !always_process {
                    // TODO: other views like threads might have their own sub ids, so ignore those events... or should we?
                    return
@@ -334,11 +272,7 @@ class HomeModel: ObservableObject {
        var our_contacts_filter = NostrFilter.filter_kinds([3, 0])
        our_contacts_filter.authors = [damus_state.pubkey]
-        
+
        var our_blocklist_filter = NostrFilter.filter_kinds([30000])
        our_blocklist_filter.parameter = ["mute"]
        our_blocklist_filter.authors = [damus_state.pubkey]
        var dms_filter = NostrFilter.filter_kinds([
            NostrKind.dm.rawValue,
        ])
@@ -369,14 +303,13 @@ class HomeModel: ObservableObject {
            NostrKind.chat.rawValue,
            NostrKind.like.rawValue,
            NostrKind.boost.rawValue,
            NostrKind.zap.rawValue,
        ])
        notifications_filter.pubkeys = [damus_state.pubkey]
        notifications_filter.limit = 100
        var home_filters = [home_filter]
        var notifications_filters = [notifications_filter]
-        var contacts_filters = [contacts_filter, our_contacts_filter, our_blocklist_filter]
+        var contacts_filters = [contacts_filter, our_contacts_filter]
        var dms_filters = [dms_filter, our_dms_filter]
        let last_of_kind = relay_id.flatMap { last_event_of_kind[$0] } ?? [:]
@@ -400,32 +333,9 @@ class HomeModel: ObservableObject {
            pool.send(.subscribe(.init(filters: dms_filters, sub_id: dms_subid)))
        }
    }
-    
+
    func handle_list_event(_ ev: NostrEvent) {
        // we only care about our lists
        guard ev.pubkey == damus_state.pubkey else {
            return
        }
        if let mutelist = damus_state.contacts.mutelist {
            if ev.created_at <= mutelist.created_at {
                return
            }
        }
        guard let name = get_referenced_ids(tags: ev.tags, key: "d").first else {
            return
        }
        guard name.ref_id == "mute" else {
            return
        }
        damus_state.contacts.set_mutelist(ev)
    }
    func handle_metadata_event(_ ev: NostrEvent) {
-        process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+        process_metadata_event(profiles: damus_state.profiles, ev: ev)
    }
    func get_last_event_of_kind(relay_id: String, kind: Int) -> NostrEvent? {
@@ -437,23 +347,24 @@ class HomeModel: ObservableObject {
        return m[kind]
    }
-    func handle_notification(ev: NostrEvent) {
+    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) {
-        guard event_has_our_pubkey(ev, our_pubkey: self.damus_state.pubkey) else {
+        let last_ev = get_last_event(timeline)
-            return
+
        if last_ev == nil || last_ev!.created_at < ev.created_at {
            save_last_event(ev, timeline: timeline)
            if shouldNotify {
                new_events = NewEventsBits(prev: new_events, setting: timeline)
            }
        }
-        
+    }
    func handle_notification(ev: NostrEvent) {
        if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
            return
        }
        handle_last_event(ev: ev, timeline: .notifications)
    }
    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) {
        if let new_bits = handle_last_events(new_events: self.new_events, ev: ev, timeline: timeline, shouldNotify: shouldNotify) {
            new_events = new_bits
        }
    }
    func insert_home_event(_ ev: NostrEvent) -> Bool {
        let ok = insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at })
@@ -463,8 +374,12 @@ class HomeModel: ObservableObject {
        return ok
    }
    func should_hide_event(_ ev: NostrEvent) -> Bool {
        return !ev.should_show_event
    }
    func handle_text_event(sub_id: String, _ ev: NostrEvent) {
-        if should_hide_event(contacts: damus_state.contacts, ev: ev) {
+        if should_hide_event(ev) {
            return
        }
@@ -476,8 +391,49 @@ class HomeModel: ObservableObject {
    }
    func handle_dm(_ ev: NostrEvent) {
-        if let notifs = handle_incoming_dm(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, ev: ev) {
+
-            self.new_events = notifs
+        var inserted = false
        var found = false
        let ours = ev.pubkey == self.damus_state.pubkey
        var i = 0
        var the_pk = ev.pubkey
        if ours {
            if let ref_pk = ev.referenced_pubkeys.first {
                the_pk = ref_pk.ref_id
            } else {
                // self dm!?
                print("TODO: handle self dm?")
            }
        }
        for (pk, _) in dms.dms {
            if pk == the_pk {
                found = true
                inserted = insert_uniq_sorted_event(events: &(dms.dms[i].1.events), new_ev: ev) {
                    $0.created_at < $1.created_at
                }
                break
            }
            i += 1
        }
        if !found {
            inserted = true
            let model = DirectMessageModel(events: [ev])
            dms.dms.append((the_pk, model))
        }
        if inserted {
            handle_last_event(ev: ev, timeline: .dms, shouldNotify: !ours)
            dms.dms = dms.dms.sorted { a, b in
                if a.1.events.count > 0 && b.1.events.count > 0 {
                    return a.1.events.last!.created_at > b.1.events.last!.created_at
                }
                return false
            }
        }
    }
 }
@@ -583,21 +539,12 @@ func print_filters(relay_id: String?, filters groups: [[NostrFilter]]) {
    print("-----")
 }
-func process_metadata_event(our_pubkey: String, profiles: Profiles, ev: NostrEvent) {
+func process_metadata_event(profiles: Profiles, ev: NostrEvent) {
    guard let profile: Profile = decode_data(Data(ev.content.utf8)) else {
        return
    }
    if our_pubkey == ev.pubkey && (profile.deleted ?? false) {
        DispatchQueue.main.async {
            notify(.deleted_account, ())
        }
        return
    }
    var old_nip05: String? = nil
    if let mprof = profiles.lookup_with_timestamp(id: ev.pubkey) {
        old_nip05 = mprof.profile.nip05
        if mprof.timestamp > ev.created_at {
            // skip if we already have an newer profile
            return
@@ -607,20 +554,6 @@ func process_metadata_event(our_pubkey: String, profiles: Profiles, ev: NostrEve
    let tprof = TimestampedProfile(profile: profile, timestamp: ev.created_at)
    profiles.add(id: ev.pubkey, profile: tprof)
    if let nip05 = profile.nip05, old_nip05 != profile.nip05 {
        Task.detached(priority: .background) {
            let validated = await validate_nip05(pubkey: ev.pubkey, nip05_str: nip05)
            if validated != nil {
                print("validated nip05 for '\(nip05)'")
            }
            DispatchQueue.main.async {
                profiles.validated[ev.pubkey] = validated
                notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
            }
        }
    }
    // load pfps asap
    let picture = tprof.profile.picture ?? robohash(ev.pubkey)
    if let _ = URL(string: picture) {
@@ -629,13 +562,6 @@ func process_metadata_event(our_pubkey: String, profiles: Profiles, ev: NostrEve
        }
    }
    let banner = tprof.profile.banner ?? ""
    if let _ = URL(string: banner) {
        DispatchQueue.main.async {
            notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
        }
    }
    notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
 }
@@ -707,84 +633,4 @@ func load_our_relays(contacts: Contacts, our_pubkey: String, pool: RelayPool, m_
    }
 }
 func handle_incoming_dm(prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, ev: NostrEvent) -> NewEventsBits? {
    var inserted = false
    var found = false
    let ours = ev.pubkey == our_pubkey
    var i = 0
    var the_pk = ev.pubkey
    if ours {
        if let ref_pk = ev.referenced_pubkeys.first {
            the_pk = ref_pk.ref_id
        } else {
            // self dm!?
            print("TODO: handle self dm?")
        }
    }
    for (pk, _) in dms.dms {
        if pk == the_pk {
            found = true
            inserted = insert_uniq_sorted_event(events: &(dms.dms[i].1.events), new_ev: ev) {
                $0.created_at < $1.created_at
            }
            break
        }
        i += 1
    }
    if !found {
        inserted = true
        let model = DirectMessageModel(events: [ev], our_pubkey: our_pubkey)
        dms.dms.append((the_pk, model))
    }
    var new_events: NewEventsBits? = nil
    if inserted {
        new_events = handle_last_events(new_events: prev_events, ev: ev, timeline: .dms, shouldNotify: !ours)
        dms.dms = dms.dms.filter({ $0.1.events.count > 0 }).sorted { a, b in
            return a.1.events.last!.created_at > b.1.events.last!.created_at
        }
    }
    return new_events
 }
 /// A helper to determine if we need to notify the user of new events
 func handle_last_events(new_events: NewEventsBits, ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) -> NewEventsBits? {
    let last_ev = get_last_event(timeline)
    if last_ev == nil || last_ev!.created_at < ev.created_at {
        save_last_event(ev, timeline: timeline)
        if shouldNotify {
            return NewEventsBits(prev: new_events, setting: timeline)
        }
    }
    return nil
 }
 /// Sometimes we get garbage in our notifications. Ensure we have our pubkey on this event
 func event_has_our_pubkey(_ ev: NostrEvent, our_pubkey: String) -> Bool {
    for tag in ev.tags {
        if tag.count >= 2 && tag[0] == "p" && tag[1] == our_pubkey {
            return true
        }
    }
    return false
 }
 func should_hide_event(contacts: Contacts, ev: NostrEvent) -> Bool {
    if contacts.is_muted(ev.pubkey) {
        return true
    }
    return !ev.should_show_event
 }
--- a/damus/Models/KFImageModel.swift
+++ b/damus/Models/KFImageModel.swift
@@ -1,114 +0,0 @@
 //
 //  KFImageModel.swift
 //  damus
 //
 //  Created by Oleg Abalonski on 1/11/23.
 //
 import UIKit
 import Kingfisher
 class KFImageModel: ObservableObject {
    let url: URL?
    let fallbackUrl: URL?
    let processor: ImageProcessor
    let serializer: CacheSerializer
    @Published var refreshID = ""
    init(url: URL?, fallbackUrl: URL?, maxByteSize: Int, downsampleSize: CGSize) {
        self.url = url
        self.fallbackUrl = fallbackUrl
        self.processor = CustomImageProcessor(maxSize: maxByteSize, downsampleSize: downsampleSize)
        self.serializer = CustomCacheSerializer(maxSize: maxByteSize, downsampleSize: downsampleSize)
    }
    func refresh() -> Void {
        DispatchQueue.main.async {
            self.refreshID = UUID().uuidString
        }
    }
    func cache(_ image: UIImage, forKey key: String) -> Void {
        KingfisherManager.shared.cache.store(image, forKey: key, processorIdentifier: processor.identifier) { _ in
            self.refresh()
        }
    }
    func downloadFailed() -> Void {
        guard let url = url, let fallbackUrl = fallbackUrl else { return }
        DispatchQueue.global(qos: .background).async {
            KingfisherManager.shared.downloader.downloadImage(with: fallbackUrl) { result in
                var fallbackImage: UIImage {
                    switch result {
                    case .success(let imageLoadingResult):
                        return imageLoadingResult.image
                    case .failure(let error):
                        print(error)
                        return UIImage()
                    }
                }
                self.cache(fallbackImage, forKey: url.absoluteString)
            }
        }
    }
 }
 struct CustomImageProcessor: ImageProcessor {
    let maxSize: Int
    let downsampleSize: CGSize
    let identifier = "com.damus.customimageprocessor"
    func process(item: ImageProcessItem, options: KingfisherParsedOptionsInfo) -> KFCrossPlatformImage? {
        switch item {
        case .image(_):
            // This case will never run
            return DefaultImageProcessor.default.process(item: item, options: options)
        case .data(let data):
            // Handle large image size
            if data.count > maxSize {
                return KingfisherWrapper.downsampledImage(data: data, to: downsampleSize, scale: options.scaleFactor)
            }
            // Handle SVG image
            if let dataString = String(data: data, encoding: .utf8),
                let svg = SVG(dataString) {
                    let render = UIGraphicsImageRenderer(size: svg.size)
                    let image = render.image { context in
                        svg.draw(in: context.cgContext)
                    }
                    return image.kf.scaled(to: options.scaleFactor)
            }
            return DefaultImageProcessor.default.process(item: item, options: options)
        }
    }
 }
 struct CustomCacheSerializer: CacheSerializer {
    let maxSize: Int
    let downsampleSize: CGSize
    func data(with image: Kingfisher.KFCrossPlatformImage, original: Data?) -> Data? {
        return DefaultCacheSerializer.default.data(with: image, original: original)
    }
    func image(with data: Data, options: Kingfisher.KingfisherParsedOptionsInfo) -> Kingfisher.KFCrossPlatformImage? {
        if data.count > maxSize {
            return KingfisherWrapper.downsampledImage(data: data, to: downsampleSize, scale: options.scaleFactor)
        }
        return DefaultCacheSerializer.default.image(with: data, options: options)
    }
 }
--- a/damus/Models/LibreTranslateServer.swift
+++ b/damus/Models/LibreTranslateServer.swift
@@ -1,44 +0,0 @@
 //
 //  LibreTranslateServer.swift
 //  damus
 //
 //  Created by Terry Yiu on 1/21/23.
 //
 import Foundation
 enum LibreTranslateServer: 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 none
    case argosopentech
    case terraprint
    case vern
    case custom
    var model: Model {
        switch self {
        case .none:
            return .init(tag: self.rawValue, displayName: NSLocalizedString("None", comment: "Dropdown option for selecting no translation server."), url: nil)
        case .argosopentech:
            return .init(tag: self.rawValue, displayName: "translate.argosopentech.com", url: "https://translate.argosopentech.com")
        case .terraprint:
            return .init(tag: self.rawValue, displayName: "translate.terraprint.co", url: "https://translate.terraprint.co")
        case .vern:
            return .init(tag: self.rawValue, displayName: "lt.vern.cc", url: "https://lt.vern.cc")
        case .custom:
            return .init(tag: self.rawValue, displayName: NSLocalizedString("Custom", comment: "Dropdown option for selecting a custom translation server."), url: nil)
        }
    }
    static var allModels: [Model] {
        return Self.allCases.map { $0.model }
    }
 }
--- a/damus/Models/LikeCounter.swift
+++ b/damus/Models/LikeCounter.swift
@@ -7,10 +7,6 @@
 import Foundation
 enum CountResult {
    case already_counted
    case success(Int)
 }
 class EventCounter {
    var counts: [String: Int] = [:]
@@ -18,6 +14,11 @@ class EventCounter {
    var our_events: [String: NostrEvent] = [:]
    var our_pubkey: String
    enum CountResult {
        case already_counted
        case success(Int)
    }
    init (our_pubkey: String) {
        self.our_pubkey = our_pubkey
    }
--- a/damus/Models/Mentions.swift
+++ b/damus/Models/Mentions.swift
@@ -32,30 +32,13 @@ struct IdBlock: Identifiable {
    let block: Block
 }
-typealias Invoice = LightningInvoice<Amount>
+struct Invoice {
-typealias ZapInvoice = LightningInvoice<Int64>
+    let description: String
-
+    let amount: Amount
 enum InvoiceDescription {
    case description(String)
    case description_hash(Data)
 }
 struct LightningInvoice<T> {
    let description: InvoiceDescription
    let amount: T
    let string: String
    let expiry: UInt64
    let payment_hash: Data
    let created_at: UInt64
    var description_string: String {
        switch description {
        case .description(let string):
            return string
        case .description_hash:
            return ""
        }
    }
 }
 enum Block {
@@ -204,52 +187,16 @@ enum Amount: Equatable {
    func amount_sats_str() -> String {
        switch self {
        case .any:
-            return NSLocalizedString("Any", comment: "Any amount of sats")
+            return "Any"
        case .specific(let amt):
-            return format_msats(amt)
+            if amt < 1000 {
                return "\(Double(amt) / 1000.0) sats"
            }
            return "\(amt / 1000) sats"
        }
    }
 }
 func format_msats_abbrev(_ msats: Int64) -> String {
    let formatter = NumberFormatter()
    formatter.numberStyle = .decimal
    formatter.positiveSuffix = "m"
    formatter.positivePrefix = ""
    formatter.minimumFractionDigits = 0
    formatter.maximumFractionDigits = 3
    formatter.roundingMode = .down
    formatter.roundingIncrement = 0.1
    formatter.multiplier = 1
    let sats = NSNumber(value: (Double(msats) / 1000.0))
    if msats >= 1_000_000*1000 {
        formatter.positiveSuffix = "m"
        formatter.multiplier = 0.000001
    } else if msats >= 1000*1000 {
        formatter.positiveSuffix = "k"
        formatter.multiplier = 0.001
    } else {
        return sats.stringValue
    }
    return formatter.string(from: sats) ?? sats.stringValue
 }
 func format_msats(_ msat: Int64) -> String {
    let numberFormatter = NumberFormatter()
    numberFormatter.numberStyle = .decimal
    numberFormatter.minimumFractionDigits = 0
    numberFormatter.maximumFractionDigits = 3
    numberFormatter.roundingMode = .down
    let sats = NSNumber(value: (Double(msat) / 1000.0))
    let formattedSats = numberFormatter.string(from: sats) ?? sats.stringValue
    return String(format: NSLocalizedString("sats_count", comment: "Amount of sats."), sats.decimalValue as NSDecimalNumber, formattedSats)
 }
 func convert_invoice_block(_ b: invoice_block) -> Block? {
    guard let invstr = strblock_to_string(b.invstr) else {
        return nil
@@ -259,8 +206,9 @@ func convert_invoice_block(_ b: invoice_block) -> Block? {
        return nil
    }
-    guard let description = convert_invoice_description(b11: b11) else {
+    var description = ""
-        return nil
+    if b11.description != nil {
        description = String(cString: b11.description)
    }
    let amount: Amount = maybe_pointee(b11.msat).map { .specific(Int64($0.millisatoshis)) } ?? .any
@@ -271,18 +219,6 @@ func convert_invoice_block(_ b: invoice_block) -> Block? {
    return .invoice(Invoice(description: description, amount: amount, string: invstr, expiry: b11.expiry, payment_hash: payment_hash, created_at: created_at))
 }
 func convert_invoice_description(b11: bolt11) -> InvoiceDescription? {
    if let desc = b11.description {
        return .description(String(cString: desc))
    }
    if var deschash = maybe_pointee(b11.description_hash) {
        return .description_hash(Data(bytes: &deschash, count: 32))
    }
    return nil
 }
 func convert_mention_block(ind: Int32, tags: [[String]]) -> Block?
 {
    let ind = Int(ind)
--- a/damus/Models/MutelistModel.swift
+++ b/damus/Models/MutelistModel.swift
@@ -1,18 +0,0 @@
 //
 //  ListModel.swift
 //  damus
 //
 //  Created by William Casarin on 2023-01-25.
 //
 import Foundation
 /*
 class MutelistModel: ObservableObject {
 let contacts: Contacts
 @Published var users: [String]
 }
 */
--- a/damus/Models/ProfileModel.swift
+++ b/damus/Models/ProfileModel.swift
@@ -97,7 +97,7 @@ class ProfileModel: ObservableObject, Equatable {
        } else if ev.known_kind == .contacts {
            handle_profile_contact_event(ev)
        } else if ev.known_kind == .metadata {
-            process_metadata_event(our_pubkey: damus.pubkey, profiles: damus.profiles, ev: ev)
+            process_metadata_event(profiles: damus.profiles, ev: ev)
        }
        seen_event.insert(ev.id)
    }
--- a/damus/Models/ReactionsModel.swift
+++ b/damus/Models/ReactionsModel.swift
@@ -1,78 +0,0 @@
 //
 //  LikesModel.swift
 //  damus
 //
 //  Created by William Casarin on 2023-01-11.
 //
 import Foundation
 class ReactionsModel: ObservableObject {
    let state: DamusState
    let target: String
    let sub_id: String
    let profiles_id: String
    @Published var reactions: [NostrEvent]
    init (state: DamusState, target: String) {
        self.state = state
        self.target = target
        self.sub_id = UUID().description
        self.profiles_id = UUID().description
        self.reactions = []
    }
    func get_filter() -> NostrFilter {
        var filter = NostrFilter.filter_kinds([7])
        filter.referenced_ids = [target]
        filter.limit = 500
        return filter
    }
    func subscribe() {
        let filter = get_filter()
        let filters = [filter]
        self.state.pool.subscribe(sub_id: sub_id, filters: filters, handler: handle_nostr_event)
    }
    func unsubscribe() {
        self.state.pool.unsubscribe(sub_id: sub_id)
    }
    func handle_event(relay_id: String, ev: NostrEvent) {
        guard ev.kind == 7 else {
            return
        }
        guard let reacted_to = last_etag(tags: ev.tags) else {
            return
        }
        guard reacted_to == self.target else {
            return
        }
        if insert_uniq_sorted_event(events: &self.reactions, new_ev: ev, cmp: { a, b in a.created_at < b.created_at } ) {
            objectWillChange.send()
        }
    }
    func handle_nostr_event(relay_id: String, ev: NostrConnectionEvent) {
        guard case .nostr_event(let nev) = ev else {
            return
        }
        switch nev {
        case .event(_, let ev):
            handle_event(relay_id: relay_id, ev: ev)
        case .notice(_):
            break
        case .eose(_):
            load_profiles(profiles_subid: profiles_id, relay_id: relay_id, events: reactions, damus_state: state)
            break
        }
    }
 }
--- a/damus/Models/Report.swift
+++ b/damus/Models/Report.swift
@@ -1,59 +0,0 @@
 //
 //  Report.swift
 //  damus
 //
 //  Created by William Casarin on 2023-01-24.
 //
 import Foundation
 enum ReportType: String {
    case explicit
    case illegal
    case spam
    case impersonation
 }
 struct ReportNoteTarget {
    let pubkey: String
    let note_id: String
 }
 enum ReportTarget {
    case user(String)
    case note(ReportNoteTarget)
 }
 struct Report {
    let type: ReportType
    let target: ReportTarget
    let message: String
 }
 func create_report_tags(target: ReportTarget, type: ReportType) -> [[String]] {
    var tags: [[String]]
    switch target {
    case .user(let pubkey):
        tags = [["p", pubkey]]
    case .note(let notet):
        tags = [["e", notet.note_id], ["p", notet.pubkey]]
    }
    tags.append(["report", type.rawValue])
    return tags
 }
 func create_report_event(privkey: String, report: Report) -> NostrEvent? {
    guard let pubkey = privkey_to_pubkey(privkey: privkey) else {
        return nil
    }
    let kind = 1984
    let tags = create_report_tags(target: report.target, type: report.type)
    let ev = NostrEvent(content: report.message, pubkey: pubkey, kind: kind, tags: tags)
    ev.id = calculate_event_id(ev: ev)
    ev.sig = sign_event(privkey: privkey, ev: ev)
    return ev
 }
--- a/damus/Models/RepostsModel.swift
+++ b/damus/Models/RepostsModel.swift
@@ -1,77 +0,0 @@
 //
 //  RepostsModel.swift
 //  damus
 //
 //  Created by Terry Yiu on 1/22/23.
 //
 import Foundation
 class RepostsModel: ObservableObject {
    let state: DamusState
    let target: String
    let sub_id: String
    let profiles_id: String
    @Published var reposts: [NostrEvent]
    init (state: DamusState, target: String) {
        self.state = state
        self.target = target
        self.sub_id = UUID().description
        self.profiles_id = UUID().description
        self.reposts = []
    }
    func get_filter() -> NostrFilter {
        var filter = NostrFilter.filter_kinds([NostrKind.boost.rawValue])
        filter.referenced_ids = [target]
        filter.limit = 500
        return filter
    }
    func subscribe() {
        let filter = get_filter()
        let filters = [filter]
        self.state.pool.subscribe(sub_id: sub_id, filters: filters, handler: handle_nostr_event)
    }
    func unsubscribe() {
        self.state.pool.unsubscribe(sub_id: sub_id)
    }
    func handle_event(relay_id: String, ev: NostrEvent) {
        guard ev.kind == NostrKind.boost.rawValue else {
            return
        }
        guard let reposted_event = last_etag(tags: ev.tags) else {
            return
        }
        guard reposted_event == self.target else {
            return
        }
        if insert_uniq_sorted_event(events: &self.reposts, new_ev: ev, cmp: { a, b in a.created_at < b.created_at } ) {
            objectWillChange.send()
        }
    }
    func handle_nostr_event(relay_id: String, ev: NostrConnectionEvent) {
        guard case .nostr_event(let nev) = ev else {
            return
        }
        switch nev {
        case .event(_, let ev):
            handle_event(relay_id: relay_id, ev: ev)
        case .notice(_):
            break
        case .eose(_):
            load_profiles(profiles_subid: profiles_id, relay_id: relay_id, events: reposts, damus_state: state)
            break
        }
    }
 }
--- a/damus/Models/SearchHomeModel.swift
+++ b/damus/Models/SearchHomeModel.swift
@@ -30,10 +30,6 @@ class SearchHomeModel: ObservableObject {
        return filter
    }
    func filter_muted() {
        events = events.filter { !should_hide_event(contacts: damus_state.contacts, ev: $0) }
    }
    func subscribe() {
        loading = true
        damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event)
@@ -45,40 +41,40 @@ class SearchHomeModel: ObservableObject {
    }
    func handle_event(relay_id: String, conn_ev: NostrConnectionEvent) {
-        guard case .nostr_event(let event) = conn_ev else {
+        switch conn_ev {
-            return
+        case .ws_event:
-        }
+            break
-        
+        case .nostr_event(let event):
-        switch event {
+            switch event {
-        case .event(let sub_id, let ev):
+            case .event(let sub_id, let ev):
-            guard sub_id == self.base_subid || sub_id == self.profiles_subid else {
+                guard sub_id == self.base_subid || sub_id == self.profiles_subid else {
                return
            }
            if ev.is_textlike && !should_hide_event(contacts: damus_state.contacts, ev: ev) && !ev.is_reply(nil) {
                if seen_pubkey.contains(ev.pubkey) {
                    return
                }
-                seen_pubkey.insert(ev.pubkey)
+                if ev.is_textlike && ev.should_show_event {
-                
+                    if seen_pubkey.contains(ev.pubkey) {
-                let _ = insert_uniq_sorted_event(events: &events, new_ev: ev) {
+                        return
-                    $0.created_at > $1.created_at
+                    }
                    seen_pubkey.insert(ev.pubkey)
                    let _ = insert_uniq_sorted_event(events: &events, new_ev: ev) {
                        $0.created_at > $1.created_at
                    }
                }
-            }
+            case .notice(let msg):
-        case .notice(let msg):
+                print("search home notice: \(msg)")
-            print("search home notice: \(msg)")
+            case .eose(let sub_id):
-        case .eose(let sub_id):
+                loading = false
            loading = false
            if sub_id == self.base_subid {
                // Make sure we unsubscribe after we've fetched the global events
                // global events are not realtime
                unsubscribe(to: relay_id)
-                load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: events, damus_state: damus_state)
+                if sub_id == self.base_subid {
                    // Make sure we unsubscribe after we've fetched the global events
                    // global events are not realtime
                    unsubscribe(to: relay_id)
                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: events, damus_state: damus_state)
                }
                break
            }
            break
        }
    }
 }
@@ -116,30 +112,27 @@ func load_profiles(profiles_subid: String, relay_id: String, events: [NostrEvent
    let authors = find_profiles_to_fetch(profiles: damus_state.profiles, events: events)
    filter.authors = authors
-    guard !authors.isEmpty else {
+    if !authors.isEmpty {
-        return
+        print("loading \(authors.count) profiles from \(relay_id)")
-    }
+        damus_state.pool.subscribe_to(sub_id: profiles_subid, filters: [filter], to: [relay_id]) { sub_id, conn_ev in
-    
+            let (sid, done) = handle_subid_event(pool: damus_state.pool, relay_id: relay_id, ev: conn_ev) { sub_id, ev in
-    print("loading \(authors.count) profiles from \(relay_id)")
+                guard sub_id == profiles_subid else {
-    
+                    return
-    damus_state.pool.subscribe_to(sub_id: profiles_subid, filters: [filter], to: [relay_id]) { sub_id, conn_ev in
+                }
-        let (sid, done) = handle_subid_event(pool: damus_state.pool, relay_id: relay_id, ev: conn_ev) { sub_id, ev in
+                
-            guard sub_id == profiles_subid else {
+                if ev.known_kind == .metadata {
                    process_metadata_event(profiles: damus_state.profiles, ev: ev)
                }
            }
            guard done && sid == profiles_subid else {
                return
            }
-            
+                
-            if ev.known_kind == .metadata {
+            print("done loading \(authors.count) profiles from \(relay_id)")
-                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+            damus_state.pool.unsubscribe(sub_id: profiles_subid, to: [relay_id])
            }
        }
        guard done && sid == profiles_subid else {
            return
        }
        print("done loading \(authors.count) profiles from \(relay_id)")
        damus_state.pool.unsubscribe(sub_id: profiles_subid, to: [relay_id])
    }
 }
--- a/damus/Models/ThreadModel.swift
+++ b/damus/Models/ThreadModel.swift
@@ -115,7 +115,7 @@ class ThreadModel: ObservableObject {
            ref_events.referenced_ids = ev.referenced_ids.map { $0.ref_id }
            ref_events.referenced_ids?.append(ev.id)
            ref_events.limit = 50
-            events_filter.ids = ref_events.referenced_ids ?? []
+            events_filter.ids = ref_events.referenced_ids!
            events_filter.limit = 100
            events_filter.ids?.append(ev.id)
        case .event_id(let evid):
@@ -190,7 +190,7 @@ class ThreadModel: ObservableObject {
            }
            if ev.known_kind == .metadata {
-                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                process_metadata_event(profiles: damus_state.profiles, ev: ev)
            } else if ev.is_textlike {
                self.add_event(ev, privkey: self.damus_state.keypair.privkey)
            } else if ev.known_kind == .channel_meta || ev.known_kind == .channel_create {
--- a/damus/Models/UserSettingsStore.swift
+++ b/damus/Models/UserSettingsStore.swift
@@ -6,37 +6,6 @@
 //
 import Foundation
 import Vault
 func should_show_wallet_selector(_ pubkey: String) -> Bool {
    return UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
 }
 func get_default_wallet(_ pubkey: String) -> Wallet {
    if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
       let default_wallet = Wallet(rawValue: defaultWalletName)
    {
        return default_wallet
    } else {
        return .system_default_wallet
    }
 }
 func get_libretranslate_server(_ pubkey: String) -> LibreTranslateServer? {
    guard let server_name = UserDefaults.standard.string(forKey: "libretranslate_server") else {
        return nil
    }
    return LibreTranslateServer(rawValue: server_name)
 }
 func get_libretranslate_url(_ pubkey: String, server: LibreTranslateServer) -> String? {
    if let url = server.model.url {
        return url
    }
    return UserDefaults.standard.object(forKey: "libretranslate_url") as? String
 }
 class UserSettingsStore: ObservableObject {
    @Published var default_wallet: Wallet {
@@ -51,90 +20,13 @@ class UserSettingsStore: ObservableObject {
        }
    }
    @Published var left_handed: Bool {
        didSet {
            UserDefaults.standard.set(left_handed, forKey: "left_handed")
        }
    }
    @Published var libretranslate_server: LibreTranslateServer {
        didSet {
            if oldValue == libretranslate_server {
                return
            }
            UserDefaults.standard.set(libretranslate_server.rawValue, forKey: "libretranslate_server")
            libretranslate_api_key = ""
            if libretranslate_server == .custom || libretranslate_server == .none {
                libretranslate_url = ""
            } else {
                libretranslate_url = libretranslate_server.model.url!
            }
        }
    }
    @Published var libretranslate_url: String {
        didSet {
            UserDefaults.standard.set(libretranslate_url, forKey: "libretranslate_url")
        }
    }
    @Published var libretranslate_api_key: String {
        didSet {
            do {
                if libretranslate_api_key == "" {
                    try clearLibreTranslateApiKey()
                } else {
                    try saveLibreTranslateApiKey(libretranslate_api_key)
                }
            } catch {
                // No-op.
            }
        }
    }
    init() {
-        // TODO: pubkey-scoped settings
+        if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
-        let pubkey = ""
+           let default_wallet = Wallet(rawValue: defaultWalletName) {
-        self.default_wallet = get_default_wallet(pubkey)
+            self.default_wallet = default_wallet
        show_wallet_selector = should_show_wallet_selector(pubkey)
        left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
        if let server = get_libretranslate_server(pubkey) {
            self.libretranslate_server = server
            self.libretranslate_url = get_libretranslate_url(pubkey, server: server) ?? ""
        } else {
-            // Note from @tyiu:
+            self.default_wallet = .system_default_wallet
            // Default server is disabled by default for now until we gain some confidence that it is working well in production.
            // Instead of throwing all Damus users onto feature immediately, allow for discovery of feature organically.
            // Also, we are connecting to servers listed as mirrors on the official LibreTranslate GitHub README that do not require API keys.
            // However, we have not asked them for permission to use, so we're trying to be good neighbors for now.
            // Opportunity: spin up dedicated trusted LibreTranslate server that requires an API key for any access (or higher rate limit access).
            libretranslate_server = .none
            libretranslate_url = ""
        }
-            
+        self.show_wallet_selector = UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
        do {
            libretranslate_api_key = try Vault.getPrivateKey(keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
        } catch {
            libretranslate_api_key = ""
        }
    }
    func saveLibreTranslateApiKey(_ apiKey: String) throws {
        try Vault.savePrivateKey(apiKey, keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
    }
    func clearLibreTranslateApiKey() throws {
        try Vault.deletePrivateKey(keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
    }
 }
 struct DamusLibreTranslateKeychainConfiguration: KeychainConfiguration {
    var serviceName = "damus"
    var accessGroup: String? = nil
    var accountName = "libretranslate_apikey"
 }
--- a/damus/Models/Wallet.swift
+++ b/damus/Models/Wallet.swift
@@ -45,7 +45,7 @@ enum Wallet: String, CaseIterable, Identifiable {
            return .init(index: 0, tag: "strike", displayName: NSLocalizedString("Strike", comment: "Dropdown option label for Lightning wallet, Strike."), link: "strike:",
                         appStoreLink: "https://apps.apple.com/us/app/strike-bitcoin-payments/id1488724463", image: "strike")
        case .cashapp:
-            return .init(index: 1, tag: "cashapp", displayName: NSLocalizedString("Cash App", comment: "Dropdown option label for Lightning wallet, Cash App."), link: "https://cash.app/launch/lightning/",
+            return .init(index: 1, tag: "cashapp", displayName: NSLocalizedString("Cash App", comment: "Dropdown option label for Lightning wallet, Cash App."), link: "squarecash://",
                         appStoreLink: "https://apps.apple.com/us/app/cash-app/id711923939", image: "cashapp")
        case .muun:
            return .init(index: 2, tag: "muun", displayName: NSLocalizedString("Muun", comment: "Dropdown option label for Lightning wallet, Muun."), link: "muun:", appStoreLink: "https://apps.apple.com/us/app/muun-wallet/id1482037683", image: "muun")
@@ -53,7 +53,7 @@ enum Wallet: String, CaseIterable, Identifiable {
            return .init(index: 3, tag: "bluewallet", displayName: NSLocalizedString("Blue Wallet", comment: "Dropdown option label for Lightning wallet, Blue Wallet."), link: "bluewallet:lightning:",
                         appStoreLink: "https://apps.apple.com/us/app/bluewallet-bitcoin-wallet/id1376878040", image: "bluewallet")
        case .walletofsatoshi:
-            return .init(index: 4, tag: "walletofsatoshi", displayName: NSLocalizedString("Wallet of Satoshi", comment: "Dropdown option label for Lightning wallet, Wallet of Satoshi."), link:  "walletofsatoshi:lightning:",
+            return .init(index: 4, tag: "walletofsatoshi", displayName: NSLocalizedString("Wallet Of Satoshi", comment: "Dropdown option label for Lightning wallet, Wallet Of Satoshi."), link:  "walletofsatoshi:lightning:",
                         appStoreLink: "https://apps.apple.com/us/app/wallet-of-satoshi/id1438599608", image: "walletofsatoshi")
        case .zebedee:
            return .init(index: 5, tag: "zebedee", displayName: NSLocalizedString("Zebedee", comment: "Dropdown option label for Lightning wallet, Zebedee."), link: "zebedee:lightning:",
@@ -75,7 +75,7 @@ enum Wallet: String, CaseIterable, Identifiable {
                         appStoreLink: "https://apps.apple.com/sv/app/bitcoin-beach-wallet/id1531383905", image: "bbw")
        case .blixtwallet:
            return .init(index: 11, tag: "blixtwallet", displayName: NSLocalizedString("Blixt Wallet", comment: "Dropdown option label for Lightning wallet, Blixt Wallet"), link: "blixtwallet:lightning:",
-                         appStoreLink: "https://testflight.apple.com/join/EXvGhRzS", image: "blixt-wallet")
+                         appStoreLink: nil, image: "blixt-wallet")
        case .river:
            return .init(index: 12, tag: "river", displayName: NSLocalizedString("River", comment: "Dropdown option label for Lightning wallet, River"), link: "river://",
                         appStoreLink: "https://apps.apple.com/us/app/river-buy-mine-bitcoin/id1536176542", image: "river")
--- a/damus/Modifiers/SwipeToDismiss.swift
+++ b/damus/Modifiers/SwipeToDismiss.swift
@@ -1,39 +0,0 @@
 //
 //  SwipeToDismiss.swift
 //  damus
 //
 //  Created by Joel Klabo on 1/18/23.
 //
 import SwiftUI
 struct SwipeToDismissModifier: ViewModifier {
    let minDistance: CGFloat?
    var onDismiss: () -> Void
    @State private var offset: CGSize = .zero
    @GestureState private var viewOffset: CGSize = .zero
    func body(content: Content) -> some View {
        content
            .offset(y: viewOffset.height)
            .animation(.interactiveSpring(), value: viewOffset)
            .simultaneousGesture(
                DragGesture(minimumDistance: minDistance ?? 10)
                    .updating($viewOffset, body: { value, gestureState, transaction in
                        gestureState = CGSize(width: value.location.x - value.startLocation.x, height: value.location.y - value.startLocation.y)
                    })
                    .onChanged { gesture in
                        if gesture.translation.width < 50 {
                            offset = gesture.translation
                        }
                    }
                    .onEnded { _ in
                        if abs(offset.height) > 100 {
                            onDismiss()
                        } else {
                            offset = .zero
                        }
                    }
            )
    }
 }
--- a/damus/Nostr/Nostr.swift
+++ b/damus/Nostr/Nostr.swift
@@ -8,97 +8,53 @@
 import Foundation
 struct Profile: Codable {
-    var value: [String: AnyCodable]
+    var value: [String: String]
-    init (name: String?, display_name: String?, about: String?, picture: String?, banner: String?, website: String?, lud06: String?, lud16: String?, nip05: String?) {
+    init (name: String?, display_name: String?, about: String?, picture: String?, website: String?, lud06: String?, lud16: String?, nip05: String?) {
        self.value = [:]
        self.name = name
        self.display_name = display_name
        self.about = about
        self.picture = picture
        self.banner = banner
        self.website = website
        self.lud06 = lud06
        self.lud16 = lud16
        self.nip05 = nip05
    }
    private func str(_ str: String) -> String? {
        return get_val(str)
    }
    private func get_val<T>(_ v: String) -> T? {
        guard let val = self.value[v] else{
            return nil
        }
        guard let s = val.value as? T else {
            return nil
        }
        return s
    }
    private mutating func set_val<T>(_ key: String, _ val: T?) {
        if val == nil {
            self.value.removeValue(forKey: key)
            return
        }
        self.value[key] = AnyCodable.init(val)
    }
    private mutating func set_str(_ key: String, _ val: String?) {
        set_val(key, val)
    }
    var deleted: Bool? {
        get { return get_val("deleted"); }
        set(s) { set_val("deleted", s) }
    }
    var display_name: String? {
-        get { return str("display_name"); }
+        get { return value["display_name"]; }
-        set(s) { set_str("display_name", s) }
+        set(s) { value["display_name"] = s }
    }
    var name: String? {
-        get { return str("name"); }
+        get { return value["name"]; }
-        set(s) { set_str("name", s) }
+        set(s) { value["name"] = s }
    }
    var about: String? {
-        get { return str("about"); }
+        get { return value["about"]; }
-        set(s) { set_str("about", s) }
+        set(s) { value["about"] = s }
    }
    var picture: String? {
-        get { return str("picture"); }
+        get { return value["picture"]; }
-        set(s) { set_str("picture", s) }
+        set(s) { value["picture"] = s }
    }
    var banner: String? {
        get { return str("banner"); }
        set(s) { set_str("banner", s) }
    }
    var website: String? {
-        get { return str("website"); }
+        get { return value["website"]; }
-        set(s) { set_str("website", s) }
+        set(s) { value["website"] = s }
    }
    var lud06: String? {
-        get { return str("lud06"); }
+        get { return value["lud06"]; }
-        set(s) { set_str("lud06", s) }
+        set(s) { value["lud06"] = s }
    }
    var lud16: String? {
-        get { return str("lud16"); }
+        get { return value["lud16"]; }
-        set(s) { set_str("lud16", s) }
+        set(s) { value["lud16"] = s }
    }
    var website_url: URL? {
        return self.website.flatMap { URL(string: $0) }
    }
    var lnurl: String? {
@@ -110,29 +66,21 @@ struct Profile: Codable {
            return lnaddress_to_lnurl(addr);
        }
        if !addr.lowercased().hasPrefix("lnurl") {
            return nil
        }
        return addr;
    }
    var nip05: String? {
-        get { return str("nip05"); }
+        get { return value["nip05"]; }
-        set(s) { set_str("nip05", s) }
+        set(s) { value["nip05"] = s }
    }
    var lightning_uri: URL? {
        return make_ln_url(self.lnurl)
    }
    init() {
        self.value = [:]
    }
    init(from decoder: Decoder) throws {
        let container = try decoder.singleValueContainer()
-        self.value = try container.decode([String: AnyCodable].self)
+        self.value = try container.decode([String: String].self)
    }
    func encode(to encoder: Encoder) throws {
@@ -146,9 +94,26 @@ struct Profile: Codable {
    }
 }
-func make_test_profile() -> Profile {
+/*
-    return Profile(name: "jb55", display_name: "Will", about: "Its a me", picture: "https://cdn.jb55.com/img/red-me.jpg", banner: "https://pbs.twimg.com/profile_banners/9918032/1531711830/600x200",  website: "jb55.com", lud06: "jb55@jb55.com", lud16: nil, nip05: "jb55@jb55.com")
+struct Profile: Decodable {
    let name: String?
    let display_name: String?
    let about: String?
    let picture: String?
    let website: String?
    let nip05: String?
    let lud06: String?
    let lud16: String?
    var lightning_uri: URL? {
        return make_ln_url(self.lud06) ?? make_ln_url(self.lud16)
    }
    static func displayName(profile: Profile?, pubkey: String) -> String {
        return profile?.name ?? abbrev_pubkey(pubkey)
    }
 }
 */
 func make_ln_url(_ str: String?) -> URL? {
    return str.flatMap { URL(string: "lightning:" + $0) }
--- a/damus/Nostr/NostrEvent.swift
+++ b/damus/Nostr/NostrEvent.swift
@@ -11,8 +11,6 @@ import secp256k1
 import secp256k1_implementation
 import CryptoKit
 enum ValidationResult: Decodable {
    case ok
    case bad_id
@@ -29,7 +27,7 @@ struct KeyEvent {
    let relay_url: String
 }
-struct ReferencedId: Identifiable, Hashable, Equatable {
+struct ReferencedId: Identifiable, Hashable {
    let ref_id: String
    let relay_id: String?
    let key: String
@@ -81,7 +79,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
    }
    var too_big: Bool {
-        return self.content.count > 16000
+        return self.content.count > 32000
    }
    var should_show_event: Bool {
@@ -105,15 +103,11 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
        if let bs = _blocks {
            return bs
        }
-        let blocks = get_blocks(content: self.get_content(privkey))
+        let blocks = parse_mentions(content: self.get_content(privkey), tags: self.tags)
        self._blocks = blocks
        return blocks
    }
    func get_blocks(content: String) -> [Block] {
        return parse_mentions(content: content, tags: self.tags)
    }
    lazy var inner_event: NostrEvent? = {
        // don't try to deserialize an inner event if we know there won't be one
        if self.known_kind == .boost {
@@ -373,10 +367,6 @@ func encode_json<T: Encodable>(_ val: T) -> String? {
    return (try? encoder.encode(val)).map { String(decoding: $0, as: UTF8.self) }
 }
 func decode_nostr_event_json(json: String) -> NostrEvent? {
    return decode_json(json)
 }
 func decode_json<T: Decodable>(_ val: String) -> T? {
    return try? JSONDecoder().decode(T.self, from: Data(val.utf8))
 }
@@ -456,13 +446,11 @@ func hex_encode(_ data: Data) -> String {
 func random_bytes(count: Int) -> Data {
-    var bytes = [Int8](repeating: 0, count: count)
+    var data = Data(count: count)
-    guard
+    _ = data.withUnsafeMutableBytes { mutableBytes in
-        SecRandomCopyBytes(kSecRandomDefault, bytes.count, &bytes) == errSecSuccess
+        SecRandomCopyBytes(kSecRandomDefault, count, mutableBytes.baseAddress!)
    else {
        fatalError("can't copy secure random data")
    }
-    return Data(bytes: bytes, count: count)
+    return data
 }
 func refid_to_tag(_ ref: ReferencedId) -> [String] {
@@ -577,26 +565,6 @@ func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> Nost
    return ev
 }
 func zap_target_to_tags(_ target: ZapTarget) -> [[String]] {
    switch target {
    case .profile(let pk):
        return [["p", pk]]
    case .note(let note_target):
        return [["e", note_target.note_id], ["p", note_target.author]]
    }
 }
 func make_zap_request_event(pubkey: String, privkey: String, content: String, relays: [RelayDescriptor], target: ZapTarget) -> NostrEvent {
    var tags = zap_target_to_tags(target)
    var relay_tag = ["relays"]
    relay_tag.append(contentsOf: relays.map { $0.url.absoluteString })
    tags.append(relay_tag)
    let ev = NostrEvent(content: content, pubkey: pubkey, kind: 9734, tags: tags)
    ev.id = calculate_event_id(ev: ev)
    ev.sig = sign_event(privkey: privkey, ev: ev)
    return ev
 }
 func gather_reply_ids(our_pubkey: String, from: NostrEvent) -> [ReferencedId] {
    var ids = get_referenced_ids(tags: from.tags, key: "e").first.map { [$0] } ?? []
@@ -802,15 +770,6 @@ func validate_event(ev: NostrEvent) -> ValidationResult {
    return ok ? .ok : .bad_sig
 }
 func last_etag(tags: [[String]]) -> String? {
    var e: String? = nil
    for tag in tags {
        if tag.count >= 2 && tag[0] == "e" {
            e = tag[1]
        }
    }
    return e
 }
 func inner_event_or_self(ev: NostrEvent) -> NostrEvent {
    guard let inner_ev = ev.inner_event else {
@@ -819,46 +778,3 @@ func inner_event_or_self(ev: NostrEvent) -> NostrEvent {
    return inner_ev
 }
 func first_eref_mention(ev: NostrEvent, privkey: String?) -> Mention? {
    let blocks = ev.blocks(privkey).filter { block in
        guard case .mention(let mention) = block else {
            return false
        }
        guard case .event = mention.type else {
            return false
        }
        if mention.ref.key != "e" {
            return false
        }
        return true
    }
    /// MARK: - Preview
    if let firstBlock = blocks.first, case .mention(let mention) = firstBlock, mention.ref.key == "e" {
        return mention
    }
    return nil
 }
 extension [ReferencedId] {
    var pRefs: [ReferencedId] {
        get {
            self.filter { ref in
                ref.key == "p"
            }
        }
    }
    var eRefs: [ReferencedId] {
        get {
            self.filter { ref in
                ref.key == "e"
            }
        }
    }
 }
--- a/damus/Nostr/NostrFilter.swift
+++ b/damus/Nostr/NostrFilter.swift
@@ -7,7 +7,7 @@
 import Foundation
-struct NostrFilter: Codable, Equatable {
+struct NostrFilter: Codable {
    var ids: [String]?
    var kinds: [Int]?
    var referenced_ids: [String]?
@@ -17,7 +17,6 @@ struct NostrFilter: Codable, Equatable {
    var limit: UInt32?
    var authors: [String]?
    var hashtag: [String]? = nil
    var parameter: [String]? = nil
    private enum CodingKeys : String, CodingKey {
        case ids
@@ -25,7 +24,6 @@ struct NostrFilter: Codable, Equatable {
        case referenced_ids = "#e"
        case pubkeys = "#p"
        case hashtag = "#t"
        case parameter = "#d"
        case since
        case until
        case authors
--- a/damus/Nostr/NostrKind.swift
+++ b/damus/Nostr/NostrKind.swift
@@ -19,6 +19,4 @@ enum NostrKind: Int {
    case channel_create = 40
    case channel_meta = 41
    case chat = 42
    case list = 30000
    case zap = 9735
 }
--- a/damus/Nostr/NostrLink.swift
+++ b/damus/Nostr/NostrLink.swift
@@ -8,7 +8,7 @@
 import Foundation
-enum NostrLink: Equatable {
+enum NostrLink {
    case ref(ReferencedId)
    case filter(NostrFilter)
 }
@@ -80,50 +80,7 @@ func parse_nostr_ref_uri(_ p: Parser) -> ReferencedId? {
    return ReferencedId(ref_id: pk, relay_id: nil, key: typ)
 }
 func decode_universal_link(_ s: String) -> NostrLink? {
    var uri = s.replacingOccurrences(of: "https://damus.io/r/", with: "")
    uri = uri.replacingOccurrences(of: "https://damus.io/", with: "")
    uri = uri.replacingOccurrences(of: "/", with: "")
    guard let decoded = try? bech32_decode(uri) else {
        return nil
    }
    let h = hex_encode(decoded.data)
    if decoded.hrp == "note" {
        return .ref(ReferencedId(ref_id: h, relay_id: nil, key: "e"))
    } else if decoded.hrp == "npub" {
        return .ref(ReferencedId(ref_id: h, relay_id: nil, key: "p"))
    }
    // TODO: handle nprofile, etc
    return nil
 }
 func decode_nostr_bech32_uri(_ s: String) -> NostrLink? {
    guard let obj = Bech32Object.parse(s) else {
        return nil
    }
    switch obj {
    case .nsec(let privkey):
        guard let pubkey = privkey_to_pubkey(privkey: privkey) else {
            return nil
        }
        return .ref(ReferencedId(ref_id: pubkey, relay_id: nil, key: "p"))
    case .npub(let pubkey):
        return .ref(ReferencedId(ref_id: pubkey, relay_id: nil, key: "p"))
    case .note(let id):
        return .ref(ReferencedId(ref_id: id, relay_id: nil, key: "e"))
    }
 }
 func decode_nostr_uri(_ s: String) -> NostrLink? {
    if s.starts(with: "https://damus.io/") {
        return decode_universal_link(s)
    }
    var uri = s.replacingOccurrences(of: "nostr://", with: "")
    uri = uri.replacingOccurrences(of: "nostr:", with: "")
@@ -140,15 +97,5 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
        return .filter(NostrFilter.filter_hashtag([parts[1].lowercased()]))
    }
-    if let rid = tag_to_refid(parts) {
+    return tag_to_refid(parts).map { .ref($0) }
        return .ref(rid)
    }
    guard parts.count == 1 else {
        return nil
    }
    let part = parts[0]
    return decode_nostr_bech32_uri(part)
 }
--- a/damus/Nostr/NostrMetadata.swift
+++ b/damus/Nostr/NostrMetadata.swift
@@ -15,11 +15,10 @@ struct NostrMetadata: Codable {
    let website: String?
    let nip05: String?
    let picture: String?
    let banner: String?
    let lud06: String?
    let lud16: String?
 }
 func create_account_to_metadata(_ model: CreateAccountModel) -> NostrMetadata {
-    return NostrMetadata(display_name: model.real_name, name: model.nick_name, about: model.about, website: nil, nip05: nil, picture: nil, banner: nil, lud06: nil, lud16: nil)
+    return NostrMetadata(display_name: model.real_name, name: model.nick_name, about: model.about, website: nil, nip05: nil, picture: nil, lud06: nil, lud16: nil)
 }
--- a/damus/Nostr/NostrResponse.swift
+++ b/damus/Nostr/NostrResponse.swift
@@ -11,17 +11,6 @@ enum NostrResponse: Decodable {
    case event(String, NostrEvent)
    case notice(String)
    case eose(String)
    var subid: String? {
        switch self {
        case .event(let sub_id, _):
            return sub_id
        case .eose(let sub_id):
            return sub_id
        case .notice:
            return nil
        }
    }
    init(from decoder: Decoder) throws {
        var container = try decoder.unkeyedContainer()
--- a/damus/Nostr/Profiles.swift
+++ b/damus/Nostr/Profiles.swift
@@ -11,20 +11,6 @@ import UIKit
 class Profiles {
    var profiles: [String: TimestampedProfile] = [:]
    var validated: [String: NIP05] = [:]
    var zappers: [String: String] = [:]
    func is_validated(_ pk: String) -> NIP05? {
        return validated[pk]
    }
    func lookup_zapper(pubkey: String) -> String? {
        if let zapper = zappers[pubkey] {
            return zapper
        }
        return nil
    }
    func add(id: String, profile: TimestampedProfile) {
        profiles[id] = profile
--- a/damus/Nostr/Relay.swift
+++ b/damus/Nostr/Relay.swift
@@ -7,16 +7,16 @@
 import Foundation
-public struct RelayInfo: Codable {
+struct RelayInfo: Codable {
    let read: Bool
    let write: Bool
    static let rw = RelayInfo(read: true, write: true)
 }
-public struct RelayDescriptor: Codable {
+struct RelayDescriptor: Codable {
-    public let url: URL
+    let url: URL
-    public let info: RelayInfo
+    let info: RelayInfo
 }
 enum RelayFlags: Int {
--- a/damus/Nostr/RelayConnection.swift
+++ b/damus/Nostr/RelayConnection.swift
@@ -38,7 +38,7 @@ class RelayConnection: WebSocketDelegate {
            self.connect(force: true)
        }
    }
-    
+
    func connect(force: Bool = false){
        if !force && (self.isConnected || self.isConnecting) {
            return
--- a/damus/Nostr/RelayPool.swift
+++ b/damus/Nostr/RelayPool.swift
@@ -28,20 +28,9 @@ struct RelayHandler {
    let callback: (String, NostrConnectionEvent) -> ()
 }
 struct QueuedRequest {
    let req: NostrRequest
    let relay: String
 }
 struct NostrRequestId: Equatable, Hashable {
    let relay: String?
    let sub_id: String
 }
 class RelayPool {
    var relays: [Relay] = []
    var handlers: [RelayHandler] = []
    var request_queue: [QueuedRequest] = []
    var descriptors: [RelayDescriptor] {
        relays.map { $0.descriptor }
@@ -159,38 +148,13 @@ class RelayPool {
        send(.subscribe(.init(filters: filters, sub_id: sub_id)), to: to)
    }
    func count_queued(relay: String) -> Int {
        var c = 0
        for request in request_queue {
            if request.relay == relay {
                c += 1
            }
        }
        return c
    }
    func queue_req(r: NostrRequest, relay: String) {
        let count = count_queued(relay: relay)
        guard count <= 10 else {
            print("can't queue, too many queued events for \(relay)")
            return
        }
        print("queueing request: \(r) for \(relay)")
        request_queue.append(QueuedRequest(req: r, relay: relay))
    }
    func send(_ req: NostrRequest, to: [String]? = nil) {
        let relays = to.map{ get_relays($0) } ?? self.relays
        for relay in relays {
-            guard relay.connection.isConnected else {
+            if relay.connection.isConnected {
-                queue_req(r: req, relay: relay.id)
+                relay.connection.send(req)
                continue
            }
            relay.connection.send(req)
        }
    }
@@ -229,28 +193,9 @@ class RelayPool {
        }
    }
    func run_queue(_ relay_id: String) {
        self.request_queue = request_queue.reduce(into: Array<QueuedRequest>()) { (q, req) in
            guard req.relay == relay_id else {
                q.append(req)
                return
            }
            print("running queueing request: \(req.req) for \(relay_id)")
            self.send(req.req, to: [relay_id])
        }
    }
    func handle_event(relay_id: String, event: NostrConnectionEvent) {
        record_last_pong(relay_id: relay_id, event: event)
        // run req queue when we reconnect
        if case .ws_event(let ws) = event {
            if case .connected = ws {
                run_queue(relay_id)
            }
        }
        // handle reconnect logic, etc?
        for handler in handlers {
            handler.callback(relay_id, event)
--- a/damus/Util/AccountDeletion.swift
+++ b/damus/Util/AccountDeletion.swift
@@ -1,22 +0,0 @@
 //
 //  AccountDeletion.swift
 //  damus
 //
 //  Created by William Casarin on 2023-01-30.
 //
 import Foundation
 func created_deleted_account_profile(keypair: FullKeypair) -> NostrEvent {
    var profile = Profile()
    profile.deleted = true
    profile.about = "account deleted"
    profile.name = "nobody"
    let content = encode_json(profile)!
    let ev = NostrEvent(content: content, pubkey: keypair.pubkey, kind: 0)
    ev.id = calculate_event_id(ev: ev)
    ev.sig = sign_event(privkey: keypair.privkey, ev: ev)
    return ev
 }
--- a/damus/Util/AnyCodable/AnyCodable.swift
+++ b/damus/Util/AnyCodable/AnyCodable.swift
@@ -1,147 +0,0 @@
 import Foundation
 /**
 A type-erased `Codable` value.
 The `AnyCodable` type forwards encoding and decoding responsibilities
 to an underlying value, hiding its specific underlying type.
 You can encode or decode mixed-type values in dictionaries
 and other collections that require `Encodable` or `Decodable` conformance
 by declaring their contained type to be `AnyCodable`.
 - SeeAlso: `AnyEncodable`
 - SeeAlso: `AnyDecodable`
 */
@frozen public struct AnyCodable: Codable {
    public let value: Any
    public init<T>(_ value: T?) {
        self.value = value ?? ()
    }
 }
 extension AnyCodable: _AnyEncodable, _AnyDecodable {}
 extension AnyCodable: Equatable {
    public static func == (lhs: AnyCodable, rhs: AnyCodable) -> Bool {
        switch (lhs.value, rhs.value) {
        case is (Void, Void):
            return true
        case let (lhs as Bool, rhs as Bool):
            return lhs == rhs
        case let (lhs as Int, rhs as Int):
            return lhs == rhs
        case let (lhs as Int8, rhs as Int8):
            return lhs == rhs
        case let (lhs as Int16, rhs as Int16):
            return lhs == rhs
        case let (lhs as Int32, rhs as Int32):
            return lhs == rhs
        case let (lhs as Int64, rhs as Int64):
            return lhs == rhs
        case let (lhs as UInt, rhs as UInt):
            return lhs == rhs
        case let (lhs as UInt8, rhs as UInt8):
            return lhs == rhs
        case let (lhs as UInt16, rhs as UInt16):
            return lhs == rhs
        case let (lhs as UInt32, rhs as UInt32):
            return lhs == rhs
        case let (lhs as UInt64, rhs as UInt64):
            return lhs == rhs
        case let (lhs as Float, rhs as Float):
            return lhs == rhs
        case let (lhs as Double, rhs as Double):
            return lhs == rhs
        case let (lhs as String, rhs as String):
            return lhs == rhs
        case let (lhs as [String: AnyCodable], rhs as [String: AnyCodable]):
            return lhs == rhs
        case let (lhs as [AnyCodable], rhs as [AnyCodable]):
            return lhs == rhs
        case let (lhs as [String: Any], rhs as [String: Any]):
            return NSDictionary(dictionary: lhs) == NSDictionary(dictionary: rhs)
        case let (lhs as [Any], rhs as [Any]):
            return NSArray(array: lhs) == NSArray(array: rhs)
        case is (NSNull, NSNull):
            return true
        default:
            return false
        }
    }
 }
 extension AnyCodable: CustomStringConvertible {
    public var description: String {
        switch value {
        case is Void:
            return String(describing: nil as Any?)
        case let value as CustomStringConvertible:
            return value.description
        default:
            return String(describing: value)
        }
    }
 }
 extension AnyCodable: CustomDebugStringConvertible {
    public var debugDescription: String {
        switch value {
        case let value as CustomDebugStringConvertible:
            return "AnyCodable(\(value.debugDescription))"
        default:
            return "AnyCodable(\(description))"
        }
    }
 }
 extension AnyCodable: ExpressibleByNilLiteral {}
 extension AnyCodable: ExpressibleByBooleanLiteral {}
 extension AnyCodable: ExpressibleByIntegerLiteral {}
 extension AnyCodable: ExpressibleByFloatLiteral {}
 extension AnyCodable: ExpressibleByStringLiteral {}
 extension AnyCodable: ExpressibleByStringInterpolation {}
 extension AnyCodable: ExpressibleByArrayLiteral {}
 extension AnyCodable: ExpressibleByDictionaryLiteral {}
 extension AnyCodable: Hashable {
    public func hash(into hasher: inout Hasher) {
        switch value {
        case let value as Bool:
            hasher.combine(value)
        case let value as Int:
            hasher.combine(value)
        case let value as Int8:
            hasher.combine(value)
        case let value as Int16:
            hasher.combine(value)
        case let value as Int32:
            hasher.combine(value)
        case let value as Int64:
            hasher.combine(value)
        case let value as UInt:
            hasher.combine(value)
        case let value as UInt8:
            hasher.combine(value)
        case let value as UInt16:
            hasher.combine(value)
        case let value as UInt32:
            hasher.combine(value)
        case let value as UInt64:
            hasher.combine(value)
        case let value as Float:
            hasher.combine(value)
        case let value as Double:
            hasher.combine(value)
        case let value as String:
            hasher.combine(value)
        case let value as [String: AnyCodable]:
            hasher.combine(value)
        case let value as [AnyCodable]:
            hasher.combine(value)
        default:
            break
        }
    }
 }
--- a/damus/Util/AnyCodable/AnyDecodable.swift
+++ b/damus/Util/AnyCodable/AnyDecodable.swift
@@ -1,188 +0,0 @@
 #if canImport(Foundation)
 import Foundation
 #endif
 /**
 A type-erased `Decodable` value.
 The `AnyDecodable` type forwards decoding responsibilities
 to an underlying value, hiding its specific underlying type.
 You can decode mixed-type values in dictionaries
 and other collections that require `Decodable` conformance
 by declaring their contained type to be `AnyDecodable`:
     let json = """
     {
         "boolean": true,
         "integer": 42,
         "double": 3.141592653589793,
         "string": "string",
         "array": [1, 2, 3],
         "nested": {
             "a": "alpha",
             "b": "bravo",
             "c": "charlie"
         },
         "null": null
     }
     """.data(using: .utf8)!
     let decoder = JSONDecoder()
     let dictionary = try! decoder.decode([String: AnyDecodable].self, from: json)
 */
@frozen public struct AnyDecodable: Decodable {
    public let value: Any
    public init<T>(_ value: T?) {
        self.value = value ?? ()
    }
 }
@usableFromInline
 protocol _AnyDecodable {
    var value: Any { get }
    init<T>(_ value: T?)
 }
 extension AnyDecodable: _AnyDecodable {}
 extension _AnyDecodable {
    public init(from decoder: Decoder) throws {
        let container = try decoder.singleValueContainer()
        if container.decodeNil() {
            #if canImport(Foundation)
                self.init(NSNull())
            #else
                self.init(Optional<Self>.none)
            #endif
        } else if let bool = try? container.decode(Bool.self) {
            self.init(bool)
        } else if let int = try? container.decode(Int.self) {
            self.init(int)
        } else if let uint = try? container.decode(UInt.self) {
            self.init(uint)
        } else if let double = try? container.decode(Double.self) {
            self.init(double)
        } else if let string = try? container.decode(String.self) {
            self.init(string)
        } else if let array = try? container.decode([AnyDecodable].self) {
            self.init(array.map { $0.value })
        } else if let dictionary = try? container.decode([String: AnyDecodable].self) {
            self.init(dictionary.mapValues { $0.value })
        } else {
            throw DecodingError.dataCorruptedError(in: container, debugDescription: "AnyDecodable value cannot be decoded")
        }
    }
 }
 extension AnyDecodable: Equatable {
    public static func == (lhs: AnyDecodable, rhs: AnyDecodable) -> Bool {
        switch (lhs.value, rhs.value) {
 #if canImport(Foundation)
        case is (NSNull, NSNull), is (Void, Void):
            return true
 #endif
        case let (lhs as Bool, rhs as Bool):
            return lhs == rhs
        case let (lhs as Int, rhs as Int):
            return lhs == rhs
        case let (lhs as Int8, rhs as Int8):
            return lhs == rhs
        case let (lhs as Int16, rhs as Int16):
            return lhs == rhs
        case let (lhs as Int32, rhs as Int32):
            return lhs == rhs
        case let (lhs as Int64, rhs as Int64):
            return lhs == rhs
        case let (lhs as UInt, rhs as UInt):
            return lhs == rhs
        case let (lhs as UInt8, rhs as UInt8):
            return lhs == rhs
        case let (lhs as UInt16, rhs as UInt16):
            return lhs == rhs
        case let (lhs as UInt32, rhs as UInt32):
            return lhs == rhs
        case let (lhs as UInt64, rhs as UInt64):
            return lhs == rhs
        case let (lhs as Float, rhs as Float):
            return lhs == rhs
        case let (lhs as Double, rhs as Double):
            return lhs == rhs
        case let (lhs as String, rhs as String):
            return lhs == rhs
        case let (lhs as [String: AnyDecodable], rhs as [String: AnyDecodable]):
            return lhs == rhs
        case let (lhs as [AnyDecodable], rhs as [AnyDecodable]):
            return lhs == rhs
        default:
            return false
        }
    }
 }
 extension AnyDecodable: CustomStringConvertible {
    public var description: String {
        switch value {
        case is Void:
            return String(describing: nil as Any?)
        case let value as CustomStringConvertible:
            return value.description
        default:
            return String(describing: value)
        }
    }
 }
 extension AnyDecodable: CustomDebugStringConvertible {
    public var debugDescription: String {
        switch value {
        case let value as CustomDebugStringConvertible:
            return "AnyDecodable(\(value.debugDescription))"
        default:
            return "AnyDecodable(\(description))"
        }
    }
 }
 extension AnyDecodable: Hashable {
    public func hash(into hasher: inout Hasher) {
        switch value {
        case let value as Bool:
            hasher.combine(value)
        case let value as Int:
            hasher.combine(value)
        case let value as Int8:
            hasher.combine(value)
        case let value as Int16:
            hasher.combine(value)
        case let value as Int32:
            hasher.combine(value)
        case let value as Int64:
            hasher.combine(value)
        case let value as UInt:
            hasher.combine(value)
        case let value as UInt8:
            hasher.combine(value)
        case let value as UInt16:
            hasher.combine(value)
        case let value as UInt32:
            hasher.combine(value)
        case let value as UInt64:
            hasher.combine(value)
        case let value as Float:
            hasher.combine(value)
        case let value as Double:
            hasher.combine(value)
        case let value as String:
            hasher.combine(value)
        case let value as [String: AnyDecodable]:
            hasher.combine(value)
        case let value as [AnyDecodable]:
            hasher.combine(value)
        default:
            break
        }
    }
 }
--- a/damus/Util/AnyCodable/AnyEncodable.swift
+++ b/damus/Util/AnyCodable/AnyEncodable.swift
@@ -1,291 +0,0 @@
 #if canImport(Foundation)
 import Foundation
 #endif
 /**
 A type-erased `Encodable` value.
 The `AnyEncodable` type forwards encoding responsibilities
 to an underlying value, hiding its specific underlying type.
 You can encode mixed-type values in dictionaries
 and other collections that require `Encodable` conformance
 by declaring their contained type to be `AnyEncodable`:
     let dictionary: [String: AnyEncodable] = [
         "boolean": true,
         "integer": 42,
         "double": 3.141592653589793,
         "string": "string",
         "array": [1, 2, 3],
         "nested": [
             "a": "alpha",
             "b": "bravo",
             "c": "charlie"
         ],
         "null": nil
     ]
     let encoder = JSONEncoder()
     let json = try! encoder.encode(dictionary)
 */
@frozen public struct AnyEncodable: Encodable {
    public let value: Any
    public init<T>(_ value: T?) {
        self.value = value ?? ()
    }
 }
@usableFromInline
 protocol _AnyEncodable {
    var value: Any { get }
    init<T>(_ value: T?)
 }
 extension AnyEncodable: _AnyEncodable {}
 // MARK: - Encodable
 extension _AnyEncodable {
    public func encode(to encoder: Encoder) throws {
        var container = encoder.singleValueContainer()
        switch value {
        #if canImport(Foundation)
        case is NSNull:
            try container.encodeNil()
        #endif
        case is Void:
            try container.encodeNil()
        case let bool as Bool:
            try container.encode(bool)
        case let int as Int:
            try container.encode(int)
        case let int8 as Int8:
            try container.encode(int8)
        case let int16 as Int16:
            try container.encode(int16)
        case let int32 as Int32:
            try container.encode(int32)
        case let int64 as Int64:
            try container.encode(int64)
        case let uint as UInt:
            try container.encode(uint)
        case let uint8 as UInt8:
            try container.encode(uint8)
        case let uint16 as UInt16:
            try container.encode(uint16)
        case let uint32 as UInt32:
            try container.encode(uint32)
        case let uint64 as UInt64:
            try container.encode(uint64)
        case let float as Float:
            try container.encode(float)
        case let double as Double:
            try container.encode(double)
        case let string as String:
            try container.encode(string)
        #if canImport(Foundation)
        case let number as NSNumber:
            try encode(nsnumber: number, into: &container)
        case let date as Date:
            try container.encode(date)
        case let url as URL:
            try container.encode(url)
        #endif
        case let array as [Any?]:
            try container.encode(array.map { AnyEncodable($0) })
        case let dictionary as [String: Any?]:
            try container.encode(dictionary.mapValues { AnyEncodable($0) })
        case let encodable as Encodable:
            try encodable.encode(to: encoder)
        default:
            let context = EncodingError.Context(codingPath: container.codingPath, debugDescription: "AnyEncodable value cannot be encoded")
            throw EncodingError.invalidValue(value, context)
        }
    }
    #if canImport(Foundation)
    private func encode(nsnumber: NSNumber, into container: inout SingleValueEncodingContainer) throws {
        switch Character(Unicode.Scalar(UInt8(nsnumber.objCType.pointee)))  {
        case "B":
            try container.encode(nsnumber.boolValue)
        case "c":
            try container.encode(nsnumber.int8Value)
        case "s":
            try container.encode(nsnumber.int16Value)
        case "i", "l":
            try container.encode(nsnumber.int32Value)
        case "q":
            try container.encode(nsnumber.int64Value)
        case "C":
            try container.encode(nsnumber.uint8Value)
        case "S":
            try container.encode(nsnumber.uint16Value)
        case "I", "L":
            try container.encode(nsnumber.uint32Value)
        case "Q":
            try container.encode(nsnumber.uint64Value)
        case "f":
            try container.encode(nsnumber.floatValue)
        case "d":
            try container.encode(nsnumber.doubleValue)
        default:
            let context = EncodingError.Context(codingPath: container.codingPath, debugDescription: "NSNumber cannot be encoded because its type is not handled")
            throw EncodingError.invalidValue(nsnumber, context)
        }
    }
    #endif
 }
 extension AnyEncodable: Equatable {
    public static func == (lhs: AnyEncodable, rhs: AnyEncodable) -> Bool {
        switch (lhs.value, rhs.value) {
        case is (Void, Void):
            return true
        case let (lhs as Bool, rhs as Bool):
            return lhs == rhs
        case let (lhs as Int, rhs as Int):
            return lhs == rhs
        case let (lhs as Int8, rhs as Int8):
            return lhs == rhs
        case let (lhs as Int16, rhs as Int16):
            return lhs == rhs
        case let (lhs as Int32, rhs as Int32):
            return lhs == rhs
        case let (lhs as Int64, rhs as Int64):
            return lhs == rhs
        case let (lhs as UInt, rhs as UInt):
            return lhs == rhs
        case let (lhs as UInt8, rhs as UInt8):
            return lhs == rhs
        case let (lhs as UInt16, rhs as UInt16):
            return lhs == rhs
        case let (lhs as UInt32, rhs as UInt32):
            return lhs == rhs
        case let (lhs as UInt64, rhs as UInt64):
            return lhs == rhs
        case let (lhs as Float, rhs as Float):
            return lhs == rhs
        case let (lhs as Double, rhs as Double):
            return lhs == rhs
        case let (lhs as String, rhs as String):
            return lhs == rhs
        case let (lhs as [String: AnyEncodable], rhs as [String: AnyEncodable]):
            return lhs == rhs
        case let (lhs as [AnyEncodable], rhs as [AnyEncodable]):
            return lhs == rhs
        default:
            return false
        }
    }
 }
 extension AnyEncodable: CustomStringConvertible {
    public var description: String {
        switch value {
        case is Void:
            return String(describing: nil as Any?)
        case let value as CustomStringConvertible:
            return value.description
        default:
            return String(describing: value)
        }
    }
 }
 extension AnyEncodable: CustomDebugStringConvertible {
    public var debugDescription: String {
        switch value {
        case let value as CustomDebugStringConvertible:
            return "AnyEncodable(\(value.debugDescription))"
        default:
            return "AnyEncodable(\(description))"
        }
    }
 }
 extension AnyEncodable: ExpressibleByNilLiteral {}
 extension AnyEncodable: ExpressibleByBooleanLiteral {}
 extension AnyEncodable: ExpressibleByIntegerLiteral {}
 extension AnyEncodable: ExpressibleByFloatLiteral {}
 extension AnyEncodable: ExpressibleByStringLiteral {}
 extension AnyEncodable: ExpressibleByStringInterpolation {}
 extension AnyEncodable: ExpressibleByArrayLiteral {}
 extension AnyEncodable: ExpressibleByDictionaryLiteral {}
 extension _AnyEncodable {
    public init(nilLiteral _: ()) {
        self.init(nil as Any?)
    }
    public init(booleanLiteral value: Bool) {
        self.init(value)
    }
    public init(integerLiteral value: Int) {
        self.init(value)
    }
    public init(floatLiteral value: Double) {
        self.init(value)
    }
    public init(extendedGraphemeClusterLiteral value: String) {
        self.init(value)
    }
    public init(stringLiteral value: String) {
        self.init(value)
    }
    public init(arrayLiteral elements: Any...) {
        self.init(elements)
    }
    public init(dictionaryLiteral elements: (AnyHashable, Any)...) {
        self.init([AnyHashable: Any](elements, uniquingKeysWith: { first, _ in first }))
    }
 }
 extension AnyEncodable: Hashable {
    public func hash(into hasher: inout Hasher) {
        switch value {
        case let value as Bool:
            hasher.combine(value)
        case let value as Int:
            hasher.combine(value)
        case let value as Int8:
            hasher.combine(value)
        case let value as Int16:
            hasher.combine(value)
        case let value as Int32:
            hasher.combine(value)
        case let value as Int64:
            hasher.combine(value)
        case let value as UInt:
            hasher.combine(value)
        case let value as UInt8:
            hasher.combine(value)
        case let value as UInt16:
            hasher.combine(value)
        case let value as UInt32:
            hasher.combine(value)
        case let value as UInt64:
            hasher.combine(value)
        case let value as Float:
            hasher.combine(value)
        case let value as Double:
            hasher.combine(value)
        case let value as String:
            hasher.combine(value)
        case let value as [String: AnyEncodable]:
            hasher.combine(value)
        case let value as [AnyEncodable]:
            hasher.combine(value)
        default:
            break
        }
    }
 }
--- a/damus/Util/Bech32Object.swift
+++ b/damus/Util/Bech32Object.swift
@@ -1,31 +0,0 @@
 //
 //  Bech32Object.swift
 //  damus
 //
 //  Created by William Casarin on 2023-01-28.
 //
 import Foundation
 enum Bech32Object {
    case nsec(String)
    case npub(String)
    case note(String)
    static func parse(_ str: String) -> Bech32Object? {
        guard let decoded = try? bech32_decode(str) else {
            return nil
        }
        if decoded.hrp == "npub" {
            return .npub(hex_encode(decoded.data))
        } else if decoded.hrp == "nsec" {
            return .nsec(hex_encode(decoded.data))
        } else if decoded.hrp == "note" {
            return .note(hex_encode(decoded.data))
        }
        return nil
    }
 }
--- a/damus/Util/Constants.swift
+++ b/damus/Util/Constants.swift
@@ -11,7 +11,7 @@ public class Constants {
    static let PUB_KEY = "3efdaebb1d8923ebd99c9e7ace3b4194ab45512e2be79c1b7d68d9243e0d2681"
-    static let EXAMPLE_DEMOS: DamusState = .empty
+    static let EXAMPLE_DEMOS = DamusState(pool: RelayPool(), keypair: Keypair(pubkey: PUB_KEY, privkey: "privkey"), likes: EventCounter(our_pubkey: PUB_KEY), boosts: EventCounter(our_pubkey: PUB_KEY), contacts: Contacts(), tips: TipCounter(our_pubkey: PUB_KEY), profiles: Profiles(), dms: DirectMessagesModel())
    static let EXAMPLE_EVENTS = [
        NostrEvent(id: UUID().description, content: "Nostr - Damus... Haha get it? Bonjour Le Monde mon Ami! C'est la tres importante", pubkey: "3efdaebb1d8923ebd99c9e7ace3b4194ab45512e2be79c1b7d68d9243e0d2681"),
--- a/damus/Util/CoreSVG.swift
+++ b/damus/Util/CoreSVG.swift
@@ -1,101 +0,0 @@
 //
 //  CoreSVG.swift
 //  damus
 //
 //  Created by Oleg Abalonski on 1/27/23.
 //  Ref: https://gist.github.com/ollieatkinson/eb87a82fcb5500d5561fed8b0900a9f7
 import Darwin
 import Foundation
 import UIKit
@objc
 class CGSVGDocument: NSObject { }
 var CGSVGDocumentRetain: (@convention(c) (CGSVGDocument?) -> Unmanaged<CGSVGDocument>?) = load("CGSVGDocumentRetain")
 var CGSVGDocumentRelease: (@convention(c) (CGSVGDocument?) -> Void) = load("CGSVGDocumentRelease")
 var CGSVGDocumentCreateFromData: (@convention(c) (CFData?, CFDictionary?) -> Unmanaged<CGSVGDocument>?) = load("CGSVGDocumentCreateFromData")
 var CGContextDrawSVGDocument: (@convention(c) (CGContext?, CGSVGDocument?) -> Void) = load("CGContextDrawSVGDocument")
 var CGSVGDocumentGetCanvasSize: (@convention(c) (CGSVGDocument?) -> CGSize) = load("CGSVGDocumentGetCanvasSize")
 typealias ImageWithCGSVGDocument = @convention(c) (AnyObject, Selector, CGSVGDocument) -> UIImage
 var ImageWithCGSVGDocumentSEL: Selector = NSSelectorFromString("_imageWithCGSVGDocument:")
 let CoreSVG = dlopen("/System/Library/PrivateFrameworks/CoreSVG.framework/CoreSVG", RTLD_NOW)
 func load<T>(_ name: String) -> T {
    unsafeBitCast(dlsym(CoreSVG, name), to: T.self)
 }
 public class SVG {
    deinit { CGSVGDocumentRelease(document) }
    let document: CGSVGDocument
    public convenience init?(_ value: String) {
        guard let data = value.data(using: .utf8) else { return nil }
        self.init(data)
    }
    public init?(_ data: Data) {
        guard let document = CGSVGDocumentCreateFromData(data as CFData, nil)?.takeUnretainedValue() else { return nil }
        guard CGSVGDocumentGetCanvasSize(document) != .zero else { return nil }
        self.document = document
    }
    public var size: CGSize {
        CGSVGDocumentGetCanvasSize(document)
    }
    public func image() -> UIImage? {
        let ImageWithCGSVGDocument = unsafeBitCast(UIImage.self.method(for: ImageWithCGSVGDocumentSEL), to: ImageWithCGSVGDocument.self)
        let image = ImageWithCGSVGDocument(UIImage.self, ImageWithCGSVGDocumentSEL, document)
        return image
    }
    public func draw(in context: CGContext) {
        draw(in: context, size: size)
    }
    public func draw(in context: CGContext, size target: CGSize) {
        var target = target
        let ratio = (
            x: target.width / size.width,
            y: target.height / size.height
        )
        let rect = (
            document: CGRect(origin: .zero, size: size), ()
        )
        let scale: (x: CGFloat, y: CGFloat)
        if target.width <= 0 {
            scale = (ratio.y, ratio.y)
            target.width = size.width * scale.x
        } else if target.height <= 0 {
            scale = (ratio.x, ratio.x)
            target.width = size.width * scale.y
        } else {
            let min = min(ratio.x, ratio.y)
            scale = (min, min)
            target.width = size.width * scale.x
            target.height = size.height * scale.y
        }
        let transform = (
            scale: CGAffineTransform(scaleX: scale.x, y: scale.y),
            aspect: CGAffineTransform(translationX: (target.width / scale.x - rect.document.width) / 2, y: (target.height / scale.y - rect.document.height) / 2)
        )
        context.translateBy(x: 0, y: target.height)
        context.scaleBy(x: 1, y: -1)
        context.concatenate(transform.scale)
        context.concatenate(transform.aspect)
        CGContextDrawSVGDocument(context, document)
    }
 }
--- a/damus/Util/InsertSort.swift
+++ b/damus/Util/InsertSort.swift
@@ -38,26 +38,6 @@ func insert_uniq_by_pubkey(events: inout [NostrEvent], new_ev: NostrEvent, cmp:
    return true
 }
 func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
    var i: Int = 0
    for zap in zaps {
        // don't insert duplicate events
        if new_zap.event.id == zap.event.id {
            return false
        }
        if new_zap.invoice.amount > zap.invoice.amount {
            zaps.insert(new_zap, at: i)
            return true
        }
        i += 1
    }
    zaps.append(new_zap)
    return true
 }
 func insert_uniq_sorted_event(events: inout [NostrEvent], new_ev: NostrEvent, cmp: (NostrEvent, NostrEvent) -> Bool) -> Bool {
    var i: Int = 0
--- a/damus/Util/Keys.swift
+++ b/damus/Util/Keys.swift
@@ -12,25 +12,12 @@ import Vault
 let PUBKEY_HRP = "npub"
 let PRIVKEY_HRP = "nsec"
 struct FullKeypair {
    let pubkey: String
    let privkey: String
 }
 struct Keypair {
    let pubkey: String
    let privkey: String?
    let pubkey_bech32: String
    let privkey_bech32: String?
    func to_full() -> FullKeypair? {
        guard let privkey = self.privkey else {
            return nil
        }
        return FullKeypair(pubkey: pubkey, privkey: privkey)
    }
    init(pubkey: String, privkey: String?) {
        self.pubkey = pubkey
        self.privkey = privkey
--- a/Show More
+++ b/Show More