[ABW-2674] Pool redemption/contribution tx preview types #745

jakub-rdx · 2024-01-12T13:48:36Z

Description

adds pool contribution/redemption tx preview types
changes to state database so that we keep metadata for Pool
created PreviewType subtype called Transfer, and Pool, Stake and "General" transfer subtypes. Extracted common UI logic to use common "template" for transfer related types, since they were very similar.
crowdin strings to be added soon

How to test

Use Sandbox dapp to trigger pool contributions/redemption.
Validate if transfer/staking tx previews work as expected.

Video

screen-20240104-091533.2.1.mp4

PR submission checklist

I have tested pool contribution/redemption, stake and transfer tx types.

micbakos-rdx

Solid work! Don't forget the todos. Also will this be included in this PR?

micbakos-rdx · 2024-01-15T12:22:54Z

app/src/main/java/com/babylon/wallet/android/data/repository/cache/database/Wrappers.kt

@@ -69,6 +69,8 @@ data class PoolWithResourceResponse(
    val poolUnitAddress: String,


So this can be deleted now, since the same info exists in the poolMetadata.

micbakos-rdx · 2024-01-15T12:25:00Z

app/src/main/java/com/babylon/wallet/android/domain/model/Transferable.kt

+                        is TransferableResource.LsuAmount -> GuaranteeAssertion.ForAmount(
+                            amount = transferable.amount * predicted.guaranteeOffset.toBigDecimal(),
+                            instructionIndex = predicted.instructionIndex
+                        )
                        is TransferableResource.StakeClaimNft -> null


Do we need to ask Matt about stake claim NFTs and their assertions?

micbakos-rdx · 2024-01-15T12:25:12Z

app/src/main/java/com/babylon/wallet/android/domain/model/resources/Pool.kt

 data class Pool(
    val address: String,
-    val poolUnitAddress: String,
+    val metadata: List<Metadata>,


micbakos-rdx · 2024-01-15T12:25:50Z

...src/main/java/com/babylon/wallet/android/domain/usecases/assets/GetPoolUnitDetailsUseCase.kt

@@ -23,10 +23,10 @@ class GetPoolUnitDetailsUseCase @Inject constructor(
        val poolAddress = poolResource.poolAddress ?: return@then runCatching {
            error("Resource $resourceAddress is not associated with a pool")
        }
-        stateRepository.getPool(poolAddress).map {
+        stateRepository.getPools(setOf(poolAddress)).map {


Better to use mapCatching here since first() can throw an exception.

micbakos-rdx · 2024-01-15T12:26:39Z

.../main/java/com/babylon/wallet/android/presentation/transaction/TransactionReviewViewModel.kt

@@ -321,7 +321,7 @@ class TransactionReviewViewModel @Inject constructor(
        )

        val isRawManifestToggleVisible: Boolean
-            get() = previewType is PreviewType.Transfer
+            get() = true // previewType is PreviewType.Transfer


Why is this set to always true?

fixed, was for testing

micbakos-rdx · 2024-01-15T12:27:06Z

.../main/java/com/babylon/wallet/android/presentation/transaction/TransactionReviewViewModel.kt

+    sealed interface Transfer : PreviewType {
+        val from: List<AccountWithTransferableResources>
+        val to: List<AccountWithTransferableResources>
+
+        data class Staking(
+            override val from: List<AccountWithTransferableResources>,
+            override val to: List<AccountWithTransferableResources>,
+            val validators: List<ValidatorDetail>,
+            val actionType: ActionType
+        ) : Transfer {
+            enum class ActionType {
+                Stake, Unstake, ClaimStake
+            }
+        }

-        fun getNewlyCreatedResources() = (from + to).map { allTransfers ->
-            allTransfers.resources.filter { it.transferable.isNewlyCreated }.map { it.transferable }
-        }.flatten()
-    }
+        data class Pool(
+            override val from: List<AccountWithTransferableResources>,
+            override val to: List<AccountWithTransferableResources>,
+            val pools: List<com.babylon.wallet.android.domain.model.resources.Pool>,
+            val actionType: ActionType
+        ) : Transfer {
+            enum class ActionType {
+                Contribution, Redemption
+            }
+        }
+
+        data class GeneralTransfer(
+            override val from: List<AccountWithTransferableResources>,
+            override val to: List<AccountWithTransferableResources>,
+            val badges: List<Badge> = emptyList(),
+            val dApps: List<Pair<DApp, Boolean>> = emptyList()
+        ) : Transfer {

-    data class Staking(
-        val from: List<AccountWithTransferableResources>,
-        val to: List<AccountWithTransferableResources>,
-        val validators: List<ValidatorDetail>,
-        val actionType: ActionType
-    ) : PreviewType {
-        enum class ActionType {
-            Stake, Unstake, ClaimStake
+            fun getNewlyCreatedResources() = (from + to).map { allTransfers ->
+                allTransfers.resources.filter { it.transferable.isNewlyCreated }.map { it.transferable }
+            }.flatten()


Well done 👏

micbakos-rdx · 2024-01-15T12:28:23Z

...ava/com/babylon/wallet/android/presentation/transaction/analysis/PoolContributionAnalysis.kt

+    getProfileUseCase: GetProfileUseCase,
+    resources: List<Resource>,
+    involvedPools: List<Pool>
+): PreviewType {


You can set the return type to be more explicit like PreviewType.Transfer.Pool. The same with the rest of the analysis methods.

micbakos-rdx · 2024-01-15T12:29:30Z

.../com/babylon/wallet/android/presentation/transaction/analysis/TransactionAnalysisDelegate.kt

+        manifest.toPrettyString().let { prettyString ->
+            logger.d(prettyString)
+        }


Maybe better of with:
logger.d(manifest.toPrettyString())

micbakos-rdx · 2024-01-15T12:31:16Z

...main/java/com/babylon/wallet/android/presentation/transaction/composables/PoolTypeContent.kt

+    val poolSectionLabel = when (previewType.actionType) {
+        PreviewType.Transfer.Pool.ActionType.Contribution -> "Contributing to pools"
+        PreviewType.Transfer.Pool.ActionType.Redemption -> "Redeeming from pools"


micbakos-rdx · 2024-01-15T12:32:48Z

app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/Thumbnail.kt

+    @Composable
+    fun Pool(
+        modifier: Modifier = Modifier,
+        pool: Pool


giannis-rdx · 2024-01-16T08:11:40Z

.../main/java/com/babylon/wallet/android/data/gateway/extensions/StateEntityDetailsApiHelper.kt

        }
    }

    return result
 }

+data class FetchPoolsResult(


why fetch? Fetch is the action ⚠️
PoolsResponse

giannis-rdx · 2024-01-16T08:15:41Z

app/src/main/java/com/babylon/wallet/android/domain/model/Transferable.kt

@@ -99,19 +116,25 @@ sealed interface TransferableResource {
        get() = resource.resourceAddress
    val isNewlyCreated: Boolean

-    data class Amount(
-        val amount: BigDecimal,
+    data class FungibleAmount(


sonarcloud · 2024-01-17T14:38:37Z

Quality Gate failed

Failed conditions

9.7% Coverage on New Code (required ≥ 40%)
14.9% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

jakub-rdx requested review from micbakos-rdx, giannis-rdx and raf-rdx January 12, 2024 14:21

jakub-rdx marked this pull request as ready for review January 12, 2024 14:22

micbakos-rdx reviewed Jan 15, 2024

View reviewed changes

micbakos-rdx approved these changes Jan 15, 2024

View reviewed changes

giannis-rdx approved these changes Jan 16, 2024

View reviewed changes

jakub-rdx force-pushed the feature/ABW-2674-pool-redeem-controbute-tx-types branch from df475b1 to 221a495 Compare January 16, 2024 10:19

jakub-rdx added 5 commits January 17, 2024 15:26

pool redemption/contribution tx preview types

e5b4550

aggregate pool contributions

e88aef4

display guarantees for pool units

0c3f81f

pr changes

87aedc3

rebase fixes

9a8bf7d

jakub-rdx force-pushed the feature/ABW-2674-pool-redeem-controbute-tx-types branch from 30efd2a to 9a8bf7d Compare January 17, 2024 14:28

micbakos-rdx merged commit 4bc4dee into main Jan 17, 2024
8 of 9 checks passed

micbakos-rdx deleted the feature/ABW-2674-pool-redeem-controbute-tx-types branch January 17, 2024 14:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ABW-2674] Pool redemption/contribution tx preview types #745

[ABW-2674] Pool redemption/contribution tx preview types #745

jakub-rdx commented Jan 12, 2024 •

edited

Loading

micbakos-rdx left a comment •

edited

Loading

micbakos-rdx Jan 15, 2024

micbakos-rdx Jan 15, 2024

micbakos-rdx Jan 15, 2024

micbakos-rdx Jan 15, 2024

micbakos-rdx Jan 15, 2024

jakub-rdx Jan 16, 2024

micbakos-rdx Jan 15, 2024

micbakos-rdx Jan 15, 2024

micbakos-rdx Jan 15, 2024

micbakos-rdx Jan 15, 2024

micbakos-rdx Jan 15, 2024

giannis-rdx Jan 16, 2024

giannis-rdx Jan 16, 2024

sonarcloud bot commented Jan 17, 2024

		@@ -69,6 +69,8 @@ data class PoolWithResourceResponse(
		val poolUnitAddress: String,

[ABW-2674] Pool redemption/contribution tx preview types #745

[ABW-2674] Pool redemption/contribution tx preview types #745

Conversation

jakub-rdx commented Jan 12, 2024 • edited Loading

Description

How to test

Video

PR submission checklist

micbakos-rdx left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Jan 17, 2024

Quality Gate failed

jakub-rdx commented Jan 12, 2024 •

edited

Loading

micbakos-rdx left a comment •

edited

Loading