From 448177c2d1e98edc61f2cd5613e110432a08756e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= <rychnovsky.honza@gmail.com>
Date: Thu, 2 May 2024 12:37:50 +0200
Subject: [PATCH] [#1427] Do not concatenate memos

- Closes #1427
- Changelog update
---
 CHANGELOG.md                                          |  4 ++++
 .../zcash/ui/screen/account/view/HistoryView.kt       | 11 +++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9bab8f8..a2184b59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@ directly impact users rather than highlighting other key architectural updates.*
 ### Changed
 - We've improved the visibility logic of the little loader that is part of the Balances widget
 
+### Removed
+- Concatenation of the messages on a multi-messages transaction has been removed and will be addressed using a new 
+  design
+
 ## [1.0 (638)] - 2024-04-26
 
 ### Fixed
diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/account/view/HistoryView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/account/view/HistoryView.kt
index 30718f37..b40e6a2f 100644
--- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/account/view/HistoryView.kt
+++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/account/view/HistoryView.kt
@@ -729,10 +729,6 @@ private fun HistoryItemMessagePart(
     onAction: (TrxItemAction) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    // TODO [#1315]: Proper more messages in transaction displaying
-    // TODO [#1315]: https://github.com/Electric-Coin-Company/zashi-android/issues/1315
-    val composedMessage = messages.joinToString(separator = "\n\n")
-
     val textStyle: TextStyle
     val textColor: Color
     if (state.isFailed()) {
@@ -758,8 +754,11 @@ private fun HistoryItemMessagePart(
                     .fillMaxWidth()
                     .border(width = 1.dp, color = ZcashTheme.colors.textFieldFrame)
         ) {
+            // TODO [#1315]: Proper more messages in transaction displaying
+            // TODO [#1315]: Note we display the first one only for now
+            // TODO [#1315]: https://github.com/Electric-Coin-Company/zashi-android/issues/1315
             Text(
-                text = composedMessage,
+                text = messages[0],
                 style = textStyle,
                 color = textColor,
                 modifier = Modifier.padding(all = ZcashTheme.dimens.spacingMid)
@@ -776,7 +775,7 @@ private fun HistoryItemMessagePart(
             modifier =
                 Modifier
                     .clip(RoundedCornerShape(ZcashTheme.dimens.regularRippleEffectCorner))
-                    .clickable { onAction(TrxItemAction.MessageClick(composedMessage)) }
+                    .clickable { onAction(TrxItemAction.MessageClick(messages[0])) }
                     .padding(all = ZcashTheme.dimens.spacingTiny)
         )
     }