Fix UX to open relay config view when navigating from personal profile

2023-02-06 10:57:28 -05:00
220 changed files with 20302 additions and 8501 deletions
@@ -1,99 +1,3 @@
-## [1.1.0-3] - 2023-02-20
-
-### Added
-
- Add a "load more" button instead of always inserting events in timelines (William Casarin)
- Added the ability to select text on posts (OlegAba)
- Added Posts or Post & Replies selector to Profile (ericholguin)
- Improved profile navbar (OlegAba)
-
-
-### Changed
-
- Rename global feed to universe (William Casarin)
- Improve look of post view (ericholguin)
- Added a 20MB content length limit for all image files (OlegAba)
- Improved EventActionBar button spacing (Bryan Montz)
- Polished profile key copy buttons, added animation (Bryan Montz)
- Format large numbers of action bar actions (Joel Klabo)
- Improved blur on images, especially in dark mode (Bryan Montz)
-
-
-### Fixed
-
- Remove trailing slash when adding a relay (middlingphys)
- Scroll to top of events instead of the bottom (OlegAba)
- Fix lag on startup when you have lots of DMs (William Casarin)
- Fix an issues where dm notifications appear without any new events (William Casarin)
- Fix some hangs when scrolling by images (OlegAba)
- Force default zap amount text field to accept only numbers (Terry Yiu)
-
-
-
-[1.1.0-3]: https://github.com/damus-io/damus/releases/tag/v1.1.0-3
-
-## [1.1.0-2] - 2023-02-14
-
-### Added
-
- Save drafts to posts, replies and DMs (Terry Yiu)
-
-### Fixed
-
- Ensure stats get updated in realtime on action bars (William Casarin)
- Fix reposts not getting counted properly (William Casarin)
- Fix a bug where zaps on other people's posts weren't showing (William Casarin)
- Fix punctuation getting included in some urls (Gert Goet)
- Improve language detection (Terry Yiu)
- Fix some animated image crashes (William Casarin)
-
-
-[1.1.0-2]: https://github.com/damus-io/damus/releases/tag/v1.1.0-2
-## [1.0.0-15] - 2023-02-10
-
-### Added
-
- Relay Filtering (William Casarin)
- Japanese translations (Terry Yiu)
- Add password autofill on account login and creation (Terry Yiu)
- Show if relay is paid (William Casarin)
- Add "Follows You" indicator on profile (William Casarin)
- Add screen to select individual relays when posting/broadcasting (Andrii Sievrikov)
- Relay Detail View (Joel Klabo)
- Warn when attempting to post an nsec key (Terry Yiu)
- DeepL translation integration (Terry Yiu)
- Use local authentication (faceid) to access private key (Andrii Sievrikov)
- Add accessibility labels to action bar (Bryan Montz)
- Copy invoice button (Joel Klabo)
- Receive Lightning Zaps (William Casarin)
- Allow text selection in bio (Suhail Saqan)
-
-
-### Changed
-
- Show "Follow Back" button on profile page (William Casarin)
- When on your profile page, open relay view instead for your own relays (Terry Yiu)
- Updated QR code view, include profile image, etc (ericholguin)
- Clicking relay numbers now goes to relay config (radixrat)
-
-### Fixed
-
- Load zaps, likes and reposts when you open a thread (William Casarin)
- Fix bug where sidebar navigation fails to pop when switching timelines (William Casarin)
- Use lnaddress before lnurl for tip addresses to avoid Anigma scamming (William Casarin)
- Fix sidebar navigation bugs (OlegAba)
- Fix issue where navigation fails pop to root when switching timelines (William Casarin)
- Make @ mentions case insensitive (William Casarin)
- Fix some lnurls not getting decoded properly (William Casarin)
- Hide incoming DMs from blocked users (William Casarin)
- Hide blocked users from search results (William Casarin)
- Fix Cash App invoice payments (Rob Seward)
- DM Padding (OlegAba)
- Check for broken lnurls (William Casarin)
-
-
-
-[1.0.0-15]: https://github.com/damus-io/damus/releases/tag/v1.0.0-15
 ## [1.0.0-13] - 2023-01-30

 ### Added
@@ -611,3 +515,4 @@
 [0.1.2]: https://github.com/damus-io/damus/releases/tag/v0.1.2


+
@@ -108,6 +108,24 @@ All user-facing strings must have a comment in order to provide context to trans

 [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... :)
@@ -26,10 +26,6 @@ static inline int is_boundary(char c) {
    return !isalnum(c);
 }

-static inline int is_invalid_url_ending(char c) {
-    return c == '!' || c == '?' || c == ')' || c == '.' || c == ',' || c == ';';
-}
-
 static void make_cursor(struct cursor *c, const u8 *content, size_t len)
 {
    c->start = content;
@@ -59,8 +55,8 @@ static int consume_until_whitespace(struct cursor *cur, int or_end) {
    while (cur->p < cur->end) {
        c = *cur->p;
        
-        if (is_whitespace(c))
-            return consumedAtLeastOne;
+        if (is_whitespace(c) && consumedAtLeastOne)
+            return 1;
        
        cur->p++;
        consumedAtLeastOne = true;
@@ -225,9 +221,6 @@ static int parse_url(struct cursor *cur, struct block *block) {
        return 0;
    }
    
-    // strip any unwanted characters
-    while(is_invalid_url_ending(peek_char(cur, -1))) cur->p--;
-    
    block->type = BLOCK_URL;
    block->block.str.start = (const char *)start;
    block->block.str.end = (const char *)cur->p;
@@ -15,10 +15,6 @@
 		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 */; };
-		3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA59D1C2999B0400061C48E /* DraftsModel.swift */; };
-		3AAA95CA298DF87B00F3D526 /* TranslationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAA95C9298DF87B00F3D526 /* TranslationService.swift */; };
-		3AAA95CC298E07E900F3D526 /* DeepLPlan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */; };
-		3AB72AB9298ECF30004BB58C /* Translator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AB72AB8298ECF30004BB58C /* Translator.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 */; };
@@ -32,6 +28,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 */; };
+		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 */; };
 		4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F352870A9A700040376 /* InputDismissKeyboard.swift */; };
@@ -42,7 +39,6 @@
 		4C285C8A2838B985008A31F1 /* ProfilePictureSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */; };
 		4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C285C8B28398BC6008A31F1 /* Keys.swift */; };
 		4C285C8E28399BFE008A31F1 /* SaveKeysView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */; };
-		4C2CDDF7299D4A5E00879FD5 /* Debouncer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2CDDF6299D4A5E00879FD5 /* Debouncer.swift */; };
 		4C363A8428233689006E126D /* Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A8328233689006E126D /* Parser.swift */; };
 		4C363A8828236948006E126D /* BlocksView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A8728236948006E126D /* BlocksView.swift */; };
 		4C363A8A28236B57006E126D /* MentionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A8928236B57006E126D /* MentionView.swift */; };
@@ -143,8 +139,6 @@
 		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 */; };
-		4CB9D4A72992D02B00A9A7E4 /* ProfileNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */; };
-		4CB9D4A92992D2F400A9A7E4 /* FollowsYou.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB9D4A82992D2F400A9A7E4 /* FollowsYou.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 */; };
@@ -156,9 +150,6 @@
 		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 */; };
-		4CE0E2AF29A2E82100DB4CA2 /* EventHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */; };
-		4CE0E2B229A3DF6900DB4CA2 /* LoadMoreButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */; };
-		4CE0E2B629A3ED5500DB4CA2 /* InnerTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */; };
 		4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F8CC281352B30009DFBB /* Notifications.swift */; };
 		4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */; };
 		4CE4F9E1285287B800C00DD9 /* TextFieldAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9E0285287B800C00DD9 /* TextFieldAlert.swift */; };
@@ -172,14 +163,6 @@
 		4CE6DF0427F7A08200C66700 /* damusUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE6DF0327F7A08200C66700 /* damusUITestsLaunchTests.swift */; };
 		4CE6DF1227F7A2B300C66700 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 4CE6DF1127F7A2B300C66700 /* Starscream */; };
 		4CE6DF1627F8DEBF00C66700 /* RelayConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE6DF1527F8DEBF00C66700 /* RelayConnection.swift */; };
-		4CE8794829941DA700F758CC /* RelayFilters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794729941DA700F758CC /* RelayFilters.swift */; };
-		4CE8794C2995B59E00F758CC /* RelayMetadatas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */; };
-		4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794D2996B16A00F758CC /* RelayToggle.swift */; };
-		4CE879502996B2BD00F758CC /* RelayStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794F2996B2BD00F758CC /* RelayStatus.swift */; };
-		4CE879522996B68900F758CC /* RelayType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879512996B68900F758CC /* RelayType.swift */; };
-		4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879542996BAB900F758CC /* RelayPaidDetail.swift */; };
-		4CE879582996C45300F758CC /* ZapsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879572996C45300F758CC /* ZapsView.swift */; };
-		4CE8795B2996C47A00F758CC /* ZapsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8795A2996C47A00F758CC /* ZapsModel.swift */; };
 		4CEE2AED2805B22500AB5EEF /* NostrRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AEC2805B22500AB5EEF /* NostrRequest.swift */; };
 		4CEE2AF1280B216B00AB5EEF /* EventDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */; };
 		4CEE2AF3280B25C500AB5EEF /* ProfilePicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */; };
@@ -202,28 +185,23 @@
 		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 */; };
-		50A50A8D29A09E1C00C01BE7 /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A50A8C29A09E1C00C01BE7 /* RequestTests.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 */; };
-		643EA5C8296B764E005081BB /* RelayFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 643EA5C7296B764E005081BB /* RelayFilterView.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 */; };
-		7C95CAEE299DCEF1009DCB67 /* KFOptionSetter+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */; };
-		7CFF6317299FEFE5005D382A /* SelectableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CFF6316299FEFE5005D382A /* SelectableText.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 */; };
-		F7908E92298B0F0700AB113A /* RelayDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E91298B0F0700AB113A /* RelayDetailView.swift */; };
-		F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */; };
 		F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */; };
-		F7F0BA272978E54D009531F3 /* ParticipantsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA262978E54D009531F3 /* ParticipantsView.swift */; };
+		F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA262978E54D009531F3 /* ParicipantsView.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -251,13 +229,7 @@
 		3A185A04297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/InfoPlist.strings"; 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>"; };
-		3A25EF132992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "el-GR"; path = "el-GR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		3A25EF142992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "el-GR"; path = "el-GR.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3A25EF152992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "el-GR"; path = "el-GR.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>"; };
-		3A41E559299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3A41E55A299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3A41E55B299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = id; path = id.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>"; };
@@ -265,15 +237,6 @@
 		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>"; };
-		3A66D927299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3A66D928299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3A66D929299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ja; path = ja.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3A827A18299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3A827A19299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3A827A1A299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ru; path = ru.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3A8624D9299E82BE00BD8BE9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3A8624DA299E82BE00BD8BE9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3A8624DB299E82BE00BD8BE9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.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>"; };
@@ -286,13 +249,9 @@
 		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>"; };
-		3AA59D1C2999B0400061C48E /* DraftsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsModel.swift; sourceTree = "<group>"; };
-		3AAA95C9298DF87B00F3D526 /* TranslationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationService.swift; sourceTree = "<group>"; };
-		3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLPlan.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>"; };
-		3AB72AB8298ECF30004BB58C /* Translator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Translator.swift; 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>"; };
@@ -317,6 +276,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>"; };
+		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>"; };
 		4C216F352870A9A700040376 /* InputDismissKeyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputDismissKeyboard.swift; sourceTree = "<group>"; };
@@ -327,7 +287,6 @@
 		4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilePictureSelector.swift; sourceTree = "<group>"; };
 		4C285C8B28398BC6008A31F1 /* Keys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = "<group>"; };
 		4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SaveKeysView.swift; sourceTree = "<group>"; };
-		4C2CDDF6299D4A5E00879FD5 /* Debouncer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debouncer.swift; sourceTree = "<group>"; };
 		4C363A8328233689006E126D /* Parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Parser.swift; sourceTree = "<group>"; };
 		4C363A8728236948006E126D /* BlocksView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlocksView.swift; sourceTree = "<group>"; };
 		4C363A8928236B57006E126D /* MentionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionView.swift; sourceTree = "<group>"; };
@@ -458,8 +417,6 @@
 		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>"; };
-		4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileNameView.swift; sourceTree = "<group>"; };
-		4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowsYou.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>"; };
@@ -471,9 +428,6 @@
 		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>"; };
-		4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventHolder.swift; sourceTree = "<group>"; };
-		4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadMoreButton.swift; sourceTree = "<group>"; };
-		4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InnerTimelineView.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>"; };
 		4CE4F9E0285287B800C00DD9 /* TextFieldAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldAlert.swift; sourceTree = "<group>"; };
@@ -489,14 +443,6 @@
 		4CE6DF0127F7A08200C66700 /* damusUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = damusUITests.swift; sourceTree = "<group>"; };
 		4CE6DF0327F7A08200C66700 /* damusUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = damusUITestsLaunchTests.swift; sourceTree = "<group>"; };
 		4CE6DF1527F8DEBF00C66700 /* RelayConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayConnection.swift; sourceTree = "<group>"; };
-		4CE8794729941DA700F758CC /* RelayFilters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayFilters.swift; sourceTree = "<group>"; };
-		4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayMetadatas.swift; sourceTree = "<group>"; };
-		4CE8794D2996B16A00F758CC /* RelayToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayToggle.swift; sourceTree = "<group>"; };
-		4CE8794F2996B2BD00F758CC /* RelayStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayStatus.swift; sourceTree = "<group>"; };
-		4CE879512996B68900F758CC /* RelayType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayType.swift; sourceTree = "<group>"; };
-		4CE879542996BAB900F758CC /* RelayPaidDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayPaidDetail.swift; sourceTree = "<group>"; };
-		4CE879572996C45300F758CC /* ZapsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapsView.swift; sourceTree = "<group>"; };
-		4CE8795A2996C47A00F758CC /* ZapsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapsModel.swift; sourceTree = "<group>"; };
 		4CEE2AE72804F57C00AB5EEF /* libsecp256k1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsecp256k1.a; sourceTree = "<group>"; };
 		4CEE2AEC2805B22500AB5EEF /* NostrRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrRequest.swift; sourceTree = "<group>"; };
 		4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailView.swift; sourceTree = "<group>"; };
@@ -520,27 +466,22 @@
 		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>"; };
-		50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestTests.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>"; };
-		643EA5C7296B764E005081BB /* RelayFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayFilterView.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>"; };
-		7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KFOptionSetter+.swift"; sourceTree = "<group>"; };
-		7CFF6316299FEFE5005D382A /* SelectableText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableText.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>"; };
-		F7908E91298B0F0700AB113A /* RelayDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayDetailView.swift; sourceTree = "<group>"; };
-		F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIPURLBuilder.swift; sourceTree = "<group>"; };
 		F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeToDismiss.swift; sourceTree = "<group>"; };
-		F7F0BA262978E54D009531F3 /* ParticipantsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParticipantsView.swift; sourceTree = "<group>"; };
+		F7F0BA262978E54D009531F3 /* ParicipantsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParicipantsView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -676,13 +617,10 @@
 				BA693073295D649800ADDB87 /* UserSettingsStore.swift */,
 				4FE60CDC295E1C5E00105A1F /* Wallet.swift */,
 				4CB88392296F798300DC99E7 /* ReactionsModel.swift */,
+				7C45AE70297353390031D7BC /* KFImageModel.swift */,
 				4CF0ABD32980996B00D66079 /* Report.swift */,
 				4CF0ABDD2981A69500D66079 /* MutelistModel.swift */,
 				3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */,
-				3AAA95C9298DF87B00F3D526 /* TranslationService.swift */,
-				3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */,
-				4CE8795A2996C47A00F758CC /* ZapsModel.swift */,
-				3AA59D1C2999B0400061C48E /* DraftsModel.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -690,9 +628,6 @@
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				4CE0E2B029A3DF4700DB4CA2 /* Timeline */,
-				4CE879562996C44A00F758CC /* Zaps */,
-				4CB9D4A52992D01900A9A7E4 /* Profile */,
 				4CAAD8AE29888A9B00060CEA /* Relays */,
 				4CF0ABF42985CD4200D66079 /* Posting */,
 				4CF0ABDF2981A83000D66079 /* Muting */,
@@ -729,7 +664,7 @@
 				4C3AC7A42836987600E1F516 /* MainTabView.swift */,
 				4C363A8B28236B92006E126D /* PubkeyView.swift */,
 				4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */,
-				F7F0BA262978E54D009531F3 /* ParticipantsView.swift */,
+				F7F0BA262978E54D009531F3 /* ParicipantsView.swift */,
 				4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */,
 				4C3AC7A628369BA200E1F516 /* SearchHomeView.swift */,
 				4C5C7E69284EDE2E00A22DF5 /* SearchResultsView.swift */,
@@ -737,6 +672,7 @@
 				BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */,
 				4C3AC7A02835A81400E1F516 /* SetupView.swift */,
 				E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */,
+				4C0A3F96280F8E02000448DE /* ThreadView.swift */,
 				4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */,
 				4CB55EF4295E679D007FD187 /* UserRelaysView.swift */,
 				647D9A8C2968520300A295DE /* SideMenuView.swift */,
@@ -747,7 +683,6 @@
 				4CF0ABE42981EE0C00D66079 /* EULAView.swift */,
 				3AA247FE297E3D900090C62D /* RepostsView.swift */,
 				5C513FCB2984ACA60072348F /* QRCodeView.swift */,
-				643EA5C7296B764E005081BB /* RelayFilterView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -775,11 +710,9 @@
 		4C7FF7D628233637009601DB /* Util */ = {
 			isa = PBXGroup;
 			children = (
-				4CE879492995B58700F758CC /* Relays */,
 				4CF0ABEA29844B2F00D66079 /* AnyCodable */,
 				4CC7AAE6297EFA7B00430951 /* Zap.swift */,
 				4C3A1D322960DB0500558C0F /* Markdown.swift */,
-				F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */,
 				4CEE2AF4280B29E600AB5EEF /* TimeAgo.swift */,
 				4CE4F8CC281352B30009DFBB /* Notifications.swift */,
 				4C363A8328233689006E126D /* Parser.swift */,
@@ -800,10 +733,6 @@
 				4CB883A52975F83C00DC99E7 /* LNUrlPayRequest.swift */,
 				4CB883A72975FC1800DC99E7 /* Zaps.swift */,
 				4CB883B5297730E400DC99E7 /* LNUrls.swift */,
-				3AB72AB8298ECF30004BB58C /* Translator.swift */,
-				4C2CDDF6299D4A5E00879FD5 /* Debouncer.swift */,
-				7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */,
-				4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -811,14 +740,9 @@
 		4CAAD8AE29888A9B00060CEA /* Relays */ = {
 			isa = PBXGroup;
 			children = (
-				4CE879532996BA0000F758CC /* Detail */,
 				4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */,
 				4C06670028FC7C5900038D2A /* RelayView.swift */,
 				4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */,
-				F7908E91298B0F0700AB113A /* RelayDetailView.swift */,
-				4CE8794D2996B16A00F758CC /* RelayToggle.swift */,
-				4CE8794F2996B2BD00F758CC /* RelayStatus.swift */,
-				4CE879512996B68900F758CC /* RelayType.swift */,
 			);
 			path = Relays;
 			sourceTree = "<group>";
@@ -840,15 +764,6 @@
 			path = Reactions;
 			sourceTree = "<group>";
 		};
-		4CB9D4A52992D01900A9A7E4 /* Profile */ = {
-			isa = PBXGroup;
-			children = (
-				4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */,
-				4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */,
-			);
-			path = Profile;
-			sourceTree = "<group>";
-		};
 		4CC7AAEE297F11B300430951 /* Events */ = {
 			isa = PBXGroup;
 			children = (
@@ -866,15 +781,6 @@
 			path = Events;
 			sourceTree = "<group>";
 		};
-		4CE0E2B029A3DF4700DB4CA2 /* Timeline */ = {
-			isa = PBXGroup;
-			children = (
-				4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */,
-				4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */,
-			);
-			path = Timeline;
-			sourceTree = "<group>";
-		};
 		4CE4F9DF285287A000C00DD9 /* Components */ = {
 			isa = PBXGroup;
 			children = (
@@ -893,7 +799,6 @@
 				7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */,
 				4CB883AF297705DD00DC99E7 /* ZapButton.swift */,
 				4C42812B298C848200DBF26F /* TranslateView.swift */,
-				7CFF6316299FEFE5005D382A /* SelectableText.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -953,7 +858,6 @@
 		4CE6DEF627F7A08200C66700 /* damusTests */ = {
 			isa = PBXGroup;
 			children = (
-				50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */,
 				DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */,
 				4C90BD1B283AC38E008EE7EF /* Bech32Tests.swift */,
 				4C363A9F2828A8DD006E126D /* LikeTests.swift */,
@@ -978,31 +882,6 @@
 			path = damusUITests;
 			sourceTree = "<group>";
 		};
-		4CE879492995B58700F758CC /* Relays */ = {
-			isa = PBXGroup;
-			children = (
-				4CE8794729941DA700F758CC /* RelayFilters.swift */,
-				4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */,
-			);
-			path = Relays;
-			sourceTree = "<group>";
-		};
-		4CE879532996BA0000F758CC /* Detail */ = {
-			isa = PBXGroup;
-			children = (
-				4CE879542996BAB900F758CC /* RelayPaidDetail.swift */,
-			);
-			path = Detail;
-			sourceTree = "<group>";
-		};
-		4CE879562996C44A00F758CC /* Zaps */ = {
-			isa = PBXGroup;
-			children = (
-				4CE879572996C45300F758CC /* ZapsView.swift */,
-			);
-			path = Zaps;
-			sourceTree = "<group>";
-		};
 		4CEE2AE62804F57B00AB5EEF /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -1149,11 +1028,6 @@
 				ar,
 				nl,
 				"zh-CN",
-				"el-GR",
-				ja,
-				id,
-				cs,
-				ru,
 			);
 			mainGroup = 4CE6DEDA27F7A08100C66700;
 			packageReferences = (
@@ -1219,7 +1093,6 @@
 				4C285C86283892E7008A31F1 /* CreateAccountModel.swift in Sources */,
 				4C64987C286D03E000EAE2B3 /* DirectMessagesView.swift in Sources */,
 				7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */,
-				4CE8794C2995B59E00F758CC /* RelayMetadatas.swift in Sources */,
 				4C363A8C28236B92006E126D /* PubkeyView.swift in Sources */,
 				4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */,
 				4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
@@ -1239,17 +1112,14 @@
 				4C7FF7D52823313F009601DB /* Mentions.swift in Sources */,
 				4C633350283D40E500B1C9C3 /* HomeModel.swift in Sources */,
 				4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */,
-				3AB72AB9298ECF30004BB58C /* Translator.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 /* ParticipantsView.swift in Sources */,
+				F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */,
 				4C0A3F91280F6528000448DE /* ChatView.swift in Sources */,
 				4CF0ABE32981BC7D00D66079 /* UserView.swift in Sources */,
-				4CE0E2AF29A2E82100DB4CA2 /* EventHolder.swift in Sources */,
-				4CE0E2B229A3DF6900DB4CA2 /* LoadMoreButton.swift in Sources */,
 				4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */,
 				4C3D52B8298DB5C6001C5831 /* TextEvent.swift in Sources */,
 				4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */,
@@ -1264,7 +1134,6 @@
 				4C75EFB328049D640006080F /* NostrEvent.swift in Sources */,
 				4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */,
 				4C363A8428233689006E126D /* Parser.swift in Sources */,
-				3AAA95CA298DF87B00F3D526 /* TranslationService.swift in Sources */,
 				4CE4F9E328528C5200C00DD9 /* AddRelayView.swift in Sources */,
 				4C363A9A28283854006E126D /* Reply.swift in Sources */,
 				BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */,
@@ -1280,12 +1149,11 @@
 				4CEE2AF7280B2DEA00AB5EEF /* ProfileName.swift in Sources */,
 				4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */,
 				31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */,
-				F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */,
 				4C285C8228385570008A31F1 /* CarouselView.swift in Sources */,
 				4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */,
-				4CE8794829941DA700F758CC /* RelayFilters.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 */,
@@ -1293,23 +1161,19 @@
 				4CC7AAE7297EFA7B00430951 /* Zap.swift in Sources */,
 				4C3BEFD22819DB9B00B3DE84 /* ProfileModel.swift in Sources */,
 				4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */,
-				7C95CAEE299DCEF1009DCB67 /* KFOptionSetter+.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 */,
-				4CE879522996B68900F758CC /* RelayType.swift in Sources */,
 				4C90BD162839DB54008EE7EF /* NostrMetadata.swift in Sources */,
-				4CE8795B2996C47A00F758CC /* ZapsModel.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 */,
-				4CE879582996C45300F758CC /* ZapsView.swift in Sources */,
 				4C633352283D419F00B1C9C3 /* SignalModel.swift in Sources */,
 				9609F058296E220800069BF3 /* BannerImageView.swift in Sources */,
 				4C363A94282704FA006E126D /* Post.swift in Sources */,
@@ -1317,7 +1181,6 @@
 				4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */,
 				4C3EA67928FF7ABF00C48A62 /* list.c in Sources */,
 				4C64987E286D082C00EAE2B3 /* DirectMessagesModel.swift in Sources */,
-				4CE0E2B629A3ED5500DB4CA2 /* InnerTimelineView.swift in Sources */,
 				4C363A8828236948006E126D /* BlocksView.swift in Sources */,
 				4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */,
 				4C75EFAF28049D350006080F /* NostrFilter.swift in Sources */,
@@ -1361,35 +1224,27 @@
 				4C3AC7A728369BA200E1F516 /* SearchHomeView.swift in Sources */,
 				4CB883B0297705DD00DC99E7 /* ZapButton.swift in Sources */,
 				4C363A922825FCF2006E126D /* ProfileUpdate.swift in Sources */,
-				4CB9D4A92992D2F400A9A7E4 /* FollowsYou.swift in Sources */,
 				4C3BEFDA281DCA1400B3DE84 /* LikeCounter.swift in Sources */,
 				4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */,
 				4CF0ABDE2981A69500D66079 /* MutelistModel.swift in Sources */,
-				4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
-				7CFF6317299FEFE5005D382A /* SelectableText.swift in Sources */,
 				4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */,
 				4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */,
 				4C5F9118283D88E40052CD1C /* FollowingModel.swift in Sources */,
-				643EA5C8296B764E005081BB /* RelayFilterView.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 */,
-				F7908E92298B0F0700AB113A /* RelayDetailView.swift in Sources */,
 				4C3A1D332960DB0500558C0F /* Markdown.swift in Sources */,
-				4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */,
 				4CF0ABD42980996B00D66079 /* Report.swift in Sources */,
+				4C0A3F97280F8E02000448DE /* ThreadView.swift in Sources */,
 				4C06670B28FDE64700038D2A /* damus.c in Sources */,
-				4C2CDDF7299D4A5E00879FD5 /* Debouncer.swift in Sources */,
-				3AAA95CC298E07E900F3D526 /* DeepLPlan.swift in Sources */,
 				4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */,
 				3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */,
 				3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */,
-				4CE879502996B2BD00F758CC /* RelayStatus.swift in Sources */,
 				4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */,
 				4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */,
 				4C75EFA427FA577B0006080F /* PostView.swift in Sources */,
@@ -1398,9 +1253,7 @@
 				4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */,
 				4C75EFBB2804A34C0006080F /* ProofOfWork.swift in Sources */,
 				4C3AC7A52836987600E1F516 /* MainTabView.swift in Sources */,
-				3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */,
 				3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */,
-				4CB9D4A72992D02B00A9A7E4 /* ProfileNameView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1417,7 +1270,6 @@
 				4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */,
 				4C363AA02828A8DD006E126D /* LikeTests.swift in Sources */,
 				4C90BD1C283AC38E008EE7EF /* Bech32Tests.swift in Sources */,
-				50A50A8D29A09E1C00C01BE7 /* RequestTests.swift in Sources */,
 				4CE6DEF827F7A08200C66700 /* damusTests.swift in Sources */,
 				4CF0ABDC2981A19E00D66079 /* ListTests.swift in Sources */,
 			);
@@ -1463,11 +1315,6 @@
 				3AC524F0298C000B00693EBF /* ar */,
 				3A96D41C298DA94500388A2A /* nl */,
 				3A5CAE1F298DC0DB00B5334F /* zh-CN */,
-				3A25EF152992DA5D008ABE69 /* el-GR */,
-				3A66D929299472FA008B44F4 /* ja */,
-				3A41E55B299D52BE001FA465 /* id */,
-				3A8624DB299E82BE00BD8BE9 /* cs */,
-				3A827A1A299FC69D00C4D171 /* ru */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
@@ -1486,11 +1333,6 @@
 				3AC524EE298C000B00693EBF /* ar */,
 				3A96D41A298DA94500388A2A /* nl */,
 				3A5CAE1D298DC0DB00B5334F /* zh-CN */,
-				3A25EF132992DA5D008ABE69 /* el-GR */,
-				3A66D927299472FA008B44F4 /* ja */,
-				3A41E559299D52BE001FA465 /* id */,
-				3A8624D9299E82BE00BD8BE9 /* cs */,
-				3A827A18299FC69D00C4D171 /* ru */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -1509,11 +1351,6 @@
 				3AC524EF298C000B00693EBF /* ar */,
 				3A96D41B298DA94500388A2A /* nl */,
 				3A5CAE1E298DC0DB00B5334F /* zh-CN */,
-				3A25EF142992DA5D008ABE69 /* el-GR */,
-				3A66D928299472FA008B44F4 /* ja */,
-				3A41E55A299D52BE001FA465 /* id */,
-				3A8624DA299E82BE00BD8BE9 /* cs */,
-				3A827A19299FC69D00C4D171 /* ru */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1649,7 +1486,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1657,7 +1494,6 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				INFOPLIST_KEY_NSFaceIDUsageDescription = "Local authentication to access private key";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1672,7 +1508,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1691,7 +1527,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1699,7 +1535,6 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				INFOPLIST_KEY_NSFaceIDUsageDescription = "Local authentication to access private key";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1714,7 +1549,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -5,8 +5,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/onevcat/Kingfisher",
      "state" : {
-        "revision" : "415b1d97fb38bda1e5a6b2dde63354720832110b",
-        "version" : "7.6.1"
+        "revision" : "017f94ccfdacabb1ae7f45b75b4217b24c06e6ac",
+        "version" : "7.4.0"
      }
    },
    {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xC5",
+          "green" : "0x43",
+          "red" : "0xCC"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0x4D",
+          "red" : "0x4B"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x1E",
+          "green" : "0x1C",
+          "red" : "0x1C"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4F",
+          "green" : "0xC3",
+          "red" : "0x66"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF4",
+          "green" : "0xEE",
+          "red" : "0xEE"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x5F",
+          "green" : "0x5F",
+          "red" : "0x5F"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xC5",
+          "green" : "0x43",
+          "red" : "0xCC"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,6 +11,24 @@
        }
      },
      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-copy.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-key.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,52 @@
+{
+  "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
+  }
+}
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-nipverified.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-qr.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "profile-banner.jpeg",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "bbw.jpg",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "bitcoin-p2p.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "blixt-wallet.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "bluewallet.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "breez.jpg",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "cashapp.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "digital-nomad.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "encrypted-message.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-lightning.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-tick.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "lnlink.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "damus-nobg.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "muun.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "phoenix.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "river.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "strike.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "undercover.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "walletofsatoshi.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "zebedee.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -2,7 +2,16 @@
  "images" : [
    {
      "filename" : "zeus.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
    }
  ],
  "info" : {
@@ -66,11 +66,20 @@ struct ImageContextMenuModifier: ViewModifier {

 private struct ImageContainerView: View {
    
-    let url: 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?
        
@@ -82,17 +91,30 @@ private struct ImageContainerView: View {
    
    var body: some View {
        
-        KFAnimatedImage(url)
-            .imageContext(.note)
+        KFAnimatedImage(imageModel.url)
+            .callbackQueue(.dispatch(.global(qos: .background)))
+            .processingQueue(.dispatch(.global(qos: .background)))
+            .cacheOriginalImage()
            .configure { view in
-                view.framePreloadCount = 3
+                view.framePreloadCount = 1
            }
+            .scaleFactor(UIScreen.main.scale)
+            .loadDiskFileSynchronously()
+            .fade(duration: 0.1)
            .imageModifier(ImageHandler(handler: $image))
-            .clipped()
-            .modifier(ImageContextMenuModifier(url: url, image: image, showShareSheet: $showShareSheet))
-            .sheet(isPresented: $showShareSheet) {
-                ShareSheet(activityItems: [url])
+            .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)
    }
 }

@@ -105,6 +127,14 @@ struct ImageView: View {
    @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 {
@@ -150,8 +180,8 @@ struct ImageView: View {
                    ZoomableScrollView {
                        ImageContainerView(url: urls[index])
                            .aspectRatio(contentMode: .fit)
-                            .padding(.top, Theme.safeAreaInsets?.top)
-                            .padding(.bottom, Theme.safeAreaInsets?.bottom)
+                            .padding(.top, safeAreaInsets?.top)
+                            .padding(.bottom, safeAreaInsets?.bottom)
                    }
                    .modifier(SwipeToDismissModifier(minDistance: 50, onDismiss: {
                        presentationMode.wrappedValue.dismiss()
@@ -180,7 +210,7 @@ struct ImageView: View {
                    }
                }
                .animation(.easeInOut, value: showMenu)
-                .padding(.bottom, Theme.safeAreaInsets?.bottom)
+                .padding(.bottom, safeAreaInsets?.bottom)
            )
        }
    }
@@ -199,8 +229,12 @@ struct ImageCarousel: View {
                    .foregroundColor(Color.clear)
                    .overlay {
                        KFAnimatedImage(url)
-                            .imageContext(.note)
-                            .cancelOnDisappear(true)
+                            .callbackQueue(.dispatch(.global(qos: .background)))
+                            .processingQueue(.dispatch(.global(qos: .background)))
+                            .cacheOriginalImage()
+                            .loadDiskFileSynchronously()
+                            .scaleFactor(UIScreen.main.scale)
+                            .fade(duration: 0.1)
                            .configure { view in
                                view.framePreloadCount = 3
                            }
@@ -1,96 +0,0 @@
-//
-//  SelectableText.swift
-//  damus
-//
-//  Created by Oleg Abalonski on 2/16/23.
-//
-
-import UIKit
-import SwiftUI
-
-struct SelectableText: View {
-    
-    let attributedString: AttributedString
-    
-    @State private var selectedTextHeight: CGFloat = .zero
-    @State private var selectedTextWidth: CGFloat = .zero
-    
-    var body: some View {
-        GeometryReader { geo in
-            TextViewRepresentable(
-                attributedString: attributedString,
-                textColor: UIColor.label,
-                font: UIFont.preferredFont(forTextStyle: .title2),
-                fixedWidth: selectedTextWidth,
-                height: $selectedTextHeight
-            )
-            .onAppear {
-                self.selectedTextWidth = geo.size.width
-            }
-            .onChange(of: geo.size) { newSize in
-                self.selectedTextWidth = newSize.width
-            }
-        }
-        .frame(height: selectedTextHeight)
-    }
-}
-
- fileprivate struct TextViewRepresentable: UIViewRepresentable {
-
-    let attributedString: AttributedString
-    let textColor: UIColor
-    let font: UIFont
-    let fixedWidth: CGFloat
-
-    @Binding var height: CGFloat
-
-    func makeUIView(context: UIViewRepresentableContext<Self>) -> UITextView {
-        let view = UITextView()
-        view.isEditable = false
-        view.dataDetectorTypes = .all
-        view.isSelectable = true
-        view.textContainer.lineFragmentPadding = 0
-        view.textContainerInset = .zero
-        return view
-    }
-
-    func updateUIView(_ uiView: UITextView, context: UIViewRepresentableContext<Self>) {
-        let mutableAttributedString = createNSAttributedString()
-        uiView.attributedText = mutableAttributedString
-
-        let newHeight = mutableAttributedString.height(containerWidth: fixedWidth)
-
-        DispatchQueue.main.async {
-            height = newHeight
-        }
-    }
-
-    func createNSAttributedString() -> NSMutableAttributedString {
-        let mutableAttributedString = NSMutableAttributedString(attributedString)
-        let myAttribute = [
-            NSAttributedString.Key.font: font,
-            NSAttributedString.Key.foregroundColor: textColor
-        ]
-
-        mutableAttributedString.addAttributes(
-            myAttribute,
-            range: NSRange.init(location: 0, length: mutableAttributedString.length)
-        )
-
-        return mutableAttributedString
-    }
-}
-
-fileprivate extension NSAttributedString {
-
-    func height(containerWidth: CGFloat) -> CGFloat {
-
-        let rect = self.boundingRect(
-            with: CGSize.init(width: containerWidth, height: CGFloat.greatestFiniteMagnitude),
-            options: [.usesLineFragmentOrigin, .usesFontLeading],
-            context: nil
-        )
-
-        return ceil(rect.size.height)
-    }
-}
@@ -11,6 +11,7 @@ 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"
@@ -33,7 +34,9 @@ struct TranslateView: View {
            }
            .translate_button_style()
            
-            SelectableText(attributedString: artifacts.content)
+            Text(artifacts.content)
+                .font(eventviewsize_to_font(size))
+                .fixedSize(horizontal: false, vertical: true)
        }
    }
    
@@ -68,7 +71,10 @@ struct TranslateView: View {
            }
        }
        .task {
-            guard noteLanguage == nil && !checkingTranslationStatus && damus_state.settings.can_translate(damus_state.pubkey) else {
+            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
            }
            
@@ -80,22 +86,16 @@ struct TranslateView: View {
                currentLanguage = Locale.current.languageCode ?? "en"
            }

-            // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in
-            // and filter on only the text portions of the content as URLs and hashtags confuse the language recognizer.
-            let originalBlocks = event.blocks(damus_state.keypair.privkey)
-            let originalOnlyText = originalBlocks.compactMap { $0.is_text }.joined(separator: " ")
-
-            // Only accept language recognition hypothesis if there's at least a 50% probability that it's accurate.
-            let languageRecognizer = NLLanguageRecognizer()
-            languageRecognizer.processString(originalOnlyText)
-            noteLanguage = languageRecognizer.languageHypotheses(withMaximum: 1).first(where: { $0.value >= 0.5 })?.key.rawValue ?? currentLanguage
+            // 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 translation services typically only supports the variant-less language.
+                // 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 = NSLocale(localeIdentifier: lang).languageCode
+                    noteLanguage = Locale.canonicalLanguageIdentifier(from: lang)
                }
            }
            
@@ -109,15 +109,8 @@ struct TranslateView: View {
            if note_lang != currentLanguage {
                do {
                    // If the note language is different from our language, send a translation request.
-                    let translator = Translator(damus_state.settings)
-                    let originalContent = event.get_content(damus_state.keypair.privkey)
-                    translated_note = try await translator.translate(originalContent, from: note_lang, to: currentLanguage)
-
-                    if originalContent == translated_note {
-                        // If the translation is the same as the original, don't bother showing it.
-                        noteLanguage = currentLanguage
-                        translated_note = nil
-                    }
+                    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
@@ -127,8 +120,8 @@ struct TranslateView: View {

            if let translated = translated_note {
                // Render translated note.
-                let translatedBlocks = event.get_blocks(content: translated)
-                translated_artifacts = render_blocks(blocks: translatedBlocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
+                let blocks = event.get_blocks(content: translated)
+                translated_artifacts = render_blocks(blocks: blocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
            }

            checkingTranslationStatus = false
@@ -140,6 +133,6 @@ struct TranslateView: View {
 struct TranslateView_Previews: PreviewProvider {
    static var previews: some View {
        let ds = test_damus_state()
-        TranslateView(damus_state: ds, event: test_event)
+        TranslateView(damus_state: ds, event: test_event, size: .selected)
    }
 }
@@ -52,8 +52,7 @@ struct ZapButton: View {
                damus_state.lnurls.endpoints[target.pubkey] = payreq
            }
            
-            let zap_amount = get_default_zap_amount(pubkey: damus_state.pubkey) ?? 1000
-            guard let inv = await fetch_zap_invoice(payreq, zapreq: zapreq, sats: zap_amount) else {
+            guard let inv = await fetch_zap_invoice(payreq, zapreq: zapreq, amount: 1000000) else {
                DispatchQueue.main.async {
                    zapping = false
                }
@@ -100,7 +99,7 @@ struct ZapButton: View {
    }
    
    var body: some View {
-        HStack(spacing: 4) {
+        ZStack {
            EventActionButton(img: zap_img, col: zap_color) {
                if bar.zapped {
                    //notify(.delete, bar.our_tip)
@@ -108,9 +107,9 @@ struct ZapButton: View {
                    send_zap()
                }
            }
-            .accessibilityLabel(NSLocalizedString("Zap", comment: "Accessibility label for zap button"))
            
-            Text(String("\(bar.zap_total > 0 ? "\(format_msats_abbrev(bar.zap_total))" : "")"))
+            Text("\(bar.zap_total > 0 ? "\(format_msats_abbrev(bar.zap_total))" : "")")
+                .offset(x: 22)
                .font(.footnote)
                .foregroundColor(bar.zapped ? Color.orange : Color.gray)
        }
@@ -7,12 +7,13 @@

 import SwiftUI
 import Starscream
+import Kingfisher

 var BOOTSTRAP_RELAYS = [
    "wss://relay.damus.io",
    "wss://eden.nostr.land",
    "wss://relay.snort.social",
-    "wss://offchain.pub",
+    "wss://nostr.bitcoiner.social",
    "wss://nos.lol",
    "wss://relay.current.fyi",
    "wss://brb.io",
@@ -27,16 +28,12 @@ enum Sheets: Identifiable {
    case post
    case report(ReportTarget)
    case reply(NostrEvent)
-    case event(NostrEvent)
-    case filter

    var id: String {
        switch self {
        case .report: return "report"
        case .post: return "post"
        case .reply(let ev): return "reply-" + ev.id
-        case .event(let ev): return "event-" + ev.id
-        case .filter: return "filter"
        }
    }
 }
@@ -92,7 +89,7 @@ struct ContentView: View {
    @State var filter_state : FilterState = .posts_and_replies
    @State private var isSideBarOpened = false
    @StateObject var home: HomeModel = HomeModel()
-    
+
    // connect retry timer
    let timer = Timer.publish(every: 4, on: .main, in: .common).autoconnect()

@@ -136,37 +133,7 @@ struct ContentView: View {
    func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
        ZStack {
            if let damus = self.damus_state {
-                TimelineView(events: home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
-            }
-        }
-    }
-    
-    func popToRoot() {
-        profile_open = false
-        thread_open = false
-        search_open = false
-        isSideBarOpened = false
-    }
-
-    var timelineNavItem: some View {
-        VStack {
-            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("Universe 🛸", comment: "Toolbar label for the universal 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.")
+                TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
            }
        }
    }
@@ -190,10 +157,9 @@ struct ContentView: View {
                PostingTimelineView
                
            case .notifications:
-                VStack(spacing: 0) {
-                    Divider()
-                    TimelineView(events: home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
-                }
+                TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
+                    .navigationTitle(NSLocalizedString("Notifications", comment: "Navigation title for notifications."))
+                
            case .dms:
                DirectMessagesView(damus_state: damus_state!)
                    .environmentObject(home.dms)
@@ -202,12 +168,27 @@ 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("Universe 🛸", comment: "Navigation bar title for universal view where posts from all connected relay servers appear."), displayMode: .inline)
+        .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)
        .toolbar {
            ToolbarItem(placement: .principal) {
-                timelineNavItem
-                    .opacity(isSideBarOpened ? 0 : 1)
-                    .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
+                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)
@@ -264,7 +245,7 @@ struct ContentView: View {
            if let damus = self.damus_state {
                NavigationView {
                    ZStack {
-                        TabView { // Prevents navbar appearance change on scroll
+                        VStack {
                            MainContent(damus: damus)
                                .toolbar() {
                                    ToolbarItem(placement: .navigationBarLeading) {
@@ -272,10 +253,7 @@ struct ContentView: View {
                                            isSideBarOpened.toggle()
                                        } label: {
                                            ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
-                                                .opacity(isSideBarOpened ? 0 : 1)
-                                                .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
                                        }
-                                        .disabled(isSideBarOpened)
                                    }
                                    
                                    ToolbarItem(placement: .navigationBarTrailing) {
@@ -287,28 +265,19 @@ struct ContentView: View {
                                                        .foregroundColor(.gray)
                                                }
                                            }
-                                            
-                                            // maybe expand this to other timelines in the future
-                                            if selected_timeline == .search {
-                                                Button(action: {
-                                                    //isFilterVisible.toggle()
-                                                    self.active_sheet = .filter
-                                                }) {
-                                                    // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
-                                                    Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), systemImage: "line.3.horizontal.decrease")
-                                                        .foregroundColor(.gray)
-                                                        //.contentShape(Rectangle())
-                                                }
-                                            }
+
                                        }
                                    }
                                }
+
                        }
-                        .tabViewStyle(.page(indexDisplayMode: .never))
+                        
+                        Color.clear
+                        .overlay(
+                            SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened)
+                        )
                    }
-                    .overlay(
-                        SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
-                    )
+                    .navigationBarHidden(isSideBarOpened ? true: false) // Would prefer a different way of doing this.
                }
                .navigationViewStyle(.stack)
            
@@ -318,6 +287,7 @@ struct ContentView: View {
        }
        .onAppear() {
            self.connect()
+            //KingfisherManager.shared.cache.clearDiskCache()
            setup_notifications()
        }
        .sheet(item: $active_sheet) { item in
@@ -328,17 +298,6 @@ struct ContentView: View {
                PostView(replying_to: nil, references: [], damus_state: damus_state!)
            case .reply(let event):
                ReplyView(replying_to: event, damus: damus_state!)
-            case .event:
-                EventDetailView()
-            case .filter:
-                let timeline = selected_timeline ?? .home
-                if #available(iOS 16.0, *) {
-                    RelayFilterView(state: damus_state!, timeline: timeline)
-                        .presentationDetents([.height(550)])
-                        .presentationDragIndicator(.visible)
-                } else {
-                    RelayFilterView(state: damus_state!, timeline: timeline)
-                }
            }
        }
        .onOpenURL { url in
@@ -457,8 +416,6 @@ struct ContentView: View {
            let post_res = obj.object as! NostrPostResult
            switch post_res {
            case .post(let post):
-                //let post = tup.0
-                //let to_relays = tup.1
                print("post \(post.content)")
                let new_ev = post_to_event(post: post, privkey: privkey, pubkey: pubkey)
                self.damus_state?.pool.send(.event(new_ev))
@@ -563,7 +520,6 @@ struct ContentView: View {
    }
    
    func switch_timeline(_ timeline: Timeline) {
-        self.popToRoot()
        NotificationCenter.default.post(name: .switched_timeline, object: timeline)
        
        if timeline == self.selected_timeline {
@@ -589,33 +545,24 @@ struct ContentView: View {

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

-        self.damus_state = DamusState(pool: pool,
-                                      keypair: keypair,
-                                      likes: EventCounter(our_pubkey: pubkey),
-                                      boosts: EventCounter(our_pubkey: pubkey),
-                                      contacts: Contacts(our_pubkey: pubkey),
-                                      tips: TipCounter(our_pubkey: pubkey),
-                                      profiles: Profiles(),
-                                      dms: home.dms,
-                                      previews: PreviewCache(),
-                                      zaps: Zaps(our_pubkey: pubkey),
-                                      lnurls: LNUrls(),
-                                      settings: UserSettingsStore(),
-                                      relay_filters: relay_filters,
-                                      relay_metadata: metadatas,
-                                      drafts: Drafts()
+        self.damus_state = DamusState(pool: pool, keypair: keypair,
+                                likes: EventCounter(our_pubkey: pubkey),
+                                boosts: EventCounter(our_pubkey: pubkey),
+                                contacts: Contacts(our_pubkey: pubkey),
+                                tips: TipCounter(our_pubkey: pubkey),
+                                profiles: Profiles(),
+                                dms: home.dms,
+                                previews: PreviewCache(),
+                                zaps: Zaps(our_pubkey: pubkey),
+                                lnurls: LNUrls(),
+                                settings: UserSettingsStore()
        )
        home.damus_state = self.damus_state!
        
@@ -31,17 +31,6 @@ class ActionBarModel: ObservableObject {
        self.our_zap = our_zap
    }
    
-    func update(damus: DamusState, evid: String) {
-        self.likes = damus.likes.counts[evid] ?? 0
-        self.boosts = damus.boosts.counts[evid] ?? 0
-        self.zaps = damus.zaps.event_counts[evid] ?? 0
-        self.zap_total = damus.zaps.event_totals[evid] ?? 0
-        self.our_like = damus.likes.our_events[evid]
-        self.our_boost = damus.boosts.our_events[evid]
-        self.our_zap = damus.zaps.our_zaps[evid]?.first
-        self.objectWillChange.send()
-    }
-    
    var is_empty: Bool {
        return likes == 0 && boosts == 0 && zaps == 0
    }
@@ -21,9 +21,6 @@ struct DamusState {
    let zaps: Zaps
    let lnurls: LNUrls
    let settings: UserSettingsStore
-    let relay_filters: RelayFilters
-    let relay_metadata: RelayMetadatas
-    let drafts: Drafts
    
    var pubkey: String {
        return keypair.pubkey
@@ -35,6 +32,6 @@ struct DamusState {

    
    static var empty: DamusState {
-        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts())
+        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())
    }
 }
@@ -1,35 +0,0 @@
-//
-//  DeepLPlan.swift
-//  damus
-//
-//  Created by Terry Yiu on 2/3/23.
-//
-
-import Foundation
-
-enum DeepLPlan: String, CaseIterable, Identifiable {
-    var id: String { self.rawValue }
-
-    struct Model: Identifiable, Hashable {
-        var id: String { self.tag }
-        var tag: String
-        var displayName: String
-        var url: String
-    }
-
-    case free
-    case pro
-
-    var model: Model {
-        switch self {
-        case .free:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("Free", comment: "Dropdown option for selecting Free plan for DeepL translation service."), url: "https://api-free.deepl.com")
-        case .pro:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("Pro", comment: "Dropdown option for selecting Pro plan for DeepL translation service."), url: "https://api.deepl.com")
-        }
-    }
-
-    static var allModels: [Model] {
-        return Self.allCases.map { $0.model }
-    }
-}
@@ -13,8 +13,6 @@ class DirectMessageModel: ObservableObject {
            is_request = determine_is_request()
        }
    }
-
-    @Published var draft: String
    
    var is_request: Bool
    var our_pubkey: String
@@ -33,13 +31,11 @@ class DirectMessageModel: ObservableObject {
        self.events = events
        self.is_request = false
        self.our_pubkey = our_pubkey
-        self.draft = ""
    }
    
    init(our_pubkey: String) {
        self.events = []
        self.is_request = false
        self.our_pubkey = our_pubkey
-        self.draft = ""
    }
 }
@@ -1,13 +0,0 @@
-//
-//  DraftsModel.swift
-//  damus
-//
-//  Created by Terry Yiu on 2/12/23.
-//
-
-import Foundation
-
-class Drafts: ObservableObject {
-    @Published var post: String = ""
-    @Published var replies: [NostrEvent: String] = [:]
-}
@@ -9,63 +9,9 @@ import Foundation


 class EventsModel: ObservableObject {
-    let state: DamusState
-    let target: String
-    let kind: NostrKind
-    let sub_id = UUID().uuidString
-    let profiles_id = UUID().uuidString
-    
+    var has_event: Set<String> = Set()
    @Published var events: [NostrEvent] = []
    
-    init(state: DamusState, target: String, kind: NostrKind) {
-        self.state = state
-        self.target = target
-        self.kind = kind
-    }
-    
-    private func get_filter() -> NostrFilter {
-        var filter = NostrFilter.filter_kinds([kind.rawValue])
-        filter.referenced_ids = [target]
-        filter.limit = 500
-        return filter
-    }
-    
-    func subscribe() {
-        state.pool.subscribe(sub_id: sub_id,
-                             filters: [get_filter()],
-                             handler: handle_nostr_event)
-    }
-    
-    func unsubscribe() {
-        state.pool.unsubscribe(sub_id: sub_id)
-    }
-    
-    private func handle_event(relay_id: String, ev: NostrEvent) {
-        guard ev.kind == kind.rawValue else {
-            return
-        }
-        
-        guard last_etag(tags: ev.tags) == target else {
-            return
-        }
-        
-        if insert_uniq_sorted_event(events: &self.events, 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: events, damus_state: state)
-        }
+    init() {
    }
 }
@@ -51,7 +51,11 @@ class FollowersModel: ObservableObject {
        if has_contact.contains(ev.pubkey) {
            return
        }
-        process_contact_event(state: damus_state, ev: ev)
+        process_contact_event(
+            pool: damus_state.pool,
+            contacts: damus_state.contacts,
+            pubkey: damus_state.pubkey, ev: ev
+        )
        contacts?.append(ev.pubkey)
        has_contact.insert(ev.pubkey)
    }
@@ -38,9 +38,6 @@ class HomeModel: ObservableObject {
    var channels: [String: NostrEvent] = [:]
    var last_event_of_kind: [String: [Int: NostrEvent]] = [:]
    var done_init: Bool = false
-    var incoming_dms: [NostrEvent] = []
-    let dm_debouncer = Debouncer(interval: 0.5)
-    var should_debounce_dms = true

    let home_subid = UUID().description
    let contacts_subid = UUID().description
@@ -50,37 +47,25 @@ class HomeModel: ObservableObject {
    let profiles_subid = UUID().description

    @Published var new_events: NewEventsBits = NewEventsBits()
-    @Published var notifications: EventHolder
+    @Published var notifications: [NostrEvent] = []
    @Published var dms: DirectMessagesModel
-    @Published var events: EventHolder
+    @Published var events: [NostrEvent] = []
    @Published var loading: Bool = false
    @Published var signal: SignalModel = SignalModel()

    init() {
-        self.events = EventHolder()
-        self.notifications = EventHolder()
        self.damus_state = DamusState.empty
-        self.dms = DirectMessagesModel(our_pubkey: "")
+        self.dms = DirectMessagesModel(our_pubkey: damus_state.pubkey)
    }
-    
+
    init(damus_state: DamusState) {
-        self.events = EventHolder()
-        self.notifications = EventHolder()
        self.damus_state = damus_state
        self.dms = DirectMessagesModel(our_pubkey: damus_state.pubkey)
-        self.setup_debouncer()
    }

    var pool: RelayPool {
        return damus_state.pool
    }
-    
-    func setup_debouncer() {
-        // turn off debouncer after initial load
-        DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
-            self.should_debounce_dms = false
-        }
-    }

    func has_sub_id_event(sub_id: String, ev_id: String) -> Bool {
        if !has_event.keys.contains(sub_id) {
@@ -132,18 +117,14 @@ class HomeModel: ObservableObject {
        }
    }
    
-    func handle_zap_event_with_zapper(_ ev: NostrEvent, our_pubkey: String, zapper: String) {
+    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)
        
-        guard zap.target.pubkey == our_pubkey else {
-            return
-        }
-        
-        if !notifications.insert(ev) {
+        if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
            return
        }
        
@@ -157,12 +138,16 @@ class HomeModel: ObservableObject {
            return
        }
        
-        if let local_zapper = damus_state.profiles.lookup_zapper(pubkey: ptag) {
-            handle_zap_event_with_zapper(ev, our_pubkey: damus_state.pubkey, zapper: local_zapper)
+        guard ptag == damus_state.pubkey else {
            return
        }
        
-        guard let profile = damus_state.profiles.lookup(id: ptag) else {
+        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
        }
        
@@ -176,8 +161,7 @@ class HomeModel: ObservableObject {
            }
            
            DispatchQueue.main.async {
-                self.damus_state.profiles.zappers[ptag] = zapper
-                self.handle_zap_event_with_zapper(ev, our_pubkey: self.damus_state.pubkey, zapper: zapper)
+                self.handle_zap_event_with_zapper(ev, zapper: zapper)
            }
        }
        
@@ -195,9 +179,9 @@ class HomeModel: ObservableObject {
    }
    
    func filter_muted() {
-        events.filter { !damus_state.contacts.is_muted($0.pubkey) }
+        self.events = events.filter { !damus_state.contacts.is_muted($0.pubkey) }
        self.dms.dms = dms.dms.filter { !damus_state.contacts.is_muted($0.0) }
-        notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
+        self.notifications = notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
    }
    
    func handle_delete_event(_ ev: NostrEvent) {
@@ -209,7 +193,7 @@ class HomeModel: ObservableObject {
    }

    func handle_contact_event(sub_id: String, relay_id: String, ev: NostrEvent) {
-        process_contact_event(state: self.damus_state, ev: ev)
+        process_contact_event(pool: damus_state.pool, contacts: damus_state.contacts, pubkey: damus_state.pubkey, ev: ev)

        if sub_id == init_subid {
            pool.send(.unsubscribe(init_subid), to: [relay_id])
@@ -245,7 +229,6 @@ class HomeModel: ObservableObject {
        case .success(let n):
            let boosted = Counted(event: ev, id: e, total: n)
            notify(.boosted, boosted)
-            notify(.update_stats, e)
        }
    }

@@ -263,7 +246,6 @@ class HomeModel: ObservableObject {
        case .success(let n):
            let liked = Counted(event: ev, id: e.ref_id, total: n)
            notify(.liked, liked)
-            notify(.update_stats, e.ref_id)
        }
    }

@@ -304,7 +286,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 == .boost || 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 == .zap || 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
@@ -318,11 +300,10 @@ class HomeModel: ObservableObject {
            case .eose(let sub_id):
                
                if sub_id == dms_subid {
-                    var dms = dms.dms.flatMap { $0.1.events }
-                    dms.append(contentsOf: incoming_dms)
+                    let dms = dms.dms.flatMap { $0.1.events }
                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: dms, damus_state: damus_state)
                } else if sub_id == notifications_subid {
-                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: notifications.all_events, damus_state: damus_state)
+                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: notifications, damus_state: damus_state)
                }
                
                self.loading = false
@@ -461,10 +442,10 @@ class HomeModel: ObservableObject {
            return
        }
        
-        if !notifications.insert(ev) {
+        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)
    }
    
@@ -474,10 +455,12 @@ class HomeModel: ObservableObject {
        }
    }

-    func insert_home_event(_ ev: NostrEvent) {
-        if events.insert(ev) {
+    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 })
+        if ok {
            handle_last_event(ev: ev, timeline: .home)
        }
+        return ok
    }

    func handle_text_event(sub_id: String, _ ev: NostrEvent) {
@@ -486,33 +469,15 @@ class HomeModel: ObservableObject {
        }

        if sub_id == home_subid {
-            insert_home_event(ev)
+            let _ = insert_home_event(ev)
        } else if sub_id == notifications_subid {
            handle_notification(ev: ev)
        }
    }
-    
+
    func handle_dm(_ ev: NostrEvent) {
-        guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
-            return
-        }
-        
-        if !should_debounce_dms {
-            self.incoming_dms.append(ev)
-            if let notifs = handle_incoming_dms(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, evs: self.incoming_dms) {
-                self.new_events = notifs
-            }
-            self.incoming_dms = []
-            return
-        }
-        
-        incoming_dms.append(ev)
-        
-        dm_debouncer.debounce {
-            if let notifs = handle_incoming_dms(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, evs: self.incoming_dms) {
-                self.new_events = notifs
-            }
-            self.incoming_dms = []
+        if let notifs = handle_incoming_dm(contacts: damus_state.contacts, prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, ev: ev) {
+            self.new_events = notifs
        }
    }
 }
@@ -658,14 +623,14 @@ func process_metadata_event(our_pubkey: String, profiles: Profiles, ev: NostrEve
    
    // load pfps asap
    let picture = tprof.profile.picture ?? robohash(ev.pubkey)
-    if URL(string: picture) != nil {
+    if let _ = URL(string: picture) {
        DispatchQueue.main.async {
            notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
        }
    }
    
    let banner = tprof.profile.banner ?? ""
-    if URL(string: banner) != nil {
+    if let _ = URL(string: banner) {
        DispatchQueue.main.async {
            notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
        }
@@ -678,31 +643,31 @@ func robohash(_ pk: String) -> String {
    return "https://robohash.org/" + pk
 }

-func load_our_stuff(state: DamusState, ev: NostrEvent) {
-    guard ev.pubkey == state.pubkey else {
+func load_our_stuff(pool: RelayPool, contacts: Contacts, pubkey: String, ev: NostrEvent) {
+    guard ev.pubkey == pubkey else {
        return
    }
    
    // only use new stuff
-    if let current_ev = state.contacts.event {
+    if let current_ev = contacts.event {
        guard ev.created_at > current_ev.created_at else {
            return
        }
    }
    
-    let m_old_ev = state.contacts.event
-    state.contacts.event = ev
+    let m_old_ev = contacts.event
+    contacts.event = ev

-    load_our_contacts(contacts: state.contacts, our_pubkey: state.pubkey, m_old_ev: m_old_ev, ev: ev)
-    load_our_relays(state: state, m_old_ev: m_old_ev, ev: ev)
+    load_our_contacts(contacts: contacts, our_pubkey: pubkey, m_old_ev: m_old_ev, ev: ev)
+    load_our_relays(contacts: contacts, our_pubkey: pubkey, pool: pool, m_old_ev: m_old_ev, ev: ev)
 }

-func process_contact_event(state: DamusState, ev: NostrEvent) {
-    load_our_stuff(state: state, ev: ev)
-    add_contact_if_friend(contacts: state.contacts, ev: ev)
+func process_contact_event(pool: RelayPool, contacts: Contacts, pubkey: String, ev: NostrEvent) {
+    load_our_stuff(pool: pool, contacts: contacts, pubkey: pubkey, ev: ev)
+    add_contact_if_friend(contacts: contacts, ev: ev)
 }

-func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
+func load_our_relays(contacts: Contacts, our_pubkey: String, pool: RelayPool, m_old_ev: NostrEvent?, ev: NostrEvent) {
    let bootstrap_dict: [String: RelayInfo] = [:]
    let old_decoded = m_old_ev.flatMap { decode_json_relays($0.content) } ?? BOOTSTRAP_RELAYS.reduce(into: bootstrap_dict) { (d, r) in
        d[r] = .rw
@@ -726,15 +691,14 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
    
    let diff = old.symmetricDifference(new)
    
-    let new_relay_filters = load_relay_filters(state.pubkey) == nil
    for d in diff {
        changed = true
        if new.contains(d) {
            if let url = URL(string: d) {
-                add_new_relay(relay_filters: state.relay_filters, metadatas: state.relay_metadata, pool: state.pool, url: url, info: decoded[d] ?? .rw, new_relay_filters: new_relay_filters)
+                try? pool.add_relay(url, info: decoded[d] ?? .rw)
            }
        } else {
-            state.pool.remove_relay(d)
+            pool.remove_relay(d)
        }
    }
    
@@ -743,61 +707,14 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
    }
 }

-func add_new_relay(relay_filters: RelayFilters, metadatas: RelayMetadatas, pool: RelayPool, url: URL, info: RelayInfo, new_relay_filters: Bool) {
-    try? pool.add_relay(url, info: info)
-    
-    let relay_id = url.absoluteString
-    guard metadatas.lookup(relay_id: relay_id) == nil else {
-        return
+func handle_incoming_dm(contacts: Contacts, prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, ev: NostrEvent) -> NewEventsBits? {
+    // hide blocked users
+    guard should_show_event(contacts: contacts, ev: ev) else {
+        return prev_events
    }
    
-    Task.detached(priority: .background) {
-        guard let meta = try? await fetch_relay_metadata(relay_id: relay_id) else {
-            return
-        }
-        
-        DispatchQueue.main.async {
-            metadatas.insert(relay_id: relay_id, metadata: meta)
-            
-            // if this is the first time adding filters, we should filter non-paid relays
-            if new_relay_filters && !meta.is_paid {
-                relay_filters.insert(timeline: .search, relay_id: relay_id)
-            }
-        }
-    }
-}
-
-func fetch_relay_metadata(relay_id: String) async throws -> RelayMetadata? {
-    var urlString = relay_id.replacingOccurrences(of: "wss://", with: "https://")
-    urlString = urlString.replacingOccurrences(of: "ws://", with: "http://")
-    
-    guard let url = URL(string: urlString) else {
-        return nil
-    }
-    
-    var request = URLRequest(url: url)
-    request.setValue("application/nostr+json", forHTTPHeaderField: "Accept")
-    
-    var res: (Data, URLResponse)? = nil
-    
-    res = try await URLSession.shared.data(for: request)
-    
-    guard let data = res?.0 else {
-        return nil
-    }
-    
-    let nip11 = try JSONDecoder().decode(RelayMetadata.self, from: data)
-    return nip11
-}
-
-func process_relay_metadata() {
-}
-
-@discardableResult
-func handle_incoming_dm(ev: NostrEvent, our_pubkey: String, dms: DirectMessagesModel, prev_events: NewEventsBits) -> (Bool, NewEventsBits?) {
    var inserted = false
    var found = false
-    
    let ours = ev.pubkey == our_pubkey
    var i = 0

@@ -824,34 +741,15 @@ func handle_incoming_dm(ev: NostrEvent, our_pubkey: String, dms: DirectMessagesM
    }

    if !found {
+        inserted = true
        let model = DirectMessageModel(events: [ev], our_pubkey: our_pubkey)
        dms.dms.append((the_pk, model))
-        inserted = true
    }
-    
-    var new_bits: NewEventsBits? = nil
-    if inserted {
-        new_bits = handle_last_events(new_events: prev_events, ev: ev, timeline: .dms, shouldNotify: !ours)
-    }
-    
-    return (inserted, new_bits)
-}
-
-@discardableResult
-func handle_incoming_dms(prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, evs: [NostrEvent]) -> NewEventsBits? {
-    var inserted = false

    var new_events: NewEventsBits? = nil
-    
-    for ev in evs {
-        let res = handle_incoming_dm(ev: ev, our_pubkey: our_pubkey, dms: dms, prev_events: prev_events)
-        inserted = res.0 || inserted
-        if let new = res.1 {
-            new_events = new
-        }
-    }
-    
    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
        }
@@ -0,0 +1,114 @@
+//
+//  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)
+    }
+}
@@ -17,6 +17,7 @@ enum LibreTranslateServer: String, CaseIterable, Identifiable {
        var url: String?
    }

+    case none
    case argosopentech
    case terraprint
    case vern
@@ -24,6 +25,8 @@ enum LibreTranslateServer: String, CaseIterable, Identifiable {

    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:
@@ -211,32 +211,6 @@ enum Amount: Equatable {
    }
 }

-func format_actions_abbrev(_ actions: Int) -> 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
-        
-    if actions >= 1_000_000 {
-        formatter.positiveSuffix = "m"
-        formatter.multiplier = 0.000001
-    } else if actions >= 1000 {
-        formatter.positiveSuffix = "k"
-        formatter.multiplier = 0.001
-    } else {
-        return "\(actions)"
-    }
-    
-    let actions = NSNumber(value: actions)
-    
-    return formatter.string(from: actions) ?? "\(actions)"
-}
-
 func format_msats_abbrev(_ msats: Int64) -> String {
    let formatter = NumberFormatter()
    formatter.numberStyle = .decimal
@@ -273,7 +247,7 @@ func format_msats(_ msat: Int64) -> String {
    let sats = NSNumber(value: (Double(msat) / 1000.0))
    let formattedSats = numberFormatter.string(from: sats) ?? sats.stringValue

-    return String(format: Bundle.main.localizedString(forKey: "sats_count", value: nil, table: nil), sats.decimalValue as NSDecimalNumber, formattedSats)
+    return String(format: NSLocalizedString("sats_count", comment: "Amount of sats."), sats.decimalValue as NSDecimalNumber, formattedSats)
 }

 func convert_invoice_block(_ b: invoice_block) -> Block? {
@@ -8,7 +8,7 @@
 import Foundation

 class ProfileModel: ObservableObject, Equatable {
-    var events: EventHolder = EventHolder()
+    @Published var events: [NostrEvent] = []
    @Published var contacts: NostrEvent? = nil
    @Published var following: Int = 0
    @Published var relays: [String: RelayInfo]? = nil
@@ -20,24 +20,6 @@ class ProfileModel: ObservableObject, Equatable {
    var sub_id = UUID().description
    var prof_subid = UUID().description
    
-    func follows(pubkey: String) -> Bool {
-        guard let contacts = self.contacts else {
-            return false
-        }
-        
-        for tag in contacts.tags {
-            guard tag.count >= 2 && tag[0] == "p" else {
-                continue
-            }
-            
-            if tag[1] == pubkey {
-                return true
-            }
-        }
-        
-        return false
-    }
-    
    func get_follow_target() -> FollowTarget {
        if let contacts = contacts {
            return .contact(contacts)
@@ -88,7 +70,7 @@ class ProfileModel: ObservableObject, Equatable {
    }
    
    func handle_profile_contact_event(_ ev: NostrEvent) {
-        process_contact_event(state: damus, ev: ev)
+        process_contact_event(pool: damus.pool, contacts: damus.contacts, pubkey: damus.pubkey, ev: ev)
        
        // only use new stuff
        if let current_ev = self.contacts {
@@ -111,9 +93,7 @@ class ProfileModel: ObservableObject, Equatable {
            return
        }
        if ev.is_textlike || ev.known_kind == .boost {
-            if self.events.insert(ev) {
-                self.objectWillChange.send()
-            }
+            let _ = insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at})
        } else if ev.known_kind == .contacts {
            handle_profile_contact_event(ev)
        } else if ev.known_kind == .metadata {
@@ -8,9 +8,71 @@
 import Foundation


-final class ReactionsModel: EventsModel {
+class ReactionsModel: ObservableObject {
+    let state: DamusState
+    let target: String
+    let sub_id: String
+    let profiles_id: String
    
-    init(state: DamusState, target: String) {
-        super.init(state: state, target: target, kind: .like)
+    @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
+        }
    }
 }
@@ -7,9 +7,71 @@

 import Foundation

-final class RepostsModel: EventsModel {
-    
-    init(state: DamusState, target: String) {
-        super.init(state: state, target: target, kind: .boost)
+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
+        }
    }
 }
@@ -10,7 +10,7 @@ import Foundation

 /// The data model for the SearchHome view, typically something global-like
 class SearchHomeModel: ObservableObject {
-    var events: EventHolder = EventHolder()
+    @Published var events: [NostrEvent] = []
    @Published var loading: Bool = false

    var seen_pubkey: Set<String> = Set()
@@ -31,14 +31,12 @@ class SearchHomeModel: ObservableObject {
    }
    
    func filter_muted() {
-        events.filter { should_show_event(contacts: damus_state.contacts, ev: $0) }
-        self.objectWillChange.send()
+        events = events.filter { should_show_event(contacts: damus_state.contacts, ev: $0) }
    }
    
    func subscribe() {
        loading = true
-        let to_relays = determine_to_relays(pool: damus_state.pool, filters: damus_state.relay_filters)
-        damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event, to: to_relays)
+        damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event)
    }

    func unsubscribe(to: String? = nil) {
@@ -62,8 +60,8 @@ class SearchHomeModel: ObservableObject {
                }
                seen_pubkey.insert(ev.pubkey)
                
-                if self.events.insert(ev) {
-                    self.objectWillChange.send()
+                let _ = insert_uniq_sorted_event(events: &events, new_ev: ev) {
+                    $0.created_at > $1.created_at
                }
            }
        case .notice(let msg):
@@ -76,7 +74,7 @@ class SearchHomeModel: ObservableObject {
                // global events are not realtime
                unsubscribe(to: relay_id)
                
-                load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: events.all_events, damus_state: damus_state)
+                load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: events, damus_state: damus_state)
            }
            
            
@@ -9,7 +9,7 @@ import Foundation


 class SearchModel: ObservableObject {
-    var events: EventHolder = EventHolder()
+    @Published var events: [NostrEvent] = []
    @Published var loading: Bool = false
    @Published var channel_name: String? = nil
    
@@ -26,8 +26,7 @@ class SearchModel: ObservableObject {
    }
    
    func filter_muted()  {
-        self.events.filter { should_show_event(contacts: contacts, ev: $0) }
-        self.objectWillChange.send()
+        self.events = self.events.filter { should_show_event(contacts: contacts, ev: $0) }
    }
    
    func subscribe() {
@@ -58,7 +57,7 @@ class SearchModel: ObservableObject {
            return
        }
        
-        if self.events.insert(ev) {
+        if insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at } ) {
            objectWillChange.send()
        }
    }
@@ -99,21 +98,6 @@ func event_matches_hashtag(_ ev: NostrEvent, hashtags: [String]) -> Bool {
    return false
 }

-func tag_is_hashtag(_ tag: [String]) -> Bool {
-    // "hashtag" is deprecated, will remove in the future
-    return tag.count >= 2 && (tag[0] == "hashtag" || tag[0] == "t")
-}
-
-func has_hashtag(_ tags: [[String]], hashtag: String) -> Bool {
-    for tag in tags {
-        if tag_is_hashtag(tag) && tag[1] == hashtag {
-            return true
-        }
-    }
-    
-    return false
-}
-
 func event_matches_filter(_ ev: NostrEvent, filter: NostrFilter) -> Bool {
    if let hashtags = filter.hashtag {
        return event_matches_hashtag(ev, hashtags: hashtags)
@@ -1,37 +0,0 @@
-//
-//  TranslationService.swift
-//  damus
-//
-//  Created by Terry Yiu on 2/3/23.
-//
-
-import Foundation
-
-enum TranslationService: String, CaseIterable, Identifiable {
-    var id: String { self.rawValue }
-
-    struct Model: Identifiable, Hashable {
-        var id: String { self.tag }
-        var tag: String
-        var displayName: String
-    }
-
-    case none
-    case libretranslate
-    case deepl
-
-    var model: Model {
-        switch self {
-        case .none:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("None", comment: "Dropdown option for selecting no translation service."))
-        case .libretranslate:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("LibreTranslate (Open Source)", comment: "Dropdown option for selecting LibreTranslate as the translation service."))
-        case .deepl:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("DeepL (Proprietary, Higher Accuracy)", comment: "Dropdown option for selecting DeepL as the translation service."))
-        }
-    }
-
-    static var allModels: [Model] {
-        return Self.allCases.map { $0.model }
-    }
-}
@@ -12,29 +12,6 @@ func should_show_wallet_selector(_ pubkey: String) -> Bool {
    return UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
 }

-func pk_setting_key(_ pubkey: String, key: String) -> String {
-    return "\(pubkey)_\(key)"
-}
-
-func default_zap_setting_key(pubkey: String) -> String {
-    return pk_setting_key(pubkey, key: "default_zap_amount")
-}
-
-func set_default_zap_amount(pubkey: String, amount: Int) {
-    let key = default_zap_setting_key(pubkey: pubkey)
-    UserDefaults.standard.setValue(amount, forKey: key)
-}
-
-func get_default_zap_amount(pubkey: String) -> Int? {
-    let key = default_zap_setting_key(pubkey: pubkey)
-    let amt = UserDefaults.standard.integer(forKey: key)
-    if amt == 0 {
-        return nil
-    }
-    return amt
-}
-
-
 func get_default_wallet(_ pubkey: String) -> Wallet {
    if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
       let default_wallet = Wallet(rawValue: defaultWalletName)
@@ -45,23 +22,7 @@ func get_default_wallet(_ pubkey: String) -> Wallet {
    }
 }

-private func get_translation_service(_ pubkey: String) -> TranslationService? {
-    guard let translation_service = UserDefaults.standard.string(forKey: "translation_service") else {
-        return nil
-    }
-
-    return TranslationService(rawValue: translation_service)
-}
-
-private func get_deepl_plan(_ pubkey: String) -> DeepLPlan? {
-    guard let server_name = UserDefaults.standard.string(forKey: "deepl_plan") else {
-        return nil
-    }
-
-    return DeepLPlan(rawValue: server_name)
-}
-
-private func get_libretranslate_server(_ pubkey: String) -> LibreTranslateServer? {
+func get_libretranslate_server(_ pubkey: String) -> LibreTranslateServer? {
    guard let server_name = UserDefaults.standard.string(forKey: "libretranslate_server") else {
        return nil
    }
@@ -69,7 +30,7 @@ private func get_libretranslate_server(_ pubkey: String) -> LibreTranslateServer
    return LibreTranslateServer(rawValue: server_name)
 }

-private func get_libretranslate_url(_ pubkey: String, server: LibreTranslateServer) -> String? {
+func get_libretranslate_url(_ pubkey: String, server: LibreTranslateServer) -> String? {
    if let url = server.model.url {
        return url
    }
@@ -96,32 +57,6 @@ class UserSettingsStore: ObservableObject {
        }
    }

-    @Published var translation_service: TranslationService {
-        didSet {
-            UserDefaults.standard.set(translation_service.rawValue, forKey: "translation_service")
-        }
-    }
-
-    @Published var deepl_plan: DeepLPlan {
-        didSet {
-            UserDefaults.standard.set(deepl_plan.rawValue, forKey: "deepl_plan")
-        }
-    }
-
-    @Published var deepl_api_key: String {
-        didSet {
-            do {
-                if deepl_api_key == "" {
-                    try clearDeepLApiKey()
-                } else {
-                    try saveDeepLApiKey(deepl_api_key)
-                }
-            } catch {
-                // No-op.
-            }
-        }
-    }
-
    @Published var libretranslate_server: LibreTranslateServer {
        didSet {
            if oldValue == libretranslate_server {
@@ -132,7 +67,7 @@ class UserSettingsStore: ObservableObject {

            libretranslate_api_key = ""

-            if libretranslate_server == .custom {
+            if libretranslate_server == .custom || libretranslate_server == .none {
                libretranslate_url = ""
            } else {
                libretranslate_url = libretranslate_server.model.url!
@@ -167,25 +102,18 @@ class UserSettingsStore: ObservableObject {
        show_wallet_selector = should_show_wallet_selector(pubkey)

        left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
-
-        // Note from @tyiu:
-        // Default translation service 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).
-        if let translation_service = get_translation_service(pubkey) {
-            self.translation_service = translation_service
+        
+        if let server = get_libretranslate_server(pubkey) {
+            self.libretranslate_server = server
+            self.libretranslate_url = get_libretranslate_url(pubkey, server: server) ?? ""
        } else {
-            self.translation_service = .none
-        }
-
-        if let libretranslate_server = get_libretranslate_server(pubkey) {
-            self.libretranslate_server = libretranslate_server
-            self.libretranslate_url = get_libretranslate_url(pubkey, server: libretranslate_server) ?? ""
-        } else {
-            // Choose a random server to distribute load.
-            libretranslate_server = .allCases.filter { $0 != .custom }.randomElement()!
+            // Note from @tyiu:
+            // 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 = ""
        }
            
@@ -194,46 +122,15 @@ class UserSettingsStore: ObservableObject {
        } catch {
            libretranslate_api_key = ""
        }
-
-        if let deepl_plan = get_deepl_plan(pubkey) {
-            self.deepl_plan = deepl_plan
-        } else {
-            self.deepl_plan = .free
-        }
-
-        do {
-            deepl_api_key = try Vault.getPrivateKey(keychainConfiguration: DamusDeepLKeychainConfiguration())
-        } catch {
-            deepl_api_key = ""
-        }
    }

-    private func saveLibreTranslateApiKey(_ apiKey: String) throws {
+    func saveLibreTranslateApiKey(_ apiKey: String) throws {
        try Vault.savePrivateKey(apiKey, keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
    }

-    private func clearLibreTranslateApiKey() throws {
+    func clearLibreTranslateApiKey() throws {
        try Vault.deletePrivateKey(keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
    }
-
-    private func saveDeepLApiKey(_ apiKey: String) throws {
-        try Vault.savePrivateKey(apiKey, keychainConfiguration: DamusDeepLKeychainConfiguration())
-    }
-
-    private func clearDeepLApiKey() throws {
-        try Vault.deletePrivateKey(keychainConfiguration: DamusDeepLKeychainConfiguration())
-    }
-
-    func can_translate(_ pubkey: String) -> Bool {
-        switch translation_service {
-        case .none:
-            return false
-        case .libretranslate:
-            return URLComponents(string: libretranslate_url) != nil
-        case .deepl:
-            return deepl_api_key != ""
-        }
-    }
 }

 struct DamusLibreTranslateKeychainConfiguration: KeychainConfiguration {
@@ -241,9 +138,3 @@ struct DamusLibreTranslateKeychainConfiguration: KeychainConfiguration {
    var accessGroup: String? = nil
    var accountName = "libretranslate_apikey"
 }
-
-struct DamusDeepLKeychainConfiguration: KeychainConfiguration {
-    var serviceName = "damus"
-    var accessGroup: String? = nil
-    var accountName = "deepl_apikey"
-}
@@ -1,77 +0,0 @@
-//
-//  ZapsModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-02-10.
-//
-
-import Foundation
-
-class ZapsModel: ObservableObject {
-    let state: DamusState
-    let target: ZapTarget
-    var zaps: [Zap]
-    
-    let zaps_subid = UUID().description
-    
-    init(state: DamusState, target: ZapTarget) {
-        self.state = state
-        self.target = target
-        self.zaps = []
-    }
-    
-    func subscribe() {
-        var filter = NostrFilter.filter_kinds([9735])
-        switch target {
-        case .profile(let profile_id):
-            filter.pubkeys = [profile_id]
-        case .note(let note_target):
-            filter.referenced_ids = [note_target.note_id]
-        }
-        state.pool.subscribe(sub_id: zaps_subid, filters: [filter], handler: handle_event)
-    }
-    
-    func unsubscribe() {
-        state.pool.unsubscribe(sub_id: zaps_subid)
-    }
-    
-    func handle_event(relay_id: String, conn_ev: NostrConnectionEvent) {
-        guard case .nostr_event(let resp) = conn_ev else {
-            return
-        }
-        
-        guard resp.subid == zaps_subid else {
-            return
-        }
-        
-        guard case .event(_, let ev) = resp else {
-            return
-        }
-        
-        guard ev.kind == 9735 else {
-            return
-        }
-        
-        if let zap = state.zaps.zaps[ev.id] {
-            if insert_uniq_sorted_zap(zaps: &zaps, new_zap: zap) {
-                objectWillChange.send()
-            }
-        } else {
-            guard let zapper = state.profiles.lookup_zapper(pubkey: target.pubkey) else {
-                return
-            }
-            
-            guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper) else {
-                return
-            }
-            
-            state.zaps.add_zap(zap: zap)
-            
-            if insert_uniq_sorted_zap(zaps: &zaps, new_zap: zap) {
-                objectWillChange.send()
-            }
-        }
-        
-        
-    }
-}
@@ -102,7 +102,7 @@ struct Profile: Codable {
    }
    
    var lnurl: String? {
-        guard let addr = lud16 ?? lud06 else {
+        guard let addr = lud06 ?? lud16 else {
            return nil;
        }
        
@@ -278,8 +278,8 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
        return (self.flags & 1) != 0
    }

-    init(id: String = "", content: String, pubkey: String, kind: Int = 1, tags: [[String]] = [], createdAt: Int64 = Int64(Date().timeIntervalSince1970)) {
-        self.id = id
+    init(content: String, pubkey: String, kind: Int = 1, tags: [[String]] = [], createdAt: Int64 = Int64(Date().timeIntervalSince1970)) {
+        self.id = ""
        self.sig = ""

        self.content = content
@@ -288,6 +288,20 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
        self.tags = tags
        self.created_at = createdAt
    }
+    
+    /// Intiialization statement used to specificy ID
+    ///
+    /// This is mainly used for contant and testing data
+    init(id: String, content: String, pubkey: String, kind: Int = 1, tags: [[String]] = []) {
+        self.id = id
+        self.sig = ""
+
+        self.content = content
+        self.pubkey = pubkey
+        self.kind = kind
+        self.tags = tags
+        self.created_at = Int64(Date().timeIntervalSince1970)
+    }

    init(from: NostrEvent, content: String? = nil) {
        self.id = from.id
@@ -356,7 +370,6 @@ func decode_nostr_event(txt: String) -> NostrResponse? {

 func encode_json<T: Encodable>(_ val: T) -> String? {
    let encoder = JSONEncoder()
-    encoder.outputFormatting = .withoutEscapingSlashes
    return (try? encoder.encode(val)).map { String(decoding: $0, as: UTF8.self) }
 }

@@ -72,7 +72,7 @@ func char_to_hex(_ c: UInt8) -> UInt8?
    return nil;
 }

-@discardableResult
+
 func hex_decode(_ str: String) -> [UInt8]?
 {
    if str.count == 0 {
@@ -24,30 +24,6 @@ enum RelayFlags: Int {
    case broken = 1
 }

-struct Limitations: Codable {
-    let payment_required: Bool?
-    
-    static var empty: Limitations {
-        Limitations(payment_required: nil)
-    }
-}
-
-struct RelayMetadata: Codable {
-    let name: String?
-    let description: String?
-    let pubkey: String?
-    let contact: String?
-    let supported_nips: [Int]?
-    let software: String?
-    let version: String?
-    let limitation: Limitations?
-    let payments_url: String?
-    
-    var is_paid: Bool {
-        return limitation?.payment_required ?? false
-    }
-}
-
 class Relay: Identifiable {
    let descriptor: RelayDescriptor
    let connection: RelayConnection
@@ -13,41 +13,42 @@ enum NostrConnectionEvent {
    case nostr_event(NostrResponse)
 }

-final class RelayConnection: WebSocketDelegate {
-    private(set) var isConnected = false
-    private(set) var isConnecting = false
-    private(set) var isReconnecting = false
-    
-    private(set) var last_connection_attempt: TimeInterval = 0
-    private lazy var socket = {
-        let req = URLRequest(url: url)
-        let socket = WebSocket(request: req, compressionHandler: .none)
-        socket.delegate = self
-        return socket
-    }()
-    private var handleEvent: (NostrConnectionEvent) -> ()
-    private let url: URL
+class RelayConnection: WebSocketDelegate {
+    var isConnected: Bool = false
+    var isConnecting: Bool = false
+    var isReconnecting: Bool = false
+    var last_connection_attempt: Double = 0
+    var socket: WebSocket
+    var handleEvent: (NostrConnectionEvent) -> ()
+    let url: URL

    init(url: URL, handleEvent: @escaping (NostrConnectionEvent) -> ()) {
        self.url = url
        self.handleEvent = handleEvent
+        // just init, we don't actually use this one
+        self.socket = make_websocket(url: url)
    }
    
    func reconnect() {
-        if isConnected {
-            isReconnecting = true
-            disconnect()
+        if self.isConnected {
+            self.isReconnecting = true
+            self.disconnect()
        } else {
            // we're already disconnected, so just connect
-            connect(force: true)
+            self.connect(force: true)
        }
    }
    
-    func connect(force: Bool = false) {
-        if !force && (isConnected || isConnecting) {
+    func connect(force: Bool = false){
+        if !force && (self.isConnected || self.isConnecting) {
            return
        }
-        
+
+        var req = URLRequest(url: self.url)
+        req.timeoutInterval = 5
+        socket = make_websocket(url: url)
+        socket.delegate = self
+
        isConnecting = true
        last_connection_attempt = Date().timeIntervalSince1970
        socket.connect()
@@ -67,9 +68,7 @@ final class RelayConnection: WebSocketDelegate {

        socket.write(string: req)
    }
-    
-    // MARK: - WebSocketDelegate
-    
+
    func didReceive(event: WebSocketEvent, client: WebSocket) {
        switch event {
        case .connected:
@@ -84,25 +83,15 @@ final class RelayConnection: WebSocketDelegate {
                self.connect()
            }

-        case .cancelled, .error:
+        case .cancelled: fallthrough
+        case .error:
            self.isConnecting = false
            self.isConnected = false

        case .text(let txt):
-            if txt.count > 2000 {
-                DispatchQueue.global(qos: .default).async {
-                    if let ev = decode_nostr_event(txt: txt) {
-                        DispatchQueue.main.async {
-                            self.handleEvent(.nostr_event(ev))
-                        }
-                        return
-                    }
-                }
-            } else {
-                if let ev = decode_nostr_event(txt: txt) {
-                    handleEvent(.nostr_event(ev))
-                    return
-                }
+            if let ev = decode_nostr_event(txt: txt) {
+                handleEvent(.nostr_event(ev))
+                return
            }

            print("decode failed for \(txt)")
@@ -114,6 +103,7 @@ final class RelayConnection: WebSocketDelegate {

        handleEvent(.ws_event(event))
    }
+
 }

 func make_nostr_req(_ req: NostrRequest) -> String? {
@@ -128,16 +118,17 @@ func make_nostr_req(_ req: NostrRequest) -> String? {
 }

 func make_nostr_push_event(ev: NostrEvent) -> String? {
-    guard let event = encode_json(ev) else {
-        return nil
-    }
+    let encoder = JSONEncoder()
+    encoder.outputFormatting = .withoutEscapingSlashes
+    let event_data = try! encoder.encode(ev)
+    let event = String(decoding: event_data, as: UTF8.self)
    let encoded = "[\"EVENT\",\(event)]"
    print(encoded)
    return encoded
 }

 func make_nostr_unsubscribe_req(_ sub_id: String) -> String? {
-    "[\"CLOSE\",\"\(sub_id)\"]"
+    return "[\"CLOSE\",\"\(sub_id)\"]"
 }

 func make_nostr_subscription_req(_ filters: [NostrFilter], sub_id: String) -> String? {
@@ -154,3 +145,10 @@ func make_nostr_subscription_req(_ filters: [NostrFilter], sub_id: String) -> St
    req += "]"
    return req
 }
+
+func make_websocket(url: URL) -> WebSocket {
+    let req = URLRequest(url: url)
+    //req.setValue("chat,superchat", forHTTPHeaderField: "Sec-WebSocket-Protocol")
+    return WebSocket(request: req, compressionHandler: .none)
+}
+
@@ -42,8 +42,6 @@ class RelayPool {
    var relays: [Relay] = []
    var handlers: [RelayHandler] = []
    var request_queue: [QueuedRequest] = []
-    var seen: Set<String> = Set()
-    var counts: [String: UInt64] = [:]

    var descriptors: [RelayDescriptor] {
        relays.map { $0.descriptor }
@@ -151,9 +149,9 @@ class RelayPool {
        self.send(.unsubscribe(sub_id), to: to)
    }
    
-    func subscribe(sub_id: String, filters: [NostrFilter], handler: @escaping (String, NostrConnectionEvent) -> (), to: [String]? = nil) {
+    func subscribe(sub_id: String, filters: [NostrFilter], handler: @escaping (String, NostrConnectionEvent) -> ()) {
        register_handler(sub_id: sub_id, handler: handler)
-        send(.subscribe(.init(filters: filters, sub_id: sub_id)), to: to)
+        send(.subscribe(.init(filters: filters, sub_id: sub_id)))
    }
    
    func subscribe_to(sub_id: String, filters: [NostrFilter], to: [String]?, handler: @escaping (String, NostrConnectionEvent) -> ()) {
@@ -195,13 +193,27 @@ class RelayPool {
            relay.connection.send(req)
        }
    }
-    
+
    func get_relays(_ ids: [String]) -> [Relay] {
-        relays.filter { ids.contains($0.id) }
+        var relays: [Relay] = []
+
+        for id in ids {
+            if let relay = get_relay(id) {
+                relays.append(relay)
+            }
+        }
+
+        return relays
    }
-    
+
    func get_relay(_ id: String) -> Relay? {
-        relays.first(where: { $0.id == id })
+        for relay in relays {
+            if relay.id == id {
+                return relay
+            }
+        }
+
+        return nil
    }
    
    func record_last_pong(relay_id: String, event: NostrConnectionEvent) {
@@ -229,25 +241,8 @@ class RelayPool {
        }
    }
    
-    func record_seen(relay_id: String, event: NostrConnectionEvent) {
-        if case .nostr_event(let ev) = event {
-            if case .event(_, let nev) = ev {
-                let k = relay_id + nev.id
-                if !seen.contains(k) {
-                    seen.insert(k)
-                    if counts[relay_id] == nil {
-                        counts[relay_id] = 1
-                    } else {
-                        counts[relay_id] = (counts[relay_id] ?? 0) + 1
-                    }
-                }
-            }
-        }
-    }
-    
    func handle_event(relay_id: String, event: NostrConnectionEvent) {
        record_last_pong(relay_id: relay_id, event: event)
-        record_seen(relay_id: relay_id, event: event)
        
        // run req queue when we reconnect
        if case .ws_event(let ws) = event {
@@ -143,12 +143,11 @@ func eightToFiveBits(_ input: [UInt8]) -> [UInt8] {
 }
    
    /// Decode Bech32 string
-@discardableResult
 public func bech32_decode(_ str: String) throws -> (hrp: String, data: Data)? {
    guard let strBytes = str.data(using: .utf8) else {
        throw Bech32Error.nonUTF8String
    }
-    guard strBytes.count <= 2024 else {
+    guard strBytes.count <= 90 else {
        throw Bech32Error.stringLengthExceeded
    }
    var lower: Bool = false
@@ -1,27 +0,0 @@
-//
-//  Debouncer.swift
-//  damus
-//
-//  Created by William Casarin on 2023-02-15.
-//
-
-import Foundation
-
-class Debouncer {
-    private let queue = DispatchQueue.main
-    private var workItem: DispatchWorkItem?
-    private var interval: TimeInterval
-
-    init(interval: TimeInterval) {
-        self.interval = interval
-    }
-
-    func debounce(action: @escaping () -> Void) {
-        // Cancel the previous work item if it hasn't yet executed
-        workItem?.cancel()
-
-        // Create a new work item with a delay
-        workItem = DispatchWorkItem { action() }
-        queue.asyncAfter(deadline: .now() + interval, execute: workItem!)
-    }
-}
@@ -1,99 +0,0 @@
-//
-//  EventHolder.swift
-//  damus
-//
-//  Created by William Casarin on 2023-02-19.
-//
-
-import Foundation
-
-/// Used for holding back events until they're ready to be displayed
-class EventHolder: ObservableObject {
-    private var has_event: Set<String>
-    @Published var events: [NostrEvent]
-    @Published var incoming: [NostrEvent]
-    @Published var should_queue: Bool
-    
-    var queued: Int {
-        return incoming.count
-    }
-    
-    var has_incoming: Bool {
-        return queued > 0
-    }
-    
-    var all_events: [NostrEvent] {
-        events + incoming
-    }
-    
-    init() {
-        self.should_queue = false
-        self.events = []
-        self.incoming = []
-        self.has_event = Set()
-    }
-    
-    init(events: [NostrEvent], incoming: [NostrEvent]) {
-        self.should_queue = false
-        self.events = events
-        self.incoming = incoming
-        self.has_event = Set()
-    }
-    
-    func filter(_ isIncluded: (NostrEvent) -> Bool) {
-        self.events = self.events.filter(isIncluded)
-        self.incoming = self.incoming.filter(isIncluded)
-    }
-    
-    func insert(_ ev: NostrEvent) -> Bool {
-        if should_queue {
-            return insert_queued(ev)
-        } else {
-            return insert_immediate(ev)
-        }
-    }
-    
-    private func insert_immediate(_ ev: NostrEvent) -> Bool {
-        if has_event.contains(ev.id) {
-            return false
-        }
-        
-        has_event.insert(ev.id)
-        
-        if insert_uniq_sorted_event_created(events: &self.events, new_ev: ev) {
-            return true
-        }
-        
-        return false
-    }
-    
-    private func insert_queued(_ ev: NostrEvent) -> Bool {
-        if has_event.contains(ev.id) {
-            return false
-        }
-        
-        has_event.insert(ev.id)
-        
-        incoming.append(ev)
-        return true
-    }
-    
-    func flush() {
-        guard !incoming.isEmpty else {
-            return
-        }
-        
-        var changed = false
-        for event in incoming {
-            if insert_uniq_sorted_event_created(events: &events, new_ev: event) {
-                changed = true
-            }
-        }
-        
-        if changed {
-            self.objectWillChange.send()
-        }
-        
-        self.incoming = []
-    }
-}
@@ -29,7 +29,7 @@ public struct DismissKeyboardOnTap: ViewModifier {

 }

-public func end_editing() {
+func end_editing() {
    UIApplication.shared.connectedScenes
      .filter {$0.activationState == .foregroundActive}
      .map {$0 as? UIWindowScene}
@@ -38,7 +38,6 @@ func insert_uniq_by_pubkey(events: inout [NostrEvent], new_ev: NostrEvent, cmp:
    return true
 }

-@discardableResult
 func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
    var i: Int = 0
    
@@ -59,14 +58,6 @@ func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
    return true
 }

-
-func insert_uniq_sorted_event_created(events: inout [NostrEvent], new_ev: NostrEvent) -> Bool {
-    return insert_uniq_sorted_event(events: &events, new_ev: new_ev) {
-        $0.created_at > $1.created_at
-    }
-}
-
-@discardableResult
 func insert_uniq_sorted_event(events: inout [NostrEvent], new_ev: NostrEvent, cmp: (NostrEvent, NostrEvent) -> Bool) -> Bool {
    var i: Int = 0
    
@@ -1,148 +0,0 @@
-//
-//  KFOptionSetter+.swift
-//  damus
-//
-//  Created by Oleg Abalonski on 2/15/23.
-//
-
-import UIKit
-import Kingfisher
-
-extension KFOptionSetter {
-    
-    func imageContext(_ imageContext: ImageContext) -> Self {
-        options.callbackQueue = .dispatch(.global(qos: .background))
-        options.processingQueue = .dispatch(.global(qos: .background))
-        options.downloader = CustomImageDownloader.shared
-        options.backgroundDecode = true
-        options.cacheOriginalImage = true
-        options.scaleFactor = UIScreen.main.scale
-        
-        options.processor = CustomImageProcessor(
-            maxSize: imageContext.maxMebibyteSize(),
-            downsampleSize: imageContext.downsampleSize()
-        )
-        
-        options.cacheSerializer = CustomCacheSerializer(
-            maxSize: imageContext.maxMebibyteSize(),
-            downsampleSize: imageContext.downsampleSize()
-        )
-        
-        return self
-    }
-    
-    func onFailure(fallbackUrl: URL?, cacheKey: String?) -> Self {
-        guard let url = fallbackUrl, let key = cacheKey else { return self }
-        let imageResource = ImageResource(downloadURL: url, cacheKey: key)
-        let source = imageResource.convertToSource()
-        options.alternativeSources = [source]
-        
-        return self
-    }
-}
-
-let MAX_FILE_SIZE = 20_971_520 // 20MiB
-
-enum ImageContext {
-    case pfp
-    case banner
-    case note
-    
-    func maxMebibyteSize() -> Int {
-        switch self {
-        case .pfp:
-            return 5_242_880 // 5Mib
-        case .banner, .note:
-            return 20_971_520 // 20MiB
-        }
-    }
-    
-    func downsampleSize() -> CGSize {
-        switch self {
-        case .pfp:
-            return CGSize(width: 200, height: 200)
-        case .banner:
-            return CGSize(width: 750, height: 250)
-        case .note:
-            return CGSize(width: 500, height: 500)
-        }
-    }
-}
-
-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)
-    }
-}
-
-class CustomSessionDelegate: SessionDelegate {
-    override func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive response: URLResponse, completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
-        let contentLength = response.expectedContentLength
-        
-        // Content-Length header is optional (-1 when missing)
-        if (contentLength != -1 && contentLength > MAX_FILE_SIZE) {
-            return super.urlSession(session, dataTask: dataTask, didReceive: URLResponse(), completionHandler: completionHandler)
-        }
-        
-        super.urlSession(session, dataTask: dataTask, didReceive: response, completionHandler: completionHandler)
-    }
-}
-
-class CustomImageDownloader: ImageDownloader {
-    
-    static let shared = CustomImageDownloader(name: "shared")
-    
-    override init(name: String) {
-        super.init(name: name)
-        sessionDelegate = CustomSessionDelegate()
-    }
-}
@@ -158,20 +158,6 @@ func get_saved_privkey() -> String? {
    return mkey.map { $0.trimmingCharacters(in: .whitespaces) }
 }

-/**
- Detects whether a string might contain an nsec1 prefixed private key.
- It does not determine if it's the current user's private key and does not verify if it is properly encoded or has the right length.
- */
-func contentContainsPrivateKey(_ content: String) -> Bool {
-    if #available(iOS 16.0, *) {
-        return content.contains(/nsec1[02-9ac-z]+/)
-    } else {
-        let regex = try! NSRegularExpression(pattern: "nsec1[02-9ac-z]+")
-        return (regex.firstMatch(in: content, range: NSRange(location: 0, length: content.count)) != nil)
-    }
-
-}
-
 fileprivate func removePrivateKeyFromUserDefaults() throws {
    guard let privKey = UserDefaults.standard.string(forKey: "privkey") else { return }
    try save_privkey(privkey: privKey)
@@ -8,8 +8,8 @@
 import Foundation

 public struct Markdown {
-    private var detector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
-    
+    private let detector = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
+
    /// Ensure the specified URL has a scheme by prepending "https://" if it's absent.
    static func withScheme(_ url: any StringProtocol) -> any StringProtocol {
        return url.contains("://") ? url : "https://" + url
@@ -31,9 +31,6 @@ public struct Markdown {

    /// Process the input text and add markdown for any embedded URLs.
    public func process(_ input: String) -> AttributedString {
-        guard let detector else {
-            return AttributedString(stringLiteral: input)
-        }
        let matches = detector.matches(in: input, options: [], range: NSRange(location: 0, length: input.utf16.count))
        var output = input
        // Start with the last match, because replacing the first would invalidate all subsequent indices
@@ -1,26 +0,0 @@
-//
-//  NIPURLBuilder.swift
-//  damus
-//
-//  Created by Honk on 2/1/23.
-//
-
-import Foundation
-
-struct NIPURLBuilder {
-    static private let baseURL = "https://github.com/nostr-protocol/nips/blob/master/"
-    static func url(forNIP nip: Int) -> URL? {
-        let urlString = baseURL + "\(formatNipNumber(nip: nip)).md"
-        return URL(string: urlString)
-    }
-    
-    static func formatNipNumber(nip: Int) -> String {
-        let formatted: String
-        if nip < 10 {
-            formatted = "0\(nip)"
-        } else {
-            formatted = "\(nip)"
-        }
-        return formatted
-    }
-}
@@ -98,9 +98,6 @@ extension Notification.Name {
    static var deleted_account: Notification.Name {
        return Notification.Name("deleted_account")
    }
-    static var update_stats: Notification.Name {
-        return Notification.Name("update_stats")
-    }
 }

 func handle_notify(_ name: Notification.Name) -> NotificationCenter.Publisher {
@@ -1,94 +0,0 @@
-//
-//  RelayFilters.swift
-//  damus
-//
-//  Created by William Casarin on 2023-02-08.
-//
-
-import Foundation
-
-struct RelayFilter: Hashable {
-    let timeline: Timeline
-    let relay_id: String
-    
-    init(timeline: Timeline, relay_id: String, on: Bool = false) {
-        self.timeline = timeline
-        self.relay_id = relay_id
-    }
-}
-
-class RelayFilters {
-    private let our_pubkey: String
-    private var disabled: Set<RelayFilter>
-    
-    func is_filtered(timeline: Timeline, relay_id: String) -> Bool {
-        let filter = RelayFilter(timeline: timeline, relay_id: relay_id)
-        let contains = disabled.contains(filter)
-        return contains
-    }
-    
-    func remove(timeline: Timeline, relay_id: String) {
-        let filter = RelayFilter(timeline: timeline, relay_id: relay_id)
-        if !disabled.contains(filter) {
-            return
-        }
-        
-        disabled.remove(filter)
-        save_relay_filters(our_pubkey, filters: disabled)
-    }
-    
-    func insert(timeline: Timeline, relay_id: String) {
-        let filter = RelayFilter(timeline: timeline, relay_id: relay_id)
-        if disabled.contains(filter) {
-            return
-        }
-        
-        disabled.insert(filter)
-        save_relay_filters(our_pubkey, filters: disabled)
-    }
-    
-    init(our_pubkey: String) {
-        self.our_pubkey = our_pubkey
-        disabled = load_relay_filters(our_pubkey) ?? Set()
-    }
-}
-
-func save_relay_filters(_ pubkey: String, filters: Set<RelayFilter>) {
-    let key = pk_setting_key(pubkey, key: "relay_filters")
-    let arr = Array(filters.map { filter in "\(filter.timeline)\t\(filter.relay_id)" })
-    UserDefaults.standard.set(arr, forKey: key)
-}
-
-func relay_filter_setting_key(_ pubkey: String) -> String {
-    return pk_setting_key(pubkey, key: "relay_filters")
-}
-
-func clear_relay_filters(_ pubkey: String) {
-    let key = relay_filter_setting_key(pubkey)
-    UserDefaults.standard.removeObject(forKey: key)
-}
-
-func load_relay_filters(_ pubkey: String) -> Set<RelayFilter>? {
-    let key = relay_filter_setting_key(pubkey)
-    guard let filters = UserDefaults.standard.stringArray(forKey: key) else {
-        return nil
-    }
-    
-    return filters.reduce(into: Set()) { s, str in
-        let parts = str.components(separatedBy: "\t")
-        guard parts.count == 2 else {
-            return
-        }
-        guard let timeline = Timeline.init(rawValue: parts[0]) else {
-            return
-        }
-        let filter = RelayFilter(timeline: timeline, relay_id: parts[1])
-        s.insert(filter)
-    }
-}
-
-func determine_to_relays(pool: RelayPool, filters: RelayFilters) -> [String] {
-    return pool.descriptors
-        .map { $0.url.absoluteString }
-        .filter { !filters.is_filtered(timeline: .search, relay_id: $0) }
-}
@@ -1,20 +0,0 @@
-//
-//  RelayMetadatas.swift
-//  damus
-//
-//  Created by William Casarin on 2023-02-09.
-//
-
-import Foundation
-
-class RelayMetadatas {
-    private var metadata: [String: RelayMetadata] = [:]
-    
-    func lookup(relay_id: String) -> RelayMetadata? {
-        return metadata[relay_id]
-    }
-    
-    func insert(relay_id: String, metadata: RelayMetadata) {
-        self.metadata[relay_id] = metadata
-    }
-}
@@ -25,12 +25,4 @@ class Theme {

        UINavigationBar.appearance().tintColor = tintColor ?? titleColor ?? .black
    }
-    
-    static var safeAreaInsets: UIEdgeInsets? {
-        return UIApplication
-                .shared
-                .connectedScenes
-                .flatMap { ($0 as? UIWindowScene)?.windows ?? [] }
-                .first { $0.isKeyWindow }?.safeAreaInsets
-    }
 }
@@ -1,127 +0,0 @@
-//
-//  Translator.swift
-//  damus
-//
-//  Created by Terry Yiu on 2/4/23.
-//
-
-import Foundation
-#if canImport(FoundationNetworking)
-import FoundationNetworking
-#endif
-
-public struct Translator {
-    private let userSettingsStore: UserSettingsStore
-    private let session = URLSession.shared
-    private let encoder = JSONEncoder()
-    private let decoder = JSONDecoder()
-
-    init(_ userSettingsStore: UserSettingsStore) {
-        self.userSettingsStore = userSettingsStore
-    }
-
-    public func translate(_ text: String, from sourceLanguage: String, to targetLanguage: String) async throws -> String? {
-        switch userSettingsStore.translation_service {
-        case .libretranslate:
-            return try await translateWithLibreTranslate(text, from: sourceLanguage, to: targetLanguage)
-        case .deepl:
-            return try await translateWithDeepL(text, from: sourceLanguage, to: targetLanguage)
-        case .none:
-            return text
-        }
-    }
-
-    private func translateWithLibreTranslate(_ text: String, from sourceLanguage: String, to targetLanguage: String) async throws -> String? {
-        let url = try makeURL(userSettingsStore.libretranslate_url, path: "/translate")
-
-        var request = URLRequest(url: url)
-        request.httpMethod = "POST"
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-
-        struct RequestBody: Encodable {
-            let q: String
-            let source: String
-            let target: String
-            let api_key: String?
-        }
-        let body = RequestBody(q: text, source: sourceLanguage, target: targetLanguage, api_key: userSettingsStore.libretranslate_api_key)
-        request.httpBody = try encoder.encode(body)
-
-        struct Response: Decodable {
-            let translatedText: String
-        }
-        let response: Response = try await decodedData(for: request)
-        return response.translatedText
-    }
-
-    private func translateWithDeepL(_ text: String, from sourceLanguage: String, to targetLanguage: String) async throws -> String? {
-        if userSettingsStore.deepl_api_key == "" {
-            return nil
-        }
-
-        let url = try makeURL(userSettingsStore.deepl_plan.model.url, path: "/v2/translate")
-
-        var request = URLRequest(url: url)
-        request.httpMethod = "POST"
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.setValue("DeepL-Auth-Key \(userSettingsStore.deepl_api_key)", forHTTPHeaderField: "Authorization")
-
-        struct RequestBody: Encodable {
-            let text: [String]
-            let source_lang: String
-            let target_lang: String
-        }
-        let body = RequestBody(text: [text], source_lang: sourceLanguage.uppercased(), target_lang: targetLanguage.uppercased())
-        request.httpBody = try encoder.encode(body)
-
-        struct Response: Decodable {
-            let translations: [DeepLTranslations]
-        }
-        struct DeepLTranslations: Decodable {
-            let detected_source_language: String
-            let text: String
-        }
-
-        let response: Response = try await decodedData(for: request)
-        return response.translations.map { $0.text }.joined(separator: " ")
-    }
-
-    private func makeURL(_ baseUrl: String, path: String) throws -> URL {
-        guard var components = URLComponents(string: baseUrl) else {
-            throw URLError(.badURL)
-        }
-        components.path = path
-        guard let url = components.url else {
-            throw URLError(.badURL)
-        }
-        return url
-    }
-
-    private func decodedData<Output: Decodable>(for request: URLRequest) async throws -> Output {
-        let data = try await session.data(for: request)
-        let result = try decoder.decode(Output.self, from: data)
-        return result
-    }
-}
-
-private extension URLSession {
-    func data(for request: URLRequest) async throws -> Data {
-        var task: URLSessionDataTask?
-        let onCancel = { task?.cancel() }
-        return try await withTaskCancellationHandler(
-            operation: {
-                try await withCheckedThrowingContinuation { continuation in
-                    task = dataTask(with: request) { data, _, error in
-                        guard let data = data else {
-                            let error = error ?? URLError(.badServerResponse)
-                            return continuation.resume(throwing: error)
-                        }
-                        continuation.resume(returning: data)
-                    }
-                    task?.resume()
-                }
-            },
-            onCancel: { onCancel() }
-        )
-    }
-}
@@ -285,19 +285,17 @@ func fetch_static_payreq(_ lnurl: String) async -> LNUrlPayRequest? {
    return endpoint
 }

-func fetch_zap_invoice(_ payreq: LNUrlPayRequest, zapreq: NostrEvent, sats: Int) async -> String? {
+func fetch_zap_invoice(_ payreq: LNUrlPayRequest, zapreq: NostrEvent, amount: Int64) async -> String? {
    guard var base_url = payreq.callback.flatMap({ URLComponents(string: $0) }) else {
        return nil
    }
    
    let zappable = payreq.allowsNostr ?? false
-    let amount: Int64 = Int64(sats) * 1000
    
    var query = [URLQueryItem(name: "amount", value: "\(amount)")]
    
    if zappable {
        if let json = encode_json(zapreq) {
-            print("zapreq json: \(json)")
            query.append(URLQueryItem(name: "nostr", value: json))
        }
    }
@@ -36,7 +36,7 @@ class Zaps {
                if our_zaps[note_target.note_id] == nil {
                    our_zaps[note_target.note_id] = [zap]
                } else {
-                    insert_uniq_sorted_zap(zaps: &(our_zaps[note_target.note_id]!), new_zap: zap)
+                    let _ = insert_uniq_sorted_zap(zaps: &(our_zaps[note_target.note_id]!), new_zap: zap)
                }
            case .profile(_):
                break
@@ -60,6 +60,6 @@ class Zaps {
        event_counts[id] = event_counts[id]! + 1
        event_totals[id] = event_totals[id]! + zap.invoice.amount
        
-        notify(.update_stats, zap.target.id)
+        return
    }
 }
@@ -28,14 +28,13 @@ struct EventActionBar: View {
    @State var sheet: ActionBarSheet? = nil
    @State var confirm_boost: Bool = false
    @State var show_share_sheet: Bool = false
+    @StateObject var bar: ActionBarModel
    
-    @ObservedObject var bar: ActionBarModel
-    
-    init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel? = nil, test_lnurl: String? = nil) {
+    init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel, test_lnurl: String? = nil) {
        self.damus_state = damus_state
        self.event = event
        self.test_lnurl = test_lnurl
-        _bar = ObservedObject(wrappedValue: bar ?? make_actionbar_model(ev: event.id, damus: damus_state))
+        _bar = StateObject.init(wrappedValue: bar)
    }
    
    var lnurl: String? {
@@ -48,10 +47,9 @@ struct EventActionBar: View {
                EventActionButton(img: "bubble.left", col: nil) {
                    notify(.reply, event)
                }
-                .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
            }
            Spacer()
-            HStack(spacing: 4) {
+            ZStack {
                
                EventActionButton(img: "arrow.2.squarepath", col: bar.boosted ? Color.green : nil) {
                    if bar.boosted {
@@ -60,14 +58,14 @@ struct EventActionBar: View {
                        self.confirm_boost = true
                    }
                }
-                .accessibilityLabel(NSLocalizedString("Boosts", comment: "Accessibility label for boosts button"))
-                Text(verbatim: "\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
+                Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
+                    .offset(x: 18)
                    .font(.footnote.weight(.medium))
                    .foregroundColor(bar.boosted ? Color.green : Color.gray)
            }
            Spacer()
            
-            HStack(spacing: 4) {
+            ZStack {
                LikeButton(liked: bar.liked) {
                    if bar.liked {
                        notify(.delete, bar.our_like)
@@ -75,7 +73,8 @@ struct EventActionBar: View {
                        send_like()
                    }
                }
-                Text(verbatim: "\(bar.likes > 0 ? "\(bar.likes)" : "")")
+                Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
+                    .offset(x: 22)
                    .font(.footnote.weight(.medium))
                    .foregroundColor(bar.liked ? Color.accentColor : Color.gray)
                
@@ -90,7 +89,6 @@ struct EventActionBar: View {
            EventActionButton(img: "square.and.arrow.up", col: Color.gray) {
                show_share_sheet = true
            }
-            .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a post"))
        }
        .sheet(isPresented: $show_share_sheet) {
            if let note_id = bech32_note_id(event.id) {
@@ -109,11 +107,6 @@ struct EventActionBar: View {
        } message: {
            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
        }
-        .onReceive(handle_notify(.update_stats)) { n in
-            let target = n.object as! String
-            guard target == self.event.id else { return }
-            self.bar.update(damus: self.damus_state, evid: target)
-        }
        .onReceive(handle_notify(.liked)) { n in
            let liked = n.object as! Counted
            if liked.id != event.id {
@@ -156,9 +149,9 @@ struct EventActionBar: View {

 func EventActionButton(img: String, col: Color?, action: @escaping () -> ()) -> some View {
    Button(action: action) {
-        Image(systemName: img)
-            .foregroundColor(col == nil ? Color.gray : col!)
+        Label(NSLocalizedString("\u{00A0}", comment: "Non-breaking space character to fill in blank space next to event action button icons."), systemImage: img)
            .font(.footnote.weight(.medium))
+            .foregroundColor(col == nil ? Color.gray : col!)
    }
 }

@@ -173,7 +166,6 @@ struct LikeButton: View {
            Image(liked ? "shaka-full" : "shaka-line")
                .foregroundColor(liked ? .accentColor : .gray)
        }
-        .accessibilityLabel(NSLocalizedString("Like", comment: "Accessibility Label for Like button"))
    }
 }

@@ -188,8 +180,6 @@ struct EventActionBar_Previews: PreviewProvider {
        let likedbar = ActionBarModel(likes: 10, boosts: 0, zaps: 0, zap_total: 0, our_like: nil, our_boost: nil, our_zap: nil)
        let likedbar_ours = ActionBarModel(likes: 10, boosts: 0, zaps: 0, zap_total: 0, our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: nil, our_zap: nil)
        let maxed_bar = ActionBarModel(likes: 999, boosts: 999, zaps: 999, zap_total: 99999999,  our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: NostrEvent(id: "", content: "", pubkey: ""), our_zap: nil)
-        let extra_max_bar = ActionBarModel(likes: 9999, boosts: 9999, zaps: 9999, zap_total: 99999999,  our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: NostrEvent(id: "", content: "", pubkey: ""), our_zap: nil)
-        let mega_max_bar = ActionBarModel(likes: 9999999, boosts: 99999, zaps: 9999, zap_total: 99999999,  our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: NostrEvent(id: "", content: "", pubkey: ""), our_zap: nil)
        let zapbar = ActionBarModel(likes: 0, boosts: 0, zaps: 5, zap_total: 10000000, our_like: nil, our_boost: nil, our_zap: nil)
        
        VStack(spacing: 50) {
@@ -200,11 +190,7 @@ struct EventActionBar_Previews: PreviewProvider {
            EventActionBar(damus_state: ds, event: ev, bar: likedbar_ours)
            
            EventActionBar(damus_state: ds, event: ev, bar: maxed_bar)
-            
-            EventActionBar(damus_state: ds, event: ev, bar: extra_max_bar)

-            EventActionBar(damus_state: ds, event: ev, bar: mega_max_bar)
-            
            EventActionBar(damus_state: ds, event: ev, bar: zapbar, test_lnurl: "lnurl")
        }
        .padding(20)
@@ -10,40 +10,26 @@ import SwiftUI
 struct EventDetailBar: View {
    let state: DamusState
    let target: String
-    let target_pk: String
-    
-    @ObservedObject var bar: ActionBarModel
-    
-    init (state: DamusState, target: String, target_pk: String) {
-        self.state = state
-        self.target = target
-        self.target_pk = target_pk
-        self._bar = ObservedObject(wrappedValue: make_actionbar_model(ev: target, damus: state))
-        
-    }
+    @StateObject var bar: ActionBarModel
    
    var body: some View {
        HStack {
            if bar.boosts > 0 {
                NavigationLink(destination: RepostsView(damus_state: state, model: RepostsModel(state: state, target: target))) {
-                    Text("\(Text(verbatim: "\(bar.boosts)").font(.body.bold())) \(Text(String(format: Bundle.main.localizedString(forKey: "reposts_count", value: nil, table: nil), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.")
+                    Text("\(Text("\(bar.boosts)", comment: "Number of reposts.").font(.body.bold())) \(Text(String(format: NSLocalizedString("reposts_count", comment: "Part of a larger sentence to describe how many reposts there are."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.")
                }
                .buttonStyle(PlainButtonStyle())
            }

            if bar.likes > 0 {
                NavigationLink(destination: ReactionsView(damus_state: state, model: ReactionsModel(state: state, target: target))) {
-                    Text("\(Text(verbatim: "\(bar.likes)").font(.body.bold())) \(Text(String(format: Bundle.main.localizedString(forKey: "reactions_count", value: nil, table: nil), bar.likes)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reactions there are on a post. In source English, the first variable is the number of reactions, and the second variable is 'Reaction' or 'Reactions'.")
+                    Text("\(Text("\(bar.likes)", comment: "Number of reactions on a post.").font(.body.bold())) \(Text(String(format: NSLocalizedString("reactions_count", comment: "Part of a larger sentence to describe how many reactions there are on a post."), bar.likes)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reactions there are on a post. In source English, the first variable is the number of reactions, and the second variable is 'Reaction' or 'Reactions'.")
                }
                .buttonStyle(PlainButtonStyle())
            }
            
            if bar.zaps > 0 {
-                let dst = ZapsView(state: state, target: .note(id: target, author: target_pk))
-                NavigationLink(destination: dst) {
-                    Text("\(Text(verbatim: "\(bar.zaps)").font(.body.bold())) \(Text(String(format: Bundle.main.localizedString(forKey: "zaps_count", value: nil, table: nil), bar.zaps)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.")
-                }
-                .buttonStyle(PlainButtonStyle())
+                Text("\(Text("\(bar.zaps)", comment: "Number of zap payments on a post.").font(.body.bold())) \(Text(String(format: NSLocalizedString("Zaps", comment: "Part of a larger sentence to describe how many zap payments there are on a post."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.")
            }
        }
    }
@@ -51,6 +37,6 @@ struct EventDetailBar: View {

 struct EventDetailBar_Previews: PreviewProvider {
    static var previews: some View {
-        EventDetailBar(state: test_damus_state(), target: "", target_pk: "")
+        EventDetailBar(state: test_damus_state(), target: "", bar: ActionBarModel.empty())
    }
 }
@@ -10,23 +10,40 @@ import Kingfisher

 struct InnerBannerImageView: View {
    
-    let url: URL?
    let defaultImage = UIImage(named: "profile-banner") ?? UIImage()
+    
+    @ObservedObject var imageModel: KFImageModel
+    
+    init(url: URL?) {
+        self.imageModel = KFImageModel(
+            url: url,
+            fallbackUrl: nil,
+            maxByteSize: 20_971_520, // 20 MiB
+            downsampleSize: CGSize(width: 750, height: 250)
+        )
+    }

    var body: some View {
        ZStack {
            Color(uiColor: .systemBackground)
            
-            if (url != nil) {
-                KFAnimatedImage(url)
-                    .imageContext(.banner)
+            if (imageModel.url != nil) {
+                KFAnimatedImage(imageModel.url)
+                    .callbackQueue(.dispatch(.global(qos: .background)))
+                    .processingQueue(.dispatch(.global(qos: .background)))
+                    .serialize(by: imageModel.serializer)
+                    .setProcessor(imageModel.processor)
                    .configure { view in
-                        view.framePreloadCount = 3
+                        view.framePreloadCount = 1
                    }
                    .placeholder { _ in
                        Color(uiColor: .secondarySystemBackground)
                    }
+                    .scaleFactor(UIScreen.main.scale)
+                    .loadDiskFileSynchronously()
+                    .fade(duration: 0.1)
                    .onFailureImage(defaultImage)
+                    .id(imageModel.refreshID)
            } else {
                Image(uiImage: defaultImage).resizable()
            }
@@ -63,7 +63,7 @@ struct ChatView: View {
    }
    
    var ReplyDescription: some View {
-        Text(verbatim: "\(reply_desc(profiles: damus_state.profiles, event: event))")
+        Text("\(reply_desc(profiles: damus_state.profiles, event: event))")
            .font(.footnote)
            .foregroundColor(.gray)
            .frame(alignment: .leading)
@@ -89,12 +89,12 @@ struct ChatView: View {
                            ProfileName(pubkey: event.pubkey, profile: damus_state.profiles.lookup(id: event.pubkey), damus: damus_state, show_friend_confirmed: true)
                                .foregroundColor(colorScheme == .dark ?  id_to_color(event.pubkey) : Color.black)
                                //.shadow(color: Color.black, radius: 2)
-                            Text(verbatim: "\(format_relative_time(event.created_at))")
+                            Text("\(format_relative_time(event.created_at))")
                                    .foregroundColor(.gray)
                        }
                    }
                
-                    if let _ = thread.replies.lookup(event.id) {
+                    if let ref_id = thread.replies.lookup(event.id) {
                        if !is_reply_to_prev() {
                            /*
                            ReplyQuoteView(keypair: damus_state.keypair, quoter: event, event_id: ref_id, profiles: damus_state.profiles, previews: damus_state.previews)
@@ -112,11 +112,11 @@ struct ChatView: View {
                    NoteContentView(damus_state: damus_state,
                                    event: event,
                                    show_images: show_images,
-                                    size: .normal,
-                                    artifacts: .just_content(event.content))
+                                    artifacts: .just_content(event.content),
+                                    size: .normal)

                    if is_active || next_ev == nil || next_ev!.pubkey != event.pubkey {
-                        let bar = make_actionbar_model(ev: event.id, damus: damus_state)
+                        let bar = make_actionbar_model(ev: event, damus: damus_state)
                        EventActionBar(damus_state: damus_state, event: event, bar: bar)
                    }

@@ -7,8 +7,6 @@
 import AVFoundation
 import Kingfisher
 import SwiftUI
-import LocalAuthentication
-import Combine

 struct ConfigView: View {
    let state: DamusState
@@ -16,13 +14,11 @@ struct ConfigView: View {
    @State var confirm_logout: Bool = false
    @State var confirm_delete_account: Bool = false
    @State var show_privkey: Bool = false
-    @State var has_authenticated_locally: Bool = false
-    @State var show_api_key: Bool = false
+    @State var show_libretranslate_api_key: Bool = false
    @State var privkey: String
    @State var privkey_copied: Bool = false
    @State var pubkey_copied: Bool = false
    @State var delete_text: String = ""
-    @State var default_zap_amount: String
    
    @ObservedObject var settings: UserSettingsStore
    
@@ -30,51 +26,17 @@ struct ConfigView: View {
    
    init(state: DamusState) {
        self.state = state
-        let zap_amt = get_default_zap_amount(pubkey: state.pubkey).map({ "\($0)" }) ?? "1000"
-        _default_zap_amount = State(initialValue: zap_amt)
        _privkey = State(initialValue: self.state.keypair.privkey_bech32 ?? "")
        _settings = ObservedObject(initialValue: state.settings)
    }

-    func authenticateLocally(completion: @escaping (Bool) -> Void) {
-        // Need to authenticate only once while ConfigView is presented
-        guard !has_authenticated_locally else {
-            completion(true)
-            return
-        }
-        let context = LAContext()
-        if context.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil) {
-            context.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: NSLocalizedString("Local authentication to access private key", comment: "Face ID usage description shown when trying to access private key")) { success, error in
-                DispatchQueue.main.async {
-                    has_authenticated_locally = success
-                    completion(success)
-                }
-            }
-        } else {
-            // If there's no authentication set up on the device, let the user copy the key without it
-            has_authenticated_locally = true
-            completion(true)
-        }
-    }
-    
    // TODO: (jb55) could be more general but not gonna worry about it atm
    func CopyButton(is_pk: Bool) -> some View {
        return Button(action: {
-            let copyKey = {
-                UIPasteboard.general.string = is_pk ? self.state.keypair.pubkey_bech32 : self.privkey
-                self.privkey_copied = !is_pk
-                self.pubkey_copied = is_pk
-                generator.impactOccurred()
-            }
-            if has_authenticated_locally {
-                copyKey()
-            } else {
-                authenticateLocally { success in
-                    if success {
-                        copyKey()
-                    }
-                }
-            }
+            UIPasteboard.general.string = is_pk ? self.state.keypair.pubkey_bech32 : self.privkey
+            self.privkey_copied = !is_pk
+            self.pubkey_copied = is_pk
+            generator.impactOccurred()
        }) {
            let copied = is_pk ? self.pubkey_copied : self.privkey_copied
            Image(systemName: copied ? "checkmark.circle" : "doc.on.doc")
@@ -96,7 +58,7 @@ struct ConfigView: View {
                if let sec = state.keypair.privkey_bech32 {
                    Section(NSLocalizedString("Secret Account Login Key", comment: "Section title for user's secret account login key.")) {
                        HStack {
-                            if show_privkey == false || !has_authenticated_locally {
+                            if show_privkey == false {
                                SecureField(NSLocalizedString("Private Key", comment: "Title of the secure field that holds the user's private key."), text: $privkey)
                                    .disabled(true)
                            } else {
@@ -108,13 +70,6 @@ struct ConfigView: View {
                        }

                        Toggle(NSLocalizedString("Show", comment: "Toggle to show or hide user's secret account login key."), isOn: $show_privkey)
-                            .onChange(of: show_privkey) { newValue in
-                                if newValue {
-                                    authenticateLocally { success in
-                                        show_privkey = success
-                                    }
-                                }
-                            }
                    }
                }

@@ -128,74 +83,37 @@ struct ConfigView: View {
                        }
                    }
                }
-                
-                
-                Section(NSLocalizedString("Default Zap Amount in sats", comment: "Section title for zap configuration")) {
-                    TextField(String("1000"), text: $default_zap_amount)
-                        .keyboardType(.numberPad)
-                        .onReceive(Just(default_zap_amount)) { newValue in
-                            let filtered = newValue.filter { Set("0123456789").contains($0) }

-                            if filtered != newValue {
-                                default_zap_amount = filtered
-                            }
-
-                            if filtered == "" {
-                                set_default_zap_amount(pubkey: state.pubkey, amount: 1000)
-                                return
-                            }
-
-                            guard let amt = Int(filtered) else {
-                                return
-                            }
-                            set_default_zap_amount(pubkey: state.pubkey, amount: amt)
-                        }
-                }
-
-                Section(NSLocalizedString("Translations", comment: "Section title for selecting the translation service.")) {
-                    Picker(NSLocalizedString("Service", comment: "Prompt selection of translation service provider."), selection: $settings.translation_service) {
-                        ForEach(TranslationService.allCases, id: \.self) { server in
+                Section(NSLocalizedString("LibreTranslate Translations", comment: "Section title for selecting the server that hosts the LibreTranslate machine translation API.")) {
+                    Picker(NSLocalizedString("Server", comment: "Prompt selection of LibreTranslate server to perform machine translations on notes"), selection: $settings.libretranslate_server) {
+                        ForEach(LibreTranslateServer.allCases, id: \.self) { server in
                            Text(server.model.displayName)
                                .tag(server.model.tag)
                        }
                    }

-                    if settings.translation_service == .libretranslate {
-                        Picker(NSLocalizedString("Server", comment: "Prompt selection of LibreTranslate server to perform machine translations on notes"), selection: $settings.libretranslate_server) {
-                            ForEach(LibreTranslateServer.allCases, id: \.self) { server in
-                                Text(server.model.displayName)
-                                    .tag(server.model.tag)
-                            }
-                        }
-
-                        if settings.libretranslate_server == .custom {
-                            TextField(NSLocalizedString("URL", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_url)
-                                .disableAutocorrection(true)
-                                .autocapitalization(UITextAutocapitalizationType.none)
-                        }
-
-                        SecureField(NSLocalizedString("API Key (optional)", comment: "Prompt for optional entry of API Key to use translation server."), text: $settings.libretranslate_api_key)
+                    if settings.libretranslate_server != .none {
+                        TextField(NSLocalizedString("URL", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_url)
                            .disableAutocorrection(true)
-                            .disabled(settings.translation_service != .libretranslate)
+                            .disabled(settings.libretranslate_server != .custom)
                            .autocapitalization(UITextAutocapitalizationType.none)
-                    }
-
-                    if settings.translation_service == .deepl {
-                        Picker(NSLocalizedString("Plan", comment: "Prompt selection of DeepL subscription plan to perform machine translations on notes"), selection: $settings.deepl_plan) {
-                            ForEach(DeepLPlan.allCases, id: \.self) { server in
-                                Text(server.model.displayName)
-                                    .tag(server.model.tag)
+                        HStack {
+                            if show_libretranslate_api_key {
+                                TextField(NSLocalizedString("API Key (optional)", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_api_key)
+                                    .disableAutocorrection(true)
+                                    .autocapitalization(UITextAutocapitalizationType.none)
+                                Button(NSLocalizedString("Hide API Key", comment: "Button to hide the LibreTranslate server API key.")) {
+                                    show_libretranslate_api_key = false
+                                }
+                            } else {
+                                SecureField(NSLocalizedString("API Key (optional)", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_api_key)
+                                    .disableAutocorrection(true)
+                                    .autocapitalization(UITextAutocapitalizationType.none)
+                                Button(NSLocalizedString("Show API Key", comment: "Button to hide the LibreTranslate server API key.")) {
+                                    show_libretranslate_api_key = true
+                                }
                            }
                        }
-
-                        SecureField(NSLocalizedString("API Key (required)", comment: "Prompt for required entry of API Key to use translation server."), text: $settings.deepl_api_key)
-                            .disableAutocorrection(true)
-                            .disabled(settings.translation_service != .deepl)
-                            .autocapitalization(UITextAutocapitalizationType.none)
-
-                        if settings.deepl_api_key == "" {
-                            Link(NSLocalizedString("Get API Key", comment: "Button to navigate to DeepL website to get a translation API key."), destination: URL(string: "https://www.deepl.com/pro-api")!)
-                        }
                    }
                }

@@ -219,18 +137,12 @@ struct ConfigView: View {
                        }
                    }
                }
-
-                let bundleShortVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
-                let bundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
-                Section(NSLocalizedString("Version", comment: "Section title for displaying the version number of the Damus app.")) {
-                    Text(verbatim: "\(bundleShortVersion) (\(bundleVersion))")
-                }
            }
        }
        .navigationTitle(NSLocalizedString("Settings", comment: "Navigation title for Settings view."))
        .navigationBarTitleDisplayMode(.large)
-        .alert(NSLocalizedString("Permanently Delete Account", comment: "Alert for deleting the users account."), isPresented: $confirm_delete_account) {
-            TextField(NSLocalizedString("Type DELETE to delete", comment: "Text field prompt asking user to type the word DELETE to confirm that they want to proceed with deleting their account. The all caps lock DELETE word should not be translated. Everything else should."), text: $delete_text)
+        .alert(NSLocalizedString("Delete Account", comment: "Alert for deleting the users account."), isPresented: $confirm_delete_account) {
+            TextField("Type DELETE to delete", text: $delete_text)
            Button(NSLocalizedString("Cancel", comment: "Cancel deleting the user."), role: .cancel) {
                confirm_delete_account = false
            }
@@ -262,81 +174,6 @@ struct ConfigView: View {
            dismiss()
        }
    }
-
-    var libretranslate_view: some View {
-        VStack {
-            Picker(NSLocalizedString("Server", comment: "Prompt selection of LibreTranslate server to perform machine translations on notes"), selection: $settings.libretranslate_server) {
-                ForEach(LibreTranslateServer.allCases, id: \.self) { server in
-                    Text(server.model.displayName)
-                        .tag(server.model.tag)
-                }
-            }
-
-            TextField(NSLocalizedString("URL", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_url)
-                .disableAutocorrection(true)
-                .disabled(settings.libretranslate_server != .custom)
-                .autocapitalization(UITextAutocapitalizationType.none)
-            HStack {
-                let libretranslate_api_key_placeholder = NSLocalizedString("API Key (optional)", comment: "Prompt for optional entry of API Key to use translation server.")
-                if show_api_key {
-                    TextField(libretranslate_api_key_placeholder, text: $settings.libretranslate_api_key)
-                        .disableAutocorrection(true)
-                        .autocapitalization(UITextAutocapitalizationType.none)
-                    if settings.libretranslate_api_key != "" {
-                        Button(NSLocalizedString("Hide API Key", comment: "Button to hide the LibreTranslate server API key.")) {
-                            show_api_key = false
-                        }
-                    }
-                } else {
-                    SecureField(libretranslate_api_key_placeholder, text: $settings.libretranslate_api_key)
-                        .disableAutocorrection(true)
-                        .autocapitalization(UITextAutocapitalizationType.none)
-                    if settings.libretranslate_api_key != "" {
-                        Button(NSLocalizedString("Show API Key", comment: "Button to show the LibreTranslate server API key.")) {
-                            show_api_key = true
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    var deepl_view: some View {
-        VStack {
-            Picker(NSLocalizedString("Plan", comment: "Prompt selection of DeepL subscription plan to perform machine translations on notes"), selection: $settings.deepl_plan) {
-                ForEach(DeepLPlan.allCases, id: \.self) { server in
-                    Text(server.model.displayName)
-                        .tag(server.model.tag)
-                }
-            }
-
-            HStack {
-                let deepl_api_key_placeholder = NSLocalizedString("API Key (required)", comment: "Prompt for required entry of API Key to use translation server.")
-                if show_api_key {
-                    TextField(deepl_api_key_placeholder, text: $settings.deepl_api_key)
-                        .disableAutocorrection(true)
-                        .autocapitalization(UITextAutocapitalizationType.none)
-                    if settings.deepl_api_key != "" {
-                        Button(NSLocalizedString("Hide API Key", comment: "Button to hide the DeepL translation API key.")) {
-                            show_api_key = false
-                        }
-                    }
-                } else {
-                    SecureField(deepl_api_key_placeholder, text: $settings.deepl_api_key)
-                        .disableAutocorrection(true)
-                        .autocapitalization(UITextAutocapitalizationType.none)
-                    if settings.deepl_api_key != "" {
-                        Button(NSLocalizedString("Show API Key", comment: "Button to show the DeepL translation API key.")) {
-                            show_api_key = true
-                        }
-                    }
-                }
-                if settings.deepl_api_key == "" {
-                    Link(NSLocalizedString("Get API Key", comment: "Button to navigate to DeepL website to get a translation API key."), destination: URL(string: "https://www.deepl.com/pro-api")!)
-                }
-            }
-        }
-    }
 }

 struct ConfigView_Previews: PreviewProvider {
@@ -36,14 +36,14 @@ struct CreateAccountView: View {
                
                HStack(alignment: .top) {
                    VStack {
-                        Text(verbatim: "   ")
+                        Text("   ", comment: "Blank space to separate profile picture from profile editor form.")
                            .foregroundColor(.white)
                    }
                    VStack {
                        SignupForm {
                            FormLabel(NSLocalizedString("Username", comment: "Label to prompt username entry."))
                            HStack(spacing: 0.0) {
-                                Text(verbatim: "@")
+                                Text("@", comment: "Prefix character to username.")
                                    .foregroundColor(.white)
                                    .padding(.leading, -25.0)
                                
--- a/Show More
+++ b/Show More