Fix broken QR code scanner and fix landscape mode

Changelog-Fixed: Fix broken QR code scanner and fix landscape mode

CHANGELOG.md

@@ -1,3 +1,79 @@
+## [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

damus.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3169CAE5294E69C000EE4006 /* EmptyTimelineView.swift */; };
 		3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3169CAEC294FCCFC00EE4006 /* Constants.swift */; };
 		31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D2E846295218AF006D67F8 /* Shimmer.swift */; };
+		3A0A30BB2C21397A00F8C9BC /* EmojiPicker in Frameworks */ = {isa = PBXBuildFile; productRef = 3A0A30BA2C21397A00F8C9BC /* EmojiPicker */; };
 		3A23838E2A297DD200E5AA2E /* ZapButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A23838D2A297DD200E5AA2E /* ZapButtonModel.swift */; };
 		3A3040ED29A5CB86008A0F29 /* ReplyDescriptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040EC29A5CB86008A0F29 /* ReplyDescriptionTests.swift */; };
 		3A3040F129A8FF97008A0F29 /* LocalizationUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040F029A8FF97008A0F29 /* LocalizationUtil.swift */; };
@@ -32,7 +33,6 @@
 		3ACB685F297633BC00C46468 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685D297633BC00C46468 /* Localizable.strings */; };
 		3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */; };
 		3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */; };
-		3AFE89C32BD4156F00AD31EF /* MCEmojiPicker in Frameworks */ = {isa = PBXBuildFile; productRef = 3AFE89C22BD4156F00AD31EF /* MCEmojiPicker */; };
 		3CCD1E6A2A874C4E0099A953 /* Nip98HTTPAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CCD1E692A874C4E0099A953 /* Nip98HTTPAuth.swift */; };
 		4C011B5E2BD0A56A002F2F9B /* ChatEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C011B5C2BD0A56A002F2F9B /* ChatEventView.swift */; };
 		4C011B5F2BD0A56A002F2F9B /* ChatroomThreadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C011B5D2BD0A56A002F2F9B /* ChatroomThreadView.swift */; };
@@ -399,6 +399,7 @@
 		5C14C29D2BBBA40B00079FD2 /* RelayAdminDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C14C29C2BBBA40B00079FD2 /* RelayAdminDetail.swift */; };
 		5C14C29F2BBBA5C600079FD2 /* RelayNipList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C14C29E2BBBA5C600079FD2 /* RelayNipList.swift */; };
 		5C42E78C29DB76D90086AAC1 /* EmptyUserSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C42E78B29DB76D90086AAC1 /* EmptyUserSearchView.swift */; };
+		5C4D9EA72C042FA5005EA0F7 /* HighlightPostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4D9EA62C042FA5005EA0F7 /* HighlightPostView.swift */; };
 		5C513FBA297F72980072348F /* CustomPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FB9297F72980072348F /* CustomPicker.swift */; };
 		5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FCB2984ACA60072348F /* QRCodeView.swift */; };
 		5C6E1DAD2A193EC2008FC15A /* GradientButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6E1DAC2A193EC2008FC15A /* GradientButtonStyle.swift */; };
@@ -406,6 +407,12 @@
 		5C7389B12B6EFA7100781E0A /* ProxyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B02B6EFA7100781E0A /* ProxyView.swift */; };
 		5C7389B72B9E692E00781E0A /* MutinyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B62B9E692E00781E0A /* MutinyButton.swift */; };
 		5C7389B92B9E69ED00781E0A /* MutinyGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */; };
+		5C8711DE2C460C06007879C2 /* PostingTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C8711DD2C460C06007879C2 /* PostingTimelineView.swift */; };
+		5CC8529D2BD741CD0039FFC5 /* HighlightEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC8529C2BD741CD0039FFC5 /* HighlightEvent.swift */; };
+		5CC8529F2BD744F60039FFC5 /* HighlightView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC8529E2BD744F60039FFC5 /* HighlightView.swift */; };
+		5CC852A22BDED9B90039FFC5 /* HighlightDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC852A12BDED9B90039FFC5 /* HighlightDescription.swift */; };
+		5CC852A42BDF3CA10039FFC5 /* HighlightLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC852A32BDF3CA10039FFC5 /* HighlightLink.swift */; };
+		5CC852A62BE00F180039FFC5 /* HighlightEventRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC852A52BE00F180039FFC5 /* HighlightEventRef.swift */; };
 		5CC868DD2AA29B3200FB22BA /* NeutralButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC868DC2AA29B3200FB22BA /* NeutralButtonStyle.swift */; };
 		5CF2DCCC2AA3AF0B00984B8D /* RelayPicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF2DCCB2AA3AF0B00984B8D /* RelayPicView.swift */; };
 		5CF2DCCE2AABE1A500984B8D /* DamusLightGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF2DCCD2AABE1A500984B8D /* DamusLightGradient.swift */; };
@@ -1334,6 +1341,7 @@
 		5C14C29C2BBBA40B00079FD2 /* RelayAdminDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayAdminDetail.swift; sourceTree = "<group>"; };
 		5C14C29E2BBBA5C600079FD2 /* RelayNipList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayNipList.swift; sourceTree = "<group>"; };
 		5C42E78B29DB76D90086AAC1 /* EmptyUserSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyUserSearchView.swift; sourceTree = "<group>"; };
+		5C4D9EA62C042FA5005EA0F7 /* HighlightPostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightPostView.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>"; };
 		5C6E1DAC2A193EC2008FC15A /* GradientButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientButtonStyle.swift; sourceTree = "<group>"; };
@@ -1341,6 +1349,12 @@
 		5C7389B02B6EFA7100781E0A /* ProxyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyView.swift; sourceTree = "<group>"; };
 		5C7389B62B9E692E00781E0A /* MutinyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutinyButton.swift; sourceTree = "<group>"; };
 		5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutinyGradient.swift; sourceTree = "<group>"; };
+		5C8711DD2C460C06007879C2 /* PostingTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostingTimelineView.swift; sourceTree = "<group>"; };
+		5CC8529C2BD741CD0039FFC5 /* HighlightEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightEvent.swift; sourceTree = "<group>"; };
+		5CC8529E2BD744F60039FFC5 /* HighlightView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightView.swift; sourceTree = "<group>"; };
+		5CC852A12BDED9B90039FFC5 /* HighlightDescription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightDescription.swift; sourceTree = "<group>"; };
+		5CC852A32BDF3CA10039FFC5 /* HighlightLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightLink.swift; sourceTree = "<group>"; };
+		5CC852A52BE00F180039FFC5 /* HighlightEventRef.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightEventRef.swift; sourceTree = "<group>"; };
 		5CC868DC2AA29B3200FB22BA /* NeutralButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NeutralButtonStyle.swift; sourceTree = "<group>"; };
 		5CF2DCCB2AA3AF0B00984B8D /* RelayPicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayPicView.swift; sourceTree = "<group>"; };
 		5CF2DCCD2AABE1A500984B8D /* DamusLightGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusLightGradient.swift; sourceTree = "<group>"; };
@@ -1485,10 +1499,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				4C06670428FC7EC500038D2A /* Kingfisher in Frameworks */,
+				3A0A30BB2C21397A00F8C9BC /* EmojiPicker in Frameworks */,
 				D78DB8592C1CE9CA00F0AB12 /* SwipeActions in Frameworks */,
 				4C649881286E0EE300EAE2B3 /* secp256k1 in Frameworks */,
 				4C27C9322A64766F007DBC75 /* MarkdownUI in Frameworks */,
-				3AFE89C32BD4156F00AD31EF /* MCEmojiPicker in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1668,6 +1682,7 @@
 				B5C60C1F2B530D5100C5ECA7 /* MuteItem.swift */,
 				B533694D2B66D791008A805E /* MutelistManager.swift */,
 				D7D2A3802BF815D000E4B42B /* PushNotificationClient.swift */,
+				5CC8529C2BD741CD0039FFC5 /* HighlightEvent.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -2402,6 +2417,7 @@
 		4CC7AAEE297F11B300430951 /* Events */ = {
 			isa = PBXGroup;
 			children = (
+				5CC852A02BDED9970039FFC5 /* Highlight */,
 				4CA927682A290F8F0098A105 /* Components */,
 				4CC7AAEF297F11C700430951 /* SelectedEventView.swift */,
 				4CC7AAF5297F1A6A00430951 /* EventBody.swift */,
@@ -2433,6 +2449,7 @@
 			isa = PBXGroup;
 			children = (
 				4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */,
+				5C8711DD2C460C06007879C2 /* PostingTimelineView.swift */,
 			);
 			path = Timeline;
 			sourceTree = "<group>";
@@ -2699,6 +2716,18 @@
 			path = Images;
 			sourceTree = "<group>";
 		};
+		5CC852A02BDED9970039FFC5 /* Highlight */ = {
+			isa = PBXGroup;
+			children = (
+				5CC8529E2BD744F60039FFC5 /* HighlightView.swift */,
+				5CC852A12BDED9B90039FFC5 /* HighlightDescription.swift */,
+				5CC852A32BDF3CA10039FFC5 /* HighlightLink.swift */,
+				5CC852A52BE00F180039FFC5 /* HighlightEventRef.swift */,
+				5C4D9EA62C042FA5005EA0F7 /* HighlightPostView.swift */,
+			);
+			path = Highlight;
+			sourceTree = "<group>";
+		};
 		7C0F392D29B57C8F0039859C /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -2866,7 +2895,7 @@
 				4C649880286E0EE300EAE2B3 /* secp256k1 */,
 				4C06670328FC7EC500038D2A /* Kingfisher */,
 				4C27C9312A64766F007DBC75 /* MarkdownUI */,
-				3AFE89C22BD4156F00AD31EF /* MCEmojiPicker */,
+				3A0A30BA2C21397A00F8C9BC /* EmojiPicker */,
 				D78DB8582C1CE9CA00F0AB12 /* SwipeActions */,
 			);
 			productName = damus;
@@ -3007,7 +3036,7 @@
 				4CCF9AB02A1FE80B00E03CFB /* XCRemoteSwiftPackageReference "GSPlayer" */,
 				4C27C9302A64766F007DBC75 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */,
 				D7A343EC2AD0D77C00CED48B /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
-				3AFE89C12BD4156F00AD31EF /* XCRemoteSwiftPackageReference "MCEmojiPicker" */,
+				3A0A30B92C21397A00F8C9BC /* XCRemoteSwiftPackageReference "EmojiPicker" */,
 				D78DB8572C1CE9CA00F0AB12 /* XCRemoteSwiftPackageReference "SwipeActions" */,
 			);
 			productRefGroup = 4CE6DEE427F7A08100C66700 /* Products */;
@@ -3149,10 +3178,12 @@
 				4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
 				4CEE2AF5280B29E600AB5EEF /* TimeAgo.swift in Sources */,
 				4CC14FF12A73FCDB007AEB17 /* Pubkey.swift in Sources */,
+				5C8711DE2C460C06007879C2 /* PostingTimelineView.swift in Sources */,
 				4CA9275D2A28FF630098A105 /* LongformView.swift in Sources */,
 				4C75EFAD28049CFB0006080F /* PostButton.swift in Sources */,
 				D7EDED1E2B11797D0018B19C /* LongformEvent.swift in Sources */,
 				504323A92A3495B6006AE6DC /* RelayModelCache.swift in Sources */,
+				5C4D9EA72C042FA5005EA0F7 /* HighlightPostView.swift in Sources */,
 				3A8CC6CC2A2CFEF900940F5F /* StringUtil.swift in Sources */,
 				D7FD12262BD345A700CF195B /* FirstAidSettingsView.swift in Sources */,
 				D7870BC12AC4750B0080BA88 /* MentionView.swift in Sources */,
@@ -3183,6 +3214,7 @@
 				4C32B94D2A9AD44700DC3548 /* Offset.swift in Sources */,
 				4C633350283D40E500B1C9C3 /* HomeModel.swift in Sources */,
 				4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */,
+				5CC852A42BDF3CA10039FFC5 /* HighlightLink.swift in Sources */,
 				4C32B9552A9AD44700DC3548 /* ByteBuffer.swift in Sources */,
 				4C32B95B2A9AD44700DC3548 /* NativeObject.swift in Sources */,
 				3AB72AB9298ECF30004BB58C /* Translator.swift in Sources */,
@@ -3322,6 +3354,7 @@
 				4C3AC7A12835A81400E1F516 /* SetupView.swift in Sources */,
 				4C06670128FC7C5900038D2A /* RelayView.swift in Sources */,
 				4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */,
+				5CC852A22BDED9B90039FFC5 /* HighlightDescription.swift in Sources */,
 				4C94D6432BA5AEFE00C26EFF /* QuoteRepostsView.swift in Sources */,
 				D7EDED332B12ACAE0018B19C /* DamusUserDefaults.swift in Sources */,
 				4CA352AE2A76C1AC003BB08B /* FollowedNotify.swift in Sources */,
@@ -3365,7 +3398,9 @@
 				4C2859602A12A2BE004746F7 /* SupporterBadge.swift in Sources */,
 				4C1A9A2A29DDF54400516EAC /* DamusVideoPlayer.swift in Sources */,
 				4CA352A22A76AEC5003BB08B /* LikedNotify.swift in Sources */,
+				5CC8529F2BD744F60039FFC5 /* HighlightView.swift in Sources */,
 				BA37598D2ABCCE500018D73B /* PhotoCaptureProcessor.swift in Sources */,
+				5CC8529D2BD741CD0039FFC5 /* HighlightEvent.swift in Sources */,
 				4C9146FD2A2A87C200DDEA40 /* wasm.c in Sources */,
 				4C75EFAF28049D350006080F /* NostrFilter.swift in Sources */,
 				4C3EA64C28FF59AC00C48A62 /* bech32_util.c in Sources */,
@@ -3477,6 +3512,7 @@
 				B51C1CEB2B55A60A00E312A9 /* MuteDurationMenu.swift in Sources */,
 				4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */,
 				4C32B9512A9AD44700DC3548 /* FlatbuffersErrors.swift in Sources */,
+				5CC852A62BE00F180039FFC5 /* HighlightEventRef.swift in Sources */,
 				4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
@@ -4037,6 +4073,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -4063,6 +4100,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
+				MARKETING_VERSION = 1.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -4086,6 +4124,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -4112,6 +4151,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
+				MARKETING_VERSION = 1.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -4316,12 +4356,12 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		3AFE89C12BD4156F00AD31EF /* XCRemoteSwiftPackageReference "MCEmojiPicker" */ = {
+		3A0A30B92C21397A00F8C9BC /* XCRemoteSwiftPackageReference "EmojiPicker" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/izyumkin/MCEmojiPicker";
+			repositoryURL = "https://github.com/tyiu/EmojiPicker.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.2.3;
+				minimumVersion = 0.1.1;
 			};
 		};
 		4C06670228FC7EC500038D2A /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
@@ -4375,10 +4415,10 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		3AFE89C22BD4156F00AD31EF /* MCEmojiPicker */ = {
+		3A0A30BA2C21397A00F8C9BC /* EmojiPicker */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 3AFE89C12BD4156F00AD31EF /* XCRemoteSwiftPackageReference "MCEmojiPicker" */;
-			productName = MCEmojiPicker;
+			package = 3A0A30B92C21397A00F8C9BC /* XCRemoteSwiftPackageReference "EmojiPicker" */;
+			productName = EmojiPicker;
 		};
 		4C06670328FC7EC500038D2A /* Kingfisher */ = {
 			isa = XCSwiftPackageProductDependency;

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

@@ -1,6 +1,24 @@
 {
   "originHash" : "babaf4d5748afecf49bbb702530d8e9576460692f478b0a50ee43195dd4440e2",
   "pins" : [
+    {
+      "identity" : "emojikit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tyiu/EmojiKit",
+      "state" : {
+        "revision" : "05805f72d63a6d6a2d7dc7fe14abd37c1317b11a",
+        "version" : "0.1.2"
+      }
+    },
+    {
+      "identity" : "emojipicker",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tyiu/EmojiPicker.git",
+      "state" : {
+        "revision" : "0c28b4a1a6b8840cf2580bda59517f6d0a733dc8",
+        "version" : "0.1.1"
+      }
+    },
     {
       "identity" : "gsplayer",
       "kind" : "remoteSourceControl",
@@ -19,15 +37,6 @@
         "version" : "7.6.1"
       }
     },
-    {
-      "identity" : "mcemojipicker",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/izyumkin/MCEmojiPicker",
-      "state" : {
-        "revision" : "e0b4903b75ae1cc418d276d84d1cb946b8a1d73c",
-        "version" : "1.2.3"
-      }
-    },
     {
       "identity" : "secp256k1.swift",
       "kind" : "remoteSourceControl",
@@ -36,6 +45,15 @@
         "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",
@@ -62,6 +80,15 @@
         "version" : "509.0.0"
       }
     },
+    {
+      "identity" : "swift-trie",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tyiu/swift-trie",
+      "state" : {
+        "revision" : "4c50bff6c168f74425f70476be62a072980d2da7",
+        "version" : "0.1.2"
+      }
+    },
     {
       "identity" : "swipeactions",
       "kind" : "remoteSourceControl",

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

@@ -0,0 +1,38 @@
+{
+  "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/damoose.imageset/Contents.json

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

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

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

damus/Components/CustomPicker.swift

@@ -12,31 +12,25 @@ let RECTANGLE_GRADIENT = LinearGradient(gradient: Gradient(colors: [
     DamusColors.blue
 ]), startPoint: .leading, endPoint: .trailing)
 
-struct CustomPicker<SelectionValue: Hashable, Content: View>: View {
+struct CustomPicker<SelectionValue: Hashable>: 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(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
-                
+            ForEach(tabs, id: \.1) { (text, tag) in
                 Button {
                     withAnimation(.spring()) {
                         selection = tag
                     }
                 } label: {
-                    text
-                        .padding(EdgeInsets(top: 15, leading: 0, bottom: 10, trailing: 0))
+                    Text(text).padding(EdgeInsets(top: 15, leading: 0, bottom: 10, trailing: 0))
                         .font(.system(size: 14, weight: .heavy))
+                        .tag(tag)
                 }
                 .background(
                     Group {

damus/Components/DamusColors.swift

@@ -28,6 +28,7 @@ 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")

damus/Components/SelectableText.swift

@@ -9,16 +9,21 @@ import UIKit
 import SwiftUI
 
 struct SelectableText: View {
-    
+    let damus_state: DamusState
+    let event: NostrEvent?
     let attributedString: AttributedString
     let textAlignment: NSTextAlignment
-    
+    @State private var showHighlightPost = false
+    @State private var showMutePost = false
+    @State private var selectedText = ""
     @State private var selectedTextHeight: CGFloat = .zero
     @State private var selectedTextWidth: CGFloat = .zero
-    
+
     let size: EventViewKind
-    
-    init(attributedString: AttributedString, textAlignment: NSTextAlignment? = nil, size: EventViewKind) {
+
+    init(damus_state: DamusState, event: NostrEvent?, attributedString: AttributedString, textAlignment: NSTextAlignment? = nil, size: EventViewKind) {
+        self.damus_state = damus_state
+        self.event = event
         self.attributedString = attributedString
         self.textAlignment = textAlignment ?? NSTextAlignment.natural
         self.size = size
@@ -32,6 +37,10 @@ struct SelectableText: View {
                 font: eventviewsize_to_uifont(size),
                 fixedWidth: selectedTextWidth,
                 textAlignment: self.textAlignment,
+                enableHighlighting: self.enableHighlighting(),
+                showHighlightPost: $showHighlightPost,
+                showMutePost: $showMutePost,
+                selectedText: $selectedText,
                 height: $selectedTextHeight
             )
             .padding([.leading, .trailing], -1.0)
@@ -46,8 +55,66 @@ struct SelectableText: View {
                 self.selectedTextWidth = newSize.width
             }
         }
+        .sheet(isPresented: $showHighlightPost) {
+            if let event {
+                HighlightPostView(damus_state: damus_state, event: event, selectedText: $selectedText)
+                    .presentationDragIndicator(.visible)
+                    .presentationDetents([.height(selectedTextHeight + 150), .medium, .large])
+            }
+        }
+        .sheet(isPresented: $showMutePost) {
+            AddMuteItemView(state: damus_state, new_text: $selectedText)
+                .presentationDragIndicator(.visible)
+                .presentationDetents([.height(300), .medium, .large])
+        }
         .frame(height: selectedTextHeight)
     }
+    
+    func enableHighlighting() -> Bool {
+        self.event != nil
+    }
+}
+
+fileprivate class TextView: UITextView {
+    @Binding var showHighlightPost: Bool
+    @Binding var showMutePost: Bool
+    @Binding var selectedText: String
+
+    init(frame: CGRect, textContainer: NSTextContainer?, showHighlightPost: Binding<Bool>, showMutePost: Binding<Bool>, selectedText: Binding<String>) {
+        self._showHighlightPost = showHighlightPost
+        self._showMutePost = showMutePost
+        self._selectedText = selectedText
+        super.init(frame: frame, textContainer: textContainer)
+    }
+
+    required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+
+    override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
+        if action == #selector(highlightText(_:)) {
+            return true
+        }
+        
+        if action == #selector(muteText(_:)) {
+            return true
+        }
+        
+        return super.canPerformAction(action, withSender: sender)
+    }
+
+    @objc public func highlightText(_ sender: Any?) {
+        guard let selectedRange = self.selectedTextRange else { return }
+        selectedText = self.text(in: selectedRange) ?? ""
+        showHighlightPost.toggle()
+    }
+    
+    @objc public func muteText(_ sender: Any?) {
+        guard let selectedRange = self.selectedTextRange else { return }
+        selectedText = self.text(in: selectedRange) ?? ""
+        showMutePost.toggle()
+    }
+
 }
 
  fileprivate struct TextViewRepresentable: UIViewRepresentable {
@@ -57,11 +124,14 @@ struct SelectableText: View {
     let font: UIFont
     let fixedWidth: CGFloat
     let textAlignment: NSTextAlignment
-
+    let enableHighlighting: Bool
+    @Binding var showHighlightPost: Bool
+    @Binding var showMutePost: Bool
+    @Binding var selectedText: String
     @Binding var height: CGFloat
 
-    func makeUIView(context: UIViewRepresentableContext<Self>) -> UITextView {
-        let view = UITextView()
+    func makeUIView(context: UIViewRepresentableContext<Self>) -> TextView {
+        let view = TextView(frame: .zero, textContainer: nil, showHighlightPost: $showHighlightPost, showMutePost: $showMutePost, selectedText: $selectedText)
         view.isEditable = false
         view.dataDetectorTypes = .all
         view.isSelectable = true
@@ -71,10 +141,16 @@ struct SelectableText: View {
         view.textContainerInset.left = 1.0
         view.textContainerInset.right = 1.0
         view.textAlignment = textAlignment
+
+        let menuController = UIMenuController.shared
+        let highlightItem = UIMenuItem(title: "Highlight", action: #selector(view.highlightText(_:)))
+        let muteItem = UIMenuItem(title: "Mute", action: #selector(view.muteText(_:)))
+        menuController.menuItems = self.enableHighlighting ? [highlightItem, muteItem] : []
+
         return view
     }
 
-    func updateUIView(_ uiView: UITextView, context: UIViewRepresentableContext<Self>) {
+    func updateUIView(_ uiView: TextView, context: UIViewRepresentableContext<Self>) {
         let mutableAttributedString = createNSAttributedString()
         uiView.attributedText = mutableAttributedString
         uiView.textAlignment = self.textAlignment

damus/Components/TranslateView.swift

@@ -51,9 +51,9 @@ struct TranslateView: View {
                 .foregroundColor(.gray)
                 .font(.footnote)
                 .padding([.top, .bottom], 10)
-            
+
             if self.size == .selected {
-                SelectableText(attributedString: artifacts.content.attributed, size: self.size)
+                SelectableText(damus_state: damus_state, event: event, attributedString: artifacts.content.attributed, size: self.size)
             } else {
                 artifacts.content.text
                     .font(eventviewsize_to_font(self.size, font_size: font_size))

damus/ContentView.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 import AVKit
 import MediaPlayer
+import EmojiPicker
 
 struct ZapSheet {
     let target: ZapTarget
@@ -78,71 +79,15 @@ struct ContentView: View {
     @State var hide_bar: Bool = false
     @State var user_muted_confirm: Bool = false
     @State var confirm_overwrite_mutelist: Bool = false
-    @SceneStorage("ContentView.filter_state") var filter_state : FilterState = .posts_and_replies
     @State private var isSideBarOpened = false
     var home: HomeModel = HomeModel()
     @StateObject var navigationCoordinator: NavigationCoordinator = NavigationCoordinator()
     @AppStorage("has_seen_suggested_users") private var hasSeenOnboardingSuggestions = false
     let sub_id = UUID().description
-
-    @Environment(\.colorScheme) var colorScheme
     
     // connect retry timer
     let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
     
-    var mystery: some View {
-        Text("Are you lost?", comment: "Text asking the user if they are lost in the app.")
-        .id("what")
-    }
-
-    func content_filter(_ fstate: FilterState) -> ((NostrEvent) -> Bool) {
-        var filters = ContentFilters.defaults(damus_state: damus_state!)
-        filters.append(fstate.filter)
-        return ContentFilters(filters: filters).filter
-    }
-
-    var PostingTimelineView: some View {
-        VStack {
-            ZStack {
-                TabView(selection: $filter_state) {
-                    // This is needed or else there is a bug when switching from the 3rd or 2nd tab to first. no idea why.
-                    mystery
-                    
-                    contentTimelineView(filter: content_filter(.posts))
-                        .tag(FilterState.posts)
-                        .id(FilterState.posts)
-                    contentTimelineView(filter: content_filter(.posts_and_replies))
-                        .tag(FilterState.posts_and_replies)
-                        .id(FilterState.posts_and_replies)
-                }
-                .tabViewStyle(.page(indexDisplayMode: .never))
-                
-                if privkey != nil {
-                    PostButtonContainer(is_left_handed: damus_state?.settings.left_handed ?? false) {
-                        self.active_sheet = .post(.posting(.none))
-                    }
-                }
-            }
-        }
-        .safeAreaInset(edge: .top, spacing: 0) {
-            VStack(spacing: 0) {
-                CustomPicker(selection: $filter_state, content: {
-                    Text("Notes", comment: "Label for filter for seeing only notes (instead of notes and replies).").tag(FilterState.posts)
-                    Text("Notes & Replies", comment: "Label for filter for seeing notes and replies (instead of only notes).").tag(FilterState.posts_and_replies)
-                })
-                Divider()
-                    .frame(height: 1)
-            }
-            .background(colorScheme == .dark ? Color.black : Color.white)
-        }
-    }
-    
-    func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
-        TimelineView(events: home.events, loading: .constant(false), damus: damus_state, show_friend_icon: false, filter: filter) {
-            PullDownSearchView(state: damus_state, on_cancel: {})
-        }
-    }
-    
     func navIsAtRoot() -> Bool {
         return navigationCoordinator.isAtRoot()
     }
@@ -170,7 +115,7 @@ struct ContentView: View {
                 }
                 
             case .home:
-                PostingTimelineView
+                PostingTimelineView(damus_state: damus_state!, home: home, active_sheet: $active_sheet)
                 
             case .notifications:
                 NotificationsView(state: damus, notifications: home.notifications)
@@ -719,7 +664,8 @@ struct ContentView: View {
                                       music: MusicController(onChange: music_changed),
                                       video: VideoController(),
                                       ndb: ndb,
-                                      quote_reposts: .init(our_pubkey: pubkey)
+                                      quote_reposts: .init(our_pubkey: pubkey),
+                                      emoji_provider: DefaultEmojiProvider(showAllVariations: true)
         )
         
         home.damus_state = self.damus_state!

damus/Models/ContentFilters.swift

@@ -16,7 +16,7 @@ enum FilterState : Int {
     func filter(ev: NostrEvent) -> Bool {
         switch self {
         case .posts:
-            return ev.known_kind == .boost || !ev.is_reply()
+            return ev.known_kind == .boost || ev.known_kind == .highlight || !ev.is_reply()
         case .posts_and_replies:
             return true
         }

damus/Models/CreateAccountModel.swift

@@ -9,31 +9,31 @@ import Foundation
 
 
 class CreateAccountModel: ObservableObject {
-    @Published var real_name: String = ""
-    @Published var nick_name: String = ""
+    @Published var display_name: String = ""
+    @Published var name: String = ""
     @Published var about: String = ""
     @Published var pubkey: Pubkey = .empty
     @Published var privkey: Privkey = .empty
     @Published var profile_image: URL? = nil
 
     var rendered_name: String {
-        if real_name.isEmpty {
-            return nick_name
+        if display_name.isEmpty {
+            return name
         }
-        return real_name
+        return display_name
     }
     
     var keypair: Keypair {
         return Keypair(pubkey: self.pubkey, privkey: self.privkey)
     }
     
-    init(real: String = "", nick: String = "", about: String = "") {
+    init(display_name: String = "", name: String = "", about: String = "") {
         let keypair = generate_new_keypair()
         self.pubkey = keypair.pubkey
         self.privkey = keypair.privkey
 
-        self.real_name = real
-        self.nick_name = nick
+        self.display_name = display_name
+        self.name = name
         self.about = about
     }
 }

damus/Models/DamusState.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import LinkPresentation
+import EmojiPicker
 
 class DamusState: HeadlessDamusState {
     let pool: RelayPool
@@ -37,8 +38,9 @@ class DamusState: HeadlessDamusState {
     let ndb: Ndb
     var purple: DamusPurple
     var push_notification_client: PushNotificationClient
+    let emoji_provider: EmojiProvider
 
-    init(pool: RelayPool, keypair: Keypair, likes: EventCounter, boosts: EventCounter, contacts: Contacts, mutelist_manager: MutelistManager, profiles: Profiles, dms: DirectMessagesModel, previews: PreviewCache, zaps: Zaps, lnurls: LNUrls, settings: UserSettingsStore, relay_filters: RelayFilters, relay_model_cache: RelayModelCache, drafts: Drafts, events: EventCache, bookmarks: BookmarksManager, postbox: PostBox, bootstrap_relays: [RelayURL], replies: ReplyCounter, wallet: WalletModel, nav: NavigationCoordinator, music: MusicController?, video: VideoController, ndb: Ndb, purple: DamusPurple? = nil, quote_reposts: EventCounter) {
+    init(pool: RelayPool, keypair: Keypair, likes: EventCounter, boosts: EventCounter, contacts: Contacts, mutelist_manager: MutelistManager, profiles: Profiles, dms: DirectMessagesModel, previews: PreviewCache, zaps: Zaps, lnurls: LNUrls, settings: UserSettingsStore, relay_filters: RelayFilters, relay_model_cache: RelayModelCache, drafts: Drafts, events: EventCache, bookmarks: BookmarksManager, postbox: PostBox, bootstrap_relays: [RelayURL], replies: ReplyCounter, wallet: WalletModel, nav: NavigationCoordinator, music: MusicController?, video: VideoController, ndb: Ndb, purple: DamusPurple? = nil, quote_reposts: EventCounter, emoji_provider: EmojiProvider) {
         self.pool = pool
         self.keypair = keypair
         self.likes = likes
@@ -70,6 +72,7 @@ class DamusState: HeadlessDamusState {
         )
         self.quote_reposts = quote_reposts
         self.push_notification_client = PushNotificationClient(keypair: keypair, settings: settings)
+        self.emoji_provider = emoji_provider
     }
 
     @discardableResult
@@ -135,7 +138,8 @@ class DamusState: HeadlessDamusState {
             music: nil,
             video: VideoController(),
             ndb: .empty,
-            quote_reposts: .init(our_pubkey: empty_pub)
+            quote_reposts: .init(our_pubkey: empty_pub),
+            emoji_provider: DefaultEmojiProvider(showAllVariations: true)
         )
     }
 }

damus/Models/HighlightEvent.swift

@@ -0,0 +1,34 @@
+//
+//  HighlightEvent.swift
+//  damus
+//
+//  Created by eric on 4/22/24.
+//
+
+import Foundation
+
+struct HighlightEvent {
+    let event: NostrEvent
+
+    var event_ref: String? = nil
+    var url_ref: URL? = nil
+    var context: String? = nil
+
+    static func parse(from ev: NostrEvent) -> HighlightEvent {
+        var highlight = HighlightEvent(event: ev)
+
+        for tag in ev.tags {
+            guard tag.count >= 2 else { continue }
+            switch tag[0].string() {
+            case "e":   highlight.event_ref = tag[1].string()
+            case "a":   highlight.event_ref = tag[1].string()
+            case "r":   highlight.url_ref = URL(string: tag[1].string())
+            case "context": highlight.context = tag[1].string()
+            default:
+                break
+            }
+        }
+
+        return highlight
+    }
+}

damus/Models/HomeModel.swift

@@ -184,7 +184,7 @@ class HomeModel: ContactsDelegate {
         }
 
         switch kind {
-        case .chat, .longform, .text:
+        case .chat, .longform, .text, .highlight:
             handle_text_event(sub_id: sub_id, ev)
         case .contacts:
             handle_contact_event(sub_id: sub_id, relay_id: relay_id, ev: ev)
@@ -586,7 +586,7 @@ class HomeModel: ContactsDelegate {
     func subscribe_to_home_filters(friends fs: [Pubkey]? = nil, relay_id: RelayURL? = nil) {
         // TODO: separate likes?
         var home_filter_kinds: [NostrKind] = [
-            .text, .longform, .boost
+            .text, .longform, .boost, .highlight
         ]
         if !damus_state.settings.onlyzaps_mode {
             home_filter_kinds.append(.like)

damus/Models/MutelistManager.swift

@@ -111,12 +111,16 @@ class MutelistManager {
     private func add_mute_item(_ item: MuteItem) {
         switch item {
         case .user(_, _):
+            guard !users.contains(item) else { return }
             users.insert(item)
         case .hashtag(_, _):
+            guard !hashtags.contains(item) else { return }
             hashtags.insert(item)
         case .word(_, _):
+            guard !words.contains(item) else { return }
             words.insert(item)
         case .thread(_, _):
+            guard !threads.contains(item) else { return }
             threads.insert(item)
         }
     }

damus/Models/ProfileModel.swift

@@ -60,11 +60,11 @@ class ProfileModel: ObservableObject, Equatable {
         damus.pool.unsubscribe(sub_id: sub_id)
         damus.pool.unsubscribe(sub_id: prof_subid)
     }
-    
+
     func subscribe() {
-        var text_filter = NostrFilter(kinds: [.text, .longform])
+        var text_filter = NostrFilter(kinds: [.text, .longform, .highlight])
         var profile_filter = NostrFilter(kinds: [.contacts, .metadata, .boost])
-        
+
         profile_filter.authors = [pubkey]
         
         text_filter.authors = [pubkey]

damus/Models/PushNotificationClient.swift

@@ -11,6 +11,10 @@ struct PushNotificationClient {
     let keypair: Keypair
     let settings: UserSettingsStore
     private(set) var device_token: Data? = nil
+    var device_token_hex: String? {
+        guard let device_token else { return nil }
+        return device_token.map { String(format: "%02.2hhx", $0) }.joined()
+    }
     
     mutating func set_device_token(new_device_token: Data) async throws {
         self.device_token = new_device_token
@@ -20,26 +24,21 @@ struct PushNotificationClient {
     }
     
     func send_token() async throws {
-        guard let device_token else { return }
         // Send the device token and pubkey to the server
-        let token = device_token.map { String(format: "%02.2hhx", $0) }.joined()
+        guard let token = device_token_hex else { return }
         
         Log.info("Sending device token to server: %s", for: .push_notifications, token)
 
-        let pubkey = self.keypair.pubkey
-
-        // Send those as JSON to the server
-        let json: [String: Any] = ["deviceToken": token, "pubkey": pubkey.hex()]
-
         // create post request
-        let url = self.settings.send_device_token_to_localhost ? Constants.DEVICE_TOKEN_RECEIVER_TEST_URL : Constants.DEVICE_TOKEN_RECEIVER_PRODUCTION_URL
-        let json_data = try JSONSerialization.data(withJSONObject: json)
-        
+        let url = self.current_push_notification_environment().api_base_url()
+            .appendingPathComponent("user-info")
+            .appendingPathComponent(self.keypair.pubkey.hex())
+            .appendingPathComponent(token)
         
         let (data, response) = try await make_nip98_authenticated_request(
-            method: .post,
+            method: .put,
             url: url,
-            payload: json_data,
+            payload: nil,
             payload_type: .json,
             auth_keypair: self.keypair
         )
@@ -58,26 +57,23 @@ struct PushNotificationClient {
     }
     
     func revoke_token() async throws {
-        guard let device_token else { return }
-        // Send the device token and pubkey to the server
-        let token = device_token.map { String(format: "%02.2hhx", $0) }.joined()
+        guard let token = device_token_hex else { return }
         
         Log.info("Revoking device token from server: %s", for: .push_notifications, token)
 
         let pubkey = self.keypair.pubkey
 
-        // Send those as JSON to the server
-        let json: [String: Any] = ["deviceToken": token, "pubkey": pubkey.hex()]
-
         // create post request
-        let url = self.settings.send_device_token_to_localhost ? Constants.DEVICE_TOKEN_REVOKER_TEST_URL : Constants.DEVICE_TOKEN_REVOKER_PRODUCTION_URL
-        let json_data = try JSONSerialization.data(withJSONObject: json)
+        let url = self.current_push_notification_environment().api_base_url()
+            .appendingPathComponent("user-info")
+            .appendingPathComponent(pubkey.hex())
+            .appendingPathComponent(token)
         
         
         let (data, response) = try await make_nip98_authenticated_request(
-            method: .post,
+            method: .delete,
             url: url,
-            payload: json_data,
+            payload: nil,
             payload_type: .json,
             auth_keypair: self.keypair
         )
@@ -94,6 +90,78 @@ struct PushNotificationClient {
         
         return
     }
+    
+    func set_settings(_ new_settings: NotificationSettings? = nil) async throws {
+        // Send the device token and pubkey to the server
+        guard let token = device_token_hex else { return }
+        
+        Log.info("Sending notification preferences to the server", for: .push_notifications)
+
+        let url = self.current_push_notification_environment().api_base_url()
+            .appendingPathComponent("user-info")
+            .appendingPathComponent(self.keypair.pubkey.hex())
+            .appendingPathComponent(token)
+            .appendingPathComponent("preferences")
+
+        let json_payload = try JSONEncoder().encode(new_settings ?? NotificationSettings.from(settings: settings))
+        
+        let (data, response) = try await make_nip98_authenticated_request(
+            method: .put,
+            url: url,
+            payload: json_payload,
+            payload_type: .json,
+            auth_keypair: self.keypair
+        )
+        
+        if let httpResponse = response as? HTTPURLResponse {
+            switch httpResponse.statusCode {
+                case 200:
+                    Log.info("Sent notification settings to Damus push notification server successfully", for: .push_notifications)
+                default:
+                    Log.error("Error in sending notification settings to Damus push notification server. HTTP status code: %d; Response: %s", for: .push_notifications, httpResponse.statusCode, String(data: data, encoding: .utf8) ?? "Unknown")
+                    throw ClientError.http_response_error(status_code: httpResponse.statusCode, response: data)
+            }
+        }
+        
+        return
+    }
+    
+    func get_settings() async throws -> NotificationSettings {
+        // Send the device token and pubkey to the server
+        guard let token = device_token_hex else {
+            throw ClientError.no_device_token
+        }
+
+        let url = self.current_push_notification_environment().api_base_url()
+            .appendingPathComponent("user-info")
+            .appendingPathComponent(self.keypair.pubkey.hex())
+            .appendingPathComponent(token)
+            .appendingPathComponent("preferences")
+        
+        let (data, response) = try await make_nip98_authenticated_request(
+            method: .get,
+            url: url,
+            payload: nil,
+            payload_type: .json,
+            auth_keypair: self.keypair
+        )
+        
+        if let httpResponse = response as? HTTPURLResponse {
+            switch httpResponse.statusCode {
+                case 200:
+                    guard let notification_settings = NotificationSettings.from(json_data: data) else { throw ClientError.json_decoding_error }
+                    return notification_settings
+                default:
+                    Log.error("Error in getting notification settings to Damus push notification server. HTTP status code: %d; Response: %s", for: .push_notifications, httpResponse.statusCode, String(data: data, encoding: .utf8) ?? "Unknown")
+                    throw ClientError.http_response_error(status_code: httpResponse.statusCode, response: data)
+            }
+        }
+        throw ClientError.could_not_process_response
+    }
+    
+    func current_push_notification_environment() -> Environment {
+        return self.settings.send_device_token_to_localhost ? .local_test(host: nil) : .production
+    }
 }
 
 // MARK: Helper structures
@@ -101,5 +169,111 @@ struct PushNotificationClient {
 extension PushNotificationClient {
     enum ClientError: Error {
         case http_response_error(status_code: Int, response: Data)
+        case could_not_process_response
+        case no_device_token
+        case json_decoding_error
+    }
+    
+    struct NotificationSettings: Codable, Equatable {
+        let zap_notifications_enabled: Bool
+        let mention_notifications_enabled: Bool
+        let repost_notifications_enabled: Bool
+        let reaction_notifications_enabled: Bool
+        let dm_notifications_enabled: Bool
+        let only_notifications_from_following_enabled: Bool
+        
+        static func from(json_data: Data) -> Self? {
+            guard let decoded = try? JSONDecoder().decode(Self.self, from: json_data) else { return nil }
+            return decoded
+        }
+        
+        static func from(settings: UserSettingsStore) -> Self {
+            return NotificationSettings(
+                zap_notifications_enabled: settings.zap_notification,
+                mention_notifications_enabled: settings.mention_notification,
+                repost_notifications_enabled: settings.repost_notification,
+                reaction_notifications_enabled: settings.like_notification,
+                dm_notifications_enabled: settings.dm_notification,
+                only_notifications_from_following_enabled: settings.notification_only_from_following
+            )
+        }
+        
+    }
+    
+    enum Environment: CaseIterable, Codable, Identifiable, StringCodable, Equatable, Hashable {
+        static var allCases: [Environment] = [.local_test(host: nil), .production]
+        
+        case local_test(host: String?)
+        case production
+
+        func text_description() -> String {
+            switch self {
+                case .local_test:
+                    return NSLocalizedString("Test (local)", comment: "Label indicating a local test environment for Push notification functionality (Developer feature)")
+                case .production:
+                    return NSLocalizedString("Production", comment: "Label indicating the production environment for Push notification functionality")
+            }
+        }
+
+        func api_base_url() -> URL {
+            switch self {
+                case .local_test(let host):
+                    URL(string: "http://\(host ?? "localhost:8000")") ?? Constants.PUSH_NOTIFICATION_SERVER_TEST_BASE_URL
+                case .production:
+                    Constants.PURPLE_API_PRODUCTION_BASE_URL
+                    
+            }
+        }
+        
+        func custom_host() -> String? {
+            switch self {
+                case .local_test(let host):
+                    return host
+                default:
+                    return nil
+            }
+        }
+
+        init?(from string: String) {
+            switch string {
+                case "local_test":
+                    self = .local_test(host: nil)
+                case "production":
+                    self = .production
+                default:
+                    let components = string.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: false)
+                    if components.count == 2 && components[0] == "local_test" {
+                        self = .local_test(host: String(components[1]))
+                    } else {
+                        return nil
+                    }
+            }
+        }
+
+        func to_string() -> String {
+            switch self {
+                case .local_test(let host):
+                    if let host {
+                        return "local_test:\(host)"
+                    }
+                    return "local_test"
+                case .production:
+                    return "production"
+            }
+        }
+
+        var id: String {
+            switch self {
+                case .local_test(let host):
+                    if let host {
+                        return "local_test:\(host)"
+                    }
+                    else {
+                        return "local_test"
+                    }
+                case .production:
+                    return "production"
+            }
+        }
     }
 }

damus/Models/SearchModel.swift

@@ -36,7 +36,7 @@ class SearchModel: ObservableObject {
     func subscribe() {
         // since 1 month
         search.limit = self.limit
-        search.kinds = [.text, .like, .longform]
+        search.kinds = [.text, .like, .longform, .highlight]
 
         //likes_filter.ids = ref_events.referenced_ids!
 

damus/Models/ThreadModel.swift

@@ -11,13 +11,15 @@ import Foundation
 class ThreadModel: ObservableObject {
     @Published var event: NostrEvent
     let original_event: NostrEvent
+    let highlight: String?
     var event_map: Set<NostrEvent>
     
-    init(event: NostrEvent, damus_state: DamusState) {
+    init(event: NostrEvent, damus_state: DamusState, highlight: String? = nil) {
         self.damus_state = damus_state
         self.event_map = Set()
         self.event = event
         self.original_event = event
+        self.highlight = highlight
         add_event(event, keypair: damus_state.keypair)
     }
 

damus/Nostr/NostrKind.swift

@@ -22,6 +22,7 @@ enum NostrKind: UInt32, Codable {
     case longform = 30023
     case zap = 9735
     case zap_request = 9734
+    case highlight = 9802
     case nwc_request = 23194
     case nwc_response = 23195
     case http_auth = 27235

damus/TestData.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import EmojiPicker
 
 
 let test_seckey = Privkey(Data([0xe0, 0xaa, 0x60, 0x26, 0x08, 0x18, 0xac, 0x10, 0x03, 0x86, 0x4d, 0x15, 0x24, 0x9a, 0xf7, 0xa3, 0x3e, 0x4f, 0x1f, 0xc9, 0x01, 0xcf, 0xee, 0xa9, 0xb4, 0x77, 0xc7, 0x07, 0x22, 0xb7, 0x25, 0xfd]))
@@ -35,6 +36,13 @@ let test_short_note =
             createdAt: UInt32(Date().timeIntervalSince1970 - 100)
         )!
 
+let test_super_short_note =
+        NostrEvent(
+            content: "A",
+            keypair: jack_keypair,
+            createdAt: UInt32(Date().timeIntervalSince1970 - 100)
+        )!
+
 let test_note_json_with_escaped_slash = "{\"tags\":[],\"pubkey\":\"f8e6c64342f1e052480630e27e1016dce35fc3a614e60434fef4aa2503328ca9\",\"content\":\"https:\\/\\/cdn.nostr.build\\/i\\/5c1d3296f66c2630131bf123106486aeaf051ed8466031c0e0532d70b33cddb2.jpg\",\"created_at\":1691864981,\"kind\":1,\"sig\":\"fc0033aa3d4df50b692a5b346fa816fdded698de2045e36e0642a021391468c44ca69c2471adc7e92088131872d4aaa1e90ea6e1ad97f3cc748f4aed96dfae18\",\"id\":\"e8f6eca3b161abba034dac9a02bb6930ecde9fd2fb5d6c5f22a05526e11382cb\"}"
 let test_encoded_note_with_image = NostrEvent.owned_from_json(json: test_note_json_with_escaped_slash)
 
@@ -100,7 +108,8 @@ var test_damus_state: DamusState = ({
                            music: .init(onChange: {_ in }),
                            video: .init(),
                            ndb: ndb,
-                           quote_reposts: .init(our_pubkey: our_pubkey)
+                           quote_reposts: .init(our_pubkey: our_pubkey),
+                           emoji_provider: DefaultEmojiProvider(showAllVariations: true)
     )
 
     /*

damus/Util/Constants.swift

@@ -10,13 +10,13 @@ import Foundation
 class Constants {
     //static let EXAMPLE_DEMOS: DamusState = .empty
     static let DAMUS_APP_GROUP_IDENTIFIER: String = "group.com.damus"
-    static let DEVICE_TOKEN_RECEIVER_PRODUCTION_URL: URL = URL(string: "https://notify.damus.io:8000/user-info")!
-    static let DEVICE_TOKEN_RECEIVER_TEST_URL: URL = URL(string: "http://localhost:8000/user-info")!
-    static let DEVICE_TOKEN_REVOKER_PRODUCTION_URL: URL = URL(string: "https://notify.damus.io:8000/user-info/remove")!
-    static let DEVICE_TOKEN_REVOKER_TEST_URL: URL = URL(string: "http://localhost:8000/user-info/remove")!
     static let MAIN_APP_BUNDLE_IDENTIFIER: String = "com.jb55.damus2"
     static let NOTIFICATION_EXTENSION_BUNDLE_IDENTIFIER: String = "com.jb55.damus2.DamusNotificationService"
     
+    // MARK: Push notification server
+    static let PUSH_NOTIFICATION_SERVER_PRODUCTION_BASE_URL: URL = URL(string: "http://45.33.32.5:8000")!
+    static let PUSH_NOTIFICATION_SERVER_TEST_BASE_URL: URL = URL(string: "http://localhost:8000")!
+    
     // MARK: Purple
     // API
     static let PURPLE_API_LOCAL_TEST_BASE_URL: URL = URL(string: "http://localhost:8989")!

damus/Util/Images/ImageMetadata.swift

@@ -60,7 +60,8 @@ struct ImageMetadata: Equatable {
 
 func process_blurhash(blurhash: String, size: CGSize?) async -> UIImage? {
     let res = Task.detached(priority: .low) {
-        let size = get_blurhash_size(img_size: size ?? CGSize(width: 100.0, height: 100.0))
+        let default_size = CGSize(width: 100.0, height: 100.0)
+        let size = get_blurhash_size(img_size: size ?? default_size) ?? default_size
         guard let img = UIImage.init(blurHash: blurhash, size: size) else {
             let noimg: UIImage? = nil
             return noimg
@@ -135,7 +136,8 @@ extension UIImage {
     }
 }
 
-func get_blurhash_size(img_size: CGSize) -> CGSize {
+func get_blurhash_size(img_size: CGSize) -> CGSize? {
+    guard img_size.width > 0 && img_size.height > 0 else { return nil }
     return CGSize(width: 100.0, height: (100.0/img_size.width) * img_size.height)
 }
 
@@ -145,7 +147,7 @@ func calculate_blurhash(img: UIImage) async -> String? {
     }
     
     let res = Task.detached(priority: .low) {
-        let bhs = get_blurhash_size(img_size: img.size)
+        let bhs = get_blurhash_size(img_size: img.size) ?? CGSize(width: 100.0, height: 100.0)
         let smaller = img.resized(to: bhs)
         
         guard let blurhash = smaller.blurHash(numberOfComponents: (5,5)) else {

damus/Util/Router.swift

@@ -85,7 +85,7 @@ enum Route: Hashable {
         case .TranslationSettings(let settings):
             TranslationSettingsView(settings: settings, damus_state: damusState)
         case .ReactionsSettings(let settings):
-            ReactionsSettingsView(settings: settings)
+            ReactionsSettingsView(settings: settings, damus_state: damusState)
         case .SearchSettings(let settings):
             SearchSettingsView(settings: settings)
         case .DeveloperSettings(let settings):

damus/Views/ActionBar/EventActionBar.swift

@@ -6,7 +6,8 @@
 //
 
 import SwiftUI
-import MCEmojiPicker
+import EmojiPicker
+import EmojiKit
 import SwipeActions
 
 struct EventActionBar: View {
@@ -22,7 +23,7 @@ struct EventActionBar: View {
     @State var show_share_action: Bool = false
     @State var show_repost_action: Bool = false
 
-    @State private var isOnTopHalfOfScreen: Bool = false
+    @State private var selectedEmoji: Emoji? = nil
 
     @ObservedObject var bar: ActionBarModel
     
@@ -126,7 +127,7 @@ struct EventActionBar: View {
     
     var like_button: some View {
         HStack(spacing: 4) {
-            LikeButton(damus_state: damus_state, liked: bar.liked, liked_emoji: bar.our_like != nil ? to_reaction_emoji(ev: bar.our_like!) : nil, isOnTopHalfOfScreen: $isOnTopHalfOfScreen) { emoji in
+            LikeButton(damus_state: damus_state, liked: bar.liked, liked_emoji: bar.our_like != nil ? to_reaction_emoji(ev: bar.our_like!) : nil) { emoji in
                 if bar.liked {
                     //notify(.delete, bar.our_like)
                 } else {
@@ -257,20 +258,6 @@ struct EventActionBar: View {
                 self.bar.our_like = liked.event
             }
         }
-        .background(
-            GeometryReader { geometry in
-                EmptyView()
-                    .onAppear {
-                        let eventActionBarY = geometry.frame(in: .global).midY
-                        let screenMidY = UIScreen.main.bounds.midY
-                        self.isOnTopHalfOfScreen = eventActionBarY > screenMidY
-                    }
-                    .onChange(of: geometry.frame(in: .global).midY) { newY in
-                        let screenMidY = UIScreen.main.bounds.midY
-                        self.isOnTopHalfOfScreen = newY > screenMidY
-                    }
-            }
-        )
     }
 
     func send_like(emoji: String) {
@@ -315,7 +302,6 @@ struct LikeButton: View {
     let damus_state: DamusState
     let liked: Bool
     let liked_emoji: String?
-    @Binding var isOnTopHalfOfScreen: Bool
     let action: (_ emoji: String) -> Void
 
     // For reactions background
@@ -324,7 +310,7 @@ struct LikeButton: View {
 
     @State private var isReactionsVisible = false
 
-    @State private var selectedEmoji: String = ""
+    @State private var selectedEmoji: Emoji?
 
     // Following four are Shaka animation properties
     let timer = Timer.publish(every: 0.10, on: .main, in: .common).autoconnect()
@@ -363,6 +349,11 @@ struct LikeButton: View {
                     .foregroundColor(.gray)
             }
         }
+        .sheet(isPresented: $isReactionsVisible) {
+            NavigationView {
+                EmojiPickerView(selectedEmoji: $selectedEmoji, emojiProvider: damus_state.emoji_provider)
+            }.presentationDetents([.medium, .large])
+        }
         .accessibilityLabel(NSLocalizedString("Like", comment: "Accessibility Label for Like button"))
         .rotationEffect(Angle(degrees: shouldAnimate ? rotationAngle : 0))
         .onReceive(self.timer) { _ in
@@ -377,14 +368,10 @@ struct LikeButton: View {
                 amountOfAngleIncrease = 20.0
             }
         })
-        .emojiPicker(
-            isPresented: $isReactionsVisible,
-            selectedEmoji: $selectedEmoji,
-            arrowDirection: isOnTopHalfOfScreen ? .down : .up,
-            isDismissAfterChoosing: true
-        )
         .onChange(of: selectedEmoji) { newSelectedEmoji in
-            self.action(newSelectedEmoji)
+            if let newSelectedEmoji {
+                self.action(newSelectedEmoji.value)
+            }
         }
     }
 

damus/Views/BannerImageView.swift

@@ -13,7 +13,7 @@ struct EditBannerImageView: View {
     var damus_state: DamusState
     @ObservedObject var viewModel: ImageUploadingObserver
     let callback: (URL?) -> Void
-    let defaultImage = UIImage(named: "profile-banner") ?? UIImage()
+    let defaultImage = UIImage(named: "damoose") ?? UIImage()
     
     @State var banner_image: URL? = nil
 
@@ -38,7 +38,7 @@ struct EditBannerImageView: View {
 struct InnerBannerImageView: View {
     let disable_animation: Bool
     let url: URL?
-    let defaultImage = UIImage(named: "profile-banner") ?? UIImage()
+    let defaultImage = UIImage(named: "damoose") ?? UIImage()
 
     var body: some View {
         ZStack {

damus/Views/Chat/ChatBubbleView.swift

@@ -165,7 +165,7 @@ struct ChatBubble<T: View, U: ShapeStyle, V: View>: View {
             stroke_style: .init(lineWidth: 4),
             background_style: Color.accentColor
         ) {
-            Text("Hello there")
+            Text(verbatim: "Hello there")
                 .padding()
         }
         .foregroundColor(.white)
@@ -176,7 +176,7 @@ struct ChatBubble<T: View, U: ShapeStyle, V: View>: View {
             stroke_style: .init(lineWidth: 4),
             background_style: Color.accentColor
         ) {
-            Text("Hello there")
+            Text(verbatim: "Hello there")
                 .padding()
         }
         .foregroundColor(.white)

damus/Views/Chat/ChatEventView.swift

@@ -6,7 +6,8 @@
 //
 
 import SwiftUI
-import MCEmojiPicker
+import EmojiKit
+import EmojiPicker
 import SwipeActions
 
 fileprivate let CORNER_RADIUS: CGFloat = 10
@@ -30,18 +31,23 @@ struct ChatEventView: View {
     @State var long_press_bounce_work_item: DispatchWorkItem?
     @State var popover_state: PopoverState = .closed {
         didSet {
-            let generator = UIImpactFeedbackGenerator(style: popover_state == .open_emoji_selector ? .heavy : .light)
+            let generator = UIImpactFeedbackGenerator(style: popover_state.some_sheet_open() ? .heavy : .light)
             generator.impactOccurred()
         }
     }
-    @State var selected_emoji: String = ""
-    
+    @State var selected_emoji: Emoji?
+
     @State private var isOnTopHalfOfScreen: Bool = false
     @ObservedObject var bar: ActionBarModel
     
     enum PopoverState: String {
         case closed
         case open_emoji_selector
+        case open_zap_sheet
+
+        func some_sheet_open() -> Bool {
+            return self == .open_zap_sheet || self == .open_emoji_selector
+        }
     }
 
     var just_started: Bool {
@@ -89,9 +95,22 @@ struct ChatEventView: View {
     var by_other_user: Bool {
         return event.pubkey != damus_state.pubkey
     }
-    
+
     var is_ours: Bool { return !by_other_user }
-    
+
+    // MARK: Zapping properties
+
+    var lnurl: String? {
+        damus_state.profiles.lookup_with_timestamp(event.pubkey)?.map({ pr in
+            pr?.lnurl
+        }).value
+    }
+    var zap_target: ZapTarget {
+        ZapTarget.note(id: event.id, author: event.pubkey)
+    }
+
+    // MARK: Views
+
     var event_bubble: some View {
         ChatBubble(
             direction: is_ours ? .right : .left,
@@ -106,6 +125,7 @@ struct ChatEventView: View {
                             .onTapGesture {
                                 show_profile_action_sheet_if_enabled(damus_state: damus_state, pubkey: event.pubkey)
                             }
+                            .lineLimit(1)
                         Text(verbatim: "\(format_relative_time(event.created_at))")
                             .foregroundColor(.gray)
                     }
@@ -123,13 +143,18 @@ struct ChatEventView: View {
                 }
                 
                 let blur_images = should_blur_images(settings: damus_state.settings, contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
-                NoteContentView(damus_state: damus_state, event: event, blur_images: blur_images, size: .normal, options: [])
+                NoteContentView(damus_state: damus_state, event: event, blur_images: blur_images, size: .normal, options: [.truncate_content])
                     .padding(2)
+                if let mention = first_eref_mention(ev: event, keypair: damus_state.keypair) {
+                    MentionView(damus_state: damus_state, mention: mention)
+                        .background(DamusColors.adaptableWhite)
+                        .clipShape(RoundedRectangle(cornerSize: CGSize(width: 10, height: 10)))
+                }
             }
-            .frame(minWidth: 150, alignment: is_ours ? .trailing : .leading)
+            .frame(minWidth: 5, alignment: is_ours ? .trailing : .leading)
             .padding(10)
         }
-        .tint(is_ours ? Color.white : Color.accentColor)
+        .tint(Color.accentColor)
         .overlay(
             ZStack(alignment: is_ours ? .bottomLeading : .bottomTrailing) {
                 VStack {
@@ -154,25 +179,32 @@ struct ChatEventView: View {
     var event_bubble_with_long_press_interaction: some View {
         ZStack(alignment: is_ours ? .bottomLeading : .bottomTrailing) {
             self.event_bubble
-                .emojiPicker(
-                    isPresented: Binding(get: { popover_state == .open_emoji_selector }, set: { new_state in
-                        withAnimation(new_state == true ? .easeIn(duration: 0.5) : .easeOut(duration: 0.1)) {
-                            popover_state = new_state == true ? .open_emoji_selector : .closed
-                        }
-                    }),
-                    selectedEmoji: $selected_emoji,
-                    arrowDirection: isOnTopHalfOfScreen ? .down : .up,
-                    isDismissAfterChoosing: false
-                )
+                .sheet(isPresented: Binding(get: { popover_state == .open_emoji_selector }, set: { new_state in
+                    withAnimation(new_state == true ? .easeIn(duration: 0.5) : .easeOut(duration: 0.1)) {
+                        popover_state = new_state == true ? .open_emoji_selector : .closed
+                    }
+                })) {
+                    NavigationView {
+                        EmojiPickerView(selectedEmoji: $selected_emoji, emojiProvider: damus_state.emoji_provider)
+                    }.presentationDetents([.medium, .large])
+                }
+                .sheet(isPresented: Binding(get: { popover_state == .open_zap_sheet }, set: { new_state in
+                    withAnimation(new_state == true ? .easeIn(duration: 0.5) : .easeOut(duration: 0.1)) {
+                        popover_state = new_state == true ? .open_zap_sheet : .closed
+                    }
+                })) {
+                    ZapSheetViewIfPossible(damus_state: damus_state, target: zap_target, lnurl: lnurl)
+                        .presentationDetents([.medium, .large])
+                }
                 .onChange(of: selected_emoji) { newSelectedEmoji in
-                    if newSelectedEmoji != "" {
-                        send_like(emoji: newSelectedEmoji)
+                    if let newSelectedEmoji {
+                        send_like(emoji: newSelectedEmoji.value)
                         popover_state = .closed
                     }
                 }
         }
-        .scaleEffect(self.popover_state == .open_emoji_selector ? 1.08 : is_pressing ? 1.02 : 1)
-        .shadow(color: (is_pressing || self.popover_state == .open_emoji_selector) ? .black.opacity(0.1) : .black.opacity(0.3), radius: (is_pressing || self.popover_state == .open_emoji_selector) ? 8 : 0, y: (is_pressing || self.popover_state == .open_emoji_selector) ? 15 : 0)
+        .scaleEffect(self.popover_state.some_sheet_open() ? 1.08 : is_pressing ? 1.02 : 1)
+        .shadow(color: (is_pressing || self.popover_state.some_sheet_open()) ? .black.opacity(0.1) : .black.opacity(0.3), radius: (is_pressing || self.popover_state.some_sheet_open()) ? 8 : 0, y: (is_pressing || self.popover_state.some_sheet_open()) ? 15 : 0)
         .onLongPressGesture(minimumDuration: 0.5, maximumDistance: 10, perform: {
             long_press_bounce_work_item?.cancel()
         }, onPressingChanged: { is_pressing in
@@ -186,7 +218,8 @@ struct ChatEventView: View {
                         // Ensure the action is performed only if the condition is still valid
                         if self.is_pressing {
                             withAnimation(.bouncy(duration: 0.2, extraBounce: 0.35)) {
-                                popover_state = .open_emoji_selector
+                                let should_show_zap_sheet = !damus_state.settings.nozaps && damus_state.settings.onlyzaps_mode
+                                popover_state = should_show_zap_sheet ? .open_zap_sheet : .open_emoji_selector
                             }
                         }
                     }
@@ -254,13 +287,25 @@ struct ChatEventView: View {
             SwipeView {
                 self.event_bubble_with_long_press_interaction
             } leadingActions: { context in
-                EventActionBar(
-                    damus_state: damus_state,
-                    event: event,
-                    bar: bar,
-                    options: is_ours ? [.swipe_action_menu_reverse] : [.swipe_action_menu],
-                    swipe_context: context
-                )
+                if !is_ours {
+                    EventActionBar(
+                        damus_state: damus_state,
+                        event: event,
+                        bar: bar,
+                        options: is_ours ? [.swipe_action_menu_reverse] : [.swipe_action_menu],
+                        swipe_context: context
+                    )
+                }
+            } trailingActions: { context in
+                if is_ours {
+                    EventActionBar(
+                        damus_state: damus_state,
+                        event: event,
+                        bar: bar,
+                        options: is_ours ? [.swipe_action_menu_reverse] : [.swipe_action_menu],
+                        swipe_context: context
+                    )
+                }
             }
             .swipeSpacing(-20)
             .swipeActionsStyle(.mask)
@@ -322,3 +367,8 @@ extension Notification.Name {
     let bar = make_actionbar_model(ev: test_note.id, damus: test_damus_state)
     return ChatEventView(event: test_short_note, selected_event: test_note, prev_ev: nil, next_ev: nil, damus_state: test_damus_state, thread: ThreadModel(event: test_note, damus_state: test_damus_state), scroll_to_event: nil, focus_event: nil, highlight_bubble: true, bar: bar)
 }
+
+#Preview {
+    let bar = make_actionbar_model(ev: test_note.id, damus: test_damus_state)
+    return ChatEventView(event: test_super_short_note, selected_event: test_note, prev_ev: nil, next_ev: nil, damus_state: test_damus_state, thread: ThreadModel(event: test_note, damus_state: test_damus_state), scroll_to_event: nil, focus_event: nil, highlight_bubble: false, bar: bar)
+}

damus/Views/CodeScanner/ScannerViewController.swift

@@ -182,25 +182,6 @@ extension CodeScannerView {
                 delegate?.didFail(reason: .badOutput)
                 return
             }
-        }
-
-        override public func viewWillLayoutSubviews() {
-            previewLayer?.frame = view.layer.bounds
-        }
-
-        @objc func updateOrientation() {
-            guard let orientation = view.window?.windowScene?.interfaceOrientation else { return }
-            guard let connection = captureSession.connections.last, connection.isVideoOrientationSupported else { return }
-            connection.videoOrientation = AVCaptureVideoOrientation(rawValue: orientation.rawValue) ?? .portrait
-        }
-
-        override public func viewDidAppear(_ animated: Bool) {
-            super.viewDidAppear(animated)
-            updateOrientation()
-        }
-
-        override public func viewWillAppear(_ animated: Bool) {
-            super.viewWillAppear(animated)
 
             if previewLayer == nil {
                 previewLayer = AVCaptureVideoPreviewLayer(session: captureSession)
@@ -220,6 +201,21 @@ extension CodeScannerView {
             }
         }
 
+        override public func viewWillLayoutSubviews() {
+            previewLayer?.frame = view.layer.bounds
+        }
+
+        @objc func updateOrientation() {
+            guard let orientation = view.window?.windowScene?.interfaceOrientation else { return }
+            guard let connection = captureSession.connections.last, connection.isVideoOrientationSupported else { return }
+            connection.videoOrientation = AVCaptureVideoOrientation(rawValue: orientation.rawValue) ?? .portrait
+        }
+
+        override public func viewDidAppear(_ animated: Bool) {
+            super.viewDidAppear(animated)
+            updateOrientation()
+        }
+
         private func addviewfinder() {
             guard showViewfinder, let imageView = viewFinder else { return }
 

damus/Views/CreateAccountView.swift

@@ -25,68 +25,44 @@ struct CreateAccountView: View {
     var body: some View {
         ZStack(alignment: .top) {
             VStack {
+                Spacer()
                 VStack(alignment: .center) {
-                    EditPictureControl(uploader: .nostrBuild, pubkey: account.pubkey, image_url: $account.profile_image , uploadObserver: profileUploadObserver, callback: uploadedProfilePicture)
-
-                    Text("Public Key", comment: "Label to indicate the public key of the account.")
+                   
+                    EditPictureControl(uploader: .nostrBuild, pubkey: account.pubkey, size: 75, setup: true, image_url: $account.profile_image , uploadObserver: profileUploadObserver, callback: uploadedProfilePicture)
+                        .shadow(radius: 2)
+                        .padding(.top, 100)
+                    
+                    Text("Add Photo", comment: "Label to indicate user can add a photo.")
                         .bold()
-                        .padding()
-                        .onTapGesture {
-                            regen_key()
-                        }
-
-                    KeyText($account.pubkey)
-                        .padding(.horizontal, 20)
-                        .onTapGesture {
-                            regen_key()
-                        }
-                }
-                .frame(minWidth: 300, maxWidth: .infinity, minHeight: 250, alignment: .center)
-                .background {
-                    RoundedRectangle(cornerRadius: 12)
-                        .fill(DamusColors.adaptableGrey, strokeBorder: .gray.opacity(0.5), lineWidth: 1)
+                        .foregroundColor(DamusColors.neutral6)
                 }
                 
                 SignupForm {
-                    FormLabel(NSLocalizedString("Display name", comment: "Label to prompt display name entry."), optional: true)
-                    FormTextInput(NSLocalizedString("Satoshi Nakamoto", comment: "Name of Bitcoin creator(s)."), text: $account.real_name)
+                    FormLabel(NSLocalizedString("Name", comment: "Label to prompt name entry."), optional: false)
+                        .foregroundColor(DamusColors.neutral6)
+                    FormTextInput(NSLocalizedString("Satoshi Nakamoto", comment: "Name of Bitcoin creator(s)."), text: $account.name)
                         .textInputAutocapitalization(.words)
 
-                    FormLabel(NSLocalizedString("About", comment: "Label to prompt for about text entry for user to describe about themself."), optional: true)
-                    FormTextInput(NSLocalizedString("Creator(s) of Bitcoin. Absolute legend.", comment: "Example description about Bitcoin creator(s), Satoshi Nakamoto."), text: $account.about)
+                    FormLabel(NSLocalizedString("Bio", comment: "Label to prompt bio entry for user to describe themself."), optional: true)
+                        .foregroundColor(DamusColors.neutral6)
+                    FormTextInput(NSLocalizedString("Absolute legend.", comment: "Example Bio"), text: $account.about)
                 }
-                .padding(.top, 10)
+                .padding(.top, 25)
 
                 Button(action: {
                     nav.push(route: Route.SaveKeys(account: account))
                 }) {
                     HStack {
-                        Text("Create account now", comment: "Button to create account.")
+                        Text("Next", comment: "Button to continue with account creation.")
                             .fontWeight(.semibold)
                     }
                     .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
                 }
                 .buttonStyle(GradientButtonStyle())
-                .disabled(profileUploadObserver.isLoading)
-                .opacity(profileUploadObserver.isLoading ? 0.5 : 1)
+                .disabled(profileUploadObserver.isLoading || account.name.isEmpty)
+                .opacity(profileUploadObserver.isLoading || account.name.isEmpty ? 0.5 : 1)
                 .padding(.top, 20)
                 
-                HStack(spacing: 0) {
-                    Text("By signing up, you agree to our ", comment: "Ask the user if they already have an account on Nostr")
-                        .font(.subheadline)
-                        .foregroundColor(Color("DamusMediumGrey"))
-
-                    Button(action: {
-                        nav.push(route: Route.EULA)
-                    }, label: {
-                        Text("EULA")
-                            .font(.subheadline)
-                    })
-                    .padding(.vertical, 5)
-
-                    Spacer()
-                }
-
                 LoginPrompt()
                     .padding(.top)
                 
@@ -94,8 +70,8 @@ struct CreateAccountView: View {
             }
             .padding()
         }
+        .background(DamusBackground(maxHeight: UIScreen.main.bounds.size.height/2), alignment: .top)
         .dismissKeyboardOnTap()
-        .navigationTitle("Create account")
         .navigationBarTitleDisplayMode(.inline)
         .navigationBarBackButtonHidden(true)
         .navigationBarItems(leading: BackNav())
@@ -111,7 +87,7 @@ struct LoginPrompt: View {
     var body: some View {
         HStack {
             Text("Already on Nostr?", comment: "Ask the user if they already have an account on Nostr")
-                .foregroundColor(Color("DamusMediumGrey"))
+                .foregroundColor(DamusColors.neutral6)
 
             Button(NSLocalizedString("Login", comment: "Button to navigate to login view.")) {
                 self.dismiss()
@@ -127,8 +103,8 @@ struct BackNav: View {
     var body: some View {
         Image("chevron-left")
             .foregroundColor(DamusColors.adaptableBlack)
-        .onTapGesture {
-            self.dismiss()
+            .onTapGesture {
+                self.dismiss()
         }
     }
 }
@@ -148,20 +124,11 @@ extension View {
 
 struct CreateAccountView_Previews: PreviewProvider {
     static var previews: some View {
-        let model = CreateAccountModel(real: "", nick: "jb55", about: "")
+        let model = CreateAccountModel(display_name: "", name: "jb55", about: "")
         return CreateAccountView(account: model, nav: .init())
     }
 }
 
-func KeyText(_ pubkey: Binding<Pubkey>) -> some View {
-    let bechkey = bech32_encode(hrp: PUBKEY_HRP, pubkey.wrappedValue.bytes)
-    return Text(bechkey)
-        .textSelection(.enabled)
-        .multilineTextAlignment(.center)
-        .font(.callout.monospaced())
-        .foregroundStyle(DamusLogoGradient.gradient)
-}
-
 func FormTextInput(_ title: String, text: Binding<String>) -> some View {
     return TextField("", text: text)
         .placeholder(when: text.wrappedValue.isEmpty) {
@@ -171,6 +138,10 @@ func FormTextInput(_ title: String, text: Binding<String>) -> some View {
         .background {
             RoundedRectangle(cornerRadius: 12)
                 .stroke(.gray.opacity(0.5), lineWidth: 1)
+                .background {
+                    RoundedRectangle(cornerRadius: 12)
+                        .foregroundColor(.damusAdaptableWhite)
+                }
         }
         .font(.body.bold())
 }
@@ -183,6 +154,10 @@ func FormLabel(_ title: String, optional: Bool = false) -> some View {
             Text("optional", comment: "Label indicating that a form input is optional.")
                 .font(.callout)
                 .foregroundColor(DamusColors.mediumGrey)
+        } else {
+            Text("required", comment: "Label indicating that a form input is required.")
+                .font(.callout)
+                .foregroundColor(DamusColors.mediumGrey)
         }
     }
 }

damus/Views/DirectMessagesView.swift

@@ -72,13 +72,11 @@ struct DirectMessagesView: View {
     
     var body: some View {
         VStack(spacing: 0) {
-            CustomPicker(selection: $dm_type, content: {
-                Text("DMs", comment: "Picker option for DM selector for seeing only DMs that have been responded to. DM is the English abbreviation for Direct Message.")
-                    .tag(DMType.friend)
-                Text("Requests", comment: "Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message.")
-                    .tag(DMType.rando)
-            })
-            
+            CustomPicker(tabs: [
+                (NSLocalizedString("DMs", comment: "Picker option for DM selector for seeing only DMs that have been responded to. DM is the English abbreviation for Direct Message."), DMType.friend),
+                (NSLocalizedString("Requests", comment: "Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet"), DMType.rando),
+            ], selection: $dm_type)
+
             Divider()
                 .frame(height: 1)
             

damus/Views/EventView.swift

@@ -45,6 +45,8 @@ struct EventView: View {
                 }
             } else if event.known_kind == .longform {
                 LongformPreview(state: damus, ev: event, options: options)
+            } else if event.known_kind == .highlight {
+                HighlightView(state: damus, event: event, options: options)
             } else {
                 TextEvent(damus: damus, event: event, pubkey: pubkey, options: options)
                     //.padding([.top], 6)

damus/Views/Events/Components/ReplyPart.swift

@@ -15,10 +15,12 @@ struct ReplyPart: View {
 
     var body: some View {
         Group {
-            if let reply_ref = event.thread_reply()?.reply {
-                ReplyDescription(event: event, replying_to: events.lookup(reply_ref.note_id), ndb: ndb)
-            } else {
-                EmptyView()
+            if event.known_kind == .highlight {
+                let highlighted_note = event.highlighted_note_id().flatMap { events.lookup($0) }
+                HighlightDescription(event: event, highlighted_event: highlighted_note, ndb: ndb)
+            } else if let reply_ref = event.thread_reply()?.reply {
+                let replying_to = events.lookup(reply_ref.note_id)
+                ReplyDescription(event: event, replying_to: replying_to, ndb: ndb)
             }
         }
     }

damus/Views/Events/EventBody.swift

@@ -35,6 +35,14 @@ struct EventBody: View {
             if !options.contains(.truncate_content) {
                 note_content
             }
+        } else if event.known_kind == .highlight {
+            HighlightBodyView(state: damus_state, ev: event, options: options)
+                .onTapGesture {
+                    if let highlighted_note = event.highlighted_note_id().flatMap({ damus_state.events.lookup($0) }) {
+                        let thread = ThreadModel(event: highlighted_note, damus_state: damus_state, highlight: event.content)
+                        damus_state.nav.push(route: Route.Thread(thread: thread))
+                    }
+                }
         } else {
             note_content
         }

damus/Views/Events/Highlight/HighlightDescription.swift

@@ -0,0 +1,53 @@
+//
+//  HighlightDescription.swift
+//  damus
+//
+//  Created by eric on 4/28/24.
+//
+
+import SwiftUI
+
+// Modified from Reply Description
+struct HighlightDescription: View {
+    let event: NostrEvent
+    let highlighted_event: NostrEvent?
+    let ndb: Ndb
+
+    var body: some View {
+        (Text(Image(systemName: "highlighter")) + Text(verbatim: " \(highlight_desc(ndb: ndb, event: event, highlighted_event: highlighted_event))"))
+            .font(.footnote)
+            .foregroundColor(.gray)
+            .frame(maxWidth: .infinity, alignment: .leading)
+
+    }
+}
+
+struct HighlightDescription_Previews: PreviewProvider {
+    static var previews: some View {
+        HighlightDescription(event: test_note, highlighted_event: test_note, ndb: test_damus_state.ndb)
+    }
+}
+
+func highlight_desc(ndb: Ndb, event: NostrEvent, highlighted_event: NostrEvent?, locale: Locale = Locale.current) -> String {
+    let desc = make_reply_description(event, replying_to: highlighted_event)
+    let pubkeys = desc.pubkeys
+
+    let bundle = bundleForLocale(locale: locale)
+
+    if pubkeys.count == 0 {
+        return NSLocalizedString("Highlighted", bundle: bundle, comment: "Label to indicate that the user is highlighting their own post.")
+    }
+
+    guard let profile_txn = NdbTxn(ndb: ndb) else  {
+        return ""
+    }
+
+    let names: [String] = pubkeys.map { pk in
+        let prof = ndb.lookup_profile_with_txn(pk, txn: profile_txn)
+
+        return Profile.displayName(profile: prof?.profile, pubkey: pk).username.truncate(maxLength: 50)
+    }
+
+    let uniqueNames: [String] = Array(Set(names))
+    return String(format: NSLocalizedString("Highlighted %@", bundle: bundle, comment: "Label to indicate that the user is highlighting 1 user."), locale: locale, uniqueNames.first ?? "")
+}

damus/Views/Events/Highlight/HighlightEventRef.swift

@@ -0,0 +1,92 @@
+//
+//  HighlightEventRef.swift
+//  damus
+//
+//  Created by eric on 4/29/24.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct HighlightEventRef: View {
+    let damus_state: DamusState
+    let event_ref: NoteId
+
+    init(damus_state: DamusState, event_ref: NoteId) {
+        self.damus_state = damus_state
+        self.event_ref = event_ref
+    }
+
+    struct FailedImage: View {
+        var body: some View {
+            Image("markdown")
+                .resizable()
+                .foregroundColor(DamusColors.neutral6)
+                .background(DamusColors.neutral3)
+                .frame(width: 35, height: 35)
+                .clipShape(RoundedRectangle(cornerRadius: 10))
+                .overlay(RoundedRectangle(cornerRadius: 10).stroke(.gray.opacity(0.5), lineWidth: 0.5))
+                .scaledToFit()
+        }
+    }
+
+    var body: some View {
+        EventLoaderView(damus_state: damus_state, event_id: event_ref) { event in
+            EventMutingContainerView(damus_state: damus_state, event: event) {
+                if event.known_kind == .longform {
+                    HStack(alignment: .top, spacing: 10) {
+                        let longform_event = LongformEvent.parse(from: event)
+                        if let url = longform_event.image {
+                            KFAnimatedImage(url)
+                                .callbackQueue(.dispatch(.global(qos:.background)))
+                                .backgroundDecode(true)
+                                .imageContext(.note, disable_animation: true)
+                                .image_fade(duration: 0.25)
+                                .cancelOnDisappear(true)
+                                .configure { view in
+                                    view.framePreloadCount = 3
+                                }
+                                .background {
+                                    FailedImage()
+                                }
+                                .frame(width: 35, height: 35)
+                                .clipShape(RoundedRectangle(cornerRadius: 10))
+                                .overlay(RoundedRectangle(cornerRadius: 10).stroke(.gray.opacity(0.5), lineWidth: 0.5))
+                                .scaledToFit()
+                        } else {
+                            FailedImage()
+                        }
+
+                        VStack(alignment: .leading, spacing: 5) {
+                            Text(longform_event.title ?? "Untitled")
+                                .font(.system(size: 14, weight: .bold))
+                                .lineLimit(1)
+
+                            let profile_txn = damus_state.profiles.lookup(id: longform_event.event.pubkey, txn_name: "highlight-profile")
+                            let profile = profile_txn?.unsafeUnownedValue
+
+                            if let display_name = profile?.display_name {
+                                Text(display_name)
+                                    .font(.system(size: 12))
+                                    .foregroundColor(.gray)
+                            } else if let name = profile?.name {
+                                Text(name)
+                                    .font(.system(size: 12))
+                                    .foregroundColor(.gray)
+                            }
+                        }
+                    }
+                    .padding([.leading, .vertical], 7)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .cornerRadius(10)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 10)
+                            .stroke(DamusColors.neutral3, lineWidth: 2)
+                    )
+                } else {
+                    EmptyView()
+                }
+            }
+        }
+    }
+}

damus/Views/Events/Highlight/HighlightLink.swift

@@ -0,0 +1,101 @@
+//
+//  HighlightLink.swift
+//  damus
+//
+//  Created by eric on 4/28/24.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct HighlightLink: View {
+    let state: DamusState
+    let url: URL
+    let content: String
+    @Environment(\.openURL) var openURL
+
+    func text_fragment_url() -> URL? {
+        let fragmentDirective = "#:~:"
+        let textDirective = "text="
+        let separator = ","
+        var text = ""
+
+        let components = content.components(separatedBy: " ")
+        if components.count <= 10 {
+            text = content
+        } else {
+            let textStart = Array(components.prefix(5)).joined(separator: " ")
+            let textEnd = Array(components.suffix(2)).joined(separator: " ")
+            text = textStart + separator + textEnd
+        }
+
+        let url_with_fragments = url.absoluteString + fragmentDirective + textDirective + text
+        return URL(string: url_with_fragments)
+    }
+
+    func get_url_icon() -> URL? {
+        var icon = URL(string: url.absoluteString + "/favicon.ico")
+        if let url_host = url.host() {
+            icon = URL(string: "https://" + url_host + "/favicon.ico")
+        }
+        return icon
+    }
+
+    var body: some View {
+        Button(action: {
+            openURL(text_fragment_url() ?? url)
+        }, label: {
+            HStack(spacing: 10) {
+                if let url = get_url_icon() {
+                    KFAnimatedImage(url)
+                        .imageContext(.pfp, disable_animation: true)
+                        .cancelOnDisappear(true)
+                        .configure { view in
+                            view.framePreloadCount = 3
+                        }
+                        .placeholder { _ in
+                            Image("link")
+                                .resizable()
+                                .padding(5)
+                                .foregroundColor(DamusColors.neutral6)
+                                .background(DamusColors.adaptableWhite)
+                        }
+                        .frame(width: 35, height: 35)
+                        .clipShape(RoundedRectangle(cornerRadius: 10))
+                        .scaledToFit()
+                } else {
+                    Image("link")
+                        .resizable()
+                        .padding(5)
+                        .foregroundColor(DamusColors.neutral6)
+                        .background(DamusColors.adaptableWhite)
+                        .frame(width: 35, height: 35)
+                        .clipShape(RoundedRectangle(cornerRadius: 10))
+                }
+
+                Text(url.absoluteString)
+                    .font(eventviewsize_to_font(.normal, font_size: state.settings.font_size))
+                    .foregroundColor(DamusColors.adaptableBlack)
+                    .truncationMode(.tail)
+                    .lineLimit(1)
+            }
+            .padding([.leading, .vertical], 7)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .background(DamusColors.neutral3)
+            .cornerRadius(10)
+            .overlay(
+                RoundedRectangle(cornerRadius: 10)
+                    .stroke(DamusColors.neutral3, lineWidth: 2)
+            )
+        })
+    }
+}
+
+struct HighlightLink_Previews: PreviewProvider {
+    static var previews: some View {
+        let url = URL(string: "https://damus.io")!
+        VStack {
+            HighlightLink(state: test_damus_state, url: url, content: "")
+        }
+    }
+}

damus/Views/Events/Highlight/HighlightPostView.swift

@@ -0,0 +1,77 @@
+//
+//  HighlightPostView.swift
+//  damus
+//
+//  Created by eric on 5/26/24.
+//
+
+import SwiftUI
+
+struct HighlightPostView: View {
+    let damus_state: DamusState
+    let event: NostrEvent
+    @Binding var selectedText: String
+
+    @Environment(\.dismiss) var dismiss
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            VStack {
+                HStack(spacing: 5.0) {
+                    Button(action: {
+                        dismiss()
+                    }, label: {
+                        Text("Cancel", comment: "Button to cancel out of highlighting a note.")
+                            .padding(10)
+                    })
+                    .buttonStyle(NeutralButtonStyle())
+
+                    Spacer()
+
+                    Button(NSLocalizedString("Post", comment: "Button to post a highlight.")) {
+                        let tags: [[String]] = [ ["e", "\(self.event.id)"] ]
+
+                        let kind = NostrKind.highlight.rawValue
+                        guard let ev = NostrEvent(content: selectedText, keypair: damus_state.keypair, kind: kind, tags: tags) else {
+                            return
+                        }
+                        damus_state.postbox.send(ev)
+                        dismiss()
+                    }
+                    .bold()
+                    .buttonStyle(GradientButtonStyle(padding: 10))
+                }
+
+                Divider()
+                    .foregroundColor(DamusColors.neutral3)
+                    .padding(.top, 5)
+            }
+            .frame(height: 30)
+            .padding()
+            .padding(.top, 15)
+
+            HStack {
+                var attributedString: AttributedString {
+                    var attributedString = AttributedString(selectedText)
+
+                    if let range = attributedString.range(of: selectedText) {
+                        attributedString[range].backgroundColor = DamusColors.highlight
+                    }
+
+                    return attributedString
+                }
+
+                Text(attributedString)
+                    .lineSpacing(5)
+                    .padding(10)
+            }
+            .overlay(
+                RoundedRectangle(cornerRadius: 25).fill(DamusColors.highlight).frame(width: 4),
+                alignment: .leading
+            )
+            .padding()
+
+            Spacer()
+        }
+    }
+}

damus/Views/Events/Highlight/HighlightView.swift

@@ -0,0 +1,192 @@
+//
+//  HighlightView.swift
+//  damus
+//
+//  Created by eric on 4/22/24.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct HighlightTruncatedText: View {
+    let attributedString: AttributedString
+    let maxChars: Int
+
+    init(attributedString: AttributedString, maxChars: Int = 360) {
+        self.attributedString = attributedString
+        self.maxChars = maxChars
+    }
+
+    var body: some View {
+        VStack(alignment: .leading) {
+
+            let truncatedAttributedString: AttributedString? = attributedString.truncateOrNil(maxLength: maxChars)
+
+            if let truncatedAttributedString {
+                Text(truncatedAttributedString)
+                    .fixedSize(horizontal: false, vertical: true)
+            } else {
+                Text(attributedString)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+
+            if truncatedAttributedString != nil {
+                Spacer()
+                Button(NSLocalizedString("Show more", comment: "Button to show entire note.")) { }
+                    .allowsHitTesting(false)
+            }
+        }
+    }
+}
+
+struct HighlightBodyView: View {
+    let state: DamusState
+    let event: HighlightEvent
+    let options: EventViewOptions
+
+    init(state: DamusState, ev: HighlightEvent, options: EventViewOptions) {
+        self.state = state
+        self.event = ev
+        self.options = options
+    }
+
+    init(state: DamusState, ev: NostrEvent, options: EventViewOptions) {
+        self.state = state
+        self.event = HighlightEvent.parse(from: ev)
+        self.options = options
+    }
+
+    var body: some View {
+        Group {
+            if options.contains(.wide) {
+                Main.padding(.horizontal)
+            } else {
+                Main
+            }
+        }
+    }
+
+    var truncate: Bool {
+        return options.contains(.truncate_content)
+    }
+
+    var truncate_very_short: Bool {
+        return options.contains(.truncate_content_very_short)
+    }
+
+    func truncatedText(attributedString: AttributedString) -> some View {
+        Group {
+            if truncate_very_short {
+                HighlightTruncatedText(attributedString: attributedString, maxChars: 140)
+                    .font(eventviewsize_to_font(.normal, font_size: state.settings.font_size))
+            }
+            else if truncate {
+                HighlightTruncatedText(attributedString: attributedString)
+                    .font(eventviewsize_to_font(.normal, font_size: state.settings.font_size))
+            } else {
+                Text(attributedString)
+                    .font(eventviewsize_to_font(.normal, font_size: state.settings.font_size))
+            }
+        }
+    }
+
+    var Main: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            HStack {
+                var attributedString: AttributedString {
+                    var attributedString: AttributedString = ""
+                    if let context = event.context {
+                        if context.count < event.event.content.count {
+                            attributedString = AttributedString(event.event.content)
+                        } else {
+                            attributedString = AttributedString(context)
+                        }
+                    } else {
+                        attributedString = AttributedString(event.event.content)
+                    }
+
+                    if let range = attributedString.range(of: event.event.content) {
+                        attributedString[range].backgroundColor = DamusColors.highlight
+                    }
+                    return attributedString
+                }
+
+                truncatedText(attributedString: attributedString)
+                    .lineSpacing(5)
+                    .padding(10)
+            }
+            .overlay(
+                RoundedRectangle(cornerRadius: 25).fill(DamusColors.highlight).frame(width: 4),
+                alignment: .leading
+            )
+            .padding(.bottom, 10)
+
+            if let url = event.url_ref {
+                HighlightLink(state: state, url: url, content: event.event.content)
+            } else {
+                if let evRef = event.event_ref {
+                    if let eventHex = hex_decode_id(evRef) {
+                        HighlightEventRef(damus_state: state, event_ref: NoteId(eventHex))
+                            .padding(.top, 5)
+                    }
+                }
+            }
+
+        }
+    }
+}
+
+struct HighlightView: View {
+    let state: DamusState
+    let event: HighlightEvent
+    let options: EventViewOptions
+
+    init(state: DamusState, event: NostrEvent, options: EventViewOptions) {
+        self.state = state
+        self.event = HighlightEvent.parse(from: event)
+        self.options = options.union(.no_mentions)
+    }
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            EventShell(state: state, event: event.event, options: options) {
+                HighlightBodyView(state: state, ev: event, options: options)
+            }
+        }
+    }
+}
+
+struct HighlightView_Previews: PreviewProvider {
+    static var previews: some View {
+
+        let content = "Nostr, a decentralized and open social network protocol. Without ads, toxic algorithms, or censorship"
+        let context = "Damus is built on Nostr, a decentralized and open social network protocol. Without ads, toxic algorithms, or censorship, Damus gives you access to the social network that a truly free and healthy society needs — and deserves."
+
+        let test_highlight_event = HighlightEvent.parse(from: NostrEvent(
+            content: content,
+            keypair: test_keypair,
+            kind: NostrKind.highlight.rawValue,
+            tags: [
+                ["context", context],
+                ["r", "https://damus.io"],
+                ["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"],
+            ])!
+        )
+
+        let test_highlight_event2 = HighlightEvent.parse(from: NostrEvent(
+            content: content,
+            keypair: test_keypair,
+            kind: NostrKind.highlight.rawValue,
+            tags: [
+                ["context", context],
+                ["e", "36017b098859d62e1dbd802290d59c9de9f18bb0ca00ba4b875c2930dd5891ae"],
+                ["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"],
+            ])!
+        )
+        VStack {
+            HighlightView(state: test_damus_state, event: test_highlight_event.event, options: [])
+
+            HighlightView(state: test_damus_state, event: test_highlight_event2.event, options: [.wide])
+        }
+    }
+}

damus/Views/Events/Longform/LongformView.swift

@@ -21,10 +21,10 @@ struct LongformView: View {
     var options: EventViewOptions {
         return [.wide, .no_mentions, .no_replying_to]
     }
-    
+
     var body: some View {
         EventShell(state: state, event: event.event, options: options) {
-            SelectableText(attributedString: AttributedString(stringLiteral: event.title ?? "Untitled"), size: .title)
+            SelectableText(damus_state: state, event: event.event, attributedString: AttributedString(stringLiteral: event.title ?? "Untitled"), size: .title)
 
             NoteContentView(damus_state: state, event: event.event, blur_images: false, size: .selected, options: options)
         }

damus/Views/Events/SelectedEventView.swift

@@ -39,12 +39,10 @@ struct SelectedEventView: View {
                 .padding(.horizontal)
                 .minimumScaleFactor(0.75)
                 .lineLimit(1)
-
-                if let reply_ref = event.thread_reply()?.reply {
-                    ReplyDescription(event: event, replying_to: damus.events.lookup(reply_ref.note_id), ndb: damus.ndb)
-                        .padding(.horizontal)
-                }
-
+                
+                ReplyPart(events: damus.events, event: event, keypair: damus.keypair, ndb: damus.ndb)
+                    .padding(.horizontal)
+                
                 ProxyView(event: event)
                     .padding(.top, 5)
                     .padding(.horizontal)

damus/Views/FollowingView.swift

@@ -160,10 +160,10 @@ struct FollowingView: View {
         .navigationBarTitle(NSLocalizedString("Following", comment: "Navigation bar title for view that shows who a user is following."))
         .safeAreaInset(edge: .top, spacing: 0) {
             VStack(spacing: 0) {
-                CustomPicker(selection: $tab_selection, content: {
-                    Text("People", comment: "Label for filter for seeing only people follows.").tag(FollowingViewTabSelection.people)
-                    Text("Hashtags", comment: "Label for filter for seeing only hashtag follows.").tag(FollowingViewTabSelection.hashtags)
-                })
+                CustomPicker(tabs: [
+                    (NSLocalizedString("People", comment: "Label for filter for seeing only people follows."), FollowingViewTabSelection.people),
+                    (NSLocalizedString("Hashtags", comment: "Label for filter for seeing only hashtag follows."), FollowingViewTabSelection.hashtags)
+                ], selection: $tab_selection)
                 Divider()
                     .frame(height: 1)
             }

damus/Views/LoginView.swift

@@ -62,8 +62,9 @@ struct LoginView: View {
     var body: some View {
         ZStack(alignment: .top) {
             VStack {
+                Spacer()
+                
                 SignInHeader()
-                    .padding(.top, 100)
                 
                 SignInEntry(key: $key, shouldSaveKey: $shouldSaveKey)
                 
@@ -112,8 +113,9 @@ struct LoginView: View {
                 Spacer()
             }
             .padding()
+            .padding(.bottom, 50)
         }
-        .background(DamusBackground(maxHeight: 350), alignment: .top)
+        .background(DamusBackground(maxHeight: UIScreen.main.bounds.size.height/2), alignment: .top)
         .onAppear {
             credential_handler.check_credentials()
         }
@@ -320,9 +322,13 @@ struct KeyInput: View {
         }
         .padding(.vertical, 2)
         .padding(.horizontal, 10)
-        .overlay {
+        .background {
             RoundedRectangle(cornerRadius: 12)
                 .stroke(.gray, lineWidth: 1)
+                .background {
+                    RoundedRectangle(cornerRadius: 12)
+                        .foregroundColor(.damusAdaptableWhite)
+                }
         }
     }
 }
@@ -337,11 +343,12 @@ struct SignInHeader: View {
                 .padding(.bottom)
             
             Text("Sign in", comment: "Title of view to log into an account.")
+                .foregroundColor(DamusColors.neutral6)
                 .font(.system(size: 32, weight: .bold))
                 .padding(.bottom, 5)
             
             Text("Welcome to the social network you control", comment: "Welcome text")
-                .foregroundColor(Color("DamusMediumGrey"))
+                .foregroundColor(DamusColors.neutral6)
         }
     }
 }
@@ -353,6 +360,7 @@ struct SignInEntry: View {
     var body: some View {
         VStack(alignment: .leading) {
             Text("Enter your account key", comment: "Prompt for user to enter an account key to login.")
+                .foregroundColor(DamusColors.neutral6)
                 .fontWeight(.medium)
                 .padding(.top, 30)
             
@@ -444,7 +452,9 @@ struct LoginView_Previews: PreviewProvider {
         let bech32_pubkey = "KeyInput"
         Group {
             LoginView(key: pubkey, nav: .init())
+                .previewDevice(PreviewDevice(rawValue: "iPhone SE (3rd generation)"))
             LoginView(key: bech32_pubkey, nav: .init())
+                .previewDevice(PreviewDevice(rawValue: "iPhone 15 Pro Max"))
         }
     }
 }

damus/Views/Muting/AddMuteItemView.swift

@@ -8,7 +8,7 @@ import SwiftUI
 
 struct AddMuteItemView: View {
     let state: DamusState
-    @State var new_text: String = ""
+    @Binding var new_text: String
     @State var expiration: DamusDuration = .indefinite
 
     @Environment(\.dismiss) var dismiss
@@ -108,6 +108,6 @@ struct AddMuteItemView: View {
 
 struct AddMuteItemView_Previews: PreviewProvider {
     static var previews: some View {
-        AddMuteItemView(state: test_damus_state)
+        AddMuteItemView(state: test_damus_state, new_text: .constant(""))
     }
 }

damus/Views/Muting/MutelistView.swift

@@ -15,6 +15,8 @@ struct MutelistView: View {
     @State var hashtags: [MuteItem] = []
     @State var threads: [MuteItem] = []
     @State var words: [MuteItem] = []
+    
+    @State var new_text: String = ""
 
     func RemoveAction(item: MuteItem) -> some View {
         Button {
@@ -120,13 +122,9 @@ struct MutelistView: View {
             }
         }
         .sheet(isPresented: $show_add_muteitem, onDismiss: { self.show_add_muteitem = false }) {
-            if #available(iOS 16.0, *) {
-                AddMuteItemView(state: damus_state)
-                    .presentationDetents([.height(300)])
-                    .presentationDragIndicator(.visible)
-            } else {
-                AddMuteItemView(state: damus_state)
-            }
+            AddMuteItemView(state: damus_state, new_text: $new_text)
+                .presentationDetents([.height(300)])
+                .presentationDragIndicator(.visible)
         }
     }
 }

damus/Views/NoteContentView.swift

@@ -132,10 +132,10 @@ struct NoteContentView: View {
         VStack(alignment: .leading) {
             if size == .selected {
                 if with_padding {
-                    SelectableText(attributedString: artifacts.content.attributed, size: self.size)
+                    SelectableText(damus_state: damus_state, event: self.event, attributedString: artifacts.content.attributed, size: self.size)
                         .padding(.horizontal)
                 } else {
-                    SelectableText(attributedString: artifacts.content.attributed, size: self.size)
+                    SelectableText(damus_state: damus_state, event: self.event, attributedString: artifacts.content.attributed, size: self.size)
                 }
             } else {
                 if with_padding {
@@ -390,7 +390,12 @@ struct NoteContentView_Previews: PreviewProvider {
                 NoteContentView(damus_state: state, event: test_note, blur_images: false, size: .normal, options: [])
             }
             .previewDisplayName("Short note")
-            
+
+            VStack {
+                NoteContentView(damus_state: state, event: test_super_short_note, blur_images: true, size: .normal, options: [])
+            }
+            .previewDisplayName("Super short note")
+
             VStack {
                 NoteContentView(damus_state: state, event: test_encoded_note_with_image!, blur_images: false, size: .normal, options: [])
             }

damus/Views/Notifications/NotificationsView.swift

@@ -117,17 +117,11 @@ struct NotificationsView: View {
         }
         .safeAreaInset(edge: .top, spacing: 0) {
             VStack(spacing: 0) {
-                CustomPicker(selection: $filter_state, content: {
-                    Text("All", comment: "Label for filter for all notifications.")
-                        .tag(NotificationFilterState.all)
-                    
-                    Text("Zaps", comment: "Label for filter for zap notifications.")
-                        .tag(NotificationFilterState.zaps)
-                    
-                    Text("Mentions", comment: "Label for filter for seeing mention notifications (replies, etc).")
-                        .tag(NotificationFilterState.replies)
-                    
-                })
+                CustomPicker(tabs: [
+                    (NSLocalizedString("All", comment: "Label for filter for all notifications."), NotificationFilterState.all),
+                    (NSLocalizedString("Zaps", comment: "Label for filter for zap notifications."), NotificationFilterState.zaps),
+                    (NSLocalizedString("Mentions", comment: "Label for filter for seeing mention notifications (replies, etc)."), NotificationFilterState.replies),
+                ], selection: $filter_state)
                 Divider()
                     .frame(height: 1)
             }

damus/Views/Profile/AboutView.swift

@@ -26,7 +26,7 @@ struct AboutView: View {
         Group {
             if let about_string {
                 let truncated_about = show_full_about ? about_string : about_string.truncateOrNil(maxLength: max_about_length)
-                SelectableText(attributedString: truncated_about ?? about_string, textAlignment: self.text_alignment, size: .subheadline)
+                SelectableText(damus_state: state, event: nil, attributedString: truncated_about ?? about_string, textAlignment: self.text_alignment, size: .subheadline)
 
                 if truncated_about != nil {
                     if show_full_about {

damus/Views/Profile/EditMetadataView.swift

@@ -21,13 +21,15 @@ struct EditMetadataView: View {
     @State var ln: String
     @State var website: String
 
-    @Environment(\.dismiss) var dismiss
-
     @State var confirm_ln_address: Bool = false
+    @State var confirm_save_alert: Bool = false
     
     @StateObject var profileUploadObserver = ImageUploadingObserver()
     @StateObject var bannerUploadObserver = ImageUploadingObserver()
     
+    @Environment(\.dismiss) var dismiss
+    @Environment(\.presentationMode) var presentationMode
+    
     init(damus_state: DamusState) {
         self.damus_state = damus_state
         let profile_txn = damus_state.profiles.lookup(id: damus_state.pubkey)
@@ -77,7 +79,7 @@ struct EditMetadataView: View {
     var TopSection: some View {
         ZStack(alignment: .top) {
             GeometryReader { geo in
-                EditBannerImageView(damus_state: damus_state, viewModel: bannerUploadObserver, callback: uploadedBanner(image_url:))
+                EditBannerImageView(damus_state: damus_state, viewModel: bannerUploadObserver, callback: uploadedBanner(image_url:), banner_image: URL(string: banner))
                     .aspectRatio(contentMode: .fill)
                     .frame(width: geo.size.width, height: BANNER_HEIGHT)
                     .clipped()
@@ -86,7 +88,7 @@ struct EditMetadataView: View {
                 let pfp_size: CGFloat = 90.0
 
                 HStack(alignment: .center) {
-                    EditProfilePictureView(pubkey: damus_state.pubkey, damus_state: damus_state, size: pfp_size, uploadObserver: profileUploadObserver, callback: uploadedProfilePicture(image_url:))
+                    EditProfilePictureView(profile_url: URL(string: picture), pubkey: damus_state.pubkey, damus_state: damus_state, size: pfp_size, uploadObserver: profileUploadObserver, callback: uploadedProfilePicture(image_url:))
                         .offset(y: -(pfp_size/2.0)) // Increase if set a frame
 
                    Spacer()
@@ -97,6 +99,28 @@ struct EditMetadataView: View {
         }
     }
     
+    func navImage(img: String) -> some View {
+        Image(img)
+            .frame(width: 33, height: 33)
+            .background(Color.black.opacity(0.6))
+            .clipShape(Circle())
+    }
+    
+    var navBackButton: some View {
+        HStack {
+            Button {
+                if didChange() {
+                    confirm_save_alert.toggle()
+                } else {
+                    presentationMode.wrappedValue.dismiss()
+                }
+            } label: {
+                navImage(img: "chevron-left")
+            }
+            Spacer()
+        }
+    }
+    
     var body: some View {
         VStack(alignment: .leading) {
             TopSection
@@ -116,18 +140,6 @@ struct EditMetadataView: View {
 
                 }
                 
-                Section (NSLocalizedString("Profile Picture", comment: "Label for Profile Picture section of user profile form.")) {
-                    TextField(NSLocalizedString("https://example.com/pic.jpg", comment: "Placeholder example text for profile picture URL."), text: $picture)
-                        .autocorrectionDisabled(true)
-                        .textInputAutocapitalization(.never)
-                }
-                
-                Section (NSLocalizedString("Banner Image", comment: "Label for Banner Image section of user profile form.")) {
-                                    TextField(NSLocalizedString("https://example.com/pic.jpg", comment: "Placeholder example text for profile picture URL."), text: $banner)
-                                        .autocorrectionDisabled(true)
-                                        .textInputAutocapitalization(.never)
-                                }
-                
                 Section(NSLocalizedString("Website", comment: "Label for Website section of user profile form.")) {
                     TextField(NSLocalizedString("https://jb55.com", comment: "Placeholder example text for website URL for user profile."), text: $website)
                         .autocorrectionDisabled(true)
@@ -139,10 +151,10 @@ struct EditMetadataView: View {
                     ZStack(alignment: .topLeading) {
                         TextEditor(text: $about)
                             .textInputAutocapitalization(.sentences)
-                            .frame(minHeight: 20, alignment: .leading)
+                            .frame(minHeight: 45, alignment: .leading)
                             .multilineTextAlignment(.leading)
                         Text(about.isEmpty ? placeholder : about)
-                            .padding(.leading, 4)
+                            .padding(4)
                             .opacity(about.isEmpty ? 1 : 0)
                             .foregroundColor(Color(uiColor: .placeholderText))
                     }
@@ -175,25 +187,48 @@ struct EditMetadataView: View {
                     }
                 })
 
-                Button(NSLocalizedString("Save", comment: "Button for saving profile.")) {
-                    if !ln.isEmpty && !is_ln_valid(ln: ln) {
-                        confirm_ln_address = true
-                    } else {
-                        save()
-                        dismiss()
-                    }
+
+            }
+            
+            Button(action: {
+                if !ln.isEmpty && !is_ln_valid(ln: ln) {
+                    confirm_ln_address = true
+                } else {
+                    save()
+                    dismiss()
                 }
-                .disabled(profileUploadObserver.isLoading || bannerUploadObserver.isLoading)
-                .alert(NSLocalizedString("Invalid Tip Address", comment: "Title of alerting as invalid tip address."), isPresented: $confirm_ln_address) {
-                    Button(NSLocalizedString("Ok", comment: "Button to dismiss the alert.")) {
-                    }
-                } message: {
-                    Text("The address should either begin with LNURL or should look like an email address.", comment: "Giving the description of the alert message.")
+            }, label: {
+                Text(NSLocalizedString("Save", comment: "Button for saving profile."))
+                    .frame(minWidth: 300, maxWidth: .infinity, alignment: .center)
+            })
+            .buttonStyle(GradientButtonStyle(padding: 15))
+            .padding(.horizontal, 10)
+            .padding(.bottom, 10)
+            .disabled(!didChange())
+            .opacity(!didChange() ? 0.5 : 1)
+            .disabled(profileUploadObserver.isLoading || bannerUploadObserver.isLoading)
+            .alert(NSLocalizedString("Invalid Tip Address", comment: "Title of alerting as invalid tip address."), isPresented: $confirm_ln_address) {
+                Button(NSLocalizedString("Ok", comment: "Button to dismiss the alert.")) {
                 }
+            } message: {
+                Text("The address should either begin with LNURL or should look like an email address.", comment: "Giving the description of the alert message.")
             }
         }
         .ignoresSafeArea(edges: .top)
         .background(Color(.systemGroupedBackground))
+        .navigationBarBackButtonHidden()
+        .toolbar {
+            ToolbarItem(placement: .principal) {
+                navBackButton
+            }
+        }
+        .alert(NSLocalizedString("Discard changes?", comment: "Alert user that changes have been made."), isPresented: $confirm_save_alert) {
+            Button(NSLocalizedString("No", comment: "Do not discard changes."), role: .cancel) {
+            }
+            Button(NSLocalizedString("Yes", comment: "Agree to discard changes made to profile.")) {
+                dismiss()
+            }
+        }
     }
     
     func uploadedProfilePicture(image_url: URL?) {
@@ -203,6 +238,45 @@ struct EditMetadataView: View {
     func uploadedBanner(image_url: URL?) {
         banner = image_url?.absoluteString ?? ""
     }
+    
+    func didChange() -> Bool {
+        let profile_txn = damus_state.profiles.lookup(id: damus_state.pubkey)
+        let data = profile_txn?.unsafeUnownedValue
+        
+        if data?.name ?? "" != name {
+            return true
+        }
+        
+        if data?.display_name ?? "" != display_name {
+            return true
+        }
+        
+        if data?.about ?? "" != about {
+            return true
+        }
+        
+        if data?.website ?? "" != website {
+            return true
+        }
+        
+        if data?.picture ?? "" != picture {
+            return true
+        }
+        
+        if data?.banner ?? "" != banner {
+            return true
+        }
+
+        if data?.nip05 ?? "" != nip05 {
+            return true
+        }
+        
+        if data?.lud16 ?? data?.lud06 ?? "" != ln {
+            return true
+        }
+        
+        return false
+    }
 }
 
 struct EditMetadataView_Previews: PreviewProvider {

damus/Views/Profile/EditPictureControl.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import Kingfisher
 
 class ImageUploadingObserver: ObservableObject {
     @Published var isLoading: Bool = false
@@ -14,7 +15,10 @@ class ImageUploadingObserver: ObservableObject {
 struct EditPictureControl: View {
     let uploader: MediaUploader
     let pubkey: Pubkey
+    var size: CGFloat? = 25
+    var setup: Bool? = false
     @Binding var image_url: URL?
+    @State var image_url_temp: URL?
     @ObservedObject var uploadObserver: ImageUploadingObserver
     let callback: (URL?) -> Void
     
@@ -22,12 +26,21 @@ struct EditPictureControl: View {
     
     @State private var show_camera = false
     @State private var show_library = false
+    @State private var show_url_sheet = false
     @State var image_upload_confirm: Bool = false
 
     @State var preUploadedMedia: PreUploadedMedia? = nil
+    
+    @Environment(\.dismiss) var dismiss
 
     var body: some View {
         Menu {
+            Button(action: {
+                self.show_url_sheet = true
+            }) {
+                Text("Image URL", comment: "Option to enter a url")
+            }
+            
             Button(action: {
                 self.show_library = true
             }) {
@@ -43,20 +56,53 @@ struct EditPictureControl: View {
             if uploadObserver.isLoading {
                 ProgressView()
                     .progressViewStyle(CircularProgressViewStyle(tint: DamusColors.purple))
+                    .frame(width: size, height: size)
                     .padding(10)
                     .background(DamusColors.white.opacity(0.7))
                     .clipShape(Circle())
                     .shadow(color: DamusColors.purple, radius: 15, x: 0, y: 0)
+            } else if let url = image_url, setup ?? false {
+                KFAnimatedImage(url)
+                    .imageContext(.pfp, disable_animation: false)
+                    .onFailure(fallbackUrl: URL(string: robohash(pubkey)), cacheKey: url.absoluteString)
+                    .cancelOnDisappear(true)
+                    .configure { view in
+                        view.framePreloadCount = 3
+                    }
+                    .scaledToFill()
+                    .frame(width: (size ?? 25) + 10, height: (size ?? 25) + 10)
+                    .foregroundColor(DamusColors.white)
+                    .clipShape(Circle())
+                    .overlay(Circle().stroke(.white, lineWidth: 4))
             } else {
-                Image("camera")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 25, height: 25)
-                    .foregroundColor(DamusColors.purple)
-                    .padding(10)
-                    .background(DamusColors.white.opacity(0.7))
-                    .clipShape(Circle())
-                    .shadow(color: DamusColors.purple, radius: 15, x: 0, y: 0)
+                if setup ?? false {
+                    Image(systemName: "person")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: size, height: size)
+                        .foregroundColor(DamusColors.white)
+                        .padding(20)
+                        .clipShape(Circle())
+                        .background {
+                            Circle()
+                                .fill(PinkGradient, strokeBorder: .white, lineWidth: 4)
+                        }
+                        
+                } else {
+                    Image("camera")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: size, height: size)
+                        .foregroundColor(DamusColors.purple)
+                        .padding(10)
+                        .background(DamusColors.white.opacity(0.7))
+                        .clipShape(Circle())
+                        .background {
+                            Circle()
+                                .fill(DamusColors.purple, strokeBorder: .white, lineWidth: 2)
+                        }
+                }
+                    
             }
         }
         .sheet(isPresented: $show_camera) {
@@ -79,6 +125,70 @@ struct EditPictureControl: View {
                 Button(NSLocalizedString("Cancel", comment: "Button to cancel the upload."), role: .cancel) {}
             }
         }
+        .sheet(isPresented: $show_url_sheet) {
+            ZStack {
+                DamusColors.adaptableWhite.edgesIgnoringSafeArea(.all)
+                VStack {
+                    Text("Image URL")
+                        .bold()
+                    
+                    Divider()
+                        .padding(.horizontal)
+                    
+                    HStack {
+                        Image(systemName: "doc.on.clipboard")
+                            .foregroundColor(.gray)
+                            .onTapGesture {
+                                if let pastedURL = UIPasteboard.general.string {
+                                    image_url_temp = URL(string: pastedURL)
+                                }
+                            }
+                        TextField(image_url_temp?.absoluteString ?? "", text: Binding(
+                            get: { image_url_temp?.absoluteString ?? "" },
+                            set: { image_url_temp = URL(string: $0) }
+                        ))
+                    }
+                    .padding(12)
+                    .background {
+                        RoundedRectangle(cornerRadius: 12)
+                            .stroke(.gray.opacity(0.5), lineWidth: 1)
+                            .background {
+                                RoundedRectangle(cornerRadius: 12)
+                                    .foregroundColor(.damusAdaptableWhite)
+                            }
+                    }
+                    .padding(10)
+                    
+                    Button(action: {
+                        show_url_sheet.toggle()
+                    }, label: {
+                        Text("Cancel", comment: "Cancel button text for dismissing updating image url.")
+                            .frame(minWidth: 300, maxWidth: .infinity, alignment: .center)
+                            .padding(10)
+                    })
+                    .buttonStyle(NeutralButtonStyle())
+                    .padding(10)
+                    
+                    Button(action: {
+                        image_url = image_url_temp
+                        callback(image_url)
+                        show_url_sheet.toggle()
+                    }, label: {
+                        Text("Update", comment: "Update button text for updating image url.")
+                            .frame(minWidth: 300, maxWidth: .infinity, alignment: .center)
+                    })
+                    .buttonStyle(GradientButtonStyle(padding: 10))
+                    .padding(.horizontal, 10)
+                    .disabled(image_url_temp == image_url)
+                    .opacity(image_url_temp == image_url ? 0.5 : 1)
+                }
+            }
+            .onAppear {
+                image_url_temp = image_url
+            }
+            .presentationDetents([.height(300)])
+            .presentationDragIndicator(.visible)
+        }
     }
     
     private func handle_upload(media: MediaUpload) {
@@ -110,7 +220,7 @@ struct EditPictureControl_Previews: PreviewProvider {
         let observer = ImageUploadingObserver()
         ZStack {
             Color.gray
-            EditPictureControl(uploader: .nostrBuild, pubkey: test_pubkey, image_url: url, uploadObserver: observer) { _ in
+            EditPictureControl(uploader: .nostrBuild, pubkey: test_pubkey, size: 100, setup: false, image_url: url, uploadObserver: observer) { _ in
                 //
             }
         }

damus/Views/Profile/ProfileName.swift

@@ -125,31 +125,34 @@ struct ProfileName: View {
                 return
             }
 
-            var profile: Profile!
-            var profile_txn: NdbTxn<Profile?>!
-
             switch update {
             case .remote(let pubkey):
-                profile_txn = damus_state.profiles.lookup(id: pubkey)
-                guard let prof = profile_txn.unsafeUnownedValue else { return }
-                profile = prof
+                guard let profile_txn = damus_state.profiles.lookup(id: pubkey),
+                      let prof = profile_txn.unsafeUnownedValue else {
+                    return
+                }
+                handle_profile_update(profile: prof)
             case .manual(_, let prof):
-                profile = prof
+                handle_profile_update(profile: prof)
             }
 
-            let display_name = Profile.displayName(profile: profile, pubkey: pubkey)
-            if self.display_name != display_name {
-                self.display_name = display_name
-            }
+        }
+    }
 
-            let nip05 = damus_state.profiles.is_validated(pubkey)
-            if nip05 != self.nip05 {
-                self.nip05 = nip05
-            }
+    @MainActor
+    func handle_profile_update(profile: Profile) {
+        let display_name = Profile.displayName(profile: profile, pubkey: pubkey)
+        if self.display_name != display_name {
+            self.display_name = display_name
+        }
 
-            if donation != profile.damus_donation {
-                donation = profile.damus_donation
-            }
+        let nip05 = damus_state.profiles.is_validated(pubkey)
+        if nip05 != self.nip05 {
+            self.nip05 = nip05
+        }
+
+        if donation != profile.damus_donation {
+            donation = profile.damus_donation
         }
     }
 }

damus/Views/Profile/ProfileView.swift

@@ -217,16 +217,6 @@ struct ProfileView: View {
         }
     }
 
-    var customNavbar: some View {
-        HStack {
-            navBackButton
-            Spacer()
-            navActionSheetButton
-        }
-        .padding(.top, 5)
-        .accentColor(DamusColors.white)
-    }
-
     func lnButton(unownedProfile: Profile?, record: ProfileRecord?) -> some View {
         return ProfileZapLinkView(unownedProfileRecord: record, profileModel: self.profile) { reactions_enabled, lud16, lnurl in
             Image(reactions_enabled ? "zap.fill" : "zap")
@@ -434,10 +424,10 @@ struct ProfileView: View {
                         aboutSection
 
                         VStack(spacing: 0) {
-                            CustomPicker(selection: $filter_state, content: {
-                                Text("Notes", comment: "Label for filter for seeing only your notes (instead of notes and replies).").tag(FilterState.posts)
-                                Text("Notes & Replies", comment: "Label for filter for seeing your notes and replies (instead of only your notes).").tag(FilterState.posts_and_replies)
-                            })
+                            CustomPicker(tabs: [
+                                (NSLocalizedString("Notes", comment: "Label for filter for seeing only notes (instead of notes and replies)."), FilterState.posts),
+                                (NSLocalizedString("Notes & Replies", comment: "Label for filter for seeing notes and replies (instead of only notes)."), FilterState.posts_and_replies)
+                            ], selection: $filter_state)
                             Divider()
                                 .frame(height: 1)
                         }
@@ -458,8 +448,15 @@ struct ProfileView: View {
             .navigationTitle("")
             .navigationBarBackButtonHidden()
             .toolbar {
-                ToolbarItem(placement: .principal) {
-                    customNavbar
+                ToolbarItem(placement: .topBarLeading) {
+                    navBackButton
+                        .padding(.top, 5)
+                        .accentColor(DamusColors.white)
+                }
+                ToolbarItem(placement: .topBarTrailing) {
+                    navActionSheetButton
+                        .padding(.top, 5)
+                        .accentColor(DamusColors.white)
                 }
             }
             .toolbarBackground(.hidden)

damus/Views/ProfileActionSheetView.swift

@@ -45,6 +45,21 @@ struct ProfileActionSheetView: View {
         )
     }
     
+    var muteButton: some View {
+        let target_pubkey = self.profile.pubkey
+        return VStack(alignment: .center, spacing: 10) {
+            MuteDurationMenu { duration in
+                notify(.mute(.user(target_pubkey, duration?.date_from_now)))
+            } label: {
+                Image("mute")
+            }
+            .buttonStyle(NeutralButtonShape.circle.style)
+            Text("Mute", comment: "Button label that allows the user to mute the user shown on-screen")
+                .foregroundStyle(.secondary)
+                .font(.caption)
+        }
+    }
+        
     var dmButton: some View {
         let dm_model = damus_state.dms.lookup_or_create(profile.pubkey)
         return VStack(alignment: .center, spacing: 10) {
@@ -103,6 +118,9 @@ struct ProfileActionSheetView: View {
                 self.followButton
                 self.zapButton
                 self.dmButton
+                if damus_state.keypair.pubkey != profile.pubkey && damus_state.keypair.privkey != nil {
+                    self.muteButton
+                }
             }
             .padding()
             

damus/Views/QRCodeView.swift

@@ -126,11 +126,11 @@ struct QRCodeView: View {
 
             if our_profile?.picture != nil {
                 ProfilePicView(pubkey: pubkey, size: 90.0, highlight: .custom(DamusColors.white, 3.0), profiles: damus_state.profiles, disable_animation: damus_state.settings.disable_animation)
-                    .padding(.top, 50)
+                    .padding(.top, 20)
             } else {
                 Image(systemName: "person.fill")
                     .font(.system(size: 60))
-                    .padding(.top, 50)
+                    .padding(.top, 20)
             }
             
             if let display_name = profile?.display_name {
@@ -150,17 +150,18 @@ struct QRCodeView: View {
                 .interpolation(.none)
                 .resizable()
                 .scaledToFit()
-                .frame(width: 300, height: 300)
+                .frame(minWidth: 100, maxWidth: 300, minHeight: 100, maxHeight: 300)
                 .cornerRadius(10)
                 .overlay(RoundedRectangle(cornerRadius: 10)
-                    .stroke(DamusColors.white, lineWidth: 5.0))
+                    .stroke(DamusColors.white, lineWidth: 5.0)
+                    .scaledToFit())
                 .shadow(radius: 10)
 
             Spacer()
             
             Text("Follow me on Nostr", comment: "Text on QR code view to prompt viewer looking at screen to follow the user.")
                 .font(.system(size: 24, weight: .heavy))
-                .padding(.top)
+                .padding(.top, 10)
                 .foregroundColor(.white)
             
             Text("Scan the code", comment: "Text on QR code view to prompt viewer to scan the QR code on screen with their device camera.")
@@ -179,7 +180,7 @@ struct QRCodeView: View {
                 .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
             }
             .buttonStyle(GradientButtonStyle())
-            .padding(50)
+            .padding(20)
         }
     }
     
@@ -201,11 +202,11 @@ struct QRCodeView: View {
                 }
             }
             .scaledToFit()
-            .frame(width: 300, height: 300)
+            .frame(maxWidth: 300, maxHeight: 300)
             .cornerRadius(10)
-            .overlay(RoundedRectangle(cornerRadius: 10).stroke(DamusColors.white, lineWidth: 5.0))
+            .overlay(RoundedRectangle(cornerRadius: 10).stroke(DamusColors.white, lineWidth: 5.0).scaledToFit())
             .overlay(RoundedRectangle(cornerRadius: 10).trim(from: 0.0, to: outerTrimEnd).stroke(DamusColors.black, lineWidth: 5.5)
-            .rotationEffect(.degrees(-90)))
+                .rotationEffect(.degrees(-90)).scaledToFit())
             .shadow(radius: 10)
             
             Spacer()

damus/Views/ReactionsView.swift

@@ -16,7 +16,7 @@ struct ReactionsView: View {
     var body: some View {
         ScrollView {
             LazyVStack {
-                ForEach(model.events.events, id: \.id) { ev in
+                ForEach(model.events.events.filter { $0.last_refid() == model.target }, id: \.id) { ev in
                     ReactionView(damus_state: damus_state, reaction: ev)
                 }
             }

damus/Views/Relays/RelayView.swift

@@ -50,6 +50,13 @@ struct RelayView: View {
                             .padding(.bottom, 2)
                             .lineLimit(1)
                         RelayType(is_paid: state.relay_model_cache.model(with_relay_id: relay)?.metadata.is_paid ?? false)
+                        
+                        if relay.absoluteString.hasSuffix(".onion") {
+                            Image("tor")
+                                .resizable()
+                                .interpolation(.none)
+                                .frame(width: 20, height: 20)
+                        }
                     }
                     Text(relay.absoluteString)
                         .font(.subheadline)

damus/Views/SaveKeysView.swift

@@ -11,8 +11,6 @@ import Security
 struct SaveKeysView: View {
     let account: CreateAccountModel
     let pool: RelayPool = RelayPool(ndb: Ndb()!)
-    @State var pub_copied: Bool = false
-    @State var priv_copied: Bool = false
     @State var loading: Bool = false
     @State var error: String? = nil
     
@@ -31,81 +29,98 @@ struct SaveKeysView: View {
     var body: some View {
         ZStack(alignment: .top) {
             VStack(alignment: .center) {
+
+                Spacer()
+                
+                Image("logo-nobg")
+                    .resizable()
+                    .shadow(color: DamusColors.purple, radius: 2)
+                    .frame(width: 56, height: 56, alignment: .center)
+                    .padding(.top, 20.0)
+                
                 if account.rendered_name.isEmpty {
                     Text("Welcome!", comment: "Text to welcome user.")
-                        .font(.title.bold())
-                        .padding(.bottom, 10)
+                        .font(.title)
+                        .fontWeight(.heavy)
+                        .foregroundStyle(DamusLogoGradient.gradient)
                 } else {
                     Text("Welcome, \(account.rendered_name)!", comment: "Text to welcome user.")
-                        .font(.title.bold())
-                        .padding(.bottom, 10)
+                        .font(.title)
+                        .fontWeight(.heavy)
+                        .foregroundStyle(DamusLogoGradient.gradient)
                 }
                 
-                Text("Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.", comment: "Reminder to user that they should save their account information.")
-                    .padding(.bottom, 10)
+                Text("Save your login info?", comment: "Ask user if they want to save their account information.")
+                    .font(.title)
+                    .fontWeight(.heavy)
+                    .foregroundColor(DamusColors.neutral6)
+                    .padding(.top, 5)
                 
-                Text("Private Key", comment: "Label to indicate that the text below is the user's private key used by only the user themself as a secret to login to access their account.")
-                    .font(.title2.bold())
-                    .padding(.bottom, 10)
+                Text("We'll save your account key, so you won't need to enter it manually next time you log in.", comment: "Reminder to user that they should save their account information.")
+                    .font(.system(size: 14))
+                    .foregroundColor(DamusColors.neutral6)
+                    .padding(.top, 2)
+                    .padding(.bottom, 100)
+                    .multilineTextAlignment(.center)
                 
-                Text("This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!", comment: "Label to describe that a private key is the user's secret account key and what they should do with it.")
-                    .padding(.bottom, 10)
+                Spacer()
                 
-                SaveKeyView(text: account.privkey.nsec, textContentType: .newPassword, is_copied: $priv_copied, focus: $privkey_focused)
-                    .padding(.bottom, 10)
-
-                if priv_copied {
-                    if loading {
-                        ProgressView()
-                            .progressViewStyle(.circular)
-                    } else if let err = error {
-                        Text("Error: \(err)", comment: "Error message indicating why saving keys failed.")
-                            .foregroundColor(.red)
-
-                        Button(action: {
-                            complete_account_creation(account)
-                        }) {
-                            HStack {
-                                Text("Retry", comment:  "Button to retry completing account creation after an error occurred.")
-                                    .fontWeight(.semibold)
-                            }
-                            .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
+                if loading {
+                    ProgressView()
+                        .progressViewStyle(.circular)
+                } else if let err = error {
+                    Text("Error: \(err)", comment: "Error message indicating why saving keys failed.")
+                        .foregroundColor(.red)
+                    
+                    Button(action: {
+                        complete_account_creation(account)
+                    }) {
+                        HStack {
+                            Text("Retry", comment:  "Button to retry completing account creation after an error occurred.")
+                                .fontWeight(.semibold)
                         }
-                        .buttonStyle(GradientButtonStyle())
-                        .padding(.top, 20)
-                    } else {
-                        Button(action: {
-                            complete_account_creation(account)
-                        }) {
-                            HStack {
-                                Text("Let's go!", comment:  "Button to complete account creation and start using the app.")
-                                    .fontWeight(.semibold)
-                            }
-                            .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
-                        }
-                        .buttonStyle(GradientButtonStyle())
-                        .padding(.top, 20)
+                        .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
                     }
+                    .buttonStyle(GradientButtonStyle())
+                    .padding(.top, 20)
+                } else {
+                    
+                    Button(action: {
+                        save_key(account)
+                        complete_account_creation(account)
+                    }) {
+                        HStack {
+                            Text("Save", comment:  "Button to save key, complete account creation, and start using the app.")
+                                .fontWeight(.semibold)
+                        }
+                        .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
+                    }
+                    .buttonStyle(GradientButtonStyle())
+                    .padding(.top, 20)
+                    
+                    Button(action: {
+                        complete_account_creation(account)
+                    }) {
+                        HStack {
+                            Text("Not now", comment:  "Button to not save key, complete account creation, and start using the app.")
+                                .fontWeight(.semibold)
+                        }
+                        .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
+                    }
+                    .buttonStyle(NeutralButtonStyle(padding: EdgeInsets(top: 15, leading: 15, bottom: 15, trailing: 15), cornerRadius: 12))
+                    .padding(.top, 20)
                 }
             }
             .padding(20)
         }
-        .background(
-            Image("eula-bg")
-                .resizable()
-                .blur(radius: 70)
-                .ignoresSafeArea(),
-            alignment: .top
-        )
+        .background(DamusBackground(maxHeight: UIScreen.main.bounds.size.height/2), alignment: .top)
         .navigationBarBackButtonHidden(true)
         .navigationBarItems(leading: BackNav())
-        .onAppear {
-            // Hack to force keyboard to show up for a short moment and then hiding it to register password autofill flow.
-            pubkey_focused = true
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                pubkey_focused = false
-            }
-        }
+
+    }
+    
+    func save_key(_ account: CreateAccountModel) {
+        credential_handler.save_credential(pubkey: account.pubkey, privkey: account.privkey)
     }
     
     func complete_account_creation(_ account: CreateAccountModel) {
@@ -122,8 +137,6 @@ struct SaveKeysView: View {
         }
 
         self.pool.register_handler(sub_id: "signup", handler: handle_event)
-        
-        credential_handler.save_credential(pubkey: account.pubkey, privkey: account.privkey)
 
         self.loading = true
         
@@ -188,74 +201,13 @@ struct SaveKeysView: View {
     }
 }
 
-struct SaveKeyView: View {
-    let text: String
-    let textContentType: UITextContentType
-    @Binding var is_copied: Bool
-    var focus: FocusState<Bool>.Binding
-    
-    func copy_text() {
-        UIPasteboard.general.string = text
-        is_copied = true
-    }
-    
-    var body: some View {
-        HStack {
-            Spacer()
-            VStack {
-                spacerBlock(width: 0, height: 0)
-                Button(action: copy_text) {
-                    Label("", image: is_copied ? "check-circle.fill" : "copy2")
-                        .foregroundColor(is_copied ? .green : .gray)
-                        .background {
-                            if is_copied {
-                                Circle()
-                                    .foregroundColor(.white)
-                                    .frame(width: 25, height: 25, alignment: .center)
-                                    .padding(.leading, -8)
-                                    .padding(.top, 1)
-                            } else {
-                                EmptyView()
-                            }
-                        }
-                }
-            }
-
-            TextField("", text: .constant(text))
-                .padding(5)
-                .background {
-                    RoundedRectangle(cornerRadius: 4.0).opacity(0.1)
-                }
-                .textSelection(.enabled)
-                .font(.callout.monospaced())
-                .onTapGesture {
-                    copy_text()
-                    // Hack to force keyboard to hide. Showing keyboard on text field is necessary to register password autofill flow but the text itself should not be modified.
-                    DispatchQueue.main.async {
-                        end_editing()
-                    }
-                }
-                .textContentType(textContentType)
-                .deleteDisabled(true)
-                .focused(focus)
-            
-            spacerBlock(width: 0, height: 0) /// set a 'width' > 0 here to vary key Text's aspect ratio
-        }
-    }
-    
-    @ViewBuilder private func spacerBlock(width: CGFloat, height: CGFloat) -> some View {
-        Color.orange.opacity(1)
-            .frame(width: width, height: height)
-    }
-}
-
 struct SaveKeysView_Previews: PreviewProvider {
     static var previews: some View {
-        let model = CreateAccountModel(real: "William", nick: "jb55", about: "I'm me")
+        let model = CreateAccountModel(display_name: "William", name: "jb55", about: "I'm me")
         SaveKeysView(account: model)
     }
 }
 
 func create_account_to_metadata(_ model: CreateAccountModel) -> Profile {
-    return Profile(name: model.nick_name, display_name: model.real_name, about: model.about, picture: model.profile_image?.absoluteString, banner: nil, website: nil, lud06: nil, lud16: nil, nip05: nil, damus_donation: nil)
+    return Profile(name: model.name, display_name: model.display_name, about: model.about, picture: model.profile_image?.absoluteString, banner: nil, website: nil, lud06: nil, lud16: nil, nip05: nil, damus_donation: nil)
 }

damus/Views/Settings/NotificationSettingsView.swift

@@ -7,10 +7,13 @@
 
 import SwiftUI
 
+let MINIMUM_PUSH_NOTIFICATION_SYNC_DELAY_IN_SECONDS = 0.25
+
 struct NotificationSettingsView: View {
     let damus_state: DamusState
     @ObservedObject var settings: UserSettingsStore
     @State var notification_mode_setting_error: String? = nil
+    @State var notification_preferences_sync_state: PreferencesSyncState = .undefined
     
     @Environment(\.dismiss) var dismiss
     
@@ -32,6 +35,7 @@ struct NotificationSettingsView: View {
             Task {
                 do {
                     try await damus_state.push_notification_client.send_token()
+                    await self.sync_up_remote_notification_settings()
                     settings.notifications_mode = new_value
                 }
                 catch {
@@ -44,6 +48,7 @@ struct NotificationSettingsView: View {
                 do {
                     try await damus_state.push_notification_client.revoke_token()
                     settings.notifications_mode = new_value
+                    notification_preferences_sync_state = .not_applicable
                 }
                 catch {
                     notification_mode_setting_error = String(format: NSLocalizedString("Error disabling push notifications with the server: %@", comment: "Error label shown when user tries to disable push notifications but something fails"), error.localizedDescription)
@@ -52,6 +57,61 @@ struct NotificationSettingsView: View {
         }
     }
     
+    // MARK: - Push notification preference sync management
+    
+    func notification_preference_binding<T>(_ raw_binding: Binding<T>) -> Binding<T> {
+        return Binding(
+            get: {
+                return raw_binding.wrappedValue
+            },
+            set: { new_value in
+                let old_value = raw_binding.wrappedValue
+                raw_binding.wrappedValue = new_value
+                if self.settings.notifications_mode == .push {
+                    Task {
+                        await self.send_push_notification_preferences(on_failure: {
+                            raw_binding.wrappedValue = old_value
+                        })
+                    }
+                }
+            }
+        )
+    }
+    
+    func sync_up_remote_notification_settings() async {
+        do {
+            notification_preferences_sync_state = .syncing
+            let remote_settings = try await damus_state.push_notification_client.get_settings()
+            let local_settings = PushNotificationClient.NotificationSettings.from(settings: settings)
+            if remote_settings != local_settings {
+                await self.send_push_notification_preferences(local_settings)
+            }
+            else {
+                notification_preferences_sync_state = .success
+            }
+        }
+        catch {
+            notification_preferences_sync_state = .failure(error: String(format: NSLocalizedString("Failed to get push notification preferences from the server", comment: "Error label indicating about a failure in fetching notification preferences"), error.localizedDescription))
+        }
+    }
+    
+    func send_push_notification_preferences(_ new_settings: PushNotificationClient.NotificationSettings? = nil, on_failure: (() -> Void)? = nil) async {
+        do {
+            notification_preferences_sync_state = .syncing
+            try await damus_state.push_notification_client.set_settings(new_settings)
+            // Make sync appear to take at least a few milliseconds or so to avoid issues with labor perception bias (https://growth.design/case-studies/labor-perception-bias)
+            DispatchQueue.main.asyncAfter(deadline: .now() + MINIMUM_PUSH_NOTIFICATION_SYNC_DELAY_IN_SECONDS) {
+                notification_preferences_sync_state = .success
+            }
+        }
+        catch {
+            notification_preferences_sync_state = .failure(error: String(format: NSLocalizedString("Error syncing up push notifications preferences with the server: %@", comment: "Error label shown when system tries to sync up notification preferences to the push notification server but something fails"), error.localizedDescription))
+            on_failure?()
+        }
+    }
+    
+    // MARK: - View layout
+    
     var body: some View {
         Form {
             if settings.enable_experimental_push_notifications {
@@ -80,21 +140,40 @@ struct NotificationSettingsView: View {
                 }
             }
             
-            Section(header: Text("Local Notifications", comment: "Section header for damus local notifications user configuration")) {
-                Toggle(NSLocalizedString("Zaps", comment: "Setting to enable Zap Local Notification"), isOn: $settings.zap_notification)
+            Section(
+                header: Text("Notification Preferences", comment: "Section header for Notification Preferences"),
+                footer: VStack {
+                    switch notification_preferences_sync_state {
+                        case .undefined, .not_applicable:
+                            EmptyView()
+                        case .success:
+                            HStack {
+                                Image("check-circle.fill")
+                                    .foregroundStyle(.damusGreen)
+                                Text("Successfully synced", comment: "Label indicating success in syncing notification preferences")
+                            }
+                        case .syncing:
+                            HStack(spacing: 10) {
+                                ProgressView()
+                                Text("Syncing", comment: "Label indicating success in syncing notification preferences")
+                            }
+                        case .failure(let error):
+                            Text(error)
+                                .foregroundStyle(.damusDangerPrimary)
+                    }
+                }
+            ) {
+                Toggle(NSLocalizedString("Zaps", comment: "Setting to enable Zap Local Notification"), isOn: self.notification_preference_binding($settings.zap_notification))
                     .toggleStyle(.switch)
-                Toggle(NSLocalizedString("Mentions", comment: "Setting to enable Mention Local Notification"), isOn: $settings.mention_notification)
+                Toggle(NSLocalizedString("Mentions", comment: "Setting to enable Mention Local Notification"), isOn: self.notification_preference_binding($settings.mention_notification))
                     .toggleStyle(.switch)
-                Toggle(NSLocalizedString("Reposts", comment: "Setting to enable Repost Local Notification"), isOn: $settings.repost_notification)
+                Toggle(NSLocalizedString("Reposts", comment: "Setting to enable Repost Local Notification"), isOn: self.notification_preference_binding($settings.repost_notification))
                     .toggleStyle(.switch)
-                Toggle(NSLocalizedString("Likes", comment: "Setting to enable Like Local Notification"), isOn: $settings.like_notification)
+                Toggle(NSLocalizedString("Likes", comment: "Setting to enable Like Local Notification"), isOn: self.notification_preference_binding($settings.like_notification))
                     .toggleStyle(.switch)
-                Toggle(NSLocalizedString("DMs", comment: "Setting to enable DM Local Notification"), isOn: $settings.dm_notification)
+                Toggle(NSLocalizedString("DMs", comment: "Setting to enable DM Local Notification"), isOn: self.notification_preference_binding($settings.dm_notification))
                     .toggleStyle(.switch)
-            }
-
-            Section(header: Text("Notification Preference", comment: "Section header for Notification Preferences")) {
-                Toggle(NSLocalizedString("Show only from users you follow", comment: "Setting to Show notifications only associated to users your follow"), isOn: $settings.notification_only_from_following)
+                Toggle(NSLocalizedString("Show only from users you follow", comment: "Setting to Show notifications only associated to users your follow"), isOn: self.notification_preference_binding($settings.notification_only_from_following))
                     .toggleStyle(.switch)
             }
             
@@ -113,6 +192,28 @@ struct NotificationSettingsView: View {
         .onReceive(handle_notify(.switched_timeline)) { _ in
             dismiss()
         }
+        .onAppear(perform: {
+            Task {
+                if self.settings.notifications_mode == .push {
+                    await self.sync_up_remote_notification_settings()
+                }
+            }
+        })
+    }
+}
+
+extension NotificationSettingsView {
+    enum PreferencesSyncState {
+        /// State is unknown
+        case undefined
+        /// State is not applicable (e.g. Notifications are set to local)
+        case not_applicable
+        /// Preferences are successfully synced
+        case success
+        /// Preferences are being synced
+        case syncing
+        /// There was a failure during syncing
+        case failure(error: String)
     }
 }
 

damus/Views/Settings/ReactionsSettingsView.swift

@@ -6,22 +6,20 @@
 //
 
 import SwiftUI
-import MCEmojiPicker
+import EmojiPicker
+import EmojiKit
 
 struct ReactionsSettingsView: View {
     @ObservedObject var settings: UserSettingsStore
+    let damus_state: DamusState
     @State private var isReactionsVisible: Bool = false
 
+    @State private var selectedEmoji: Emoji? = nil
+
     var body: some View {
         Form {
             Section {
                 Text(settings.default_emoji_reaction)
-                    .emojiPicker(
-                        isPresented: $isReactionsVisible,
-                        selectedEmoji: $settings.default_emoji_reaction,
-                        arrowDirection: .up,
-                        isDismissAfterChoosing: true
-                    )
                     .onTapGesture {
                         isReactionsVisible = true
                     }
@@ -31,43 +29,23 @@ struct ReactionsSettingsView: View {
         }
         .navigationTitle(NSLocalizedString("Reactions", comment: "Title of emoji reactions view"))
         .navigationBarTitleDisplayMode(.large)
+        .sheet(isPresented: $isReactionsVisible) {
+            NavigationView {
+                EmojiPickerView(selectedEmoji: $selectedEmoji, emojiProvider: damus_state.emoji_provider)
+            }
+            .presentationDetents([.medium, .large])
+        }
+        .onChange(of: selectedEmoji) { newEmoji in
+            guard let newEmoji else {
+                return
+            }
+            settings.default_emoji_reaction = newEmoji.value
+        }
     }
 }
 
-/// From: https://stackoverflow.com/a/39425959
-extension Character {
-    /// A simple emoji is one scalar and presented to the user as an Emoji
-    var isSimpleEmoji: Bool {
-        guard let firstScalar = unicodeScalars.first else { return false }
-        return firstScalar.properties.isEmoji && firstScalar.value > 0x238C
-    }
-
-    /// Checks if the scalars will be merged into an emoji
-    var isCombinedIntoEmoji: Bool { unicodeScalars.count > 1 && unicodeScalars.first?.properties.isEmoji ?? false }
-
-    var isEmoji: Bool { isSimpleEmoji || isCombinedIntoEmoji }
-}
-
-extension String {
-    var isSingleEmoji: Bool { count == 1 && containsEmoji }
-
-    var containsEmoji: Bool { contains { $0.isEmoji } }
-
-    var containsOnlyEmoji: Bool { !isEmpty && !contains { !$0.isEmoji } }
-
-    var emojiString: String { emojis.map { String($0) }.reduce("", +) }
-
-    var emojis: [Character] { filter { $0.isEmoji } }
-
-    var emojiScalars: [UnicodeScalar] { filter { $0.isEmoji }.flatMap { $0.unicodeScalars } }
-}
-
-func isValidEmoji(_ string: String) -> Bool {
-    return string.isSingleEmoji
-}
-
 struct ReactionsSettingsView_Previews: PreviewProvider {
     static var previews: some View {
-        ReactionsSettingsView(settings: UserSettingsStore())
+        ReactionsSettingsView(settings: UserSettingsStore(), damus_state: test_damus_state)
     }
 }

damus/Views/SetupView.swift

@@ -28,32 +28,53 @@ struct SetupView: View {
                         .fontWeight(.heavy)
                         .foregroundStyle(DamusLogoGradient.gradient)
 
-                    Text("The go-to iOS Nostr client", comment: "Quick description of what Damus is")
-                        .foregroundColor(DamusColors.mediumGrey)
+                    Text("The social network you control", comment: "Quick description of what Damus is")
+                        .foregroundColor(DamusColors.neutral6)
                         .padding(.top, 10)
                     
-                    WhatIsNostr()
-                        .padding()
-                    
-                    WhyWeNeedNostr()
-                        .padding()
-                    
                     Spacer()
                     
+                    Button(action: {
+                        navigationCoordinator.push(route: Route.CreateAccount)
+                    }) {
+                        HStack {
+                            Text("Create Account", comment: "Button to continue to the create account page.")
+                                .fontWeight(.semibold)
+                        }
+                        .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
+                    }
+                    .buttonStyle(GradientButtonStyle())
+                    .padding(.horizontal)
+                    
                     Button(action: {
                         navigationCoordinator.push(route: Route.Login)
                     }) {
                         HStack {
-                            Text("Let's get started!", comment: "Button to continue to login page.")
+                            Text("Sign In", comment: "Button to continue to login page.")
                                 .fontWeight(.semibold)
                         }
                         .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
                     }
                     .buttonStyle(GradientButtonStyle())
                     .padding()
+                    
+                    HStack(spacing: 0) {
+                        Text("By continuing you agree to our ")
+                            .font(.subheadline)
+                            .foregroundColor(DamusColors.neutral6)
+
+                        Button(action: {
+                            navigationCoordinator.push(route: Route.EULA)
+                        }, label: {
+                            Text("EULA", comment: "End User License Agreement")
+                                .font(.subheadline)
+                        })
+                        .padding(.vertical, 5)
+                    }
+                    .padding(.bottom)
                 }
             }
-            .background(DamusBackground(maxHeight: 300), alignment: .top)
+            .background(DamusBackground(maxHeight: UIScreen.main.bounds.size.height/2), alignment: .top)
             .navigationDestination(for: Route.self) { route in
                 route.view(navigationCoordinator: navigationCoordinator, damusState: DamusState.empty)
             }
@@ -63,61 +84,6 @@ struct SetupView: View {
     }
 }
 
-struct LearnAboutNostrLink: View {
-    @Environment(\.openURL) var openURL
-    var body: some View {
-        HStack {
-            Button(action: {
-                openURL(URL(string: "https://nostr.com")!)
-            }, label: {
-                Text("Learn more about Nostr", comment: "Button that opens up a webpage where the user can learn more about Nostr.")
-                    .foregroundColor(.accentColor)
-            })
-            
-            Image(systemName: "arrow.up.right")
-                .font(.footnote)
-                .foregroundColor(.accentColor)
-        }
-    }
-}
-
-struct WhatIsNostr: View {
-    var body: some View {
-        HStack(alignment: .top) {
-            Image("nostr-logo")
-            VStack(alignment: .leading) {
-                Text("What is Nostr?", comment: "Heading text for section describing what is Nostr.")
-                    .fontWeight(.bold)
-                    .padding(.vertical, 10)
-                
-                Text("Nostr is a protocol, designed for simplicity, that aims to create a censorship-resistant global social network", comment: "Description about what is Nostr.")
-                    .foregroundColor(DamusColors.mediumGrey)
-                
-                LearnAboutNostrLink()
-                    .padding(.top, 10)
-            }
-            Spacer()
-        }
-    }
-}
-
-struct WhyWeNeedNostr: View {
-    var body: some View {
-        HStack(alignment: .top) {
-            Image("lightbulb")
-            VStack(alignment: .leading) {
-                Text("Why we need Nostr?", comment: "Heading text for section describing why Nostr is needed.")
-                    .fontWeight(.bold)
-                    .padding(.vertical, 10)
-                
-                Text("Social media has developed into a key way information flows around the world. Unfortunately, our current social media systems are broken", comment: "Description about why Nostr is needed.")
-                    .foregroundColor(DamusColors.mediumGrey)
-            }
-            Spacer()
-        }
-    }
-}
-
 struct SetupView_Previews: PreviewProvider {
     static var previews: some View {
         Group {

damus/Views/Timeline/PostingTimelineView.swift

@@ -0,0 +1,80 @@
+//
+//  PostingTimelineView.swift
+//  damus
+//
+//  Created by eric on 7/15/24.
+//
+
+import SwiftUI
+
+struct PostingTimelineView: View {
+    
+    let damus_state: DamusState
+    var home: HomeModel
+    @State var search: String = ""
+    @State var results: [NostrEvent] = []
+    @State var initialOffset: CGFloat?
+    @State var offset: CGFloat?
+    @State var showSearch: Bool = true
+    @Binding var active_sheet: Sheets?
+    @FocusState private var isSearchFocused: Bool
+    @State private var contentOffset: CGFloat = 0
+    @State private var indicatorWidth: CGFloat = 0
+    @State private var indicatorPosition: CGFloat = 0
+    @SceneStorage("PostingTimelineView.filter_state") var filter_state : FilterState = .posts_and_replies
+    
+    var mystery: some View {
+        Text("Are you lost?", comment: "Text asking the user if they are lost in the app.")
+        .id("what")
+    }
+
+    func content_filter(_ fstate: FilterState) -> ((NostrEvent) -> Bool) {
+        var filters = ContentFilters.defaults(damus_state: damus_state)
+        filters.append(fstate.filter)
+        return ContentFilters(filters: filters).filter
+    }
+    
+    func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
+        TimelineView(events: home.events, loading: .constant(false), damus: damus_state, show_friend_icon: false, filter: filter) {
+            PullDownSearchView(state: damus_state, on_cancel: {})
+        }
+    }
+
+    var body: some View {
+        VStack {
+            ZStack {
+                TabView(selection: $filter_state) {
+                    // This is needed or else there is a bug when switching from the 3rd or 2nd tab to first. no idea why.
+                    mystery
+                    
+                    contentTimelineView(filter: content_filter(.posts))
+                        .tag(FilterState.posts)
+                        .id(FilterState.posts)
+                    contentTimelineView(filter: content_filter(.posts_and_replies))
+                        .tag(FilterState.posts_and_replies)
+                        .id(FilterState.posts_and_replies)
+                }
+                .tabViewStyle(.page(indexDisplayMode: .never))
+                
+                if damus_state.keypair.privkey != nil {
+                    PostButtonContainer(is_left_handed: damus_state.settings.left_handed) {
+                        self.active_sheet = .post(.posting(.none))
+                    }
+                }
+            }
+        }
+        .safeAreaInset(edge: .top, spacing: 0) {
+            VStack(spacing: 0) {
+                CustomPicker(tabs: [
+                    (NSLocalizedString("Notes", comment: "Label for filter for seeing only notes (instead of notes and replies)."), FilterState.posts),
+                    (NSLocalizedString("Notes & Replies", comment: "Label for filter for seeing notes and replies (instead of only notes)."), FilterState.posts_and_replies)
+                  ],
+                selection: $filter_state)
+
+                Divider()
+                    .frame(height: 1)
+            }
+            .background(DamusColors.adaptableWhite)
+        }
+    }
+}

damus/Views/Zaps/CustomizeZapView.swift

@@ -295,6 +295,64 @@ struct CustomizeZapView: View {
     }
 }
 
+struct ZapSheetViewIfPossible: View {
+    let damus_state: DamusState
+    let target: ZapTarget
+    let lnurl: String?
+    var zap_sheet: ZapSheet? {
+        guard let lnurl else { return nil }
+        return ZapSheet(target: target, lnurl: lnurl)
+    }
+
+    @Environment(\.dismiss) var dismiss
+    @Environment(\.colorScheme) var colorScheme
+
+    var body: some View {
+        if let zap_sheet {
+            CustomizeZapView(state: damus_state, target: zap_sheet.target, lnurl: zap_sheet.lnurl)
+        }
+        else {
+            zap_sheet_not_possible
+        }
+    }
+
+    var zap_sheet_not_possible: some View {
+        VStack(alignment: .center, spacing: 20) {
+            Image(systemName: "bolt.trianglebadge.exclamationmark.fill")
+                .resizable()
+                .scaledToFit()
+                .frame(width: 70)
+            Text("User not zappable", comment: "Headline indicating a user cannot be zapped")
+                .font(.headline)
+            Text("This user cannot be zapped because they have not configured zaps on their account yet. Time to orange-pill?", comment: "Comment explaining why a user cannot be zapped.")
+                .multilineTextAlignment(.center)
+                .opacity(0.6)
+            self.dm_button
+        }
+        .padding()
+    }
+
+    var dm_button: some View {
+        let dm_model = damus_state.dms.lookup_or_create(target.pubkey)
+        return VStack(alignment: .center, spacing: 10) {
+            Button(
+                action: {
+                    damus_state.nav.push(route: Route.DMChat(dms: dm_model))
+                    dismiss()
+                },
+                label: {
+                    Image("messages")
+                        .profile_button_style(scheme: colorScheme)
+                }
+            )
+            .buttonStyle(NeutralButtonShape.circle.style)
+            Text("Orange-pill", comment: "Button label that allows the user to start a direct message conversation with the user shown on-screen, to orange-pill them (i.e. help them to setup zaps)")
+                .foregroundStyle(.secondary)
+                .font(.caption)
+        }
+    }
+}
+
 extension View {
     func hideKeyboard() {
         let resign = #selector(UIResponder.resignFirstResponder)
@@ -302,9 +360,25 @@ extension View {
     }
 }
 
-struct CustomizeZapView_Previews: PreviewProvider {
-    static var previews: some View {
-        CustomizeZapView(state: test_damus_state, target: ZapTarget.note(id: test_note.id, author: test_note.pubkey), lnurl: "")
-            .frame(width: 400, height: 600)
-    }
+
+
+fileprivate func test_zap_sheet() -> ZapSheet {
+    let zap_target = ZapTarget.note(id: test_note.id, author: test_note.pubkey)
+    let lnurl = ""
+    return ZapSheet(target: zap_target, lnurl: lnurl)
+}
+
+#Preview {
+    CustomizeZapView(state: test_damus_state, target: test_zap_sheet().target, lnurl: test_zap_sheet().lnurl)
+        .frame(width: 400, height: 600)
+}
+
+#Preview {
+    ZapSheetViewIfPossible(damus_state: test_damus_state, target: test_zap_sheet().target, lnurl: test_zap_sheet().lnurl)
+        .frame(width: 400, height: 600)
+}
+
+#Preview {
+    ZapSheetViewIfPossible(damus_state: test_damus_state, target: test_zap_sheet().target, lnurl: nil)
+        .frame(width: 400, height: 600)
 }

damus/en-US.xcloc/Localized Contents/en-US.xliff

@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="damus/en-US.lproj/InfoPlist.strings" source-language="en-US" target-language="en-US" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.3" build-num="15E204a"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -44,7 +44,7 @@
   </file>
   <file original="damus/en-US.lproj/Localizable.strings" source-language="en-US" target-language="en-US" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.3" build-num="15E204a"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
     </header>
     <body>
       <trans-unit id="%@ %@" xml:space="preserve">
@@ -144,11 +144,6 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>API Key (required)</target>
         <note>Prompt for required entry of API Key to use translation server.</note>
       </trans-unit>
-      <trans-unit id="About" xml:space="preserve">
-        <source>About</source>
-        <target>About</target>
-        <note>Label to prompt for about text entry for user to describe about themself.</note>
-      </trans-unit>
       <trans-unit id="About Me" xml:space="preserve">
         <source>About Me</source>
         <target>About Me</target>
@@ -159,6 +154,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>Absolute Boss</target>
         <note>Placeholder text for About Me description.</note>
       </trans-unit>
+      <trans-unit id="Absolute legend." xml:space="preserve">
+        <source>Absolute legend.</source>
+        <target>Absolute legend.</target>
+        <note>Example Bio</note>
+      </trans-unit>
       <trans-unit id="Accessibility" xml:space="preserve">
         <source>Accessibility</source>
         <target>Accessibility</target>
@@ -189,6 +189,11 @@ Sentence composed of 2 variables to describe how many people are following a use
         <target>Add Bookmark</target>
         <note>Button text to add bookmark to a note.</note>
       </trans-unit>
+      <trans-unit id="Add Photo" xml:space="preserve">
+        <source>Add Photo</source>
+        <target>Add Photo</target>
+        <note>Label to indicate user can add a photo.</note>
+      </trans-unit>
       <trans-unit id="Add all" xml:space="preserve">
         <source>Add all</source>
         <target>Add all</target>
@@ -255,6 +260,11 @@ Button text to add a relay</note>
         <target>An additional percentage of each zap will be sent to support Damus development</target>
         <note>Text indicating that they can contribute zaps to support Damus development.</note>
       </trans-unit>
+      <trans-unit id="An unexpected error happened while trying to create the new contact list. Please contact support." xml:space="preserve">
+        <source>An unexpected error happened while trying to create the new contact list. Please contact support.</source>
+        <target>An unexpected error happened while trying to create the new contact list. Please contact support.</target>
+        <note>Error message for a failed contact list reset operation</note>
+      </trans-unit>
       <trans-unit id="Animations" xml:space="preserve">
         <source>Animations</source>
         <target>Animations</target>
@@ -351,10 +361,10 @@ Tip: You can always change this later in Settings → Translations</target>
         <target>Be the first to access upcoming premium features: Automatic translations, longer note storage, and more</target>
         <note>Description of new features to be expected</note>
       </trans-unit>
-      <trans-unit id="Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." xml:space="preserve">
-        <source>Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.</source>
-        <target>Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.</target>
-        <note>Reminder to user that they should save their account information.</note>
+      <trans-unit id="Bio" xml:space="preserve">
+        <source>Bio</source>
+        <target>Bio</target>
+        <note>Label to prompt bio entry for user to describe themself.</note>
       </trans-unit>
       <trans-unit id="Bitcoin Lightning Tips" xml:space="preserve">
         <source>Bitcoin Lightning Tips</source>
@@ -383,10 +393,10 @@ Tip: You can always change this later in Settings → Translations</target>
         <target>Broadcast music playing on Apple Music</target>
         <note>Toggle to enable or disable broadcasting what music is being played on Apple Music in their profile status.</note>
       </trans-unit>
-      <trans-unit id="By signing up, you agree to our " xml:space="preserve">
-        <source>By signing up, you agree to our </source>
-        <target>By signing up, you agree to our </target>
-        <note>Ask the user if they already have an account on Nostr</note>
+      <trans-unit id="By continuing you agree to our " xml:space="preserve">
+        <source>By continuing you agree to our </source>
+        <target>By continuing you agree to our </target>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="By subscribing to Damus Purple, you are accepting our [privacy policy](https://damus.io/privacy-policy.txt) and Apple's Standard [EULA](https://www.apple.com/legal/internet-services/itunes/dev/stdeula/)" xml:space="preserve">
         <source>By subscribing to Damus Purple, you are accepting our [privacy policy](https://damus.io/privacy-policy.txt) and Apple's Standard [EULA](https://www.apple.com/legal/internet-services/itunes/dev/stdeula/)</source>
@@ -413,7 +423,8 @@ Tip: You can always change this later in Settings → Translations</target>
    Button to cancel the upload.
    Cancel deleting bookmarks.
    Cancel deleting the user.
-   Cancel out of logging out the user.</note>
+   Cancel out of logging out the user.
+   Cancel resetting the contact list.</note>
       </trans-unit>
       <trans-unit id="Changing this setting will cause the cache to be cleared. This will free space, but images may take longer to load again. Are you sure you want to proceed?" xml:space="preserve">
         <source>Changing this setting will cause the cache to be cleared. This will free space, but images may take longer to load again. Are you sure you want to proceed?</source>
@@ -486,6 +497,16 @@ Button to connect to the relay.</note>
         <target>Connecting</target>
         <note>Relay status label that indicates a relay is connecting.</note>
       </trans-unit>
+      <trans-unit id="Contact list (Follows + Relay list)" xml:space="preserve">
+        <source>Contact list (Follows + Relay list)</source>
+        <target>Contact list (Follows + Relay list)</target>
+        <note>Section title for Contact list first aid tools</note>
+      </trans-unit>
+      <trans-unit id="Contact list has been reset" xml:space="preserve">
+        <source>Contact list has been reset</source>
+        <target>Contact list has been reset</target>
+        <note>Message indicating that the contact list was successfully reset.</note>
+      </trans-unit>
       <trans-unit id="Content filters" xml:space="preserve">
         <source>Content filters</source>
         <target>Content filters</target>
@@ -495,7 +516,8 @@ Button to connect to the relay.</note>
         <source>Continue</source>
         <target>Continue</target>
         <note>Continue with bookmarks.
-   Continue with deleting the user.</note>
+   Continue with deleting the user.
+   Continue with resetting the contact list.</note>
       </trans-unit>
       <trans-unit id="Copied" xml:space="preserve">
         <source>Copied</source>
@@ -569,6 +591,11 @@ Button to connect to the relay.</note>
         <target>Copy user public key</target>
         <note>Context menu option for copying the ID of the user who created the note.</note>
       </trans-unit>
+      <trans-unit id="Could not create your initial contact list event. This is a software bug, please contact Damus support via support@damus.io or through our Nostr account for help." xml:space="preserve">
+        <source>Could not create your initial contact list event. This is a software bug, please contact Damus support via support@damus.io or through our Nostr account for help.</source>
+        <target>Could not create your initial contact list event. This is a software bug, please contact Damus support via support@damus.io or through our Nostr account for help.</target>
+        <note>Error message to the user indicating that the initial contact list failed to be created.</note>
+      </trans-unit>
       <trans-unit id="Could not find the user you're looking for" xml:space="preserve">
         <source>Could not find the user you're looking for</source>
         <target>Could not find the user you're looking for</target>
@@ -579,26 +606,21 @@ Button to connect to the relay.</note>
         <target>Could not find user to mute...</target>
         <note>Alert message to indicate that the muted user could not be found.</note>
       </trans-unit>
+      <trans-unit id="Create Account" xml:space="preserve">
+        <source>Create Account</source>
+        <target>Create Account</target>
+        <note>Button to continue to the create account page.</note>
+      </trans-unit>
       <trans-unit id="Create account" xml:space="preserve">
         <source>Create account</source>
         <target>Create account</target>
         <note>Button to navigate to create account view.</note>
       </trans-unit>
-      <trans-unit id="Create account now" xml:space="preserve">
-        <source>Create account now</source>
-        <target>Create account now</target>
-        <note>Button to create account.</note>
-      </trans-unit>
       <trans-unit id="Create new mutelist" xml:space="preserve">
         <source>Create new mutelist</source>
         <target>Create new mutelist</target>
         <note>Title of alert prompting the user to create a new mutelist.</note>
       </trans-unit>
-      <trans-unit id="Creator(s) of Bitcoin. Absolute legend." xml:space="preserve">
-        <source>Creator(s) of Bitcoin. Absolute legend.</source>
-        <target>Creator(s) of Bitcoin. Absolute legend.</target>
-        <note>Example description about Bitcoin creator(s), Satoshi Nakamoto.</note>
-      </trans-unit>
       <trans-unit id="Custom" xml:space="preserve">
         <source>Custom</source>
         <target>Custom</target>
@@ -609,6 +631,7 @@ Button to connect to the relay.</note>
         <target>DMs</target>
         <note>Navigation title for DMs view, where DM is the English abbreviation for Direct Message.
    Navigation title for view of DMs, where DM is an English abbreviation for Direct Message.
+   Picker option for DM selector for seeing only DMs that have been responded to. DM is the English abbreviation for Direct Message.
    Setting to enable DM Local Notification
    Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.</note>
       </trans-unit>
@@ -695,11 +718,6 @@ Button to disconnect from a relay server.</note>
         <target>Dismiss</target>
         <note>Button to dismiss alert</note>
       </trans-unit>
-      <trans-unit id="Display name" xml:space="preserve">
-        <source>Display name</source>
-        <target>Display name</target>
-        <note>Label to prompt display name entry.</note>
-      </trans-unit>
       <trans-unit id="Done" xml:space="preserve">
         <source>Done</source>
         <target>Done</target>
@@ -766,6 +784,16 @@ Button to disconnect from a relay server.</note>
         <note>Label to display that authentication to a server has failed.
 Relay status label that indicates a relay had an error when connecting</note>
       </trans-unit>
+      <trans-unit id="Error configuring push notifications with the server: %@" xml:space="preserve">
+        <source>Error configuring push notifications with the server: %@</source>
+        <target>Error configuring push notifications with the server: %@</target>
+        <note>Error label shown when user tries to enable push notifications but something fails</note>
+      </trans-unit>
+      <trans-unit id="Error disabling push notifications with the server: %@" xml:space="preserve">
+        <source>Error disabling push notifications with the server: %@</source>
+        <target>Error disabling push notifications with the server: %@</target>
+        <note>Error label shown when user tries to disable push notifications but something fails</note>
+      </trans-unit>
       <trans-unit id="Error fetching lightning invoice" xml:space="preserve">
         <source>Error fetching lightning invoice</source>
         <target>Error fetching lightning invoice</target>
@@ -816,6 +844,12 @@ Relay status label that indicates a relay had an error when connecting</note>
         <target>Failed to parse</target>
         <note>NostrScript error message when it fails to parse a script.</note>
       </trans-unit>
+      <trans-unit id="First Aid" xml:space="preserve">
+        <source>First Aid</source>
+        <target>First Aid</target>
+        <note>Navigation title for first aid settings and tools
+   Section header for first aid tools and settings</note>
+      </trans-unit>
       <trans-unit id="Follow" xml:space="preserve">
         <source>Follow</source>
         <target>Follow</target>
@@ -907,6 +941,11 @@ My side interests include languages and I am striving to be a #polyglot - I am a
         <target>Free</target>
         <note>Dropdown option for selecting Free plan for DeepL translation service.</note>
       </trans-unit>
+      <trans-unit id="General" xml:space="preserve">
+        <source>General</source>
+        <target>General</target>
+        <note>Section header for general damus notifications user configuration</note>
+      </trans-unit>
       <trans-unit id="Get API Key" xml:space="preserve">
         <source>Get API Key</source>
         <target>Get API Key</target>
@@ -926,7 +965,8 @@ My side interests include languages and I am striving to be a #polyglot - I am a
       <trans-unit id="Hashtags" xml:space="preserve">
         <source>Hashtags</source>
         <target>Hashtags</target>
-        <note>Section header title for a list of hashtags that are muted.</note>
+        <note>Label for filter for seeing only hashtag follows.
+   Section header title for a list of hashtags that are muted.</note>
       </trans-unit>
       <trans-unit id="Hello everybody!&#10;&#10;This is my first post on Damus, I am happy to meet you all 🤙. What’s up?&#10;&#10;#introductions" xml:space="preserve">
         <source>Hello everybody!
@@ -971,6 +1011,16 @@ This is my first post on Damus, I am happy to meet you all 🤙. What’s up?
         <target>Hide notes with #nsfw tags</target>
         <note>Setting to hide notes with the #nsfw (not safe for work) tags</note>
       </trans-unit>
+      <trans-unit id="Highlighted" xml:space="preserve">
+        <source>Highlighted</source>
+        <target>Highlighted</target>
+        <note>Label to indicate that the user is highlighting their own post.</note>
+      </trans-unit>
+      <trans-unit id="Highlighted %@" xml:space="preserve">
+        <source>Highlighted %@</source>
+        <target>Highlighted %@</target>
+        <note>Label to indicate that the user is highlighting 1 user.</note>
+      </trans-unit>
       <trans-unit id="Home" xml:space="preserve">
         <source>Home</source>
         <target>Home</target>
@@ -1005,6 +1055,11 @@ Hope to meet folks who are on their own journeys to a peaceful and free life!</t
         <target>Impersonation</target>
         <note>Description of report type for impersonation.</note>
       </trans-unit>
+      <trans-unit id="In progress…" xml:space="preserve">
+        <source>In progress…</source>
+        <target>In progress…</target>
+        <note>Loading message indicating that a contact list reset operation is in progress.</note>
+      </trans-unit>
       <trans-unit id="Indefinite" xml:space="preserve">
         <source>Indefinite</source>
         <target>Indefinite</target>
@@ -1051,11 +1106,6 @@ Hope to meet folks who are on their own journeys to a peaceful and free life!</t
         <target>LIVE</target>
         <note>Text indicator that the video is a livestream.</note>
       </trans-unit>
-      <trans-unit id="Learn more about Nostr" xml:space="preserve">
-        <source>Learn more about Nostr</source>
-        <target>Learn more about Nostr</target>
-        <note>Button that opens up a webpage where the user can learn more about Nostr.</note>
-      </trans-unit>
       <trans-unit id="Learn more about the features" xml:space="preserve">
         <source>Learn more about the features</source>
         <target>Learn more about the features</target>
@@ -1066,16 +1116,6 @@ Hope to meet folks who are on their own journeys to a peaceful and free life!</t
         <target>Left Handed</target>
         <note>Moves the post button to the left side of the screen</note>
       </trans-unit>
-      <trans-unit id="Let's get started!" xml:space="preserve">
-        <source>Let's get started!</source>
-        <target>Let's get started!</target>
-        <note>Button to continue to login page.</note>
-      </trans-unit>
-      <trans-unit id="Let's go!" xml:space="preserve">
-        <source>Let's go!</source>
-        <target>Let's go!</target>
-        <note>Button to complete account creation and start using the app.</note>
-      </trans-unit>
       <trans-unit id="LibreTranslate (Open Source)" xml:space="preserve">
         <source>LibreTranslate (Open Source)</source>
         <target>LibreTranslate (Open Source)</target>
@@ -1106,6 +1146,11 @@ Hope to meet folks who are on their own journeys to a peaceful and free life!</t
         <target>Load media</target>
         <note>Button to show media in note.</note>
       </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target>Local</target>
+        <note>Option for notification mode setting: Local notification mode</note>
+      </trans-unit>
       <trans-unit id="Local Notifications" xml:space="preserve">
         <source>Local Notifications</source>
         <target>Local Notifications</target>
@@ -1175,7 +1220,8 @@ Hope to meet folks who are on their own journeys to a peaceful and free life!</t
       <trans-unit id="Mentions" xml:space="preserve">
         <source>Mentions</source>
         <target>Mentions</target>
-        <note>Setting to enable Mention Local Notification</note>
+        <note>Label for filter for seeing mention notifications (replies, etc).
+   Setting to enable Mention Local Notification</note>
       </trans-unit>
       <trans-unit id="Merch" xml:space="preserve">
         <source>Merch</source>
@@ -1195,7 +1241,9 @@ Hope to meet folks who are on their own journeys to a peaceful and free life!</t
       <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
         <target>Mute</target>
-        <note>Alert button to mute a user.</note>
+        <note>Alert button to mute a user.
+   Button to mute a profile
+   Title for confirmation dialog to mute a profile.</note>
       </trans-unit>
       <trans-unit id="Mute %@?" xml:space="preserve">
         <source>Mute %@?</source>
@@ -1235,6 +1283,11 @@ Hope to meet folks who are on their own journeys to a peaceful and free life!</t
 Text label indicating that there is no NIP-11 relay description information found. In English, N/A stands for not applicable.
 Text label indicating that there is no NIP-11 relay software information found. In English, N/A stands for not applicable.</note>
       </trans-unit>
+      <trans-unit id="Name" xml:space="preserve">
+        <source>Name</source>
+        <target>Name</target>
+        <note>Label to prompt name entry.</note>
+      </trans-unit>
       <trans-unit id="Never" xml:space="preserve">
         <source>Never</source>
         <target>Never</target>
@@ -1260,11 +1313,21 @@ Text label indicating that there is no NIP-11 relay software information found.
         <target>New to Nostr?</target>
         <note>Ask the user if they are new to Nostr</note>
       </trans-unit>
+      <trans-unit id="Next" xml:space="preserve">
+        <source>Next</source>
+        <target>Next</target>
+        <note>Button to continue with account creation.</note>
+      </trans-unit>
       <trans-unit id="No" xml:space="preserve">
         <source>No</source>
         <target>No</target>
         <note>User confirm No</note>
       </trans-unit>
+      <trans-unit id="No contact list was found. You might experience issues using the app. If you suspect you have permanently lost your contact list (or if you never had one), you can fix this by resetting it" xml:space="preserve">
+        <source>No contact list was found. You might experience issues using the app. If you suspect you have permanently lost your contact list (or if you never had one), you can fix this by resetting it</source>
+        <target>No contact list was found. You might experience issues using the app. If you suspect you have permanently lost your contact list (or if you never had one), you can fix this by resetting it</target>
+        <note>Section footer for Contact list first aid tools</note>
+      </trans-unit>
       <trans-unit id="No logs to display" xml:space="preserve">
         <source>No logs to display</source>
         <target>No logs to display</target>
@@ -1310,11 +1373,6 @@ Text label indicating that there is no NIP-11 relay software information found.
         <target>Nostr Address</target>
         <note>Label for the Nostr Address section of user profile form.</note>
       </trans-unit>
-      <trans-unit id="Nostr is a protocol, designed for simplicity, that aims to create a censorship-resistant global social network" xml:space="preserve">
-        <source>Nostr is a protocol, designed for simplicity, that aims to create a censorship-resistant global social network</source>
-        <target>Nostr is a protocol, designed for simplicity, that aims to create a censorship-resistant global social network</target>
-        <note>Description about what is Nostr.</note>
-      </trans-unit>
       <trans-unit id="NostrScript" xml:space="preserve">
         <source>NostrScript</source>
         <target>NostrScript</target>
@@ -1325,6 +1383,11 @@ Text label indicating that there is no NIP-11 relay software information found.
         <target>NostrScript Error</target>
         <note>Text indicating that there was an error with loading NostrScript. There is a more descriptive error message shown separately underneath.</note>
       </trans-unit>
+      <trans-unit id="Not now" xml:space="preserve">
+        <source>Not now</source>
+        <target>Not now</target>
+        <note>Button to not save key, complete account creation, and start using the app.</note>
+      </trans-unit>
       <trans-unit id="Note from a %@ you've muted" xml:space="preserve">
         <source>Note from a %@ you've muted</source>
         <target>Note from a %@ you've muted</target>
@@ -1333,20 +1396,18 @@ Text label indicating that there is no NIP-11 relay software information found.
       <trans-unit id="Note you've muted" xml:space="preserve">
         <source>Note you've muted</source>
         <target>Note you've muted</target>
-        <note>Text to indicate that what is being shown is a note which has been muted.</note>
+        <note>Text to indicate that what is being shown is a note which has been muted.
+Label indicating note has been muted</note>
       </trans-unit>
       <trans-unit id="Notes" xml:space="preserve">
         <source>Notes</source>
         <target>Notes</target>
-        <note>Label for filter for seeing only notes (instead of notes and replies).
-Label for filter for seeing only your notes (instead of notes and replies).
-A label indicating that the notes being displayed below it are from a timeline, not search results</note>
+        <note>Label for filter for seeing only notes (instead of notes and replies).</note>
       </trans-unit>
       <trans-unit id="Notes &amp; Replies" xml:space="preserve">
         <source>Notes &amp; Replies</source>
         <target>Notes &amp; Replies</target>
-        <note>Label for filter for seeing notes and replies (instead of only notes).
-Label for filter for seeing your notes and replies (instead of only your notes).</note>
+        <note>Label for filter for seeing notes and replies (instead of only notes).</note>
       </trans-unit>
       <trans-unit id="Notes with the #nsfw tag usually contains adult content or other &quot;Not safe for work&quot; content" xml:space="preserve">
         <source>Notes with the #nsfw tag usually contains adult content or other "Not safe for work" content</source>
@@ -1374,6 +1435,11 @@ Label for filter for seeing your notes and replies (instead of only your notes).
         <note>Section header for Damus notifications
    Toolbar label for Notifications view.</note>
       </trans-unit>
+      <trans-unit id="Notifications mode" xml:space="preserve">
+        <source>Notifications mode</source>
+        <target>Notifications mode</target>
+        <note>Prompt selection of the notification mode (Feature to switch between local notifications (generated from user's own phone) or push notifications (generated by Damus server).</note>
+      </trans-unit>
       <trans-unit id="Nudity" xml:space="preserve">
         <source>Nudity</source>
         <target>Nudity</target>
@@ -1430,6 +1496,11 @@ Button label to dismiss an error dialog</note>
         <target>Optional</target>
         <note>Prompt to enter optional additional information when reporting an account or content.</note>
       </trans-unit>
+      <trans-unit id="Orange-pill" xml:space="preserve">
+        <source>Orange-pill</source>
+        <target>Orange-pill</target>
+        <note>Button label that allows the user to start a direct message conversation with the user shown on-screen, to orange-pill them (i.e. help them to setup zaps)</note>
+      </trans-unit>
       <trans-unit id="Paid Relay" xml:space="preserve">
         <source>Paid Relay</source>
         <target>Paid Relay</target>
@@ -1478,7 +1549,8 @@ Button label to dismiss an error dialog</note>
       <trans-unit id="Post" xml:space="preserve">
         <source>Post</source>
         <target>Post</target>
-        <note>Button to post a note.</note>
+        <note>Button to post a highlight.
+   Button to post a note.</note>
       </trans-unit>
       <trans-unit id="Private" xml:space="preserve">
         <source>Private</source>
@@ -1540,11 +1612,6 @@ Button label to dismiss an error dialog</note>
         <target>Public Account ID</target>
         <note>Section title for the user's public account ID.</note>
       </trans-unit>
-      <trans-unit id="Public Key" xml:space="preserve">
-        <source>Public Key</source>
-        <target>Public Key</target>
-        <note>Label to indicate the public key of the account.</note>
-      </trans-unit>
       <trans-unit id="Public key" xml:space="preserve">
         <source>Public key</source>
         <target>Public key</target>
@@ -1570,6 +1637,11 @@ Button label to dismiss an error dialog</note>
         <target>Purple</target>
         <note>Subscription service name</note>
       </trans-unit>
+      <trans-unit id="Push" xml:space="preserve">
+        <source>Push</source>
+        <target>Push</target>
+        <note>Option for notification mode setting: Push notification mode</note>
+      </trans-unit>
       <trans-unit id="QR Code" xml:space="preserve">
         <source>QR Code</source>
         <target>QR Code</target>
@@ -1590,6 +1662,11 @@ Button label to dismiss an error dialog</note>
         <target>Ran to suspension.</target>
         <note>Indication that a NostrScript was run until it reached a suspended state.</note>
       </trans-unit>
+      <trans-unit id="React with default reaction emoji" xml:space="preserve">
+        <source>React with default reaction emoji</source>
+        <target>React with default reaction emoji</target>
+        <note>Accessibility label for react button</note>
+      </trans-unit>
       <trans-unit id="Reactions" xml:space="preserve">
         <source>Reactions</source>
         <target>Reactions</target>
@@ -1700,6 +1777,11 @@ Button label to dismiss an error dialog</note>
         <target>Repost</target>
         <note>Button to repost a note</note>
       </trans-unit>
+      <trans-unit id="Repost or quote this note" xml:space="preserve">
+        <source>Repost or quote this note</source>
+        <target>Repost or quote this note</target>
+        <note>Accessibility label for repost/quote button</note>
+      </trans-unit>
       <trans-unit id="Reposted" xml:space="preserve">
         <source>Reposted</source>
         <target>Reposted</target>
@@ -1720,7 +1802,12 @@ Button label to dismiss an error dialog</note>
       <trans-unit id="Requests" xml:space="preserve">
         <source>Requests</source>
         <target>Requests</target>
-        <note>Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message.</note>
+        <note>Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet</note>
+      </trans-unit>
+      <trans-unit id="Reset contact list" xml:space="preserve">
+        <source>Reset contact list</source>
+        <target>Reset contact list</target>
+        <note>Button to reset contact list.</note>
       </trans-unit>
       <trans-unit id="Retry" xml:space="preserve">
         <source>Retry</source>
@@ -1777,6 +1864,11 @@ Button label to dismiss an error dialog</note>
         <target>Save Key in Secure Keychain</target>
         <note>Toggle to save private key to the Apple secure keychain.</note>
       </trans-unit>
+      <trans-unit id="Save your login info?" xml:space="preserve">
+        <source>Save your login info?</source>
+        <target>Save your login info?</target>
+        <note>Ask user if they want to save their account information.</note>
+      </trans-unit>
       <trans-unit id="Scan Code" xml:space="preserve">
         <source>Scan Code</source>
         <target>Scan Code</target>
@@ -1907,6 +1999,11 @@ Button label to dismiss an error dialog</note>
         <target>Share Via...</target>
         <note>Button to present iOS share sheet</note>
       </trans-unit>
+      <trans-unit id="Share externally" xml:space="preserve">
+        <source>Share externally</source>
+        <target>Share externally</target>
+        <note>Accessibility label for external share button</note>
+      </trans-unit>
       <trans-unit id="Show" xml:space="preserve">
         <source>Show</source>
         <target>Show</target>
@@ -1954,6 +2051,11 @@ Button label to dismiss an error dialog</note>
         <target>Show wallet selector</target>
         <note>Toggle to show or hide selection of wallet.</note>
       </trans-unit>
+      <trans-unit id="Sign In" xml:space="preserve">
+        <source>Sign In</source>
+        <target>Sign In</target>
+        <note>Button to continue to login page.</note>
+      </trans-unit>
       <trans-unit id="Sign Out" xml:space="preserve">
         <source>Sign Out</source>
         <target>Sign Out</target>
@@ -1974,11 +2076,6 @@ Button label to dismiss an error dialog</note>
         <target>Skip</target>
         <note>Button to dismiss the suggested users screen</note>
       </trans-unit>
-      <trans-unit id="Social media has developed into a key way information flows around the world. Unfortunately, our current social media systems are broken" xml:space="preserve">
-        <source>Social media has developed into a key way information flows around the world. Unfortunately, our current social media systems are broken</source>
-        <target>Social media has developed into a key way information flows around the world. Unfortunately, our current social media systems are broken</target>
-        <note>Description about why Nostr is needed.</note>
-      </trans-unit>
       <trans-unit id="Someone posted a note" xml:space="preserve">
         <source>Someone posted a note</source>
         <target>Someone posted a note</target>
@@ -2087,11 +2184,6 @@ Enjoy!</target>
         <target>The address should either begin with LNURL or should look like an email address.</target>
         <note>Giving the description of the alert message.</note>
       </trans-unit>
-      <trans-unit id="The go-to iOS Nostr client" xml:space="preserve">
-        <source>The go-to iOS Nostr client</source>
-        <target>The go-to iOS Nostr client</target>
-        <note>Quick description of what Damus is</note>
-      </trans-unit>
       <trans-unit id="The relay you are trying to add is already added.&#10;You're all set!" xml:space="preserve">
         <source>The relay you are trying to add is already added.
 You're all set!</source>
@@ -2099,6 +2191,11 @@ You're all set!</source>
 You're all set!</target>
         <note>An error message that appears when the user attempts to add a relay that has already been added.</note>
       </trans-unit>
+      <trans-unit id="The social network you control" xml:space="preserve">
+        <source>The social network you control</source>
+        <target>The social network you control</target>
+        <note>Quick description of what Damus is</note>
+      </trans-unit>
       <trans-unit id="There has been an unexpected error with the in-app purchase. Please try again later or contact support@damus.io. Error: %@" xml:space="preserve">
         <source>There has been an unexpected error with the in-app purchase. Please try again later or contact support@damus.io. Error: %@</source>
         <target>There has been an unexpected error with the in-app purchase. Please try again later or contact support@damus.io. Error: %@</target>
@@ -2128,16 +2225,16 @@ Nice to meet you all! #introductions #plebchain </source>
 Nice to meet you all! #introductions #plebchain </target>
         <note>First post example given to the user during onboarding, as a suggestion as to what they could post first</note>
       </trans-unit>
-      <trans-unit id="This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" xml:space="preserve">
-        <source>This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!</source>
-        <target>This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!</target>
-        <note>Label to describe that a private key is the user's secret account key and what they should do with it.</note>
-      </trans-unit>
       <trans-unit id="This note contains too many items and cannot be rendered" xml:space="preserve">
         <source>This note contains too many items and cannot be rendered</source>
         <target>This note contains too many items and cannot be rendered</target>
         <note>Error message indicating that a note is too big and cannot be rendered</note>
       </trans-unit>
+      <trans-unit id="This user cannot be zapped because they have not configured zaps on their account yet. Time to orange-pill?" xml:space="preserve">
+        <source>This user cannot be zapped because they have not configured zaps on their account yet. Time to orange-pill?</source>
+        <target>This user cannot be zapped because they have not configured zaps on their account yet. Time to orange-pill?</target>
+        <note>Comment explaining why a user cannot be zapped.</note>
+      </trans-unit>
       <trans-unit id="Thread" xml:space="preserve">
         <source>Thread</source>
         <target>Thread</target>
@@ -2275,6 +2372,11 @@ Nice to meet you all! #introductions #plebchain </target>
         <target>User muted</target>
         <note>Alert message to indicate the user has been muted</note>
       </trans-unit>
+      <trans-unit id="User not zappable" xml:space="preserve">
+        <source>User not zappable</source>
+        <target>User not zappable</target>
+        <note>Headline indicating a user cannot be zapped</note>
+      </trans-unit>
       <trans-unit id="Username" xml:space="preserve">
         <source>Username</source>
         <target>Username</target>
@@ -2342,6 +2444,15 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
  ARE YOU SURE YOU WANT TO CONTINUE?</target>
         <note>Alert for deleting the users account.</note>
       </trans-unit>
+      <trans-unit id="WARNING:&#10;&#10;This will reset your contact list, including the list of everyone you follow and the list of all relays you usually connect to. ONLY PROCEED IF YOU ARE SURE YOU HAVE LOST YOUR CONTACT LIST BEYOND RECOVERABILITY." xml:space="preserve">
+        <source>WARNING:
+
+This will reset your contact list, including the list of everyone you follow and the list of all relays you usually connect to. ONLY PROCEED IF YOU ARE SURE YOU HAVE LOST YOUR CONTACT LIST BEYOND RECOVERABILITY.</source>
+        <target>WARNING:
+
+This will reset your contact list, including the list of everyone you follow and the list of all relays you usually connect to. ONLY PROCEED IF YOU ARE SURE YOU HAVE LOST YOUR CONTACT LIST BEYOND RECOVERABILITY.</target>
+        <note>Alert for resetting the user's contact list.</note>
+      </trans-unit>
       <trans-unit id="Wake up, %@" xml:space="preserve">
         <source>Wake up, %@</source>
         <target>Wake up, %@</target>
@@ -2365,6 +2476,16 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <target>Wallet Relay</target>
         <note>Label text indicating that below it is the information about the wallet relay.</note>
       </trans-unit>
+      <trans-unit id="We did not detect any issues that we can automatically fix for you. If you are having issues, please contact Damus support: [support@damus.io](mailto:support@damus.io)" xml:space="preserve">
+        <source>We did not detect any issues that we can automatically fix for you. If you are having issues, please contact Damus support: [support@damus.io](mailto:support@damus.io)</source>
+        <target>We did not detect any issues that we can automatically fix for you. If you are having issues, please contact Damus support: [support@damus.io](mailto:support@damus.io)</target>
+        <note>Message indicating that no First Aid actions are available.</note>
+      </trans-unit>
+      <trans-unit id="We'll save your account key, so you won't need to enter it manually next time you log in." xml:space="preserve">
+        <source>We'll save your account key, so you won't need to enter it manually next time you log in.</source>
+        <target>We'll save your account key, so you won't need to enter it manually next time you log in.</target>
+        <note>Reminder to user that they should save their account information.</note>
+      </trans-unit>
       <trans-unit id="Website" xml:space="preserve">
         <source>Website</source>
         <target>Website</target>
@@ -2405,21 +2526,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <target>What do you want to report?</target>
         <note>Header text to prompt user what issue they want to report.</note>
       </trans-unit>
-      <trans-unit id="What is Nostr?" xml:space="preserve">
-        <source>What is Nostr?</source>
-        <target>What is Nostr?</target>
-        <note>Heading text for section describing what is Nostr.</note>
-      </trans-unit>
       <trans-unit id="Who to Follow" xml:space="preserve">
         <source>Who to Follow</source>
         <target>Who to Follow</target>
         <note>Title for a screen displaying suggestions of who to follow</note>
       </trans-unit>
-      <trans-unit id="Why we need Nostr?" xml:space="preserve">
-        <source>Why we need Nostr?</source>
-        <target>Why we need Nostr?</target>
-        <note>Heading text for section describing why Nostr is needed.</note>
-      </trans-unit>
       <trans-unit id="Words" xml:space="preserve">
         <source>Words</source>
         <target>Words</target>
@@ -2530,7 +2641,8 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
       <trans-unit id="Zaps" xml:space="preserve">
         <source>Zaps</source>
         <target>Zaps</target>
-        <note>Navigation bar title for the Zaps view.
+        <note>Label for filter for zap notifications.
+   Navigation bar title for the Zaps view.
    Navigation title for zap settings.
    Section header for zap settings
    Setting to enable Zap Local Notification
@@ -2647,6 +2759,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <target>%@ and %@ reposted your profile</target>
         <note>Notification that 2 users reposted the current user's profile</note>
       </trans-unit>
+      <trans-unit id="required" xml:space="preserve">
+        <source>required</source>
+        <target>required</target>
+        <note>Label indicating that a form input is required.</note>
+      </trans-unit>
       <trans-unit id="self" xml:space="preserve">
         <source>self</source>
         <target>self</target>
@@ -2701,7 +2818,7 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
   </file>
   <file original="damus/en-US.lproj/Localizable.stringsdict" source-language="en-US" target-language="en-US" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.3" build-num="15E204a"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
     </header>
     <body>
       <trans-unit id="/followed_by_three_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
@@ -3083,7 +3200,7 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
   </file>
   <file original="DamusNotificationService/InfoPlist.xcstrings" source-language="en-US" target-language="en-US" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.3" build-num="15E204a"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
@@ -3105,7 +3222,7 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
   </file>
   <file original="DamusNotificationService/Localizable.xcstrings" source-language="en-US" target-language="en-US" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.3" build-num="15E204a"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.4" build-num="15F31d"/>
     </header>
     <body>
       <trans-unit id="" xml:space="preserve">
@@ -3158,6 +3275,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <target state="new">LibreTranslate (Open Source)</target>
         <note>Dropdown option for selecting LibreTranslate as the translation service.</note>
       </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target state="new">Local</target>
+        <note>Option for notification mode setting: Local notification mode</note>
+      </trans-unit>
       <trans-unit id="Local default" xml:space="preserve">
         <source>Local default</source>
         <target state="new">Local default</target>
@@ -3168,6 +3290,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <target state="new">Mentioned by %@</target>
         <note>Mentioned by heading in local notification</note>
       </trans-unit>
+      <trans-unit id="Muted event" xml:space="preserve">
+        <source>Muted event</source>
+        <target state="new">Muted event</target>
+        <note>Title for a push notification which has been muted</note>
+      </trans-unit>
       <trans-unit id="New encrypted direct message" xml:space="preserve">
         <source>New encrypted direct message</source>
         <target state="new">New encrypted direct message</target>
@@ -3203,6 +3330,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <target state="new">Production</target>
         <note>Label indicating the production environment for Damus Purple</note>
       </trans-unit>
+      <trans-unit id="Push" xml:space="preserve">
+        <source>Push</source>
+        <target state="new">Push</target>
+        <note>Option for notification mode setting: Push notification mode</note>
+      </trans-unit>
       <trans-unit id="Reposted by %@" xml:space="preserve">
         <source>Reposted by %@</source>
         <target state="new">Reposted by %@</target>
@@ -3238,6 +3370,11 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
         <target state="new">Test (local)</target>
         <note>Label indicating a local test environment for Damus Purple functionality (Developer feature)</note>
       </trans-unit>
+      <trans-unit id="This is an event that has been muted according to your mute list rules. We cannot suppress this notification, but we obscured the details to respect your preferences" xml:space="preserve">
+        <source>This is an event that has been muted according to your mute list rules. We cannot suppress this notification, but we obscured the details to respect your preferences</source>
+        <target state="new">This is an event that has been muted according to your mute list rules. We cannot suppress this notification, but we obscured the details to respect your preferences</target>
+        <note>Description for a push notification which has been muted, and explanation that we cannot suppress it</note>
+      </trans-unit>
       <trans-unit id="This note contains too many items and cannot be rendered" xml:space="preserve">
         <source>This note contains too many items and cannot be rendered</source>
         <target state="new">This note contains too many items and cannot be rendered</target>

damus/en-US.xcloc/Source Contents/DamusNotificationService/Localizable.xcstrings

@@ -39,12 +39,18 @@
     "LibreTranslate (Open Source)" : {
       "comment" : "Dropdown option for selecting LibreTranslate as the translation service."
     },
+    "Local" : {
+      "comment" : "Option for notification mode setting: Local notification mode"
+    },
     "Local default" : {
       "comment" : "Dropdown option label for system default for Lightning wallet."
     },
     "Mentioned by %@" : {
       "comment" : "Mentioned by heading in local notification"
     },
+    "Muted event" : {
+      "comment" : "Title for a push notification which has been muted"
+    },
     "New encrypted direct message" : {
       "comment" : "Notification that the user has received a new direct message"
     },
@@ -78,6 +84,9 @@
     "Production" : {
       "comment" : "Label indicating the production environment for Damus Purple"
     },
+    "Push" : {
+      "comment" : "Option for notification mode setting: Push notification mode"
+    },
     "Reposted by %@" : {
       "comment" : "Reposted by heading in local notification"
     },
@@ -99,6 +108,9 @@
     "Test (local)" : {
       "comment" : "Label indicating a local test environment for Damus Purple functionality (Developer feature)"
     },
+    "This is an event that has been muted according to your mute list rules. We cannot suppress this notification, but we obscured the details to respect your preferences" : {
+      "comment" : "Description for a push notification which has been muted, and explanation that we cannot suppress it"
+    },
     "This note contains too many items and cannot be rendered" : {
       "comment" : "Error message indicating that a note is too big and cannot be rendered"
     },

damus/en-US.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "damus.xcodeproj",
   "targetLocale" : "en-US",
   "toolInfo" : {
-    "toolBuildNumber" : "15E204a",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.3"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

damus/hu-HU.lproj/Localizable.stringsdict

@@ -226,6 +226,22 @@
 			<string>Megosztások</string>
 		</dict>
 	</dict>
+	<key>quoted_reposts_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@QUOTE_REPOSTS@</string>
+		<key>QUOTE_REPOSTS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Idézet</string>
+			<key>other</key>
+			<string>Idézetek</string>
+		</dict>
+	</dict>
 	<key>sats</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>

damus/ja.lproj/Localizable.stringsdict

@@ -198,6 +198,20 @@
 			<string>リポスト</string>
 		</dict>
 	</dict>
+	<key>quoted_reposts_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@QUOTE_REPOSTS@</string>
+		<key>QUOTE_REPOSTS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>引用</string>
+		</dict>
+	</dict>
 	<key>sats</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>

damus/sv-SE.lproj/Localizable.stringsdict

@@ -226,6 +226,22 @@
 			<string>Delningar</string>
 		</dict>
 	</dict>
+	<key>quoted_reposts_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@QUOTE_REPOSTS@</string>
+		<key>QUOTE_REPOSTS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Citat</string>
+			<key>other</key>
+			<string>Citat</string>
+		</dict>
+	</dict>
 	<key>sats</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>

damusTests/Mocking/MockDamusState.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 @testable import damus
+import EmojiPicker
 
 // Generates a test damus state with configurable mock parameters
 func generate_test_damus_state(
@@ -50,7 +51,9 @@ func generate_test_damus_state(
                            music: .init(onChange: {_ in }),
                            video: .init(),
                            ndb: ndb,
-                           quote_reposts: .init(our_pubkey: our_pubkey) )
+                           quote_reposts: .init(our_pubkey: our_pubkey),
+                           emoji_provider: DefaultEmojiProvider(showAllVariations: false)
+    )
 
     return damus
 }

nostrdb/NdbNote+.swift

@@ -14,7 +14,7 @@ extension NdbNote {
     }
 
     func get_cached_inner_event(cache: EventCache) -> NdbNote? {
-        guard self.known_kind == .boost else {
+        guard self.known_kind == .boost || self.known_kind == .highlight else {
             return nil
         }
 

nostrdb/NdbNote.swift

@@ -277,7 +277,7 @@ class NdbNote: Encodable, Equatable, Hashable {
 // Extension to make NdbNote compatible with NostrEvent's original API
 extension NdbNote {
     var is_textlike: Bool {
-        return kind == 1 || kind == 42 || kind == 30023
+        return kind == 1 || kind == 42 || kind == 30023 || kind == 9802
     }
 
     var is_quote_repost: NoteId? {
@@ -341,7 +341,14 @@ extension NdbNote {
     }
 
     func thread_reply() -> ThreadReply? {
-        ThreadReply(tags: self.tags)
+        if self.known_kind != .highlight {
+            return ThreadReply(tags: self.tags)
+        }
+        return nil
+    }
+    
+    func highlighted_note_id() -> NoteId? {
+        return ThreadReply(tags: self.tags)?.reply.note_id
     }
 
     func get_content(_ keypair: Keypair) -> String {

nostrdb/flatcc/flatcc_builder.h

@@ -82,7 +82,7 @@ extern "C" {
  * Note: some internal assertion will remain if disabled.
  */
 #ifndef FLATCC_BUILDER_ASSERT_ON_ERROR
-#define FLATCC_BUILDER_ASSERT_ON_ERROR 1
+#define FLATCC_BUILDER_ASSERT_ON_ERROR 0
 #endif
 
 /*