Merge pull request #1198 from LukasKorba/1195-Transaction-History-remove-No-message-included-in-transaction-copy-from-expanded-transparent-

[#1195] Transaction History: remove No message included in transaction copy from expanded transparent
This commit is contained in:
Lukas Korba 2024-04-16 16:38:32 +02:00 committed by GitHub
commit e5ec490421
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 6 deletions

View File

@ -16,6 +16,7 @@ directly impact users rather than highlighting other crucial architectural updat
- Zashi requires 1 GB of free space to operate. We have updated the user experience to display a message when this requirement is not met, indicating the actual amount of free space available. From this screen, you can access the settings to obtain the recovery phrase if needed.
- The height of syncing label has been unified to never change the overall component's' height based on different states.
- The input field for the recovery phrase now shows the expected format in the placeholder.
- "No message included in transaction" has been removed from expanded transparent transaction view.
## 1.0.4 build 2 (2024-03-29)

View File

@ -79,6 +79,9 @@ extension SDKSynchronizerClient: DependencyKey {
}
transaction.zAddress = addresses.first?.stringEncoded
if let someAddress = addresses.first, case .transparent = someAddress {
transaction.isTransparentRecipient = true
}
clearedTxs.append(transaction)
}

View File

@ -51,12 +51,14 @@ public struct TransactionRowView: View {
if transaction.isExpanded {
Group {
MessageView(
viewStore: viewStore,
message: transaction.textMemo?.toString(),
isSpending: transaction.isSpending,
isFailed: transaction.status == .failed
)
if !transaction.isTransparentRecipient {
MessageView(
viewStore: viewStore,
message: transaction.textMemo?.toString(),
isSpending: transaction.isSpending,
isFailed: transaction.status == .failed
)
}
TransactionIdView(
viewStore: viewStore,

View File

@ -27,6 +27,7 @@ public struct TransactionState: Equatable, Identifiable {
public var shielded = true
public var zAddress: String?
public var isSentTransaction: Bool
public var isTransparentRecipient: Bool
public var fee: Zatoshi?
public var id: String
@ -171,6 +172,7 @@ public struct TransactionState: Equatable, Identifiable {
timestamp: TimeInterval? = nil,
zecAmount: Zatoshi,
isSentTransaction: Bool = false,
isTransparentRecipient: Bool = false,
isAddressExpanded: Bool = false,
isExpanded: Bool = false,
isIdExpanded: Bool = false,
@ -188,6 +190,7 @@ public struct TransactionState: Equatable, Identifiable {
self.timestamp = timestamp
self.zecAmount = zecAmount
self.isSentTransaction = isSentTransaction
self.isTransparentRecipient = isTransparentRecipient
self.isAddressExpanded = isAddressExpanded
self.isExpanded = isExpanded
self.isIdExpanded = isIdExpanded
@ -224,6 +227,7 @@ extension TransactionState {
timestamp = transaction.blockTime
zecAmount = transaction.isSentTransaction ? Zatoshi(-transaction.value.amount) : transaction.value
isSentTransaction = transaction.isSentTransaction
isTransparentRecipient = false
isAddressExpanded = false
isExpanded = false
isIdExpanded = false