[ABW-3569, ABW-3586] Asset transfer & Transaction review Presenting section UI updates #1214
Conversation
danvleju-rdx
changed the title
...llet/Features/TransactionReviewFeature/TransactionReviewProofs/TransactionReviewProofs.swift
Outdated
Show resolved
Hide resolved
| } | ||
| .padding(.bottom, .medium3) | ||
|
|
||
| if proof.id != viewStore.proofs.last?.id { | ||
| if proof.id == viewStore.proofs.last?.id { |
There was a problem hiding this comment.
We can avoid this check by just adding a VStack with the ForEach inside and then adding the Separator. Also, instead of setting the .padding(.bottom, .medium3) to each item, we can set it as the VStack spacing and then apply it to the VStack.
VStack(spacing: .medium3) {
ForEach(viewStore.proofs) { proof in
ResourceBalanceView(proof.resourceBalance.viewState, appearance: .compact) {
viewStore.send(.proofTapped(proof))
}
}
Separator()
}
.padding(.bottom, .medium3)| @@ -783,8 +812,8 @@ extension TransactionReview { | |||
|
|
|||
| extension TransactionReview { | |||
| public struct ProofEntity: Sendable, Identifiable, Hashable { | |||
| public let id: ResourceAddress | |||
| public let metadata: OnLedgerEntity.Metadata | |||
| public var id: ResourceBalance { resourceBalance } | |||
There was a problem hiding this comment.
shouldn't we check a simpler identifier (such as a String) instead?
There was a problem hiding this comment.
Hmm, not sure if we could use ResourceAddress since there could be multiple NFTs with the same resource address.
There was a problem hiding this comment.
Right, we cannot use ResourceAddress. However, using ResourceBalance as the id could be quite expensive I guess on long lists.
We are already doing it on places with more elements, so I wouldn't say you need to fix it for this (that won't have too many NFTs as in the Assets View).
| case let .fungible(fungible): | ||
| state.destination = .fungibleTokenDetails(.init( | ||
| resourceAddress: resource.resourceAddress, | ||
| resource: .success(resource), | ||
| ownedFungibleResource: .init( | ||
| resourceAddress: resource.resourceAddress, | ||
| atLedgerState: resource.atLedgerState, | ||
| amount: fungible.amount, | ||
| metadata: resource.metadata | ||
| ), | ||
| isXRD: resource.resourceAddress.isXRD | ||
| )) | ||
| case let .nonFungible(nonFungible): | ||
| state.destination = .nonFungibleTokenDetails(.init( | ||
| resourceAddress: resource.resourceAddress, | ||
| resourceDetails: .success(resource), | ||
| token: nonFungible, | ||
| ledgerState: resource.atLedgerState | ||
| )) |
There was a problem hiding this comment.
We already have this logic when handling the .withdrawals(.delegate(.showAsset(transfer, token))) & .deposits(.delegate(.showAsset(transfer, token))).
We should extract the logic to a shared method so that we perform logic only once and also support missing types (.liquidStakeUnit, .poolUnit & .stakeClaimNFT).
func resourceDetailsEffect(state: inout State, resource: OnLedgerEntity.Resource, details: ResourceBalance.Details) -> Effect<Action> {
// Implement switch
return .none
}
...llet/Features/AssetsFeature/Components/HelperViews/ResourceBalance/ResourceBalanceView.swift
Show resolved
Hide resolved
…wProofs/TransactionReviewProofs.swift Co-authored-by: matiasbzurovski <164921079+matiasbzurovski@users.noreply.github.com>
| VStack(spacing: .medium3) { | ||
| ResourceBalanceView(proof.resourceBalance.viewState, appearance: .compact) { |
There was a problem hiding this comment.
You are adding a VStack for each proof, which is pointless. Need to revert the order, as shown in previous comment
Jira tickets: ABW-3569, ABW-3586
Description
Updates the Presenting section of transaction review:
Updates the resource appearance in Asset Transfer screen
Notes
This PR does not cover all the changes that need to be made regarding asset views. More details can be found in the ticket descriptions.
How to test
To test NFT badges from Presenting section stokenet gumball club can be used.
Currently, there is no way to test fungible badges. I have attached a screenshot below showcasing the UI with hardcoded values.
Screenshot
Video
RPReplay_Final1721117531.MP4