Refresh channel messages after retry

Author: RCGV1

Meshtastic/Views/Messages/ChannelMessageList.swift

@@ -372,6 +372,9 @@ struct ChannelMessageList: View {
 									  }
 									  #endif
 								  }
+							  },
+							  onMessageRetried: {
+								  loadMessages(markReadAfterLoad: routerIsShowingThisChannel())
 							  }
 						  )
 

Meshtastic/Views/Messages/ChannelMessageRow.swift

@@ -20,6 +20,7 @@ struct ChannelMessageRow: View {
 	@Binding var messageToHighlight: Int64
 	let scrollView: ScrollViewProxy
 	let onTapback: (MessageEntity) -> Void
+	let onMessageRetried: () -> Void
 
 	private var isCurrentUser: Bool {
 		Int64(preferredPeripheralNum) == message.fromUser?.num
@@ -35,7 +36,8 @@ struct ChannelMessageRow: View {
 	     messageFieldFocused: FocusState<Bool>.Binding,
 	     messageToHighlight: Binding<Int64>,
 	     scrollView: ScrollViewProxy,
-	     onTapback: @escaping (MessageEntity) -> Void) {
+	     onTapback: @escaping (MessageEntity) -> Void,
+	     onMessageRetried: @escaping () -> Void = {}) {
 		// Initialize ObservedObject with the concrete instance
 		self.message = message
 		self.replyMessage = replyMessage
@@ -48,6 +50,7 @@ struct ChannelMessageRow: View {
 		self._messageToHighlight = messageToHighlight
 		self.scrollView = scrollView
 		self.onTapback = onTapback
+		self.onMessageRetried = onMessageRetried
 	}
 
 	var body: some View {
@@ -142,7 +145,12 @@ struct ChannelMessageRow: View {
 						}
 
 						if let deliveryStatus, deliveryStatus.canRetry {
-							RetryButton(message: message, destination: .channel(channel), status: deliveryStatus)
+							RetryButton(
+								message: message,
+								destination: .channel(channel),
+								status: deliveryStatus,
+								onMessageSent: onMessageRetried
+							)
 						}
 					}
 

Meshtastic/Views/Messages/RetryButton.swift

@@ -8,8 +8,21 @@ struct RetryButton: View {
 	let message: MessageEntity
 	let destination: MessageDestination
 	let status: MessageDeliveryStatus
+	let onMessageSent: (() -> Void)?
 	@State private var isShowingDetails = false
 
+	init(
+		message: MessageEntity,
+		destination: MessageDestination,
+		status: MessageDeliveryStatus,
+		onMessageSent: (() -> Void)? = nil
+	) {
+		self.message = message
+		self.destination = destination
+		self.status = status
+		self.onMessageSent = onMessageSent
+	}
+
 	var body: some View {
 		Button {
 			isShowingDetails = true
@@ -52,11 +65,7 @@ struct RetryButton: View {
 				try await accessoryManager.sendMessage(message: payload, toUserNum: userNum, channel: channel,
 													   isEmoji: isEmoji, replyID: replyID)
 				if case .channel = destination {
-					// We must refresh the channel to trigger a view update since its relationship
-					// to messages is via a weak fetched property which is not updated by
-					// `bleManager.sendMessage` unlike the user entity.
-					Task { @MainActor in
-					}
+					await MainActor.run { onMessageSent?() }
 				}
 			} catch {
 				// Best effort

MeshtasticTests/RoutingAndMiscTests.swift

@@ -81,10 +81,6 @@ struct RoutingErrorDetailedTests {
 		}
 	}
 
-	@Test func description_noChannelUsesSourceBackedMeaning() {
-		#expect(RoutingError.noChannel.description == "The sender or recipient could not use a matching channel/key for this message.")
-	}
-
 	@Test func description_usesActionableDesignIssueWording() {
 		let expected: [(RoutingError, String)] = [
 			(.maxRetransmit, "No node confirmed this message. Try again when you have better signal or more mesh coverage."),