diff --git a/lib/screens/channel_message_path_screen.dart b/lib/screens/channel_message_path_screen.dart index 238c1802..bf3c201d 100644 --- a/lib/screens/channel_message_path_screen.dart +++ b/lib/screens/channel_message_path_screen.dart @@ -33,7 +33,7 @@ class ChannelMessagePathScreen extends StatelessWidget { return Consumer( builder: (context, connector, _) { final l10n = context.l10n; - final primaryPathTmp = _selectPrimaryPath( + final primaryPath = _selectPrimaryPath( message.pathBytes, message.pathVariants, ); @@ -42,9 +42,6 @@ class ChannelMessagePathScreen extends StatelessWidget { (message.pathHashWidth ?? connector.pathHashByteWidth) .clamp(1, 4) .toInt(); - final primaryPath = !channelMessage && !message.isOutgoing - ? _reversePathByHop(primaryPathTmp, hashByteWidth) - : primaryPathTmp; final hops = _buildPathHops( primaryPath, connector, @@ -86,8 +83,7 @@ class ChannelMessagePathScreen extends StatelessWidget { title: context.l10n.contacts_repeaterPathTrace, path: primaryPath, flipPathAround: true, - reversePathAround: - !(!channelMessage && !message.isOutgoing), + reversePathAround: false, pathHashByteWidth: hashByteWidth, ), ), @@ -485,7 +481,7 @@ class _ChannelMessagePathMapScreenState widget.message.pathVariants, ); final isDesktop = _isDesktopPlatform(defaultTargetPlatform); - final selectedPathTmp = _resolveSelectedPath( + final selectedPath = _resolveSelectedPath( _selectedPath, observedPaths, primaryPath, @@ -495,12 +491,7 @@ class _ChannelMessagePathMapScreenState (widget.message.pathHashWidth ?? connector.pathHashByteWidth) .clamp(1, 4) .toInt(); - final selectedPath = - ((!widget.message.isOutgoing && !widget.channelMessage) || - (widget.message.isOutgoing && widget.channelMessage)) - ? _reversePathByHop(selectedPathTmp, width) - : selectedPathTmp; - final selectedIndex = _indexForPath(selectedPathTmp, observedPaths); + final selectedIndex = _indexForPath(selectedPath, observedPaths); final hops = _buildPathHops( selectedPath, connector, @@ -1087,17 +1078,6 @@ String _formatPathPrefixes(Uint8List pathBytes, int hashByteWidth) { ).map(PathHelper.formatHopHex).join(','); } -Uint8List _reversePathByHop(Uint8List pathBytes, int hashByteWidth) { - final hops = PathHelper.splitPathBytes(pathBytes, hashByteWidth); - if (hops.length <= 1) return Uint8List.fromList(pathBytes); - - final reversedBytes = []; - for (final hop in hops.reversed) { - reversedBytes.addAll(hop); - } - return Uint8List.fromList(reversedBytes); -} - int _hopCountFromBytes(int byteCount, int hashByteWidth) { if (byteCount <= 0) return 0; final width = hashByteWidth.clamp(1, 4);