Fix reaction events to not tag all e and p tags in the thread

Changelog-Fixed: Fix reaction events to not tag all e and p tags in the thread

.github/ISSUE_TEMPLATE/app_release.md

@@ -1,52 +0,0 @@
----
-name: App release process
-about: Begin preparing for a new app release
-title: 'Release: '
-labels: release-tasks
-assignees: ''
-
----
-
-A new version release. Please attempt to follow the release process steps below in the order they are shown.
-
-## TestFlight release candidates
-
-### Release candidate 1
-
-**Version:** _[Enter full build information for the release candidate, including major and minor version number, build number, and commit hash]_
-
-1. [ ] Merge in all needed changes to `master`
-2. [ ] Check CI, make sure it is passing
-3. [ ] Prepare preliminary changelog as a draft PR: _[Enter PR link to changelog here]_
-4. [ ] Make a _release_ build and submit to the internal TestFlight group via our new Release candidate workflow in Xcode Cloud.
-5. [ ] Prepare short screencast style video with main changes for the announcement
-6. [ ] Publish release build to these TestFlight groups:
-    - [ ] Alpha testers group
-    - [ ] Translators group
-    - [ ] Purple group
-7. [ ] Publish announcement on Nostr
-
-
-_[Duplicate this release candidate section if there is more than one release candidate]_
-
-
-## App Store release
-
-1. [ ] Release candidate checks:
-    - [ ] Release candidate has been on Purple TestFlight for at least one week
-    - [ ] No blocker issues came from feedback from Purple users (double-check)
-    - [ ] Check with stakeholders
-    - [ ] Check with developers & product for any release showstoppers (e.g., critical newfound bugs)
-2. [ ] Thorough check on release notes
-3. [ ] Submit to App Store review (with manual publishing setting enabled)
-4. [ ] Get App Store approval from Apple
-5. [ ] Prepare announcement
-7. [ ] Publish on the App Store and make announcement
-8. [ ] Publish changelog and tag commit hash corresponding to the release
-9. [ ] Perform a version bump on the repository, in preparation for the next release
-
-
-## Notes/others
-
-_Enter any relevant notes here_
-

.github/pull_request_template.md

@@ -1,37 +0,0 @@
-## Summary
-
-_[Please provide a summary of the changes in this PR.]_
-
-## Checklist
-
-- [ ] I have read (or I am familiar with) the [Contribution Guidelines](../docs/CONTRIBUTING.md)
-- [ ] I have tested the changes in this PR
-- [ ] I have opened or referred to an existing github issue related to this change.
-- [ ] My PR is either small, or I have split it into smaller logical commits that are easier to review
-- [ ] I have added the signoff line to all my commits. See [Signing off your work](../docs/CONTRIBUTING.md#sign-your-work---the-developers-certificate-of-origin)
-- [ ] I have added appropriate changelog entries for the changes in this PR. See [Adding changelog entries](../docs/CONTRIBUTING.md#add-changelog-changed-changelog-fixed-etc)
-    - [ ] I do not need to add a changelog entry. Reason: _[Please provide a reason]_
-- [ ] I have added appropriate `Closes:` or `Fixes:` tags in the commit messages wherever applicable, or made sure those are not needed. See [Submitting patches](https://github.com/damus-io/damus/blob/master/docs/CONTRIBUTING.md#submitting-patches)
-
-## Test report
-
-_Please provide a test report for the changes in this PR. You can use the template below, but feel free to modify it as needed._
-
-**Device:** _[Please specify the device you used for testing]_
-
-**iOS:** _[Please specify the iOS version you used for testing]_
-
-**Damus:** _[Please specify the Damus version or commit hash you used for testing]_
-
-**Setup:** _[Please provide a brief description of the setup you used for testing, if applicable]_
-
-**Steps:** _[Please provide a list of steps you took to test the changes in this PR]_
-
-**Results:**
-- [ ] PASS
-- [ ] Partial PASS
-  - Details: _[Please provide details of the partial pass]_
-
-## Other notes
-
-_[Please provide any other information that you think is relevant to this PR.]_

ACKNOWLEDGEMENTS.md

@@ -1,5 +0,0 @@
-### Acknowledgements and licenses
-
-1. This product contains code derived from [Nostr SDK iOS](https://github.com/nostr-sdk/nostr-sdk-ios). [License](https://github.com/nostr-sdk/nostr-sdk-ios/blob/40df800c6749d7ce0b6fd7328e76cbc0dc71c87b/LICENSE)
-2. This product includes software developed by the "Marcin Krzyzanowski" (http://krzyzanowskim.com/). [License](https://github.com/krzyzanowskim/CryptoSwift/blob/e74bbbfbef939224b242ae7c342a90e60b88b5ce/LICENSE)
-

CHANGELOG.md

@@ -1,295 +1,3 @@
-## [1.13.1] - 2025-03-21
-
-### Fixed
-
-- Fixed an issue where threads would not load properly (Daniel D’Aquino)
-
-
-[1.13.1]: https://github.com/damus-io/damus/releases/tag/v1.13.1
-
-
-## [1.13] - 2025-03-14
-
-### Added
-
-- Added local persistence of note drafts (Daniel D’Aquino)
-- Added user-friendly error view for errors around the app that would not fit in other places (Daniel D’Aquino)
-- Coinos connection button in Wallet view (ericholguin)
-- Added Alby Go to mobile wallets selection menu (Tomek ⚡ K)
-- Minor accessibility improvements around picture editing and onboarding (Daniel D’Aquino)
-- Profile image cropping tools (Daniel D’Aquino)
-- Added Conversations tab to profiles (Terry Yiu)
-- Added profile pictures to push notifications (William Casarin)
-
-
-### Changed
-
-- Don't show reposts for the same note more than once in your home feed (William Casarin)
-- Improved profile image bandwidth optimization (Daniel D’Aquino)
-- Improved reliability of picture selector (Daniel D’Aquino)
-- Changed spaces to newlines in new posts to provide cleaner separation between text, uploaded media, and quoted notes (Terry Yiu)
-
-
-### Fixed
-
-- Fixed issue where some push notifications would not open in the app and leave users confused (Daniel D’Aquino)
-- Fixed issue where app would need a restart for new NWC wallets to work (Daniel D’Aquino)
-- Fixed overly sensitive horizontal swipe on thread chat view (Daniel D’Aquino)
-- Trim whitespaces from Lightning addresses (Terry Yiu)
-- Fixed translation export script by upgrading nostr-sdk-swift dependency to support Mac Catalyst (Terry Yiu)
-- Fixed issue where users continue to receive push notifications after logout (Daniel D’Aquino)
-- Fixed an issue where events on a thread view would occasionally disappear (Daniel D’Aquino)
-- Improved robustness of the URL handler (Daniel D’Aquino)
-- Translate notes even if they are in a preferred language but not the current language as that is what users expect (Terry Yiu)
-- Cancel ongoing uploading operations after the user cancels the post (Swift Coder)
-- Fixed link and photo sharing support on macOS (Swift Coder)
-- Fix bug where profile view was showing more than just the notes and replies on the notes / notes & replies tabs (Terry Yiu)
-- Fixed reposts banner to be localizable (Terry Yiu)
-
-
-### Removed
-
-- Removed language filtering from Universe feed because language detection can be inaccurate (Terry Yiu)
-- Removed mystery tabs meant to fix tab switching bug that no longer exists (Terry Yiu)
-
-
-
-[1.13](https://github.com/damus-io/damus/releases/tag/v1.13): https://github.com/damus-io/damus/releases/tag/v1.13
-
-
-## [1.12.3] - 2025-02-06
-
-### Added
-
-- Purple members who have been active for more than a year now get a special badge (Daniel D’Aquino)
-
-### Changed
-
-- Improved clarity of the mute button to indicate it can be used for blocking a user (Daniel D’Aquino)
-- Made the microphone access request message more clear to users (Daniel D’Aquino)
-
-[v1.12.3]: https://github.com/damus-io/damus/releases/tag/v1.12.3
-
-
-## [1.12](https://github.com/damus-io/damus/releases/tag/v1.12) - 2024-12-20
-
-### Added
-
-- Render Gif and video files while composing posts (Swift Coder)
-- Add profile info text in stretchable banner with follow button (Swift Coder)
-- Paste Gif image similar to jpeg and png files (Swift Coder)
-
-
-### Changed
-
-- Improved UX around the label for searching words (Daniel D’Aquino)
-- Improved accessibility support on some elements (Daniel D’Aquino)
-
-
-### Fixed
-
-- Fixed issue where the "next" button would appear hidden and hard to click on the create account view (Daniel D’Aquino)
-- Fix non scrollable wallet screen (Swift Coder)
-- Fixed suggested users category titles to be localizable (Terry Yiu)
-- Fixed GradientFollowButton to have consistent width and autoscale text limited to 1 line (Terry Yiu)
-- Fixed right-to-left localization issues (Terry Yiu)
-- Fixed AddMuteItemView to trim leading and trailing whitespaces from mute text and disallow adding text with only whitespaces (Terry Yiu)
-- Fixed SideMenuView text to autoscale and limit to 1 line (Terry Yiu)
-- Fixed an issue where a profile would need to be input twice in the search to be found (Daniel D’Aquino)
-- Fixed non-breaking spaces in localized strings (Terry Yiu)
-- Fixed localization issue on Add mute item button (Terry Yiu)
-- Replace non-breaking spaces with regular spaces as Apple's NSLocalizedString macro does not seem to work with it (Terry Yiu)
-- Fixed localization issues in RelayConfigView (Terry Yiu)
-- Fix duplicate uploads (Swift Coder)
-- Remove duplicate pubkey from Follow Suggestion list (Swift Coder)
-- Fix Page control indicator (Swift Coder)
-- Fix damus sharing issues (Swift Coder)
-- Fixed issue where banner edit button is unclickable (Daniel D’Aquino)
-- Handle empty notification pages by displaying suitable text (Swift Coder)
-
-[v1.12](https://github.com/damus-io/damus/releases/tag/v1.12): [https://github.com/damus-io/damus/releases/tag/v1.12]
-
-
-## [v1.11(10)](https://github.com/damus-io/damus/releases/tag/v1.11-10) - 2024-11-18
-
-### Added
-
-- Add Damus Share Feature (Swift)
-- Added new easy to use video controls for full screen video (Daniel D’Aquino)
-- Add Edit, Share, and Tap-gesture in Profile pic image viewer (Swift Coder)
-- Disappearing header, tabbar, and post button on scroll (ericholguin)
-- Add Apple translation popovers for notes for iOS 17.4+ and macOS 14.4+ (Terry Yiu)
-- Added NDB search functionality to the universe view (ericholguin)
-- Added mute button to ProfileActionSheet (chungwwei)
-- Added mute action to selected text menu (ericholguin)
-- Added support for pasting images from the clipboard to the post composer (Swift Coder)
-
-### Changed
-
-- Improved image carousel image fill behavior (Daniel D’Aquino)
-- Improved video syncing and bandwidth usage when switching between timeline video and full screen mode (Daniel D’Aquino)
-- Swipe to dismiss on full screen carousel now shows an opacity effect for improved UX (Daniel D’Aquino)
-- Removed event contents from full screen media carousel for cleaner view (Daniel D’Aquino)
-- Add share button for images on full screen image carousel view (Swift)
-- Changed boldness of font in side menu labels. (ericholguin)
-- Changed search notes button with searched keyword (ericholguin)
-- Changed opacity of tabbar and post button (ericholguin)
-- Allow multiple images to be uploaded at the same time (swiftcoder) (William Casarin)
-- Changed side menu design (ericholguin)
-- Truncate fulltext search results (William Casarin)
-- Expanded profile search results to 128 (William Casarin)
-- Expand nostrdb text search results to 128 items (William Casarin)
-- Use LazyVStack in text search results (William Casarin)
-
-### Fixed
-
-- Fixed missing tab bar on navigation (Swift Coder)
-- Fixed some issues where QR code would not work, and improved UX (Daniel D’Aquino)
-- Fixed iOS 18 gesture issues that would take user to the thread view when clicking on a video or unmuting it (Daniel D’Aquino)
-- Fixed several issues that would cause video to automatically play or pause incorrectly (Daniel D’Aquino)
-- Fixed issue where full screen video would disappear when going to landscape mode (Daniel D’Aquino)
-- Fixed portrait video size on full screen carousel (Daniel D’Aquino)
-- Fix avatar image on qrcode view (Swift Coder)
-- Fix banner image upload (Swift Coder)
-- Fix dismiss button visibility (Swift Coder)
-- Fix quote repost counting (William Casarin)
-- Fixed overlapping text in Universe View (ericholguin)
-- Fixed localization issues and exported strings (Terry Yiu)
-- Fix sensitive long-press gesture on event chat bubble in iOS 18 (Daniel D’Aquino)
-- Fixed bottom padding for tabbar (ericholguin)
-- Fixed localization build failures (Terry Yiu)
-- Fixed back nav button placement in profile edit view (ericholguin)
-- Friend profiles will now more likely show up in profile search (William Casarin)
-- Fix broken QR code scanner and fix landscape mode (Terry Yiu)
-
-[1.11(10)](https://github.com/damus-io/damus/releases/tag/v1.11-10): https://github.com/damus-io/damus/releases/tag/v1.11-10
-
-## [1.10.1] - 2024-09-22
-
-### Added
-
-- Push notification support (Daniel D’Aquino)
-- Added profile edit safe guards (Eric Holguin)
-- Tor relay icon (ericholguin)
-- Add highlighter for web pages (Daniel D’Aquino)
-- Add support for adding comments when creating a highlight (Daniel D’Aquino)
-- Add support for rendering highlights with comments (Daniel D’Aquino)
-- Ability to create highlights (ericholguin)
-- Highlights (NIP-84) (ericholguin)
-- Revamp emoji picker to be less error-prone and add search, frequently used, and multiple skin tone support capabilities (Terry Yiu)
-
-
-### Changed
-
-- Improve notification view filtering UX (Daniel D’Aquino)
-- Improve visibility of friends filter button (Daniel D’Aquino)
-- Changed the default banner from ostriches to damoose (Eric Holguin)
-- Changed image and banner url text fields to new sheet view (Eric Holguin)
-- Onboarding design (ericholguin)
-
-
-### Fixed
-
-- Fix items that became unclickable on iOS 18 (Daniel D’Aquino)
-- Fix many reconnection issues (William Casarin)
-- Fixed issue where theme would be changed to black and can't be switched back on iOS 18 (cr0bar)
-- Fixed some scenarios where the contact list would never be saved locally and cause issues when switching relays. (Daniel D’Aquino)
-- Fix albyhub zaps not appearing (William Casarin)
-- Fix inadvertent escape from mention suggestion menu when typing a space character (Daniel D’Aquino)
-- Fix profile view toolbar alignment bug in iOS 18 (Terry Yiu)
-- Create Account model now uses correct metadata (ericholguin)
-- Restore localization for custom tabs (William Casarin)
-- Fix iOS 18 reflection runtime error for custom picker (William Casarin)
-
-
-[1.10.1]: https://github.com/damus-io/damus/releases/tag/v1.10.1
-
-
-## [1.9.1 (4)] - 2024-08-13
-
-### Fixed
-
-- Fix crash when viewing notes with invalid image dimension metadata (Daniel D’Aquino)
-
-[1.9.1 (4)]: https://github.com/damus-io/damus/releases/tag/v1.9.1-4
-
-
-## [1.9 (14)] - 2024-07-14
-
-### Added
-
-- Completely new threads experience that is easier and more pleasant to use (Daniel D’Aquino)
-- Add emoji search to emoji picker (Terry Yiu)
-
-
-### Changed
-
-- Added first aid contact damus support email (alltheseas)
-- Disable mutiny wallet button (William Casarin)
-- Make friends show up first when searching for profiles (Terry Yiu)
-
-
-### Fixed
-
-- Fix crash on profile page when there are profile updates (William Casarin)
-- Fix crash when adding duplicate mute items (William Casarin)
-- Fix pretty bad crash when building flatbuffer profiles (William Casarin)
-- Fix reactions view to not show reactions from replies on parent note (Terry Yiu)
-- Fix missing Mute button in profile view menu (Terry Yiu)
-- Fixed wallet not disconnecting when a user logs out (ericholguin)
-- Fix stale feed issue when follow list is too big (Daniel D’Aquino)
-
-[1.9 (14)]: https://github.com/damus-io/damus/releases/tag/v1.9-14
-
-## [1.8] - 2024-05-11
-
-### Added
-
-- Added nip10 marker replies (William Casarin)
-- Add marker nip10 support when reading notes (William Casarin)
-- Added title image and tags to longform events (ericholguin)
-- Add First Aid solution for users who do not have a contact list created for their account (Daniel D’Aquino)
-- Relay fees metadata (ericholguin)
-- Added callbackuri for a better ux when connecting mutiny wallet nwc (ericholguin)
-- Add event content preview to the full screen carousel (Daniel D’Aquino)
-- Show list of quoted reposts in threads (William Casarin)
-- Proxy Tags are now viewable on Selected Events (ericholguin)
-- Connect to Mutiny Wallet Button (ericholguin)
-- Add ability to mute words, add new mutelist interface (Charlie) (William Casarin)
-- Add ability to mute hashtag from SearchView (Charlie Fish)
-
-
-### Changed
-
-- Change reactions to use a native looking emoji picker (Terry Yiu)
-- Relay detail design (ericholguin)
-- Updated Zeus logo (ericholguin)
-- Improve UX around video playback (Daniel D’Aquino)
-- Moved paste nwc button to main wallet view (ericholguin)
-- Errors with an NWC will show as an alert (ericholguin)
-- Relay config view user interface (ericholguin)
-- Always strip GPS data from images (kernelkind)
-
-
-### Fixed
-
-- Fix thread bug where a quote isn't picked up as a reply (William Casarin)
-- Fixed threads not loading sometimes (William Casarin)
-- Fixed issue where some replies were including the q tag (William Casarin)
-- Fixed issue where timeline was scrolling when it isn't supposed to (William Casarin)
-- Fix issue where bootstrap relays would inadvertently be added to the user's list on connectivity issues (Daniel D’Aquino)
-- Fix broken GIF uploads (Daniel D’Aquino)
-- Fix ghost notifications caused by Purple impending expiration notifications (Daniel D’Aquino)
-- Improve reliability of contact list creation during onboarding (Daniel D’Aquino)
-- Fix emoji reactions being cut off (ericholguin)
-- Fix image indicators to limit number of dots to not spill screen beyond visible margins (ericholguin)
-- Fix bug that would cause connection issues with relays defined with a trailing slash URL, and an inability to delete them. (Daniel D’Aquino)
-- Issue where NWC Scanner view would not dismiss after a failed scan/paste (ericholguin)
-
-
-
-[1.8]: https://github.com/damus-io/damus/releases/tag/v1.8
-
 ## [1.7-rc2] - 2024-02-28
 
 ### Added

DamusNotificationService/DamusNotificationService.entitlements

@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.usernotifications.communication</key>
-	<true/>
-	<key>com.apple.developer.kernel.extended-virtual-addressing</key>
-	<true/>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>
@@ -14,9 +10,5 @@
 	</array>
 	<key>com.apple.security.network.client</key>
 	<true/>
-	<key>keychain-access-groups</key>
-	<array>
-		<string>$(AppIdentifierPrefix)com.jb55.damus2</string>
-	</array>
 </dict>
 </plist>

DamusNotificationService/NotificationExtensionState.swift

@@ -18,7 +18,7 @@ struct NotificationExtensionState: HeadlessDamusState {
     let lnurls: LNUrls
     
     init?() {
-        guard let ndb = Ndb(owns_db_file: false) else { return nil }
+        guard let ndb = try? Ndb(owns_db_file: false) else { return nil }
         self.ndb = ndb
         
         guard let keypair = get_saved_keypair() else { return nil }

DamusNotificationService/NotificationFormatter.swift

@@ -55,9 +55,6 @@ struct NotificationFormatter {
         var identifier = ""
         
         switch notify.type {
-            case .tagged:
-                title = String(format: NSLocalizedString("Tagged by %@", comment: "Tagged by heading in local notification"), displayName)
-                identifier = "myMentionNotification"
             case .mention:
                 title = String(format: NSLocalizedString("Mentioned by %@", comment: "Mentioned by heading in local notification"), displayName)
                 identifier = "myMentionNotification"
@@ -73,9 +70,6 @@ struct NotificationFormatter {
             case .zap, .profile_zap:
                 // not handled here. Try `format_message(displayName: String, notify: LocalNotification, state: HeadlessDamusState) async -> (content: UNMutableNotificationContent, identifier: String)?`
                 return nil
-            case .reply:
-                title = String(format: NSLocalizedString("%@ replied to your note", comment: "Heading for local notification indicating a new reply"), displayName)
-                identifier = "myReplyNotification"
         }
         content.title = title
         content.body = notify.content
@@ -93,11 +87,10 @@ struct NotificationFormatter {
         
         // If it does not work, try async formatting methods
         let content = UNMutableNotificationContent()
-
+        
         switch notify.type {
             case .zap, .profile_zap:
                 guard let zap = await get_zap(from: notify.event, state: state) else {
-                    Log.debug("format_message: async get_zap failed", for: .push_notifications)
                     return nil
                 }
                 content.title = Self.zap_notification_title(zap)

DamusNotificationService/NotificationService.swift

@@ -5,32 +5,15 @@
 //  Created by Daniel D’Aquino on 2023-11-10.
 //
 
-import Kingfisher
-import ImageIO
 import UserNotifications
 import Foundation
-import UniformTypeIdentifiers
-import Intents
 
 class NotificationService: UNNotificationServiceExtension {
 
     var contentHandler: ((UNNotificationContent) -> Void)?
     var bestAttemptContent: UNMutableNotificationContent?
 
-    private func configureKingfisherCache() {
-        guard let groupURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.DAMUS_APP_GROUP_IDENTIFIER) else {
-            return
-        }
-
-        let cachePath = groupURL.appendingPathComponent(Constants.IMAGE_CACHE_DIRNAME)
-        if let cache = try? ImageCache(name: "sharedCache", cacheDirectoryURL: cachePath) {
-            KingfisherManager.shared.cache = cache
-        }
-    }
-
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
-        configureKingfisherCache()
-
         self.contentHandler = contentHandler
         
         guard let nostr_event_json = request.content.userInfo["nostr_event"] as? String,
@@ -44,9 +27,9 @@ class NotificationService: UNNotificationServiceExtension {
         // Log that we got a push notification
         Log.debug("Got nostr event push notification from pubkey %s", for: .push_notifications, nostr_event.pubkey.hex())
         
-        guard let state = NotificationExtensionState() else {
-            Log.debug("Failed to open nostrdb", for: .push_notifications)
-
+        guard let state = NotificationExtensionState(),
+              let display_name = state.ndb.lookup_profile(nostr_event.pubkey)?.unsafeUnownedValue?.profile?.display_name  // We are not holding the txn here.
+        else {
             // Something failed to initialize so let's go for the next best thing
             guard let improved_content = NotificationFormatter.shared.format_message(event: nostr_event) else {
                 // We cannot format this nostr event. Suppress notification.
@@ -56,18 +39,7 @@ class NotificationService: UNNotificationServiceExtension {
             contentHandler(improved_content)
             return
         }
-
-        let sender_profile = {
-            let txn = state.ndb.lookup_profile(nostr_event.pubkey)
-            let profile = txn?.unsafeUnownedValue?.profile
-            let picture = ((profile?.picture.map { URL(string: $0) }) ?? URL(string: robohash(nostr_event.pubkey)))!
-            return ProfileBuf(picture: picture,
-                                 name: profile?.name,
-                         display_name: profile?.display_name,
-                                nip05: profile?.nip05)
-        }()
-        let sender_pubkey = nostr_event.pubkey
-
+        
         // Don't show notification details that match mute list.
         // TODO: Remove this code block once we get notification suppression entitlement from Apple. It will be covered by the `guard should_display_notification` block
         if state.mutelist_manager.is_event_muted(nostr_event) {
@@ -80,74 +52,25 @@ class NotificationService: UNNotificationServiceExtension {
             contentHandler(content)
             return
         }
-
+        
         guard should_display_notification(state: state, event: nostr_event, mode: .push) else {
-            Log.debug("should_display_notification failed", for: .push_notifications)
             // We should not display notification for this event. Suppress notification.
             // contentHandler(UNNotificationContent())
             // TODO: We cannot really suppress until we have the notification supression entitlement. Show the raw notification
             contentHandler(request.content)
             return
         }
-
+        
         guard let notification_object = generate_local_notification_object(from: nostr_event, state: state) else {
-            Log.debug("generate_local_notification_object failed", for: .push_notifications)
             // We could not process this notification. Probably an unsupported nostr event kind. Suppress.
             // contentHandler(UNNotificationContent())
             // TODO: We cannot really suppress until we have the notification supression entitlement. Show the raw notification
             contentHandler(request.content)
             return
         }
-
-
+        
         Task {
-            let sender_dn = DisplayName(name: sender_profile.name, display_name: sender_profile.display_name, pubkey: sender_pubkey)
-            guard let (improvedContent, _) = await NotificationFormatter.shared.format_message(displayName: sender_dn.displayName, notify: notification_object, state: state) else {
-
-                Log.debug("NotificationFormatter.format_message failed", for: .push_notifications)
-                return
-            }
-
-            do {
-                var options: [AnyHashable: Any] = [:]
-                if let imageSource = CGImageSourceCreateWithURL(sender_profile.picture as CFURL, nil),
-                   let uti = CGImageSourceGetType(imageSource) {
-                    options[UNNotificationAttachmentOptionsTypeHintKey] = uti
-                }
-
-                let attachment = try UNNotificationAttachment(identifier: sender_profile.picture.absoluteString, url: sender_profile.picture, options: options)
-                improvedContent.attachments = [attachment]
-            } catch {
-                Log.error("failed to get notification attachment: %s", for: .push_notifications, error.localizedDescription)
-            }
-
-            let kind = nostr_event.known_kind
-
-            // these aren't supported yet
-            if !(kind == .text || kind == .dm) {
-                contentHandler(improvedContent)
-                return
-            }
-
-            // rich communication notifications for kind1, dms, etc
-
-            let message_intent = await message_intent_from_note(ndb: state.ndb,
-                                                                sender_profile: sender_profile,
-                                                                content: improvedContent.body,
-                                                                note: nostr_event,
-                                                                our_pubkey: state.keypair.pubkey)
-
-            improvedContent.threadIdentifier = nostr_event.thread_id().hex()
-            improvedContent.categoryIdentifier = "COMMUNICATION"
-
-            let interaction = INInteraction(intent: message_intent, response: nil)
-            interaction.direction = .incoming
-            do {
-                try await interaction.donate()
-                let updated = try improvedContent.updating(from: message_intent)
-                contentHandler(updated)
-            } catch {
-                Log.error("failed to donate interaction: %s", for: .push_notifications, error.localizedDescription)
+            if let (improvedContent, _) = await NotificationFormatter.shared.format_message(displayName: display_name, notify: notification_object, state: state) {
                 contentHandler(improvedContent)
             }
         }
@@ -162,162 +85,3 @@ class NotificationService: UNNotificationServiceExtension {
     }
 
 }
-
-struct ProfileBuf {
-    let picture: URL
-    let name: String?
-    let display_name: String?
-    let nip05: String?
-}
-
-func message_intent_from_note(ndb: Ndb, sender_profile: ProfileBuf, content: String, note: NdbNote, our_pubkey: Pubkey) async -> INSendMessageIntent {
-    let sender_pk = note.pubkey
-    let sender = await profile_to_inperson(name: sender_profile.name,
-                                   display_name: sender_profile.display_name,
-                                        picture: sender_profile.picture.absoluteString,
-                                          nip05: sender_profile.nip05,
-                                         pubkey: sender_pk,
-                                     our_pubkey: our_pubkey)
-
-    let conversationIdentifier = note.thread_id().hex()
-    var recipients: [INPerson] = []
-    var pks: [Pubkey] = []
-    let meta = INSendMessageIntentDonationMetadata()
-
-    // gather recipients
-    if let recipient_note_id = note.direct_replies() {
-        let replying_to = ndb.lookup_note(recipient_note_id)
-        if let replying_to_pk = replying_to?.unsafeUnownedValue?.pubkey {
-            meta.isReplyToCurrentUser = replying_to_pk == our_pubkey
-
-            if replying_to_pk != sender_pk {
-                // we push the actual person being replied to first
-                pks.append(replying_to_pk)
-            }
-        }
-    }
-
-    let pubkeys = Array(note.referenced_pubkeys)
-    meta.recipientCount = pubkeys.count
-    if pubkeys.contains(sender_pk) {
-        meta.recipientCount -= 1
-    }
-
-    for pk in pubkeys.prefix(3) {
-        if pk == sender_pk || pks.contains(pk) {
-            continue
-        }
-
-        if !meta.isReplyToCurrentUser && pk == our_pubkey {
-            meta.mentionsCurrentUser = true
-        }
-
-        pks.append(pk)
-    }
-
-    for pk in pks {
-        let recipient = await pubkey_to_inperson(ndb: ndb, pubkey: pk, our_pubkey: our_pubkey)
-        recipients.append(recipient)
-    }
-
-    // we enable default formatting this way
-    var groupName = INSpeakableString(spokenPhrase: "")
-
-    // otherwise we just say its a DM
-    if note.known_kind == .dm {
-        groupName = INSpeakableString(spokenPhrase: "DM")
-    }
-
-    let intent = INSendMessageIntent(recipients: recipients,
-                            outgoingMessageType: .outgoingMessageText,
-                                        content: content,
-                             speakableGroupName: groupName,
-                         conversationIdentifier: conversationIdentifier,
-                                    serviceName: "kind\(note.kind)",
-                                         sender: sender,
-                                    attachments: nil)
-    intent.donationMetadata = meta
-
-    // this is needed for recipients > 0
-    if let img = sender.image {
-        intent.setImage(img, forParameterNamed: \.speakableGroupName)
-    }
-
-    return intent
-}
-
-func pubkey_to_inperson(ndb: Ndb, pubkey: Pubkey, our_pubkey: Pubkey) async -> INPerson {
-    let profile_txn = ndb.lookup_profile(pubkey)
-    let profile = profile_txn?.unsafeUnownedValue?.profile
-    let name = profile?.name
-    let display_name = profile?.display_name
-    let nip05 = profile?.nip05
-    let picture = profile?.picture
-
-    return await profile_to_inperson(name: name,
-                             display_name: display_name,
-                                  picture: picture,
-                                    nip05: nip05,
-                                   pubkey: pubkey,
-                               our_pubkey: our_pubkey)
-}
-
-func fetch_pfp(picture: URL) async throws -> RetrieveImageResult {
-    try await withCheckedThrowingContinuation { continuation in
-        KingfisherManager.shared.retrieveImage(with: Kingfisher.ImageResource(downloadURL: picture)) { result in
-            switch result {
-            case .success(let img):
-                continuation.resume(returning: img)
-            case .failure(let error):
-                continuation.resume(throwing: error)
-            }
-        }
-    }
-}
-
-func profile_to_inperson(name: String?, display_name: String?, picture: String?, nip05: String?, pubkey: Pubkey, our_pubkey: Pubkey) async -> INPerson {
-    let npub = pubkey.npub
-    let handle = INPersonHandle(value: npub, type: .unknown)
-    var aliases: [INPersonHandle] = []
-
-    if let nip05 {
-        aliases.append(INPersonHandle(value: nip05, type: .emailAddress))
-    }
-
-    let nostrName = DisplayName(name: name, display_name: display_name, pubkey: pubkey)
-    let nameComponents = nostrName.nameComponents()
-    let displayName = nostrName.displayName
-    let contactIdentifier = npub
-    let customIdentifier = npub
-    let suggestionType = INPersonSuggestionType.socialProfile
-
-    var image: INImage? = nil
-
-    if let picture,
-       let url = URL(string: picture),
-       let img = try? await fetch_pfp(picture: url),
-       let imgdata = img.data()
-    {
-        image = INImage(imageData: imgdata)
-    } else {
-        Log.error("Failed to fetch pfp (%s) for %s", for: .push_notifications, picture ?? "nil", displayName)
-    }
-
-    let person = INPerson(personHandle: handle,
-                        nameComponents: nameComponents,
-                           displayName: displayName,
-                                 image: image,
-                     contactIdentifier: contactIdentifier,
-                      customIdentifier: customIdentifier,
-                                  isMe: pubkey == our_pubkey,
-                        suggestionType: suggestionType
-    )
-
-    return person
-}
-
-func robohash(_ pk: Pubkey) -> String {
-    return "https://robohash.org/" + pk.hex()
-}
-
-

Package.swift

@@ -1,32 +1,3 @@
-// swift-tools-version: 6.0
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "damus",
-    platforms: [
-        .iOS(.v16),
-        .macOS(.v12)
-    ],
-    products: [
-        .library(
-            name: "damus",
-            targets: ["damus"]),
-    ],
-    dependencies: [
-        .package(url: "https://github.com/jb55/secp256k1.swift.git", branch: "main")
-    ],
-    targets: [
-        .target(
-            name: "damus",
-            dependencies: [
-                .product(name: "secp256k1", package: "secp256k1.swift")
-            ],
-            path: "damus"),
-        .testTarget(
-            name: "damusTests",
-            dependencies: ["damus"],
-            path: "damusTests"),
-    ]
-)
+dependencies: [
+    .Package(url: "https://github.com/jb55/secp256k1.swift.git", branch: "main")
+]

README.md

@@ -8,7 +8,7 @@ A twitter-like [nostr][nostr] client for iPhone, iPad and MacOS.
 
 [nostr]: https://github.com/fiatjaf/nostr
 
-## How is Damus better than X/Twitter?
+## How is Damus better than twitter?
 There are no toxic algorithms.\
 You can send or receive zaps (satoshis) without asking for permission.\
 [There is no central database](https://fiatjaf.com/nostr.html). Therefore, Damus is censorship resistant.\

TODO

@@ -1 +0,0 @@
-Fix q tags

damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,40 +1,5 @@
 {
-  "originHash" : "06318d35ee2e6bd681b95591e67da33a9461b48a3c652e58bd9d1a6f0d82bdac",
   "pins" : [
-    {
-      "identity" : "codescanner",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/twostraws/CodeScanner.git",
-      "state" : {
-        "revision" : "9fa582f4b36c69c2a55bff5fb3377eb170ae273c"
-      }
-    },
-    {
-      "identity" : "cryptoswift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
-      "state" : {
-        "revision" : "e74bbbfbef939224b242ae7c342a90e60b88b5ce"
-      }
-    },
-    {
-      "identity" : "emojikit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/tyiu/EmojiKit",
-      "state" : {
-        "revision" : "47a4b1402de26be0299dcb4d667c1faaf21a7874",
-        "version" : "0.2.0"
-      }
-    },
-    {
-      "identity" : "emojipicker",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/tyiu/EmojiPicker.git",
-      "state" : {
-        "revision" : "3f48903721eae223238ff0af17c22d6373d33813",
-        "version" : "0.2.0"
-      }
-    },
     {
       "identity" : "gsplayer",
       "kind" : "remoteSourceControl",
@@ -49,8 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/onevcat/Kingfisher",
       "state" : {
-        "revision" : "4c6b067f96953ee19526e49e4189403a2be21fb3",
-        "version" : "8.3.1"
+        "revision" : "415b1d97fb38bda1e5a6b2dde63354720832110b",
+        "version" : "7.6.1"
+      }
+    },
+    {
+      "identity" : "mcemojipicker",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/izyumkin/MCEmojiPicker",
+      "state" : {
+        "revision" : "e0b4903b75ae1cc418d276d84d1cb946b8a1d73c",
+        "version" : "1.2.3"
       }
     },
     {
@@ -61,15 +35,6 @@
         "revision" : "40b4b38b3b1c83f7088c76189a742870e0ca06a9"
       }
     },
-    {
-      "identity" : "swift-collections",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-collections.git",
-      "state" : {
-        "revision" : "ee97538f5b81ae89698fd95938896dec5217b148",
-        "version" : "1.1.1"
-      }
-    },
     {
       "identity" : "swift-markdown-ui",
       "kind" : "remoteSourceControl",
@@ -95,32 +60,7 @@
         "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
         "version" : "509.0.0"
       }
-    },
-    {
-      "identity" : "swift-trie",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/tyiu/swift-trie",
-      "state" : {
-        "revision" : "4c50bff6c168f74425f70476be62a072980d2da7",
-        "version" : "0.1.2"
-      }
-    },
-    {
-      "identity" : "swiftycrop",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/benedom/SwiftyCrop",
-      "state" : {
-        "revision" : "454d0a0d4faf6f3a19c8d817ab9d7d27524bd79f"
-      }
-    },
-    {
-      "identity" : "swipeactions",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/damus-io/SwipeActions.git",
-      "state" : {
-        "revision" : "33d99756c3112e1a07c1732e3cddc5ad5bd0c5f4"
-      }
     }
   ],
-  "version" : 3
+  "version" : 2
 }

damus.xcodeproj/xcshareddata/xcschemes/HighlighterActionExtension.xcscheme

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1540"
-   wasCreatedForAppExtension = "YES"
-   version = "2.0">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D703D7162C66E47100A400EA"
-               BuildableName = "HighlighterActionExtension.appex"
-               BlueprintName = "HighlighterActionExtension"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-               BuildableName = "damus.app"
-               BlueprintName = "damus"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      launchStyle = "0"
-      askForAppToLaunch = "Yes"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <RemoteRunnable
-         runnableDebuggingMode = "1"
-         BundleIdentifier = "com.apple.mobilesafari"
-         RemotePath = "/Library/Developer/CoreSimulator/Volumes/iOS_21F79/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 17.5.simruntime/Contents/Resources/RuntimeRoot/Applications/MobileSafari.app">
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      askForAppToLaunch = "Yes"
-      launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

damus.xcodeproj/xcshareddata/xcschemes/damus.xcscheme

@@ -40,7 +40,7 @@
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO">
+            skipped = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "4CE6DEFC27F7A08200C66700"

damus/Assets.xcassets/Colors/DamusAdaptableGrey 2.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xD7",
-          "green" : "0xD1",
-          "red" : "0xD1"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x13",
-          "green" : "0x11",
-          "red" : "0x11"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusAdaptableLighterGrey.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xF9",
-          "green" : "0xF3",
-          "red" : "0xF3"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x25",
-          "green" : "0x22",
-          "red" : "0x22"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusAdaptablePurpleBackground 1.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "244",
-          "green" : "218",
-          "red" : "244"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "92",
-          "green" : "45",
-          "red" : "93"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusAdaptablePurpleBackground 2.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "236",
-          "green" : "194",
-          "red" : "238"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "109",
-          "green" : "49",
-          "red" : "111"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusAdaptablePurpleForeground.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "197",
-          "green" : "67",
-          "red" : "204"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "255",
-          "green" : "194",
-          "red" : "255"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Colors/DamusHighlight.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xF2",
-          "green" : "0xD8",
-          "red" : "0xF4"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x45",
-          "green" : "0x17",
-          "red" : "0x47"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Logos/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Logos/alby.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "alby.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "alby.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "alby.svg",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Logos/coinos.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "coinos.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Logos/tor.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "tor.svg.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "damoose.jpeg",
+      "filename" : "profile-banner.jpeg",
       "idiom" : "universal"
     }
   ],

damus/Assets.xcassets/alby-go.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "alby-go.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/alby.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images": [
+    {
+      "filename": "alby.svg",
+      "idiom": "universal",
+      "scale": "1x"
+    },
+    {
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "alby.svg"
+    },
+    {
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "alby.svg"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

damus/Components/CustomPicker.swift

@@ -12,25 +12,31 @@ let RECTANGLE_GRADIENT = LinearGradient(gradient: Gradient(colors: [
     DamusColors.blue
 ]), startPoint: .leading, endPoint: .trailing)
 
-struct CustomPicker<SelectionValue: Hashable>: View {
+struct CustomPicker<SelectionValue: Hashable, Content: View>: View {
     
-    let tabs: [(String, SelectionValue)]
     @Environment(\.colorScheme) var colorScheme
-
+    
     @Namespace var picker
     @Binding var selection: SelectionValue
-
+    @ViewBuilder let content: Content
+    
     public var body: some View {
+        let contentMirror = Mirror(reflecting: content)
+        let blocksCount = Mirror(reflecting: contentMirror.descendant("value")!).children.count
         HStack {
-            ForEach(tabs, id: \.1) { (text, tag) in
+            ForEach(0..<blocksCount, id: \.self) { index in
+                let tupleBlock = contentMirror.descendant("value", ".\(index)")
+                let text = Mirror(reflecting: tupleBlock!).descendant("content") as! Text
+                let tag = Mirror(reflecting: tupleBlock!).descendant("modifier", "value", "tagged") as! SelectionValue
+                
                 Button {
                     withAnimation(.spring()) {
                         selection = tag
                     }
                 } label: {
-                    Text(text).padding(EdgeInsets(top: 15, leading: 0, bottom: 10, trailing: 0))
+                    text
+                        .padding(EdgeInsets(top: 15, leading: 0, bottom: 10, trailing: 0))
                         .font(.system(size: 14, weight: .heavy))
-                        .tag(tag)
                 }
                 .background(
                     Group {
@@ -46,6 +52,7 @@ struct CustomPicker<SelectionValue: Hashable>: View {
                 .accentColor(tag == selection ? textColor() : .gray)
             }
         }
+        .background(Color(UIColor.systemBackground))
     }
     
     func textColor() -> Color {

damus/Components/DamusColors.swift

@@ -10,11 +10,6 @@ import SwiftUI
 
 class DamusColors {
     static let adaptableGrey = Color("DamusAdaptableGrey")
-    static let adaptableGrey2 = Color("DamusAdaptableGrey 2")
-    static let adaptableLighterGrey = Color("DamusAdaptableLighterGrey")
-    static let adaptablePurpleBackground = Color("DamusAdaptablePurpleBackground 1")
-    static let adaptablePurpleBackground2 = Color("DamusAdaptablePurpleBackground 2")
-    static let adaptablePurpleForeground = Color("DamusAdaptablePurpleForeground")
     static let adaptableBlack = Color("DamusAdaptableBlack")
     static let adaptableWhite = Color("DamusAdaptableWhite")
     static let white = Color("DamusWhite")
@@ -28,7 +23,6 @@ class DamusColors {
     static let green = Color("DamusGreen")
     static let purple = Color("DamusPurple")
     static let deepPurple = Color("DamusDeepPurple")
-    static let highlight = Color("DamusHighlight")
     static let blue = Color("DamusBlue")
     static let bitcoin = Color("Bitcoin")
     static let success = Color("DamusSuccessPrimary")