Inline comment cleanup: drop legacy 'removed' breadcrumbs across protocols, services, view model, and views

Remove 'preparing to share …' system message; send shared content immediately
Share Extension: migrate to UIKit + UTTypes; drop Social/SLComposeServiceViewController
2026-07-25 05:25:19 +00:00 · 2025-08-25 17:57:21 +02:00 · 2025-08-25 17:53:25 +02:00 · 2025-08-25 17:44:07 +02:00 · 2025-08-25 17:42:41 +02:00 · 2025-08-25 17:03:48 +02:00
26 changed files with 470 additions and 1156 deletions
@@ -17,6 +17,7 @@
 		0475028D2E54171C0083520F /* LocationChannelManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0475028B2E54171C0083520F /* LocationChannelManager.swift */; };
 		0475028F2E5417660083520F /* LocationChannelsSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0475028E2E5417660083520F /* LocationChannelsSheet.swift */; };
 		047502902E5417660083520F /* LocationChannelsSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0475028E2E5417660083520F /* LocationChannelsSheet.swift */; };
+
 		047502922E547ACC0083520F /* LocationChannelsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047502912E547ACC0083520F /* LocationChannelsTests.swift */; };
 		047502932E547ACC0083520F /* LocationChannelsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047502912E547ACC0083520F /* LocationChannelsTests.swift */; };
 		047502AC2E55E8360083520F /* BinaryProtocolPaddingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047502AB2E55E8360083520F /* BinaryProtocolPaddingTests.swift */; };
@@ -29,9 +30,6 @@
 		047502B72E55FED60083520F /* GeohashPeopleList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047502B22E55FED60083520F /* GeohashPeopleList.swift */; };
 		047502B92E560F690083520F /* RelayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047502B82E560F690083520F /* RelayController.swift */; };
 		047502BA2E560F690083520F /* RelayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047502B82E560F690083520F /* RelayController.swift */; };
-		048A4BE72E5CCCC300162C4A /* TransportConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048A4BE62E5CCCC300162C4A /* TransportConfig.swift */; };
-		048A4BE82E5CCCC300162C4A /* TransportConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048A4BE62E5CCCC300162C4A /* TransportConfig.swift */; };
-		048A4BE92E5CCCC300162C4B /* TransportConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048A4BE62E5CCCC300162C4A /* TransportConfig.swift */; };
 		049BD3902E4EC4F0001A566B /* PrivateChatManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049BD38F2E4EC4F0001A566B /* PrivateChatManager.swift */; };
 		049BD3912E4EC4F0001A566B /* AutocompleteService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049BD38C2E4EC4F0001A566B /* AutocompleteService.swift */; };
 		049BD3922E4EC4F0001A566B /* CommandProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049BD38D2E4EC4F0001A566B /* CommandProcessor.swift */; };
@@ -59,8 +57,6 @@
 		0AE840940F21AFC07C226636 /* PrivateChatE2ETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A262EDDC04B7D7B5E31F321 /* PrivateChatE2ETests.swift */; };
 		0B6F25559A21F8C69C8357C6 /* BinaryProtocolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B3CC6FA298729906109F61B /* BinaryProtocolTests.swift */; };
 		10E68BB889356219189E38EC /* BitchatApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF625BB3AD919322C01A46B2 /* BitchatApp.swift */; };
-		1234567890ABCDEFFEDCBA13 /* PeerDisplayNameResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1234567890ABCDEFFEDCBA02 /* PeerDisplayNameResolver.swift */; };
-		1234567890ABCDEFFEDCBA14 /* PeerDisplayNameResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1234567890ABCDEFFEDCBA02 /* PeerDisplayNameResolver.swift */; };
 		132DF1E24B4E9C7DCDAD4376 /* FingerprintView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9195CDC7EB236AFBC9A4D41A /* FingerprintView.swift */; };
 		17901751FD8010AFC8E750F2 /* bitchatShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 61F92EBA29C47C0FCC482F1F /* bitchatShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		1D9674FA5F998503831DC281 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A08E03AA0C63E97C91749AEC /* ContentView.swift */; };
@@ -107,17 +103,11 @@
 		9C7D287C8E67AAE576A5ECB7 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1B378C16594575FCC7F9C75 /* ShareViewController.swift */; };
 		9CCF09F7527EC681A13FC246 /* NoiseSecurityConsiderations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43B4548DAFC9F7AA8873DA53 /* NoiseSecurityConsiderations.swift */; };
 		A0A1C26EFBFDD5B8EFEEDE57 /* PublicChatE2ETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D22BF09A49010947CEFE45E2 /* PublicChatE2ETests.swift */; };
-		A1B2C3D44E5F60718293A4B5 /* XChaCha20Poly1305Compat.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1B2C3D44E5F60718293A4B4 /* XChaCha20Poly1305Compat.swift */; };
-		A1B2C3D54E5F60718293A4B6 /* XChaCha20Poly1305Compat.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1B2C3D44E5F60718293A4B4 /* XChaCha20Poly1305Compat.swift */; };
 		A2977428C1D9EF9944C4BFAF /* BLEServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 980B109CBA72BC996455C62B /* BLEServiceTests.swift */; };
 		A7187D48B07C6857DE01D0ED /* NoiseProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43613045E63D21D429396805 /* NoiseProtocol.swift */; };
 		AA11BB22CC33DD44EE55FF66 /* MessageTextHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11BB22CC33DD44EE55FF68 /* MessageTextHelpers.swift */; };
 		AA11BB22CC33DD44EE55FF67 /* MessageTextHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11BB22CC33DD44EE55FF68 /* MessageTextHelpers.swift */; };
 		AA6E067DB034FC0FA23C28A9 /* BinaryProtocolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B3CC6FA298729906109F61B /* BinaryProtocolTests.swift */; };
-		AA77BB11CC22DD33EE44FF55 /* VerificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA77BB10CC22DD33EE44FF55 /* VerificationService.swift */; };
-		AA77BB12CC22DD33EE44FF56 /* VerificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA77BB10CC22DD33EE44FF55 /* VerificationService.swift */; };
-		AA77BB14CC22DD33EE44FF58 /* VerificationViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA77BB13CC22DD33EE44FF57 /* VerificationViews.swift */; };
-		AA77BB15CC22DD33EE44FF59 /* VerificationViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA77BB13CC22DD33EE44FF57 /* VerificationViews.swift */; };
 		ABAF130D88561F4A646F0430 /* AppInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 763E0DBA9492A654FC0CDCB9 /* AppInfoView.swift */; };
 		ACE2ED172C37F01561E50B71 /* FavoritesPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 419BFFF209EBA93F410E9E9F /* FavoritesPersistenceService.swift */; };
 		AD11E46940D742AEAF547EB2 /* AppInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 763E0DBA9492A654FC0CDCB9 /* AppInfoView.swift */; };
@@ -151,6 +141,12 @@
 		F455F011B3B648ADA233F998 /* BinaryProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2136C3E22D02D4A8DBE7EAB /* BinaryProtocol.swift */; };
 		FB8819B4C84FAFEF5C36B216 /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 136696FC4436A02D98CE6A77 /* KeychainManager.swift */; };
 		FBC409E105493C491531B59A /* NostrProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E5A9FF4AEA8A923317ED26A /* NostrProtocol.swift */; };
+		A1B2C3D44E5F60718293A4B5 /* XChaCha20Poly1305Compat.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1B2C3D44E5F60718293A4B4 /* XChaCha20Poly1305Compat.swift */; };
+		A1B2C3D54E5F60718293A4B6 /* XChaCha20Poly1305Compat.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1B2C3D44E5F60718293A4B4 /* XChaCha20Poly1305Compat.swift */; };
+		AA77BB11CC22DD33EE44FF55 /* VerificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA77BB10CC22DD33EE44FF55 /* VerificationService.swift */; };
+		AA77BB12CC22DD33EE44FF56 /* VerificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA77BB10CC22DD33EE44FF55 /* VerificationService.swift */; };
+		AA77BB14CC22DD33EE44FF58 /* VerificationViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA77BB13CC22DD33EE44FF57 /* VerificationViews.swift */; };
+		AA77BB15CC22DD33EE44FF59 /* VerificationViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA77BB13CC22DD33EE44FF57 /* VerificationViews.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -204,7 +200,6 @@
 		047502B22E55FED60083520F /* GeohashPeopleList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeohashPeopleList.swift; sourceTree = "<group>"; };
 		047502B32E55FED60083520F /* MeshPeerList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshPeerList.swift; sourceTree = "<group>"; };
 		047502B82E560F690083520F /* RelayController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayController.swift; sourceTree = "<group>"; };
-		048A4BE62E5CCCC300162C4A /* TransportConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransportConfig.swift; sourceTree = "<group>"; };
 		049BD38C2E4EC4F0001A566B /* AutocompleteService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutocompleteService.swift; sourceTree = "<group>"; };
 		049BD38D2E4EC4F0001A566B /* CommandProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandProcessor.swift; sourceTree = "<group>"; };
 		049BD38F2E4EC4F0001A566B /* PrivateChatManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivateChatManager.swift; sourceTree = "<group>"; };
@@ -220,7 +215,6 @@
 		05BA20BC0F123F1507C5C247 /* IdentityModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityModels.swift; sourceTree = "<group>"; };
 		0B3CC6FA298729906109F61B /* BinaryProtocolTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BinaryProtocolTests.swift; sourceTree = "<group>"; };
 		11186E29A064E8D210880E1B /* BitchatPeer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitchatPeer.swift; sourceTree = "<group>"; };
-		1234567890ABCDEFFEDCBA02 /* PeerDisplayNameResolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerDisplayNameResolver.swift; sourceTree = "<group>"; };
 		136696FC4436A02D98CE6A77 /* KeychainManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainManager.swift; sourceTree = "<group>"; };
 		229F17B68CFF7AB1BC91C847 /* BitchatProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitchatProtocol.swift; sourceTree = "<group>"; };
 		2E346DF8E026FD34EE3DD038 /* TestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHelpers.swift; sourceTree = "<group>"; };
@@ -251,11 +245,9 @@
 		980B109CBA72BC996455C62B /* BLEServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEServiceTests.swift; sourceTree = "<group>"; };
 		9AB6BE4ABD7F5088E9865E56 /* NoiseSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoiseSession.swift; sourceTree = "<group>"; };
 		A08E03AA0C63E97C91749AEC /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
-		A1B2C3D44E5F60718293A4B4 /* XChaCha20Poly1305Compat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XChaCha20Poly1305Compat.swift; sourceTree = "<group>"; };
 		A2136C3E22D02D4A8DBE7EAB /* BinaryProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BinaryProtocol.swift; sourceTree = "<group>"; };
+
 		AA11BB22CC33DD44EE55FF68 /* MessageTextHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageTextHelpers.swift; sourceTree = "<group>"; };
-		AA77BB10CC22DD33EE44FF55 /* VerificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerificationService.swift; sourceTree = "<group>"; };
-		AA77BB13CC22DD33EE44FF57 /* VerificationViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerificationViews.swift; sourceTree = "<group>"; };
 		B1D6A89B36A3D31E590B94E5 /* NoiseHandshakeCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoiseHandshakeCoordinator.swift; sourceTree = "<group>"; };
 		C0DB1DE27F0AAB5092663E8E /* bitchatTests_iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = bitchatTests_iOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		C1B378C16594575FCC7F9C75 /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
@@ -274,6 +266,9 @@
 		FDC18D910D6FF2E8B1B6C885 /* SecureIdentityStateManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureIdentityStateManager.swift; sourceTree = "<group>"; };
 		FE7CCF2BD78A3F3DAE6DA145 /* MockBLEService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockBLEService.swift; sourceTree = "<group>"; };
 		FF7AF93D874001FBD94C8306 /* bitchat-macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "bitchat-macOS.entitlements"; sourceTree = "<group>"; };
+		A1B2C3D44E5F60718293A4B4 /* XChaCha20Poly1305Compat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XChaCha20Poly1305Compat.swift; sourceTree = "<group>"; };
+		AA77BB10CC22DD33EE44FF55 /* VerificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerificationService.swift; sourceTree = "<group>"; };
+		AA77BB13CC22DD33EE44FF57 /* VerificationViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerificationViews.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -410,7 +405,6 @@
 		9A78348821A7D3374607D4E3 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
-				1234567890ABCDEFFEDCBA02 /* PeerDisplayNameResolver.swift */,
 				049BD3AA2E51E38E001A566B /* PeerIDResolver.swift */,
 				049BD3A42E51DC0E001A566B /* MessageDeduplicator.swift */,
 				32F149C43D1915831B60FE09 /* CompressionUtil.swift */,
@@ -449,6 +443,7 @@
 				047502B22E55FED60083520F /* GeohashPeopleList.swift */,
 				047502B32E55FED60083520F /* MeshPeerList.swift */,
 				0475028E2E5417660083520F /* LocationChannelsSheet.swift */,
+
 				763E0DBA9492A654FC0CDCB9 /* AppInfoView.swift */,
 				A08E03AA0C63E97C91749AEC /* ContentView.swift */,
 				9195CDC7EB236AFBC9A4D41A /* FingerprintView.swift */,
@@ -519,7 +514,6 @@
 		D98A3186D7E4C72E35BDF7FE /* Services */ = {
 			isa = PBXGroup;
 			children = (
-				048A4BE62E5CCCC300162C4A /* TransportConfig.swift */,
 				AA77BB10CC22DD33EE44FF55 /* VerificationService.swift */,
 				047502B82E560F690083520F /* RelayController.swift */,
 				0475028B2E54171C0083520F /* LocationChannelManager.swift */,
@@ -733,7 +727,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				048A4BE92E5CCCC300162C4B /* TransportConfig.swift in Sources */,
 				9C7D287C8E67AAE576A5ECB7 /* ShareViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -742,8 +735,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				048A4BE72E5CCCC300162C4A /* TransportConfig.swift in Sources */,
-				1234567890ABCDEFFEDCBA13 /* PeerDisplayNameResolver.swift in Sources */,
 				AA77BB12CC22DD33EE44FF56 /* VerificationService.swift in Sources */,
 				AA77BB15CC22DD33EE44FF59 /* VerificationViews.swift in Sources */,
 				A1B2C3D54E5F60718293A4B6 /* XChaCha20Poly1305Compat.swift in Sources */,
@@ -767,6 +758,7 @@
 				7241FFD6CFFB875B864FA223 /* InputValidator.swift in Sources */,
 				FB8819B4C84FAFEF5C36B216 /* KeychainManager.swift in Sources */,
 				0475028F2E5417660083520F /* LocationChannelsSheet.swift in Sources */,
+
 				501BC56B1A08C0327A09AAF1 /* NoiseEncryptionService.swift in Sources */,
 				0475028C2E54171C0083520F /* LocationChannelManager.swift in Sources */,
 				AFF33EF44626EF0579D17EB1 /* NoiseHandshakeCoordinator.swift in Sources */,
@@ -801,8 +793,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				048A4BE82E5CCCC300162C4A /* TransportConfig.swift in Sources */,
-				1234567890ABCDEFFEDCBA14 /* PeerDisplayNameResolver.swift in Sources */,
 				AA77BB11CC22DD33EE44FF55 /* VerificationService.swift in Sources */,
 				AA77BB14CC22DD33EE44FF58 /* VerificationViews.swift in Sources */,
 				A1B2C3D44E5F60718293A4B5 /* XChaCha20Poly1305Compat.swift in Sources */,
@@ -826,6 +816,7 @@
 				EF49C600C1E464710DD6CA29 /* InputValidator.swift in Sources */,
 				8F737CE0435792CC2AD65FCB /* KeychainManager.swift in Sources */,
 				047502902E5417660083520F /* LocationChannelsSheet.swift in Sources */,
+
 				5EE49E150BBF0488E7473687 /* NoiseEncryptionService.swift in Sources */,
 				0475028D2E54171C0083520F /* LocationChannelManager.swift in Sources */,
 				6D0D4A0B1D8B659DCBAE7C9C /* NoiseHandshakeCoordinator.swift in Sources */,
@@ -1004,7 +995,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.3.3;
+				MARKETING_VERSION = 1.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.ShareExtension;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1035,7 +1026,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.3;
+				MARKETING_VERSION = 1.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat;
 				PRODUCT_NAME = bitchat;
 				SDKROOT = iphoneos;
@@ -1090,7 +1081,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.3;
+				MARKETING_VERSION = 1.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat;
 				PRODUCT_NAME = bitchat;
 				SDKROOT = iphoneos;
@@ -1122,7 +1113,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.3.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat;
 				PRODUCT_NAME = bitchat;
 				REGISTER_APP_GROUPS = YES;
@@ -1211,7 +1202,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.3.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat;
 				PRODUCT_NAME = bitchat;
 				REGISTER_APP_GROUPS = YES;
@@ -1304,7 +1295,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.3.3;
+				MARKETING_VERSION = 1.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.ShareExtension;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -99,15 +99,15 @@ struct BitchatApp: App {
            return
        }
        
-        // Only process if shared within configured window
-        if Date().timeIntervalSince(sharedDate) < TransportConfig.uiShareAcceptWindowSeconds {
+        // Only process if shared within last 30 seconds
+        if Date().timeIntervalSince(sharedDate) < 30 {
            let contentType = userDefaults.string(forKey: "sharedContentType") ?? "text"
            
            // Clear the shared content
            userDefaults.removeObject(forKey: "sharedContent")
            userDefaults.removeObject(forKey: "sharedContentType")
            userDefaults.removeObject(forKey: "sharedContentDate")
-            // No need to force synchronize here
+            userDefaults.synchronize()
            
            // Send the shared content immediately on the main queue
            DispatchQueue.main.async {
@@ -106,8 +106,6 @@ enum HandshakeState {
 struct CryptographicIdentity: Codable {
    let fingerprint: String     // SHA256 of public key
    let publicKey: Data         // Noise static public key
-    // Optional Ed25519 signing public key (used to authenticate public messages)
-    var signingPublicKey: Data? = nil
    let firstSeen: Date
    let lastHandshake: Date?
 }
@@ -229,91 +229,6 @@ class SecureIdentityStateManager {
            return cache.socialIdentities[fingerprint]
        }
    }
-
-    // MARK: - Cryptographic Identities
-
-    /// Insert or update a cryptographic identity and optionally persist its signing key and claimed nickname.
-    /// - Parameters:
-    ///   - fingerprint: SHA-256 hex of the Noise static public key
-    ///   - noisePublicKey: Noise static public key data
-    ///   - signingPublicKey: Optional Ed25519 signing public key for authenticating public messages
-    ///   - claimedNickname: Optional latest claimed nickname to persist into social identity
-    func upsertCryptographicIdentity(fingerprint: String, noisePublicKey: Data, signingPublicKey: Data?, claimedNickname: String? = nil) {
-        queue.async(flags: .barrier) {
-            let now = Date()
-            if var existing = self.cryptographicIdentities[fingerprint] {
-                // Update keys if changed
-                if existing.publicKey != noisePublicKey {
-                    existing = CryptographicIdentity(
-                        fingerprint: fingerprint,
-                        publicKey: noisePublicKey,
-                        signingPublicKey: signingPublicKey ?? existing.signingPublicKey,
-                        firstSeen: existing.firstSeen,
-                        lastHandshake: now
-                    )
-                    self.cryptographicIdentities[fingerprint] = existing
-                } else {
-                    // Update signing key and lastHandshake
-                    existing.signingPublicKey = signingPublicKey ?? existing.signingPublicKey
-                    let updated = CryptographicIdentity(
-                        fingerprint: existing.fingerprint,
-                        publicKey: existing.publicKey,
-                        signingPublicKey: existing.signingPublicKey,
-                        firstSeen: existing.firstSeen,
-                        lastHandshake: now
-                    )
-                    self.cryptographicIdentities[fingerprint] = updated
-                }
-                // Persist updated state (already assigned in branches above)
-            } else {
-                // New entry
-                let entry = CryptographicIdentity(
-                    fingerprint: fingerprint,
-                    publicKey: noisePublicKey,
-                    signingPublicKey: signingPublicKey,
-                    firstSeen: now,
-                    lastHandshake: now
-                )
-                self.cryptographicIdentities[fingerprint] = entry
-            }
-
-            // Optionally persist claimed nickname into social identity
-            if let claimed = claimedNickname {
-                var identity = self.cache.socialIdentities[fingerprint] ?? SocialIdentity(
-                    fingerprint: fingerprint,
-                    localPetname: nil,
-                    claimedNickname: claimed,
-                    trustLevel: .unknown,
-                    isFavorite: false,
-                    isBlocked: false,
-                    notes: nil
-                )
-                // Update claimed nickname if changed
-                if identity.claimedNickname != claimed {
-                    identity.claimedNickname = claimed
-                    self.cache.socialIdentities[fingerprint] = identity
-                } else if self.cache.socialIdentities[fingerprint] == nil {
-                    self.cache.socialIdentities[fingerprint] = identity
-                }
-            }
-
-            self.saveIdentityCache()
-        }
-    }
-
-    /// Retrieve cryptographic identity by fingerprint
-    func getCryptographicIdentity(for fingerprint: String) -> CryptographicIdentity? {
-        queue.sync { cryptographicIdentities[fingerprint] }
-    }
-
-    /// Find cryptographic identities whose fingerprint prefix matches a peerID (16-hex) short ID
-    func getCryptoIdentitiesByPeerIDPrefix(_ peerID: String) -> [CryptographicIdentity] {
-        queue.sync {
-            // Defensive: ensure hex and correct length
-            guard peerID.count == 16, peerID.allSatisfy({ $0.isHexDigit }) else { return [] }
-            return cryptographicIdentities.values.filter { $0.fingerprint.hasPrefix(peerID) }
-        }
-    }
    
    func getAllSocialIdentities() -> [SocialIdentity] {
        queue.sync {
@@ -8,7 +8,6 @@ struct BitchatPeer: Identifiable, Equatable {
    let nickname: String
    let lastSeen: Date
    let isConnected: Bool
-    let isReachable: Bool
    
    // Favorite-related properties
    var favoriteStatus: FavoritesPersistenceService.FavoriteRelationship?
@@ -19,7 +18,6 @@ struct BitchatPeer: Identifiable, Equatable {
    // Connection state
    enum ConnectionState {
        case bluetoothConnected
-        case meshReachable      // Seen via mesh recently, not directly connected
        case nostrAvailable     // Mutual favorite, reachable via Nostr
        case offline            // Not connected via any transport
    }
@@ -27,8 +25,6 @@ struct BitchatPeer: Identifiable, Equatable {
    var connectionState: ConnectionState {
        if isConnected {
            return .bluetoothConnected
-        } else if isReachable {
-            return .meshReachable
        } else if favoriteStatus?.isMutual == true {
            // Mutual favorites can communicate via Nostr when offline
            return .nostrAvailable
@@ -58,8 +54,6 @@ struct BitchatPeer: Identifiable, Equatable {
        switch connectionState {
        case .bluetoothConnected:
            return "📻" // Radio icon for mesh connection
-        case .meshReachable:
-            return "📡" // Antenna for mesh reachable
        case .nostrAvailable:
            return "🌐" // Purple globe for Nostr
        case .offline:
@@ -77,15 +71,13 @@ struct BitchatPeer: Identifiable, Equatable {
        noisePublicKey: Data,
        nickname: String,
        lastSeen: Date = Date(),
-        isConnected: Bool = false,
-        isReachable: Bool = false
+        isConnected: Bool = false
    ) {
        self.id = id
        self.noisePublicKey = noisePublicKey
        self.nickname = nickname
        self.lastSeen = lastSeen
        self.isConnected = isConnected
-        self.isReachable = isReachable
        
        // Load favorite status - will be set later by the manager
        self.favoriteStatus = nil
@@ -14,7 +14,7 @@ final class GeoRelayDirectory {
    private let cacheFileName = "georelays_cache.csv"
    private let lastFetchKey = "georelay.lastFetchAt"
    private let remoteURL = URL(string: "https://raw.githubusercontent.com/permissionlesstech/georelays/refs/heads/main/nostr_relays.csv")!
-    private let fetchInterval: TimeInterval = TransportConfig.geoRelayFetchIntervalSeconds // 24h
+    private let fetchInterval: TimeInterval = 60 * 60 * 24 // 24h

    private init() {
        // Load cached or bundled data synchronously
@@ -122,8 +122,8 @@ struct NostrProtocol {
            tags: tags,
            content: content
        )
-        let schnorrKey = try senderIdentity.schnorrSigningKey()
-        return try event.sign(with: schnorrKey)
+        let signingKey = try senderIdentity.signingKey()
+        return try event.sign(with: signingKey)
    }
    
    // MARK: - Private Methods
@@ -149,8 +149,9 @@ struct NostrProtocol {
            content: encrypted
        )
        
-        // Sign the seal with the sender's Schnorr private key
-        return try seal.sign(with: senderKey)
+        // Convert to P256K.Signing.PrivateKey for signing (temporary until we update sign method)
+        let signingKey = try P256K.Signing.PrivateKey(dataRepresentation: senderKey.dataRepresentation)
+        return try seal.sign(with: signingKey)
    }
    
    private static func createGiftWrap(
@@ -180,8 +181,9 @@ struct NostrProtocol {
            content: encrypted
        )
        
-        // Sign the gift wrap with the wrap Schnorr private key
-        return try giftWrap.sign(with: wrapKey)
+        // Convert to P256K.Signing.PrivateKey for signing (temporary until we update sign method)
+        let signingKey = try P256K.Signing.PrivateKey(dataRepresentation: wrapKey.dataRepresentation)
+        return try giftWrap.sign(with: signingKey)
    }
    
    private static func unwrapGiftWrap(
@@ -470,16 +472,19 @@ struct NostrEvent: Codable {
        self.sig = dict["sig"] as? String
    }
    
-    func sign(with key: P256K.Schnorr.PrivateKey) throws -> NostrEvent {
+    func sign(with key: P256K.Signing.PrivateKey) throws -> NostrEvent {
        let (eventId, eventIdHash) = try calculateEventId()
        
-        // Sign with Schnorr (BIP-340)
+        // Convert to Schnorr key for Nostr signing
+        let schnorrKey = try P256K.Schnorr.PrivateKey(dataRepresentation: key.dataRepresentation)
+        
+        // Sign with Schnorr
        var messageBytes = [UInt8](eventIdHash)
        var auxRand = [UInt8](repeating: 0, count: 32)
        _ = auxRand.withUnsafeMutableBytes { ptr in
            SecRandomCopyBytes(kSecRandomDefault, 32, ptr.baseAddress!)
        }
-        let schnorrSignature = try key.signature(message: &messageBytes, auxiliaryRand: &auxRand)
+        let schnorrSignature = try schnorrKey.signature(message: &messageBytes, auxiliaryRand: &auxRand)
        
        let signatureHex = schnorrSignature.dataRepresentation.hexEncodedString()
        
@@ -48,10 +48,10 @@ class NostrRelayManager: ObservableObject {
    private let messageQueueLock = NSLock()
    
    // Exponential backoff configuration
-    private let initialBackoffInterval: TimeInterval = TransportConfig.nostrRelayInitialBackoffSeconds
-    private let maxBackoffInterval: TimeInterval = TransportConfig.nostrRelayMaxBackoffSeconds
-    private let backoffMultiplier: Double = TransportConfig.nostrRelayBackoffMultiplier
-    private let maxReconnectAttempts = TransportConfig.nostrRelayMaxReconnectAttempts
+    private let initialBackoffInterval: TimeInterval = 1.0  // Start with 1 second
+    private let maxBackoffInterval: TimeInterval = 300.0    // Max 5 minutes
+    private let backoffMultiplier: Double = 2.0            // Double each time
+    private let maxReconnectAttempts = 10                  // Stop after 10 attempts
    
    // Reconnection timer
    private var reconnectionTimer: Timer?
@@ -289,7 +289,7 @@ class NostrRelayManager: ObservableObject {
                        
                        // Only log non-gift-wrap events to reduce noise
                        if event.kind != 1059 {
-                            SecureLogger.log("📥 Event kind=\(event.kind) id=\(event.id.prefix(16))… relay=\(relayUrl)",
+                            SecureLogger.log("📥 Received Nostr event (kind: \(event.kind)) from relay: \(relayUrl)", 
                                            category: SecureLogger.session, level: .debug)
                        }
                        
@@ -321,11 +321,11 @@ class NostrRelayManager: ObservableObject {
                        let reason = array.count >= 4 ? (array[3] as? String ?? "no reason given") : "no reason given"
                        if success {
                            _ = Self.pendingGiftWrapIDs.remove(eventId)
-                            SecureLogger.log("✅ Accepted id=\(eventId.prefix(16))… relay=\(relayUrl)",
+                            SecureLogger.log("✅ Event accepted id=\(eventId.prefix(16))... by relay: \(relayUrl)",
                                            category: SecureLogger.session, level: .debug)
                        } else {
                            let isGiftWrap = Self.pendingGiftWrapIDs.remove(eventId) != nil
-                            SecureLogger.log("📮 Rejected id=\(eventId.prefix(16))… reason=\(reason)", 
+                            SecureLogger.log("📮 Event \(eventId.prefix(16))... rejected by relay: \(reason)", 
                                            category: SecureLogger.session, level: isGiftWrap ? .warning : .error)
                        }
                    }
@@ -353,7 +353,7 @@ class NostrRelayManager: ObservableObject {
            let data = try encoder.encode(req)
            let message = String(data: data, encoding: .utf8) ?? ""
            
-            SecureLogger.log("📤 Send kind=\(event.kind) id=\(event.id.prefix(16))… relay=\(relayUrl)", 
+            SecureLogger.log("📤 Sending Nostr event (kind: \(event.kind)) to relay: \(relayUrl)", 
                            category: SecureLogger.session, level: .debug)
            
            connection.send(.string(message)) { [weak self] error in
@@ -568,7 +568,7 @@ struct NostrFilter: Encodable {
        filter.kinds = [1059] // Gift wrap kind
        filter.since = since?.timeIntervalSince1970.toInt()
        filter.tagFilters = ["p": [pubkey]]
-        filter.limit = TransportConfig.nostrRelayDefaultFetchLimit // reasonable limit
+        filter.limit = 100 // Add a reasonable limit
        return filter
    }

@@ -39,7 +39,7 @@ final class LocationChannelManager: NSObject, CLLocationManagerDelegate, Observa
        super.init()
        cl.delegate = self
        cl.desiredAccuracy = kCLLocationAccuracyHundredMeters
-        cl.distanceFilter = TransportConfig.locationDistanceFilterMeters // meters; we're not tracking continuously
+        cl.distanceFilter = 1000 // meters; we're not tracking continuously
        // Load selection
        if let data = UserDefaults.standard.data(forKey: userDefaultsKey),
           let channel = try? JSONDecoder().decode(ChannelID.self, from: data) {
@@ -93,7 +93,7 @@ final class LocationChannelManager: NSObject, CLLocationManagerDelegate, Observa
    }

    /// Begin periodic one-shot location refreshes while a selector UI is visible.
-    func beginLiveRefresh(interval: TimeInterval = TransportConfig.locationLiveRefreshInterval) {
+    func beginLiveRefresh(interval: TimeInterval = 5.0) {
        guard permissionState == .authorized else { return }
        // Switch to a lightweight periodic one-shot request (polling) while the sheet is open
        refreshTimer?.invalidate()
@@ -37,11 +37,11 @@ final class MessageRouter {
    }

    func sendPrivate(_ content: String, to peerID: String, recipientNickname: String, messageID: String) {
-        let reachableMesh = mesh.isPeerReachable(peerID)
-        if reachableMesh {
-            SecureLogger.log("Routing PM via mesh (reachable) to \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
+        let hasMesh = mesh.isPeerConnected(peerID)
+        let hasEstablished = mesh.getNoiseService().hasEstablishedSession(with: peerID)
+        if hasMesh && hasEstablished {
+            SecureLogger.log("Routing PM via mesh to \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
                            category: SecureLogger.session, level: .debug)
-            // BLEService will initiate a handshake if needed and queue the message
            mesh.sendPrivateMessage(content, to: peerID, recipientNickname: recipientNickname, messageID: messageID)
        } else if canSendViaNostr(peerID: peerID) {
            SecureLogger.log("Routing PM via Nostr to \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
@@ -57,9 +57,9 @@ final class MessageRouter {
    }

    func sendReadReceipt(_ receipt: ReadReceipt, to peerID: String) {
-        // Prefer mesh for reachable peers; BLE will queue if handshake is needed
-        if mesh.isPeerReachable(peerID) {
-            SecureLogger.log("Routing READ ack via mesh (reachable) to \(peerID.prefix(8))… id=\(receipt.originalMessageID.prefix(8))…",
+        // Prefer mesh only if a Noise session is established; else use Nostr to avoid handshakeRequired spam
+        if mesh.isPeerConnected(peerID) && mesh.getNoiseService().hasEstablishedSession(with: peerID) {
+            SecureLogger.log("Routing READ ack via mesh to \(peerID.prefix(8))… id=\(receipt.originalMessageID.prefix(8))…",
                            category: SecureLogger.session, level: .debug)
            mesh.sendReadReceipt(receipt, to: peerID)
        } else {
@@ -70,9 +70,7 @@ final class MessageRouter {
    }

    func sendDeliveryAck(_ messageID: String, to peerID: String) {
-        if mesh.isPeerReachable(peerID) {
-            SecureLogger.log("Routing DELIVERED ack via mesh (reachable) to \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
-                            category: SecureLogger.session, level: .debug)
+        if mesh.isPeerConnected(peerID) && mesh.getNoiseService().hasEstablishedSession(with: peerID) {
            mesh.sendDeliveryAck(for: messageID, to: peerID)
        } else {
            nostr.sendDeliveryAck(for: messageID, to: peerID)
@@ -103,7 +101,7 @@ final class MessageRouter {
                        category: SecureLogger.session, level: .debug)
        // Prefer mesh if connected; else try Nostr if mapping exists
        for (content, nickname, messageID) in queued {
-            if mesh.isPeerReachable(peerID) {
+            if mesh.isPeerConnected(peerID) {
                SecureLogger.log("Outbox -> mesh for \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
                                category: SecureLogger.session, level: .debug)
                mesh.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
@@ -20,7 +20,7 @@ final class NostrTransport: Transport {
    }
    private var readQueue: [QueuedRead] = []
    private var isSendingReadAcks = false
-    private let readAckInterval: TimeInterval = TransportConfig.nostrReadAckInterval
+    private let readAckInterval: TimeInterval = 0.35 // ~3 per second

    var myPeerID: String { senderPeerID }
    var myNickname: String { "" }
@@ -31,7 +31,6 @@ final class NostrTransport: Transport {
    func emergencyDisconnectAll() { /* no-op */ }

    func isPeerConnected(_ peerID: String) -> Bool { false }
-    func isPeerReachable(_ peerID: String) -> Bool { false }
    func peerNickname(peerID: String) -> String? { nil }
    func getPeerNicknames() -> [String : String] { [:] }

@@ -49,7 +48,16 @@ final class NostrTransport: Transport {

    func sendPrivateMessage(_ content: String, to peerID: String, recipientNickname: String, messageID: String) {
        Task { @MainActor in
-            guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
+            // Resolve favorite by full noise key or by short peerID fallback
+            var recipientNostrPubkey: String?
+            if let noiseKey = Data(hexString: peerID),
+               let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey) {
+                recipientNostrPubkey = fav.peerNostrPublicKey
+            }
+            if recipientNostrPubkey == nil, peerID.count == 16 {
+                recipientNostrPubkey = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID)?.peerNostrPublicKey
+            }
+            guard let recipientNpub = recipientNostrPubkey else { return }
            guard let senderIdentity = try? NostrIdentityBridge.getCurrentNostrIdentity() else { return }
            SecureLogger.log("NostrTransport: preparing PM to \(recipientNpub.prefix(16))… for peerID \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
                            category: SecureLogger.session, level: .debug)
@@ -97,7 +105,15 @@ final class NostrTransport: Transport {
        guard !readQueue.isEmpty else { isSendingReadAcks = false; return }
        let item = readQueue.removeFirst()
        Task { @MainActor in
-            guard let recipientNpub = resolveRecipientNpub(for: item.peerID) else { scheduleNextReadAck(); return }
+            var recipientNostrPubkey: String?
+            if let noiseKey = Data(hexString: item.peerID),
+               let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey) {
+                recipientNostrPubkey = fav.peerNostrPublicKey
+            }
+            if recipientNostrPubkey == nil, item.peerID.count == 16 {
+                recipientNostrPubkey = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: item.peerID)?.peerNostrPublicKey
+            }
+            guard let recipientNpub = recipientNostrPubkey else { scheduleNextReadAck(); return }
            guard let senderIdentity = try? NostrIdentityBridge.getCurrentNostrIdentity() else { scheduleNextReadAck(); return }
            SecureLogger.log("NostrTransport: preparing READ ack for id=\(item.receipt.originalMessageID.prefix(8))… to \(recipientNpub.prefix(16))…",
                            category: SecureLogger.session, level: .debug)
@@ -133,7 +149,15 @@ final class NostrTransport: Transport {

    func sendFavoriteNotification(to peerID: String, isFavorite: Bool) {
        Task { @MainActor in
-            guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
+            var recipientNostrPubkey: String?
+            if let noiseKey = Data(hexString: peerID),
+               let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey) {
+                recipientNostrPubkey = fav.peerNostrPublicKey
+            }
+            if recipientNostrPubkey == nil, peerID.count == 16 {
+                recipientNostrPubkey = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID)?.peerNostrPublicKey
+            }
+            guard let recipientNpub = recipientNostrPubkey else { return }
            guard let senderIdentity = try? NostrIdentityBridge.getCurrentNostrIdentity() else { return }
            let content = isFavorite ? "[FAVORITED]:\(senderIdentity.npub)" : "[UNFAVORITED]:\(senderIdentity.npub)"
            SecureLogger.log("NostrTransport: preparing FAVORITE(\(isFavorite)) to \(recipientNpub.prefix(16))…",
@@ -159,26 +183,18 @@ final class NostrTransport: Transport {
        }
    }

-    // MARK: - Helpers
-    @MainActor
-    private func resolveRecipientNpub(for peerID: String) -> String? {
-        if let noiseKey = Data(hexString: peerID),
-           let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey),
-           let npub = fav.peerNostrPublicKey {
-            return npub
-        }
-        if peerID.count == 16,
-           let fav = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID),
-           let npub = fav.peerNostrPublicKey {
-            return npub
-        }
-        return nil
-    }
-
    func sendBroadcastAnnounce() { /* no-op for Nostr */ }
    func sendDeliveryAck(for messageID: String, to peerID: String) {
        Task { @MainActor in
-            guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
+            var recipientNostrPubkey: String?
+            if let noiseKey = Data(hexString: peerID),
+               let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey) {
+                recipientNostrPubkey = fav.peerNostrPublicKey
+            }
+            if recipientNostrPubkey == nil, peerID.count == 16 {
+                recipientNostrPubkey = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID)?.peerNostrPublicKey
+            }
+            guard let recipientNpub = recipientNostrPubkey else { return }
            guard let senderIdentity = try? NostrIdentityBridge.getCurrentNostrIdentity() else { return }
            SecureLogger.log("NostrTransport: preparing DELIVERED ack for id=\(messageID.prefix(8))… to \(recipientNpub.prefix(16))…",
                            category: SecureLogger.session, level: .debug)
@@ -27,7 +27,7 @@ class PrivateChatManager: ObservableObject {
    }

    // Cap for messages stored per private chat
-    private let privateChatCap = TransportConfig.privateChatCap
+    private let privateChatCap = 1337
    
    /// Start a private chat with a peer
    func startChat(with peerID: String) {
@@ -15,7 +15,6 @@ struct RelayController {
                       isDirectedEncrypted: Bool,
                       isDirectedFragment: Bool,
                       isHandshake: Bool,
-                       isAnnounce: Bool,
                       degree: Int,
                       highDegreeThreshold: Int) -> RelayDecision {
        // Suppress obvious non-relays
@@ -26,8 +25,7 @@ struct RelayController {
            // Always relay with no TTL cap for these types
            let newTTL = (ttl &- 1)
            // Slight jitter to desynchronize without adding too much latency
-            // Tighter for faster multi-hop handshakes and directed DMs
-            let delayRange: ClosedRange<Int> = isHandshake ? 10...35 : 20...60
+            let delayRange: ClosedRange<Int> = isHandshake ? 20...60 : 40...120
            let delayMs = Int.random(in: delayRange)
            return RelayDecision(shouldRelay: true, newTTL: newTTL, delayMs: delayMs)
        }
@@ -44,22 +42,15 @@ struct RelayController {
        let prob = baseProb
        let shouldRelay = Double.random(in: 0...1) <= prob

-        // TTL clamping for broadcast
-        // - Dense graphs: keep very low to avoid floods
-        // - Sparse graphs: allow slightly longer reach for multi-hop discovery
-        // - Announces in sparse graphs get a bit more headroom
-        let ttlCap: UInt8 = {
-            if degree >= highDegreeThreshold { return 3 }
-            return isAnnounce ? 7 : 6
-        }()
+        // TTL clamping in dense graphs (only for broadcast)
+        let ttlCap: UInt8 = degree >= highDegreeThreshold ? 3 : 5
        let clamped = max(1, min(ttl, ttlCap))
        let newTTL = clamped &- 1

        // Wider jitter window to allow duplicate suppression to win more often
-        // For sparse graphs (<=2), relay quickly to avoid cancellation races
        let delayMs: Int
        switch degree {
-        case 0...2: delayMs = Int.random(in: 10...40)
+        case 0...2: delayMs = Int.random(in: 40...100)
        case 3...5: delayMs = Int.random(in: 60...150)
        case 6...9: delayMs = Int.random(in: 80...180)
        default:    delayMs = Int.random(in: 100...220)
@@ -3,7 +3,7 @@ import Combine

 /// Abstract transport interface used by ChatViewModel and services.
 /// BLEService implements this protocol; a future Nostr transport can too.
-struct TransportPeerSnapshot: Equatable, Hashable {
+struct TransportPeerSnapshot {
    let id: String
    let nickname: String
    let isConnected: Bool
@@ -29,7 +29,6 @@ protocol Transport: AnyObject {

    // Connectivity and peers
    func isPeerConnected(_ peerID: String) -> Bool
-    func isPeerReachable(_ peerID: String) -> Bool
    func peerNickname(peerID: String) -> String?
    func getPeerNicknames() -> [String: String]

@@ -1,182 +0,0 @@
-import Foundation
-
-/// Centralized knobs for transport- and UI-related limits.
-/// Keep values aligned with existing behavior when replacing magic numbers.
-enum TransportConfig {
-    // BLE / Protocol
-    static let bleDefaultFragmentSize: Int = 469            // ~512 MTU minus protocol overhead
-    static let messageTTLDefault: UInt8 = 7                 // Default TTL for mesh flooding
-    static let bleMaxInFlightAssemblies: Int = 128          // Cap concurrent fragment assemblies
-    static let bleHighDegreeThreshold: Int = 6              // For adaptive TTL/probabilistic relays
-
-    // UI / Storage Caps
-    static let privateChatCap: Int = 1337
-    static let meshTimelineCap: Int = 1337
-    static let geoTimelineCap: Int = 1337
-    static let contentLRUCap: Int = 2000
-
-    // Timers
-    static let networkResetGraceSeconds: TimeInterval = 600 // 10 minutes
-    static let basePublicFlushInterval: TimeInterval = 0.08  // ~12.5 fps batching
-
-    // BLE duty/announce/connect
-    static let bleConnectRateLimitInterval: TimeInterval = 0.5
-    static let bleMaxCentralLinks: Int = 6
-    static let bleDutyOnDuration: TimeInterval = 5.0
-    static let bleDutyOffDuration: TimeInterval = 10.0
-    static let bleAnnounceMinInterval: TimeInterval = 1.0
-
-    // BLE discovery/quality thresholds
-    static let bleDynamicRSSIThresholdDefault: Int = -90
-    static let bleConnectionCandidatesMax: Int = 100
-    static let blePendingWriteBufferCapBytes: Int = 1_000_000
-    static let blePendingNotificationsCapCount: Int = 20
-
-    // Nostr
-    static let nostrReadAckInterval: TimeInterval = 0.35 // ~3 per second
-
-    // UI thresholds
-    static let uiLateInsertThreshold: TimeInterval = 15.0
-    static let uiProcessedNostrEventsCap: Int = 2000
-    static let uiChannelInactivityThresholdSeconds: TimeInterval = 9 * 60
-    
-    // UI rate limiters (token buckets)
-    static let uiSenderRateBucketCapacity: Double = 5
-    static let uiSenderRateBucketRefillPerSec: Double = 1.0
-    static let uiContentRateBucketCapacity: Double = 3
-    static let uiContentRateBucketRefillPerSec: Double = 0.5
-
-    // UI sleeps/delays
-    static let uiStartupInitialDelaySeconds: TimeInterval = 1.0
-    static let uiStartupShortSleepNs: UInt64 = 200_000_000
-    static let uiStartupPhaseDurationSeconds: TimeInterval = 2.0
-    static let uiAsyncShortSleepNs: UInt64 = 100_000_000
-    static let uiAsyncMediumSleepNs: UInt64 = 500_000_000
-    static let uiReadReceiptRetryShortSeconds: TimeInterval = 0.1
-    static let uiReadReceiptRetryLongSeconds: TimeInterval = 0.5
-    static let uiBatchDispatchStaggerSeconds: TimeInterval = 0.15
-    static let uiScrollThrottleSeconds: TimeInterval = 0.5
-    static let uiAnimationShortSeconds: TimeInterval = 0.15
-    static let uiAnimationMediumSeconds: TimeInterval = 0.2
-    static let uiAnimationSidebarSeconds: TimeInterval = 0.25
-    static let uiRecentCutoffFiveMinutesSeconds: TimeInterval = 5 * 60
-
-    // BLE maintenance & thresholds
-    static let bleMaintenanceInterval: TimeInterval = 5.0
-    static let bleMaintenanceLeewaySeconds: Int = 1
-    static let bleIsolationRelaxThresholdSeconds: TimeInterval = 60
-    static let bleRecentTimeoutWindowSeconds: TimeInterval = 60
-    static let bleRecentTimeoutCountThreshold: Int = 3
-    static let bleRSSIIsolatedBase: Int = -90
-    static let bleRSSIIsolatedRelaxed: Int = -92
-    static let bleRSSIConnectedThreshold: Int = -85
-    static let bleRSSIHighTimeoutThreshold: Int = -80
-    // How long without seeing traffic before we sanity-check the direct link
-    // Lowered to make connected→reachable icon changes react faster when walking out of range
-    static let blePeerInactivityTimeoutSeconds: TimeInterval = 8.0
-    // How long to retain a peer as "reachable" (not directly connected) since lastSeen
-    static let bleReachabilityRetentionVerifiedSeconds: TimeInterval = 21.0    // 21s for verified/favorites
-    static let bleReachabilityRetentionUnverifiedSeconds: TimeInterval = 21.0  // 21s for unknown/unverified
-    static let bleFragmentLifetimeSeconds: TimeInterval = 30.0
-    static let bleIngressRecordLifetimeSeconds: TimeInterval = 3.0
-    static let bleConnectTimeoutBackoffWindowSeconds: TimeInterval = 120.0
-    static let bleRecentPacketWindowSeconds: TimeInterval = 30.0
-    static let bleRecentPacketWindowMaxCount: Int = 100
-    // Keep scanning fully ON when we saw traffic very recently
-    static let bleRecentTrafficForceScanSeconds: TimeInterval = 10.0
-    static let bleThreadSleepWriteShortDelaySeconds: TimeInterval = 0.05
-    static let bleExpectedWritePerFragmentMs: Int = 8
-    static let bleExpectedWriteMaxMs: Int = 2000
-    // Faster fragment pacing; use slightly tighter spacing for directed trains
-    static let bleFragmentSpacingMs: Int = 5
-    static let bleFragmentSpacingDirectedMs: Int = 4
-    static let bleAnnounceIntervalSeconds: TimeInterval = 4.0
-    static let bleDutyOnDurationDense: TimeInterval = 3.0
-    static let bleDutyOffDurationDense: TimeInterval = 15.0
-    static let bleConnectedAnnounceBaseSecondsDense: TimeInterval = 30.0
-    static let bleConnectedAnnounceBaseSecondsSparse: TimeInterval = 15.0
-    static let bleConnectedAnnounceJitterDense: TimeInterval = 8.0
-    static let bleConnectedAnnounceJitterSparse: TimeInterval = 4.0
-
-    // Location
-    static let locationDistanceFilterMeters: Double = 1000
-    static let locationLiveRefreshInterval: TimeInterval = 5.0
-
-    // Nostr geohash
-    static let nostrGeohashInitialLookbackSeconds: TimeInterval = 3600
-    static let nostrGeohashInitialLimit: Int = 200
-    static let nostrGeoRelayCount: Int = 5
-    static let nostrGeohashSampleLookbackSeconds: TimeInterval = 300
-    static let nostrGeohashSampleLimit: Int = 100
-    static let nostrDMSubscribeLookbackSeconds: TimeInterval = 86400
-
-    // Nostr helpers
-    static let nostrShortKeyDisplayLength: Int = 8
-    static let nostrConvKeyPrefixLength: Int = 16
-
-    // Compression
-    static let compressionThresholdBytes: Int = 100
-
-    // Message deduplication
-    static let messageDedupMaxAgeSeconds: TimeInterval = 300
-    static let messageDedupMaxCount: Int = 1000
-
-    // Verification QR
-    static let verificationQRMaxAgeSeconds: TimeInterval = 5 * 60
-
-    // Nostr relay backoff
-    static let nostrRelayInitialBackoffSeconds: TimeInterval = 1.0
-    static let nostrRelayMaxBackoffSeconds: TimeInterval = 300.0
-    static let nostrRelayBackoffMultiplier: Double = 2.0
-    static let nostrRelayMaxReconnectAttempts: Int = 10
-    static let nostrRelayDefaultFetchLimit: Int = 100
-
-    // Geo relay directory
-    static let geoRelayFetchIntervalSeconds: TimeInterval = 60 * 60 * 24
-
-    // BLE operational delays
-    static let bleInitialAnnounceDelaySeconds: TimeInterval = 0.6
-    static let bleConnectTimeoutSeconds: TimeInterval = 8.0
-    static let bleRestartScanDelaySeconds: TimeInterval = 0.1
-    static let blePostSubscribeAnnounceDelaySeconds: TimeInterval = 0.05
-    static let blePostAnnounceDelaySeconds: TimeInterval = 0.4
-    static let bleForceAnnounceMinIntervalSeconds: TimeInterval = 0.15
-
-    // Store-and-forward for directed packets at relays
-    static let bleDirectedSpoolWindowSeconds: TimeInterval = 15.0
-
-    // Log/UI debounce windows
-    // Shorter debounce so UI reacts faster while still suppressing duplicate callbacks
-    static let bleDisconnectNotifyDebounceSeconds: TimeInterval = 0.9
-    static let bleReconnectLogDebounceSeconds: TimeInterval = 2.0
-
-    // Weak-link cooldown after connection timeouts
-    static let bleWeakLinkCooldownSeconds: TimeInterval = 30.0
-    static let bleWeakLinkRSSICutoff: Int = -90
-
-    // Content hashing / formatting
-    static let contentKeyPrefixLength: Int = 256
-    static let uiLongMessageLengthThreshold: Int = 2000
-    static let uiVeryLongTokenThreshold: Int = 512
-    static let uiLongMessageLineLimit: Int = 30
-    static let uiFingerprintSampleCount: Int = 3
-    
-    // UI swipe/gesture thresholds
-    static let uiBackSwipeTranslationLarge: CGFloat = 50
-    static let uiBackSwipeTranslationSmall: CGFloat = 30
-    static let uiBackSwipeVelocityThreshold: CGFloat = 300
-    
-    // UI color tuning
-    static let uiColorHueAvoidanceDelta: Double = 0.05
-    static let uiColorHueOffset: Double = 0.12
-
-    // UI windowing (infinite scroll)
-    static let uiWindowInitialCountPublic: Int = 300
-    static let uiWindowInitialCountPrivate: Int = 300
-    static let uiWindowStepCount: Int = 200
-
-    // Share extension
-    static let uiShareExtensionDismissDelaySeconds: TimeInterval = 0.3
-    static let uiShareAcceptWindowSeconds: TimeInterval = 30.0
-    static let uiMigrationCutoffSeconds: TimeInterval = 24 * 60 * 60
-}
@@ -68,28 +68,24 @@ class UnifiedPeerService: ObservableObject, TransportPeerEventsDelegate {
    
    private func updatePeers() {
        let meshPeers = meshService.currentPeerSnapshots()
-        // If we have no direct links at all, peers should not be marked reachable
-        // "Reachable" means mesh-attached via at least one live link.
-        let hasAnyConnected = meshPeers.contains { $0.isConnected }
        let favorites = favoritesService.favorites
        
        var enrichedPeers: [BitchatPeer] = []
        var connected: Set<String> = []
        var addedPeerIDs: Set<String> = []
        
-        // Phase 1: Add all mesh peers (connected and reachable)
-        for peerInfo in meshPeers {
+        // Phase 1: Add all connected mesh peers
+        for peerInfo in meshPeers where peerInfo.isConnected {
            let peerID = peerInfo.id
            guard peerID != meshService.myPeerID else { continue }  // Never add self
            
            let peer = buildPeerFromMesh(
                peerInfo: peerInfo,
-                favorites: favorites,
-                meshAttached: hasAnyConnected
+                favorites: favorites
            )
            
            enrichedPeers.append(peer)
-            if peer.isConnected { connected.insert(peerID) }
+            connected.insert(peerID)
            addedPeerIDs.insert(peerID)
            
            // Update fingerprint cache
@@ -121,12 +117,14 @@ class UnifiedPeerService: ObservableObject, TransportPeerEventsDelegate {
        
        // Phase 3: Sort peers
        enrichedPeers.sort { lhs, rhs in
-            // Connectivity rank: connected > reachable > others
-            func rank(_ p: BitchatPeer) -> Int { p.isConnected ? 2 : (p.isReachable ? 1 : 0) }
-            let lr = rank(lhs), rr = rank(rhs)
-            if lr != rr { return lr > rr }
-            // Then favorites inside same rank
-            if lhs.isFavorite != rhs.isFavorite { return lhs.isFavorite }
+            // Connected first
+            if lhs.isConnected != rhs.isConnected {
+                return lhs.isConnected
+            }
+            // Then favorites
+            if lhs.isFavorite != rhs.isFavorite {
+                return lhs.isFavorite
+            }
            // Finally alphabetical
            return lhs.displayName < rhs.displayName
        }
@@ -147,11 +145,8 @@ class UnifiedPeerService: ObservableObject, TransportPeerEventsDelegate {
            }
        }
        
-        // Phase 5: Filter out offline non-mutual peers and update published properties
-        let filtered = enrichedPeers.filter { p in
-            p.isConnected || p.isReachable || p.isMutualFavorite
-        }
-        self.peers = filtered
+        // Phase 5: Update published properties
+        self.peers = enrichedPeers
        self.connectedPeerIDs = connected
        self.favorites = favoritesList
        self.mutualFavorites = mutualsList
@@ -167,26 +162,14 @@ class UnifiedPeerService: ObservableObject, TransportPeerEventsDelegate {
    
    private func buildPeerFromMesh(
        peerInfo: TransportPeerSnapshot,
-        favorites: [Data: FavoritesPersistenceService.FavoriteRelationship],
-        meshAttached: Bool
+        favorites: [Data: FavoritesPersistenceService.FavoriteRelationship]
    ) -> BitchatPeer {
-        // Determine reachability based on lastSeen and identity trust
-        let now = Date()
-        let fingerprint = peerInfo.noisePublicKey?.sha256Fingerprint()
-        let isVerified = fingerprint.map { SecureIdentityStateManager.shared.isVerified(fingerprint: $0) } ?? false
-        let isFav = peerInfo.noisePublicKey.flatMap { favorites[$0]?.isFavorite } ?? false
-        let retention: TimeInterval = (isVerified || isFav) ? TransportConfig.bleReachabilityRetentionVerifiedSeconds : TransportConfig.bleReachabilityRetentionUnverifiedSeconds
-        // A peer is reachable if we recently saw them AND we are attached to the mesh
-        let withinRetention = now.timeIntervalSince(peerInfo.lastSeen) <= retention
-        let isReachable = peerInfo.isConnected ? true : (withinRetention && meshAttached)
-
        var peer = BitchatPeer(
            id: peerInfo.id,
            noisePublicKey: peerInfo.noisePublicKey ?? Data(),
            nickname: peerInfo.nickname,
            lastSeen: peerInfo.lastSeen,
-            isConnected: peerInfo.isConnected,
-            isReachable: isReachable
+            isConnected: true
        )
        
        // Check for favorite status
@@ -233,8 +216,7 @@ class UnifiedPeerService: ObservableObject, TransportPeerEventsDelegate {
            noisePublicKey: favorite.peerNoisePublicKey,
            nickname: favorite.peerNickname,
            lastSeen: favorite.lastUpdated,
-            isConnected: false,
-            isReachable: false
+            isConnected: false
        )
        
        peer.favoriteStatus = favorite
@@ -102,7 +102,7 @@ final class VerificationService {
    }

    /// Verify a scanned QR and return the parsed payload if valid (signature + freshness checks)
-    func verifyScannedQR(_ urlString: String, maxAge: TimeInterval = TransportConfig.verificationQRMaxAgeSeconds) -> VerificationQR? {
+    func verifyScannedQR(_ urlString: String, maxAge: TimeInterval = 5 * 60) -> VerificationQR? {
        guard let url = URL(string: urlString), let qr = VerificationQR.fromURL(url) else { return nil }
        // Freshness
        let now = Date().timeIntervalSince1970
@@ -11,7 +11,7 @@ import Compression

 struct CompressionUtil {
    // Compression threshold - don't compress if data is smaller than this
-    static let compressionThreshold = TransportConfig.compressionThresholdBytes // bytes
+    static let compressionThreshold = 100 // bytes
    
    // Compress data using zlib algorithm (most compatible)
    static func compress(_ data: Data) -> Data? {
@@ -11,8 +11,8 @@ final class MessageDeduplicator {
    private var entries: [Entry] = []
    private var lookup = Set<String>()
    private let lock = NSLock()
-    private let maxAge: TimeInterval = TransportConfig.messageDedupMaxAgeSeconds  // 5 minutes
-    private let maxCount = TransportConfig.messageDedupMaxCount
+    private let maxAge: TimeInterval = 300  // 5 minutes
+    private let maxCount = 1000

    /// Check if message is duplicate and add if not
    func isDuplicate(_ messageID: String) -> Bool {
@@ -84,3 +84,4 @@ final class MessageDeduplicator {
        }
    }
 }
+
@@ -1,29 +0,0 @@
-import Foundation
-
-/// Resolves a stable display name for peers, adding a short suffix when collisions exist.
-struct PeerDisplayNameResolver {
-    /// Computes display names with a `#xxxx` suffix for connected peers when nickname collisions occur.
-    /// - Parameters:
-    ///   - peers: Array of tuples (id, nickname, isConnected).
-    ///   - selfNickname: The local user's current nickname, included in collision counts to suffix remotes matching it.
-    /// - Returns: Map of peerID -> displayName.
-    static func resolve(_ peers: [(id: String, nickname: String, isConnected: Bool)], selfNickname: String) -> [String: String] {
-        // Count collisions among connected peers and include our own nickname
-        var counts: [String: Int] = [:]
-        for p in peers where p.isConnected {
-            counts[p.nickname, default: 0] += 1
-        }
-        counts[selfNickname, default: 0] += 1
-
-        var result: [String: String] = [:]
-        for p in peers {
-            var name = p.nickname
-            if p.isConnected, (counts[p.nickname] ?? 0) > 1 {
-                name += "#" + String(p.id.prefix(4))
-            }
-            result[p.id] = name
-        }
-        return result
-    }
-}
-
@@ -145,10 +145,10 @@ class ChatViewModel: ObservableObject, BitchatDelegate {

    private var rateBucketsBySender: [String: TokenBucket] = [:]
    private var rateBucketsByContent: [String: TokenBucket] = [:]
-    private let senderBucketCapacity: Double = TransportConfig.uiSenderRateBucketCapacity
-    private let senderBucketRefill: Double = TransportConfig.uiSenderRateBucketRefillPerSec // tokens per second
-    private let contentBucketCapacity: Double = TransportConfig.uiContentRateBucketCapacity
-    private let contentBucketRefill: Double = TransportConfig.uiContentRateBucketRefillPerSec // tokens per second
+    private let senderBucketCapacity: Double = 5
+    private let senderBucketRefill: Double = 1 // tokens per second
+    private let contentBucketCapacity: Double = 3
+    private let contentBucketRefill: Double = 0.5 // tokens per second

    @MainActor
    private func normalizedSenderKey(for message: BitchatMessage) -> String {
@@ -192,7 +192,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        if last < ns.length { simplified += ns.substring(with: NSRange(location: last, length: ns.length - last)) }
        let trimmed = simplified.trimmingCharacters(in: .whitespacesAndNewlines)
        let collapsed = trimmed.replacingOccurrences(of: "\\s+", with: " ", options: .regularExpression)
-        let prefix = String(collapsed.prefix(TransportConfig.contentKeyPrefixLength))
+        let prefix = String(collapsed.prefix(256))
        // Fast djb2 hash
        let h = djb2(prefix)
        return String(format: "h:%016llx", h)
@@ -201,7 +201,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    // Persistent recent content map (LRU) to speed near-duplicate checks
    private var contentLRUMap: [String: Date] = [:]
    private var contentLRUOrder: [String] = []
-    private let contentLRUCap = TransportConfig.contentLRUCap
+    private let contentLRUCap = 2000
    private func recordContentKey(_ key: String, timestamp: Date) {
        if contentLRUMap[key] == nil { contentLRUOrder.append(key) }
        contentLRUMap[key] = timestamp
@@ -219,13 +219,13 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    
    @Published var messages: [BitchatMessage] = []
    @Published var currentColorScheme: ColorScheme = .light
-    private let maxMessages = TransportConfig.meshTimelineCap // Maximum messages before oldest are removed
+    private let maxMessages = 1337 // Maximum messages before oldest are removed
    @Published var isConnected = false
    private var hasNotifiedNetworkAvailable = false
    private var recentlySeenPeers: Set<String> = []
    private var lastNetworkNotificationTime = Date.distantPast
    private var networkResetTimer: Timer? = nil
-    private let networkResetGraceSeconds: TimeInterval = TransportConfig.networkResetGraceSeconds // avoid refiring on short drops/reconnects
+    private let networkResetGraceSeconds: TimeInterval = 600 // 10 minutes; avoid refiring on short drops/reconnects
    @Published var nickname: String = "" {
        didSet {
            // Trim whitespace whenever nickname is set
@@ -349,7 +349,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    // PeerManager replaced by UnifiedPeerService
    private var processedNostrEvents = Set<String>()  // Simple deduplication
    private var processedNostrEventOrder: [String] = []
-    private let maxProcessedNostrEvents = TransportConfig.uiProcessedNostrEventsCap
+    private let maxProcessedNostrEvents = 2000
    private let userDefaults = UserDefaults.standard
    private let nicknameKey = "bitchat.nickname"
    // Location channel state (macOS supports manual geohash selection)
@@ -386,14 +386,14 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    // Messages are naturally ephemeral - no persistent storage
    // Persist mesh public timeline across channel switches
    private var meshTimeline: [BitchatMessage] = []
-    private let meshTimelineCap = TransportConfig.meshTimelineCap
+    private let meshTimelineCap = 1337
    // Persist per-geohash public timelines across switches
    private var geoTimelines: [String: [BitchatMessage]] = [:] // geohash -> messages
-    private let geoTimelineCap = TransportConfig.geoTimelineCap
+    private let geoTimelineCap = 1337
    // Channel activity tracking for background nudges
    private var lastPublicActivityAt: [String: Date] = [:]   // channelKey -> last activity time
    private var lastPublicActivityNotifyAt: [String: Date] = [:]
-    private let channelInactivityThreshold: TimeInterval = TransportConfig.uiChannelInactivityThresholdSeconds
+    private let channelInactivityThreshold: TimeInterval = 9 * 60
    // Geohash participants (per geohash: pubkey -> lastSeen)
    private var geoParticipants: [String: [String: Date]] = [:]
    @Published private(set) var geohashPeople: [GeoPerson] = []
@@ -428,11 +428,11 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    // Buffer incoming public messages and flush in small batches to reduce UI invalidations
    private var publicBuffer: [BitchatMessage] = []
    private var publicBufferTimer: Timer? = nil
-    private let basePublicFlushInterval: TimeInterval = TransportConfig.basePublicFlushInterval
-    private var dynamicPublicFlushInterval: TimeInterval = TransportConfig.basePublicFlushInterval
+    private let basePublicFlushInterval: TimeInterval = 0.08 // ~12.5 fps batching
+    private var dynamicPublicFlushInterval: TimeInterval = 0.08
    private var recentBatchSizes: [Int] = []
    @Published private(set) var isBatchingPublic: Bool = false
-    private let lateInsertThreshold: TimeInterval = TransportConfig.uiLateInsertThreshold
+    private let lateInsertThreshold: TimeInterval = 15.0
    
    // Track sent read receipts to avoid duplicates (persisted across launches)
    // Note: Persistence happens automatically in didSet, no lifecycle observers needed
@@ -441,9 +441,21 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            // Only persist if there are changes
            guard oldValue != sentReadReceipts else { return }
            
-            // Persist to UserDefaults whenever it changes (no manual synchronize/verify re-read)
+            // Persist to UserDefaults whenever it changes
            if let data = try? JSONEncoder().encode(Array(sentReadReceipts)) {
                UserDefaults.standard.set(data, forKey: "sentReadReceipts")
+                // Force synchronization for immediate persistence (ensures data is written to disk)
+                UserDefaults.standard.synchronize()
+                
+                // Verify persistence by re-reading
+                if let verifyData = UserDefaults.standard.data(forKey: "sentReadReceipts"),
+                   let _ = try? JSONDecoder().decode([String].self, from: verifyData) {
+                    // Only log errors, not successful persistence
+                    // Successfully persisted
+                } else {
+                    SecureLogger.log("⚠️ Failed to verify persistence of read receipts",
+                                    category: SecureLogger.session, level: .error)
+                }
            } else {
                SecureLogger.log("❌ Failed to encode read receipts for persistence",
                                category: SecureLogger.session, level: .error)
@@ -506,7 +518,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        // Log startup info
        
        // Log fingerprint after a delay to ensure encryption service is ready
-        DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiStartupInitialDelaySeconds) { [weak self] in
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in
            if let self = self {
                _ = self.getMyFingerprint()
            }
@@ -526,7 +538,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            
            // Small delay to ensure read receipts are fully loaded
            // This prevents race conditions where messages arrive before initialization completes
-            try? await Task.sleep(nanoseconds: TransportConfig.uiStartupShortSleepNs) // 0.2 seconds
+            try? await Task.sleep(nanoseconds: 200_000_000) // 0.2 seconds
            
            // Set up Nostr message handling directly
            setupNostrMessageHandling()
@@ -539,7 +551,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            // 1. Skip cleanup of read receipts
            // 2. Only block OLD messages from being marked as unread
            Task { @MainActor in
-                try? await Task.sleep(nanoseconds: UInt64(TransportConfig.uiStartupPhaseDurationSeconds * 1_000_000_000)) // 2 seconds
+                try? await Task.sleep(nanoseconds: 2_000_000_000) // 2 seconds
                self.isStartupPhase = false
            }
            
@@ -691,7 +703,8 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    // MARK: - Deinitialization
    
    deinit {
-        // No need to force UserDefaults synchronization
+        // Force immediate save
+        userDefaults.synchronize()
    }
    
    // Resubscribe to the active geohash channel without clearing timeline
@@ -707,15 +720,8 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        startGeoParticipantsTimer()
        // Unsubscribe + resubscribe
        NostrRelayManager.shared.unsubscribe(id: subID)
-        let filter = NostrFilter.geohashEphemeral(
-            ch.geohash,
-            since: Date().addingTimeInterval(-TransportConfig.nostrGeohashInitialLookbackSeconds),
-            limit: TransportConfig.nostrGeohashInitialLimit
-        )
-        let subRelays = GeoRelayDirectory.shared.closestRelays(
-            toGeohash: ch.geohash,
-            count: TransportConfig.nostrGeoRelayCount
-        )
+        let filter = NostrFilter.geohashEphemeral(ch.geohash, since: Date().addingTimeInterval(-3600), limit: 200)
+        let subRelays = GeoRelayDirectory.shared.closestRelays(toGeohash: ch.geohash, count: 5)
        NostrRelayManager.shared.subscribe(filter: filter, id: subID, relayUrls: subRelays) { [weak self] event in
            guard let self = self else { return }
            guard event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue else { return }
@@ -733,9 +739,9 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                self.geoNicknames[event.pubkey.lowercased()] = nick
            }
            // Store mapping for geohash sender IDs used in messages (ensures consistent colors)
-            let key16 = "nostr_" + String(event.pubkey.prefix(TransportConfig.nostrConvKeyPrefixLength))
+            let key16 = "nostr_" + String(event.pubkey.prefix(16))
            self.nostrKeyMapping[key16] = event.pubkey
-            let key8 = "nostr:" + String(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))
+            let key8 = "nostr:" + String(event.pubkey.prefix(8))
            self.nostrKeyMapping[key8] = event.pubkey

            // Update participants last-seen for this pubkey
@@ -762,7 +768,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                originalSender: nil,
                isPrivate: false,
                recipientNickname: nil,
-                senderPeerID: "nostr:\(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))",
+                senderPeerID: "nostr:\(event.pubkey.prefix(8))",
                mentions: mentions.isEmpty ? nil : mentions
            )
            Task { @MainActor in
@@ -777,7 +783,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            let id = try NostrIdentityBridge.deriveIdentity(forGeohash: ch.geohash)
            let dmSub = "geo-dm-\(ch.geohash)"
            geoDmSubscriptionID = dmSub
-            let dmFilter = NostrFilter.giftWrapsFor(pubkey: id.publicKeyHex, since: Date().addingTimeInterval(-TransportConfig.nostrDMSubscribeLookbackSeconds))
+            let dmFilter = NostrFilter.giftWrapsFor(pubkey: id.publicKeyHex, since: Date().addingTimeInterval(-86400))
            NostrRelayManager.shared.subscribe(filter: dmFilter, id: dmSub) { [weak self] giftWrap in
                guard let self = self else { return }
                if self.processedNostrEvents.contains(giftWrap.id) { return }
@@ -789,7 +795,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                guard packet.type == MessageType.noiseEncrypted.rawValue else { return }
                guard let noisePayload = NoisePayload.decode(packet.payload) else { return }
                let messageTimestamp = Date(timeIntervalSince1970: TimeInterval(rumorTs))
-                let convKey = "nostr_" + String(senderPubkey.prefix(TransportConfig.nostrConvKeyPrefixLength))
+                let convKey = "nostr_" + String(senderPubkey.prefix(16))
                self.nostrKeyMapping[convKey] = senderPubkey
                switch noisePayload.type {
                case .privateMessage:
@@ -897,7 +903,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    
    func saveNickname() {
        userDefaults.set(nickname, forKey: nicknameKey)
-        // Persist nickname; no need to force synchronize
+        userDefaults.synchronize() // Force immediate save
        
        // Send announce with new nickname to all peers
        meshService.sendBroadcastAnnounce()
@@ -935,13 +941,6 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            if unreadPrivateMessages.contains(noiseKeyHex) {
                return true
            }
-            // Also check for geohash (Nostr) DM conv key if this peer has a known Nostr pubkey
-            if let nostrHex = peer.nostrPublicKey {
-                let convKey = "nostr_" + String(nostrHex.prefix(TransportConfig.nostrConvKeyPrefixLength))
-                if unreadPrivateMessages.contains(convKey) {
-                    return true
-                }
-            }
        }
        
        // Get the peer's nickname to check for temporary Nostr peer IDs
@@ -1096,7 +1095,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
           chatFingerprint == fingerprintStr {
            // Send read receipts for any unread messages from this peer
            // Use a small delay to ensure the connection is fully established
-        DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiReadReceiptRetryLongSeconds) { [weak self] in
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
                self?.markPrivateMessagesAsRead(from: peerID)
            }
        }
@@ -1222,7 +1221,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
               let myGeoIdentity = try? NostrIdentityBridge.deriveIdentity(forGeohash: ch.geohash) {
                let suffix = String(myGeoIdentity.publicKeyHex.suffix(4))
                displaySender = nickname + "#" + suffix
-                localSenderPeerID = "nostr:\(myGeoIdentity.publicKeyHex.prefix(TransportConfig.nostrShortKeyDisplayLength))"
+                localSenderPeerID = "nostr:\(myGeoIdentity.publicKeyHex.prefix(8))"
            }

            let message = BitchatMessage(
@@ -1278,10 +1277,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                            nickname: self.nickname,
                            teleported: LocationChannelManager.shared.teleported
                        )
-                        let targetRelays = GeoRelayDirectory.shared.closestRelays(
-                            toGeohash: ch.geohash,
-                            count: TransportConfig.nostrGeoRelayCount
-                        )
+                        let targetRelays = GeoRelayDirectory.shared.closestRelays(toGeohash: ch.geohash, count: 5)
                        if targetRelays.isEmpty {
                            SecureLogger.log("Geo: no geohash relays available for \(ch.geohash); not sending", category: SecureLogger.session, level: .warning)
                        } else {
@@ -1363,11 +1359,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        let subID = "geo-\(ch.geohash)"
        geoSubscriptionID = subID
        startGeoParticipantsTimer()
-        let filter = NostrFilter.geohashEphemeral(
-            ch.geohash,
-            since: Date().addingTimeInterval(-TransportConfig.nostrGeohashInitialLookbackSeconds),
-            limit: TransportConfig.nostrGeohashInitialLimit
-        )
+        let filter = NostrFilter.geohashEphemeral(ch.geohash, since: Date().addingTimeInterval(-3600), limit: 200)
        let subRelays = GeoRelayDirectory.shared.closestRelays(toGeohash: ch.geohash, count: 5)
        NostrRelayManager.shared.subscribe(filter: filter, id: subID, relayUrls: subRelays) { [weak self] event in
            guard let self = self else { return }
@@ -1409,9 +1401,9 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                return
            }
            // Store mapping for geohash DM initiation
-            let key16 = "nostr_" + String(event.pubkey.prefix(TransportConfig.nostrConvKeyPrefixLength))
+            let key16 = "nostr_" + String(event.pubkey.prefix(16))
            self.nostrKeyMapping[key16] = event.pubkey
-            let key8 = "nostr:" + String(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))
+            let key8 = "nostr:" + String(event.pubkey.prefix(8))
            self.nostrKeyMapping[key8] = event.pubkey
            // Update participants last-seen for this pubkey
            self.recordGeoParticipant(pubkeyHex: event.pubkey)
@@ -1434,7 +1426,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                originalSender: nil,
                isPrivate: false,
                recipientNickname: nil,
-                senderPeerID: "nostr:\(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))",
+                senderPeerID: "nostr:\(event.pubkey.prefix(8))",
                mentions: mentions.isEmpty ? nil : mentions
            )
            Task { @MainActor in
@@ -1452,7 +1444,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            // pared back logging: subscribe debug only
            SecureLogger.log("GeoDM: subscribing DMs pub=\(id.publicKeyHex.prefix(8))… sub=\(dmSub)",
                            category: SecureLogger.session, level: .debug)
-            let dmFilter = NostrFilter.giftWrapsFor(pubkey: id.publicKeyHex, since: Date().addingTimeInterval(-TransportConfig.nostrDMSubscribeLookbackSeconds))
+            let dmFilter = NostrFilter.giftWrapsFor(pubkey: id.publicKeyHex, since: Date().addingTimeInterval(-86400))
            NostrRelayManager.shared.subscribe(filter: dmFilter, id: dmSub) { [weak self] giftWrap in
                guard let self = self else { return }
                // Dedup basic
@@ -1601,7 +1593,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {

    private func refreshGeohashPeople() {
        guard let gh = currentGeohash else { geohashPeople = []; return }
-        let cutoff = Date().addingTimeInterval(-TransportConfig.uiRecentCutoffFiveMinutesSeconds)
+        let cutoff = Date().addingTimeInterval(-5 * 60)
        var map = geoParticipants[gh] ?? [:]
        // Prune expired entries
        map = map.filter { $0.value >= cutoff }
@@ -1636,7 +1628,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    @MainActor
    func visibleGeohashPeople() -> [GeoPerson] {
        guard let gh = currentGeohash else { return [] }
-        let cutoff = Date().addingTimeInterval(-TransportConfig.uiRecentCutoffFiveMinutesSeconds)
+        let cutoff = Date().addingTimeInterval(-5 * 60)
        let map = (geoParticipants[gh] ?? [:])
            .filter { $0.value >= cutoff }
            .filter { !SecureIdentityStateManager.shared.isNostrBlocked(pubkeyHexLowercased: $0.key) }
@@ -1648,7 +1640,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    /// Returns the current participant count for a specific geohash, using the 5-minute activity window.
    @MainActor
    func geohashParticipantCount(for geohash: String) -> Int {
-        let cutoff = Date().addingTimeInterval(-TransportConfig.uiRecentCutoffFiveMinutesSeconds)
+        let cutoff = Date().addingTimeInterval(-5 * 60)
        let map = geoParticipants[geohash] ?? [:]
        return map.values.filter { $0 >= cutoff }.count
    }
@@ -1696,7 +1688,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        }
        
        // Remove geohash DM conversation if exists
-        let convKey = "nostr_" + String(hex.prefix(TransportConfig.nostrConvKeyPrefixLength))
+        let convKey = "nostr_" + String(hex.prefix(16))
        if privateChats[convKey] != nil {
            privateChats.removeValue(forKey: convKey)
            unreadPrivateMessages.remove(convKey)
@@ -1732,11 +1724,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        for gh in toAdd {
            let subID = "geo-sample-\(gh)"
            geoSamplingSubs[subID] = gh
-            let filter = NostrFilter.geohashEphemeral(
-                gh,
-                since: Date().addingTimeInterval(-TransportConfig.nostrGeohashSampleLookbackSeconds),
-                limit: TransportConfig.nostrGeohashSampleLimit
-            )
+            let filter = NostrFilter.geohashEphemeral(gh, since: Date().addingTimeInterval(-300), limit: 100)
            let subRelays = GeoRelayDirectory.shared.closestRelays(toGeohash: gh, count: 5)
            NostrRelayManager.shared.subscribe(filter: filter, id: subID, relayUrls: subRelays) { [weak self] event in
                guard let self = self else { return }
@@ -1881,7 +1869,6 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        // Determine routing method and recipient nickname
        guard let noiseKey = Data(hexString: peerID) else { return }
        let isConnected = meshService.isPeerConnected(peerID)
-        let isReachable = meshService.isPeerReachable(peerID)
        let favoriteStatus = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey)
        let isMutualFavorite = favoriteStatus?.isMutual ?? false
        let hasNostrKey = favoriteStatus?.peerNostrPublicKey != nil
@@ -1921,8 +1908,8 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        // Trigger UI update for sent message
        objectWillChange.send()
        
-        // Send via appropriate transport (BLE if connected/reachable, else Nostr when possible)
-        if isConnected || isReachable || (isMutualFavorite && hasNostrKey) {
+        // Send via appropriate transport (BLE if connected, else Nostr when possible)
+        if isConnected || (isMutualFavorite && hasNostrKey) {
            messageRouter.sendPrivate(content, to: peerID, recipientNickname: recipientNickname ?? "user", messageID: messageID)
            // Optimistically mark as sent for both transports; delivery/read will update subsequently
            if let idx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) {
@@ -1940,7 +1927,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    // MARK: - Geohash DMs initiation
    @MainActor
    func startGeohashDM(withPubkeyHex hex: String) {
-        let convKey = "nostr_" + String(hex.prefix(TransportConfig.nostrConvKeyPrefixLength))
+        let convKey = "nostr_" + String(hex.prefix(16))
        nostrKeyMapping[convKey] = hex
        selectedPrivateChatPeer = convKey
    }
@@ -2410,7 +2397,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            // Try immediately
            self.markPrivateMessagesAsRead(from: peerID)
            // And again with a delay
-            DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiAnimationMediumSeconds) {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
                self.markPrivateMessagesAsRead(from: peerID)
            }
        }
@@ -2476,7 +2463,12 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                        )
                        let targetRelays = GeoRelayDirectory.shared.closestRelays(toGeohash: ch.geohash, count: 5)
                        if targetRelays.isEmpty {
-                            SecureLogger.log("Geo: no geohash relays available for \(ch.geohash); not sending", category: SecureLogger.session, level: .warning)
+                    let targetRelays = GeoRelayDirectory.shared.closestRelays(toGeohash: ch.geohash, count: 5)
+                    if targetRelays.isEmpty {
+                        SecureLogger.log("Geo: no geohash relays available for \(ch.geohash); not sending", category: SecureLogger.session, level: .warning)
+                    } else {
+                        NostrRelayManager.shared.sendEvent(event, to: targetRelays)
+                    }
                        } else {
                            NostrRelayManager.shared.sendEvent(event, to: targetRelays)
                        }
@@ -2503,7 +2495,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
    }
    
    @objc private func appWillResignActive() {
-        // No-op; avoid forcing synchronize on resign
+        userDefaults.synchronize()
    }
    
    @objc func applicationWillTerminate() {
@@ -2516,14 +2508,15 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        // Verify identity key is still there
        _ = KeychainManager.shared.verifyIdentityKeyExists()
        
-        // No need to force synchronize here
+        userDefaults.synchronize()
        
        // Verify identity key after save
        _ = KeychainManager.shared.verifyIdentityKeyExists()
    }
    
    @objc private func appWillTerminate() {
-        // No need to force synchronize here
+        
+        userDefaults.synchronize()
    }
    
    @MainActor
@@ -2550,12 +2543,16 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            }
        }
        
-        // If this originated over Nostr, skip (handled by Nostr code paths)
+        // If we know the original transport, use it for the read receipt
        if originalTransport == "nostr" {
-            return
+            // Skip read receipts for Nostr messages - unnecessary complexity
+            // The radical simplification plan says to accept occasional loss
+        } else if meshService.peerNickname(peerID: actualPeerID) != nil {
+            // Use mesh for connected peers (default behavior)
+            messageRouter.sendReadReceipt(receipt, to: actualPeerID)
+        } else {
+            // Skip read receipts for offline peers - fire and forget principle
        }
-        // Use router to decide (mesh if reachable, else Nostr if available)
-        messageRouter.sendReadReceipt(receipt, to: actualPeerID)
    }
    
    @MainActor
@@ -2685,7 +2682,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            }().lowercased()
            // Try exact match against cached geoNicknames (pubkey -> nickname)
            if let pub = geoNicknames.first(where: { (_, nick) in nick.lowercased() == base })?.key {
-                let convKey = "nostr_" + String(pub.prefix(TransportConfig.nostrConvKeyPrefixLength))
+                let convKey = "nostr_" + String(pub.prefix(16))
                nostrKeyMapping[convKey] = pub
                return convKey
            }
@@ -2764,13 +2761,14 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        // This will force creation of a new identity (new fingerprint) on next launch
        meshService.emergencyDisconnectAll()
        
-        // No need to force UserDefaults synchronization
+        // Force immediate UserDefaults synchronization
+        userDefaults.synchronize()
        
        // Reinitialize Nostr with new identity
        // This will generate new Nostr keys derived from new Noise keys
        Task { @MainActor in
            // Small delay to ensure cleanup completes
-            try? await Task.sleep(nanoseconds: TransportConfig.uiAsyncShortSleepNs) // 0.1 seconds
+            try? await Task.sleep(nanoseconds: 100_000_000) // 0.1 seconds
            
            // Reinitialize Nostr relay manager with new identity
            nostrRelayManager = NostrRelayManager()
@@ -2940,7 +2938,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
                // In geohash channels, compare against our per-geohash nostr short ID
                if case .location(let ch) = activeChannel, spid.hasPrefix("nostr:") {
                    if let myGeo = try? NostrIdentityBridge.deriveIdentity(forGeohash: ch.geohash) {
-                        return spid == "nostr:\(myGeo.publicKeyHex.prefix(TransportConfig.nostrShortKeyDisplayLength))"
+                        return spid == "nostr:\(myGeo.publicKeyHex.prefix(8))"
                    }
                }
                return spid == meshService.myPeerID
@@ -3491,9 +3489,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        var hue = Double(djb2(seed) % 360) / 360.0
        // Avoid orange (~30°) reserved for self
        let orange = 30.0 / 360.0
-        if abs(hue - orange) < TransportConfig.uiColorHueAvoidanceDelta {
-            hue = fmod(hue + TransportConfig.uiColorHueOffset, 1.0)
-        }
+        if abs(hue - orange) < 0.05 { hue = fmod(hue + 0.12, 1.0) }
        let saturation: Double = isDark ? 0.80 : 0.70
        let brightness: Double = isDark ? 0.75 : 0.45
        let c = Color(hue: hue, saturation: saturation, brightness: brightness)
@@ -3703,7 +3699,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        // Load verified fingerprints directly from secure storage
        verifiedFingerprints = SecureIdentityStateManager.shared.getVerifiedFingerprints()
        // Log snapshot for debugging persistence
-        let sample = Array(verifiedFingerprints.prefix(TransportConfig.uiFingerprintSampleCount)).map { $0.prefix(8) }.joined(separator: ", ")
+        let sample = Array(verifiedFingerprints.prefix(3)).map { $0.prefix(8) }.joined(separator: ", ")
        SecureLogger.log("🔐 Verified loaded: \(verifiedFingerprints.count) [\(sample)]", category: SecureLogger.security, level: .info)
        // Also log any offline favorites and whether we consider them verified
        let offlineFavorites = unifiedPeerService.favorites.filter { !$0.isConnected }
@@ -4001,7 +3997,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
               let favoriteStatus = FavoritesPersistenceService.shared.getFavoriteStatus(for: peer.noisePublicKey),
               favoriteStatus.isFavorite {
                // Resend favorite notification with our Nostr key after a short delay
-                try? await Task.sleep(nanoseconds: TransportConfig.uiAsyncMediumSleepNs) // 0.5 seconds
+                try? await Task.sleep(nanoseconds: 500_000_000) // 0.5 seconds
                meshService.sendFavoriteNotification(to: peerID, isFavorite: true)
                SecureLogger.log("📤 Resent favorite notification to reconnected peer \(peerID)", 
                                category: SecureLogger.session, level: .debug)
@@ -4415,7 +4411,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        // Subscribe to Nostr messages
        let filter = NostrFilter.giftWrapsFor(
            pubkey: currentIdentity.publicKeyHex,
-            since: Date().addingTimeInterval(-TransportConfig.nostrDMSubscribeLookbackSeconds)  // Last 24 hours
+            since: Date().addingTimeInterval(-86400)  // Last 24 hours
        )
        
        nostrRelayManager?.subscribe(filter: filter, id: "chat-messages") { [weak self] event in
@@ -4486,7 +4482,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            let messageTimestamp = Date(timeIntervalSince1970: TimeInterval(rumorTimestamp))
            let senderNickname = (actualSenderNoiseKey != nil) ? (FavoritesPersistenceService.shared.getFavoriteStatus(for: actualSenderNoiseKey!)?.peerNickname ?? "Unknown") : "Unknown"
            // Stable target ID if we know Noise key; otherwise temporary Nostr-based peer
-            let targetPeerID = actualSenderNoiseKey?.hexEncodedString() ?? ("nostr_" + senderPubkey.prefix(TransportConfig.nostrConvKeyPrefixLength))
+            let targetPeerID = actualSenderNoiseKey?.hexEncodedString() ?? ("nostr_" + senderPubkey.prefix(16))

            switch noisePayload.type {
            case .privateMessage:
@@ -4809,7 +4805,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
        
        // For now, create a temporary peer ID based on Nostr pubkey
        // This allows the message to be displayed even without Noise key mapping
-        let tempPeerID = "nostr_" + senderPubkey.prefix(TransportConfig.nostrConvKeyPrefixLength)
+        let tempPeerID = "nostr_" + senderPubkey.prefix(16)
        
        // Check if we're viewing this unknown sender's chat
        let isViewingThisChat = selectedPrivateChatPeer == tempPeerID
@@ -5037,7 +5033,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            var oldPeerIDsToRemove: [String] = []
            
            // Only migrate messages from the last 24 hours to prevent old messages from flooding
-            let cutoffTime = Date().addingTimeInterval(-TransportConfig.uiMigrationCutoffSeconds)
+            let cutoffTime = Date().addingTimeInterval(-24 * 60 * 60)
            
            for (oldPeerID, messages) in privateChats {
                if oldPeerID != peerID {
@@ -5261,7 +5257,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
            }
            
            // Mark other messages as read
-            DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiReadReceiptRetryShortSeconds) { [weak self] in
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
                self?.markPrivateMessagesAsRead(from: peerID)
            }
        }
@@ -5497,7 +5493,7 @@ private func checkForMentions(_ message: BitchatMessage) {
            impactFeedback.prepare()
            
            for i in 0..<8 {
-                DispatchQueue.main.asyncAfter(deadline: .now() + Double(i) * TransportConfig.uiBatchDispatchStaggerSeconds) {
+                DispatchQueue.main.asyncAfter(deadline: .now() + Double(i) * 0.15) {
                    impactFeedback.impactOccurred()
                }
            }
@@ -100,14 +100,14 @@ struct ContentView: View {
                                .onEnded { value in
                                    let translation = value.translation.width.isNaN ? 0 : value.translation.width
                                    let velocity = value.velocity.width.isNaN ? 0 : value.velocity.width
-                                    if translation > TransportConfig.uiBackSwipeTranslationLarge || (translation > TransportConfig.uiBackSwipeTranslationSmall && velocity > TransportConfig.uiBackSwipeVelocityThreshold) {
-                                        withAnimation(.easeOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
+                                    if translation > 50 || (translation > 30 && velocity > 300) {
+                                        withAnimation(.easeOut(duration: 0.2)) {
                                            showPrivateChat = false
                                            backSwipeOffset = 0
                                            viewModel.endPrivateChat()
                                        }
                                    } else {
-                                        withAnimation(.easeOut(duration: TransportConfig.uiAnimationShortSeconds)) {
+                                        withAnimation(.easeOut(duration: 0.15)) {
                                            backSwipeOffset = 0
                                        }
                                    }
@@ -121,7 +121,7 @@ struct ContentView: View {
                    Color.clear
                        .contentShape(Rectangle())
                        .onTapGesture {
-            withAnimation(.easeInOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
+                            withAnimation(.easeInOut(duration: 0.2)) {
                                showSidebar = false
                                sidebarDragOffset = 0
                            }
@@ -151,14 +151,14 @@ struct ContentView: View {
                    let width = geometry.size.width.isNaN ? 0 : max(0, geometry.size.width)
                    return showSidebar ? -dragOffset : width - dragOffset
                }())
-                .animation(.easeInOut(duration: TransportConfig.uiAnimationSidebarSeconds), value: showSidebar)
+                .animation(.easeInOut(duration: 0.25), value: showSidebar)
            }
        }
        #if os(macOS)
        .frame(minWidth: 600, minHeight: 400)
        #endif
        .onChange(of: viewModel.selectedPrivateChatPeer) { newValue in
-            withAnimation(.easeInOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
+            withAnimation(.easeInOut(duration: 0.2)) {
                showPrivateChat = newValue != nil
            }
        }
@@ -195,7 +195,7 @@ struct ContentView: View {
                    } else {
                        viewModel.startPrivateChat(with: peerID)
                    }
-                    withAnimation(.easeInOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
+                    withAnimation(.easeInOut(duration: 0.2)) {
                        showSidebar = false
                        sidebarDragOffset = 0
                    }
@@ -264,7 +264,7 @@ struct ContentView: View {
                    
                    // Implement windowing with adjustable window count per chat
                    let currentWindowCount: Int = {
-                        if let peer = privatePeer { return windowCountPrivate[peer] ?? TransportConfig.uiWindowInitialCountPrivate }
+                        if let peer = privatePeer { return windowCountPrivate[peer] ?? 300 }
                        return windowCountPublic
                    }()
                    let windowedMessages = messages.suffix(currentWindowCount)
@@ -296,11 +296,11 @@ struct ContentView: View {
                                    let cashuTokens = message.content.extractCashuTokens()
                                    let lightningLinks = message.content.extractLightningLinks()
                                    HStack(alignment: .top, spacing: 0) {
-                                        let isLong = (message.content.count > TransportConfig.uiLongMessageLengthThreshold || message.content.hasVeryLongToken(threshold: TransportConfig.uiVeryLongTokenThreshold)) && cashuTokens.isEmpty
+                                        let isLong = (message.content.count > 2000 || message.content.hasVeryLongToken(threshold: 512)) && cashuTokens.isEmpty
                                        let isExpanded = expandedMessageIDs.contains(message.id)
                                        Text(viewModel.formatMessageAsText(message, colorScheme: colorScheme))
                                            .fixedSize(horizontal: false, vertical: true)
-                                            .lineLimit(isLong && !isExpanded ? TransportConfig.uiLongMessageLineLimit : nil)
+                                            .lineLimit(isLong && !isExpanded ? 30 : nil)
                                            .frame(maxWidth: .infinity, alignment: .leading)
                                        
                                        // Delivery status indicator for private messages
@@ -312,7 +312,7 @@ struct ContentView: View {
                                    }
                                    
                                    // Expand/Collapse for very long messages
-                                    if (message.content.count > TransportConfig.uiLongMessageLengthThreshold || message.content.hasVeryLongToken(threshold: TransportConfig.uiVeryLongTokenThreshold)) && cashuTokens.isEmpty {
+                                    if (message.content.count > 2000 || message.content.hasVeryLongToken(threshold: 512)) && cashuTokens.isEmpty {
                                        let isExpanded = expandedMessageIDs.contains(message.id)
                                        Button(isExpanded ? "show less" : "show more") {
                                            if isExpanded { expandedMessageIDs.remove(message.id) }
@@ -371,7 +371,7 @@ struct ContentView: View {
                            }
                            // Infinite scroll up: when top row appears, increase window and preserve anchor
                            if message.id == windowedMessages.first?.id, messages.count > windowedMessages.count {
-                                let step = TransportConfig.uiWindowStepCount
+                                let step = 200
                                let contextKey: String = {
                                    if let peer = privatePeer { return "dm:\(peer)" }
                                    switch locationManager.selectedChannel {
@@ -381,7 +381,7 @@ struct ContentView: View {
                                }()
                                let preserveID = "\(contextKey)|\(message.id)"
                                if let peer = privatePeer {
-                                    let current = windowCountPrivate[peer] ?? TransportConfig.uiWindowInitialCountPrivate
+                                    let current = windowCountPrivate[peer] ?? 300
                                    let newCount = min(messages.count, current + step)
                                    if newCount != current {
                                        windowCountPrivate[peer] = newCount
@@ -540,7 +540,7 @@ struct ContentView: View {
                    }
                    // Throttle scroll animations to prevent excessive UI updates
                    let now = Date()
-                    if now.timeIntervalSince(lastScrollTime) > TransportConfig.uiScrollThrottleSeconds {
+                    if now.timeIntervalSince(lastScrollTime) > 0.5 {
                        // Immediate scroll if enough time has passed
                        lastScrollTime = now
                        let contextKey: String = {
@@ -557,7 +557,7 @@ struct ContentView: View {
                    } else {
                        // Schedule a delayed scroll
                        scrollThrottleTimer?.invalidate()
-                        scrollThrottleTimer = Timer.scheduledTimer(withTimeInterval: TransportConfig.uiScrollThrottleSeconds, repeats: false) { _ in
+                        scrollThrottleTimer = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: false) { _ in
                            lastScrollTime = Date()
                        let contextKey: String = {
                            switch locationManager.selectedChannel {
@@ -589,7 +589,7 @@ struct ContentView: View {
                    }
                    // Same throttling for private chats
                    let now = Date()
-                    if now.timeIntervalSince(lastScrollTime) > TransportConfig.uiScrollThrottleSeconds {
+                    if now.timeIntervalSince(lastScrollTime) > 0.5 {
                        lastScrollTime = now
                        let contextKey = "dm:\(peerID)"
                        let count = windowCountPrivate[peerID] ?? 300
@@ -599,7 +599,7 @@ struct ContentView: View {
                        }
                    } else {
                        scrollThrottleTimer?.invalidate()
-                        scrollThrottleTimer = Timer.scheduledTimer(withTimeInterval: TransportConfig.uiScrollThrottleSeconds, repeats: false) { _ in
+                        scrollThrottleTimer = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: false) { _ in
                            lastScrollTime = Date()
                            let contextKey = "dm:\(peerID)"
                            let count = windowCountPrivate[peerID] ?? 300
@@ -619,7 +619,7 @@ struct ContentView: View {
                    break
                case .location(let ch):
                    // Reset window size
-                    windowCountPublic = TransportConfig.uiWindowInitialCountPublic
+                    windowCountPublic = 300
                    let contextKey = "geo:\(ch.geohash)"
                    let last = viewModel.messages.suffix(windowCountPublic).last?.id
                    let target = last.map { "\(contextKey)|\($0)" }
@@ -635,11 +635,11 @@ struct ContentView: View {
                    // Try multiple times to ensure read receipts are sent
                    viewModel.markPrivateMessagesAsRead(from: peerID)
                    
-                    DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiReadReceiptRetryShortSeconds) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                        viewModel.markPrivateMessagesAsRead(from: peerID)
                    }
                    
-                    DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiReadReceiptRetryLongSeconds) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                        viewModel.markPrivateMessagesAsRead(from: peerID)
                    }
                }
@@ -859,7 +859,7 @@ struct ContentView: View {
        }
        .onAppear {
            // Delay keyboard focus to avoid iOS constraint warnings
-            DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiReadReceiptRetryShortSeconds) {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                isTextFieldFocused = true
            }
        }
@@ -925,7 +925,7 @@ struct ContentView: View {
                                 secondaryTextColor: secondaryTextColor,
                                 onTapPeer: { peerID in
                                     viewModel.startPrivateChat(with: peerID)
-                                     withAnimation(.easeInOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
+                                     withAnimation(.easeInOut(duration: 0.2)) {
                                         showSidebar = false
                                         sidebarDragOffset = 0
                                     }
@@ -973,7 +973,7 @@ struct ContentView: View {
                .onEnded { value in
                    let translation = value.translation.width.isNaN ? 0 : value.translation.width
                    let velocity = value.velocity.width.isNaN ? 0 : value.velocity.width
-                    withAnimation(.easeOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
+                    withAnimation(.easeOut(duration: 0.2)) {
                        if !showSidebar {
                            if translation < -100 || (translation < -50 && velocity < -500) {
                                showSidebar = true
@@ -1036,8 +1036,9 @@ struct ContentView: View {
        case .mesh:
            let counts = viewModel.allPeers.reduce(into: (others: 0, mesh: 0)) { counts, peer in
                guard peer.id != viewModel.meshService.myPeerID else { return }
-                if peer.isConnected { counts.mesh += 1; counts.others += 1 }
-                else if peer.isReachable { counts.others += 1 }
+                let isMeshConnected = peer.isConnected
+                if isMeshConnected { counts.mesh += 1; counts.others += 1 }
+                else if peer.isMutualFavorite { counts.others += 1 }
            }
            let meshBlue = Color(hue: 0.60, saturation: 0.85, brightness: 0.82)
            let color: Color = counts.mesh > 0 ? meshBlue : Color.secondary
@@ -1152,7 +1153,7 @@ struct ContentView: View {
                // QR moved to the PEOPLE header in the sidebar when on mesh channel
            }
            .onTapGesture {
-                withAnimation(.easeInOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
+                withAnimation(.easeInOut(duration: 0.2)) {
                    showSidebar.toggle()
                    sidebarDragOffset = 0
                }
@@ -1180,11 +1181,20 @@ struct ContentView: View {
    
    @ViewBuilder
    private func privateHeaderContent(for privatePeerID: String) -> some View {
-        // Prefer short (mesh) ID whenever available for encryption/session status; keep stable key for display resolution only.
+        // Prefer short (mesh) ID when mesh-connected (radio). Only use full Noise key when not connected (globe).
        let headerPeerID: String = {
-            if privatePeerID.count == 64 {
-                // Map stable Noise key to short ID if we know it (even if not directly connected)
-                if let short = viewModel.getShortIDForNoiseKey(privatePeerID) { return short }
+            if privatePeerID.count == 16 {
+                let isMeshConnected = viewModel.meshService.isPeerConnected(privatePeerID) || viewModel.connectedPeers.contains(privatePeerID)
+                if !isMeshConnected, let stable = viewModel.getNoiseKeyForShortID(privatePeerID) {
+                    return stable
+                }
+            } else if privatePeerID.count == 64 {
+                // If we have a full Noise key and a corresponding short ID is currently mesh-connected, prefer short ID
+                if let short = viewModel.getShortIDForNoiseKey(privatePeerID) {
+                    if viewModel.meshService.isPeerConnected(short) || viewModel.connectedPeers.contains(short) {
+                        return short
+                    }
+                }
            }
            return privatePeerID
        }()
@@ -1199,29 +1209,10 @@ struct ContentView: View {
                    return "#\(ch.geohash)/@\(disp)"
                }
            }
-            // Try mesh/unified peer display
-            if let name = peer?.displayName { return name }
-            // Try direct mesh nickname (connected-only)
-            if let name = viewModel.meshService.peerNickname(peerID: headerPeerID) { return name }
-            // Try favorite nickname by stable Noise key
-            if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: Data(hexString: headerPeerID) ?? Data()),
-               !fav.peerNickname.isEmpty { return fav.peerNickname }
-            // Fallback: resolve from persisted social identity via fingerprint mapping
-            if headerPeerID.count == 16 {
-                let candidates = SecureIdentityStateManager.shared.getCryptoIdentitiesByPeerIDPrefix(headerPeerID)
-                if let id = candidates.first,
-                   let social = SecureIdentityStateManager.shared.getSocialIdentity(for: id.fingerprint) {
-                    if let pet = social.localPetname, !pet.isEmpty { return pet }
-                    if !social.claimedNickname.isEmpty { return social.claimedNickname }
-                }
-            } else if headerPeerID.count == 64, let keyData = Data(hexString: headerPeerID) {
-                let fp = keyData.sha256Fingerprint()
-                if let social = SecureIdentityStateManager.shared.getSocialIdentity(for: fp) {
-                    if let pet = social.localPetname, !pet.isEmpty { return pet }
-                    if !social.claimedNickname.isEmpty { return social.claimedNickname }
-                }
-            }
-            return "Unknown"
+            return peer?.displayName ?? 
+                   viewModel.meshService.peerNickname(peerID: headerPeerID) ??
+                   FavoritesPersistenceService.shared.getFavoriteStatus(for: Data(hexString: headerPeerID) ?? Data())?.peerNickname ?? 
+                   "Unknown"
        }()
        let isNostrAvailable: Bool = {
            guard let connectionState = peer?.connectionState else { 
@@ -1256,12 +1247,6 @@ struct ContentView: View {
                                        .font(.system(size: 14))
                                        .foregroundColor(textColor)
                                        .accessibilityLabel("Connected via mesh")
-                                case .meshReachable:
-                                    // point.3 filled icon for reachable via mesh (not directly connected)
-                                    Image(systemName: "point.3.filled.connected.trianglepath.dotted")
-                                        .font(.system(size: 14))
-                                        .foregroundColor(textColor)
-                                        .accessibilityLabel("Reachable via mesh")
                                case .nostrAvailable:
                                    // Purple globe for Nostr
                                    Image(systemName: "globe")
@@ -1272,12 +1257,6 @@ struct ContentView: View {
                                    // Should not happen for PM header, but handle gracefully
                                    EmptyView()
                                }
-                            } else if viewModel.meshService.isPeerReachable(headerPeerID) {
-                                // Fallback: reachable via mesh but not in current peer list
-                                Image(systemName: "point.3.filled.connected.trianglepath.dotted")
-                                    .font(.system(size: 14))
-                                    .foregroundColor(textColor)
-                                    .accessibilityLabel("Reachable via mesh")
                            } else if isNostrAvailable {
                                // Fallback to Nostr if peer not in list but is mutual favorite
                                Image(systemName: "globe")
@@ -1296,14 +1275,7 @@ struct ContentView: View {
                                .font(.system(size: 16, weight: .medium, design: .monospaced))
                                .foregroundColor(textColor)                            // Dynamic encryption status icon (hide for geohash DMs)
                            if !privatePeerID.hasPrefix("nostr_") {
-                                // Use short peer ID if available for encryption status (sessions keyed by short ID)
-                                let statusPeerID: String = {
-                                    if privatePeerID.count == 64, let short = viewModel.getShortIDForNoiseKey(privatePeerID) {
-                                        return short
-                                    }
-                                    return headerPeerID
-                                }()
-                                let encryptionStatus = viewModel.getEncryptionStatus(for: statusPeerID)
+                                let encryptionStatus = viewModel.getEncryptionStatus(for: headerPeerID)
                                if let icon = encryptionStatus.icon {
                                    Image(systemName: icon)
                                        .font(.system(size: 14))
@@ -1322,7 +1294,7 @@ struct ContentView: View {
                    // Left and right buttons positioned with HStack
                    HStack {
                        Button(action: {
-                            withAnimation(.easeInOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
+                            withAnimation(.easeInOut(duration: 0.2)) {
                                showPrivateChat = false
                                viewModel.endPrivateChat()
                            }
@@ -41,27 +41,9 @@ struct FingerprintView: View {
            .padding()
            
            VStack(alignment: .leading, spacing: 16) {
-                // Prefer short mesh ID for session/encryption status
-                let statusPeerID: String = {
-                    if peerID.count == 64, let short = viewModel.getShortIDForNoiseKey(peerID) { return short }
-                    return peerID
-                }()
-                // Resolve a friendly name
-                let peerNickname: String = {
-                    if let p = viewModel.getPeer(byID: statusPeerID) { return p.displayName }
-                    if let name = viewModel.meshService.peerNickname(peerID: statusPeerID) { return name }
-                    if peerID.count == 64, let data = Data(hexString: peerID) {
-                        if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: data), !fav.peerNickname.isEmpty { return fav.peerNickname }
-                        let fp = data.sha256Fingerprint()
-                        if let social = SecureIdentityStateManager.shared.getSocialIdentity(for: fp) {
-                            if let pet = social.localPetname, !pet.isEmpty { return pet }
-                            if !social.claimedNickname.isEmpty { return social.claimedNickname }
-                        }
-                    }
-                    return "Unknown"
-                }()
-                // Accurate encryption state based on short ID session
-                let encryptionStatus = viewModel.getEncryptionStatus(for: statusPeerID)
+                // Peer info
+                let peerNickname = viewModel.meshService.peerNickname(peerID: peerID) ?? "Unknown"
+                let encryptionStatus = viewModel.getEncryptionStatus(for: peerID)
                
                HStack {
                    if let icon = encryptionStatus.icon {
@@ -92,7 +74,7 @@ struct FingerprintView: View {
                        .font(.system(size: 12, weight: .bold, design: .monospaced))
                        .foregroundColor(textColor.opacity(0.7))
                    
-                    if let fingerprint = viewModel.getFingerprint(for: statusPeerID) {
+                    if let fingerprint = viewModel.getFingerprint(for: peerID) {
                        Text(formatFingerprint(fingerprint))
                            .font(.system(size: 14, design: .monospaced))
                            .foregroundColor(textColor)
@@ -52,11 +52,6 @@ struct MeshPeerList: View {
                            Image(systemName: "antenna.radiowaves.left.and.right")
                                .font(.system(size: 10))
                                .foregroundColor(baseColor)
-                        } else if peer.isReachable {
-                            // Mesh-reachable (relayed): point.3 icon
-                            Image(systemName: "point.3.filled.connected.trianglepath.dotted")
-                                .font(.system(size: 10))
-                                .foregroundColor(baseColor)
                        } else if peer.isMutualFavorite {
                            // Mutual favorite reachable via Nostr: globe icon (purple)
                            Image(systemName: "globe")
@@ -115,14 +110,6 @@ struct MeshPeerList: View {

                        Spacer()

-                        // Unread message indicator for this peer
-                        if !isMe, item.hasUnread {
-                            Image(systemName: "envelope.fill")
-                                .font(.system(size: 10))
-                                .foregroundColor(.orange)
-                                .help("New messages")
-                        }
-
                        if !isMe {
                            Button(action: { onToggleFavorite(peer.id) }) {
                                Image(systemName: (peer.favoriteStatus?.isFavorite ?? false) ? "star.fill" : "star")
@@ -153,13 +153,13 @@ final class ShareViewController: UIViewController {
        userDefaults.set(content, forKey: "sharedContent")
        userDefaults.set(type, forKey: "sharedContentType")
        userDefaults.set(Date(), forKey: "sharedContentDate")
-        // No need to force synchronize; the system persists changes
+        userDefaults.synchronize()
    }

    private func finishWithMessage(_ msg: String) {
        statusLabel.text = msg
        // Complete shortly after showing status
-        DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiShareExtensionDismissDelaySeconds) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
            self.extensionContext?.completeRequest(returningItems: nil, completionHandler: nil)
        }
    }
Author	SHA1	Message	Date
jack	334c6271b6	Inline comment cleanup: drop legacy 'removed' breadcrumbs across protocols, services, view model, and views	2025-08-25 17:57:21 +02:00
jack	6f4da62e4e	Remove 'preparing to share …' system message; send shared content immediately	2025-08-25 17:53:25 +02:00
jack	d946c01bfc	Share Extension: migrate to UIKit + UTTypes; drop Social/SLComposeServiceViewController	2025-08-25 17:44:07 +02:00
jack	ce48720e9a	Tests: gate verbose prints under DEBUG; ChatViewModel: remove legacy fingerprint helper and rely on UnifiedPeerService	2025-08-25 17:42:41 +02:00
jack	e0db8a2bc8	Remove dead code and artifacts: drop PeerManager, unused views/types; delete LegacyTestProtocolTypes; update .gitignore; purge TestResult.xcresult and build.log	2025-08-25 17:03:48 +02:00