Merge pull request #436 from radixdlt/bugfix/ABW-2166-associated-tokens

Show dapp's associated tokens correctly

app/src/main/java/com/babylon/wallet/android/data/gateway/model/ExplicitMetadataKey.kt

@@ -87,7 +87,7 @@ enum class ExplicitMetadataKey(val key: String) {
  websites = value.typed<MetadataOriginArrayValue>()?.propertyValues.orEmpty()
  )
  CLAIMED_ENTITIES -> ClaimedEntitiesMetadataItem(
- entities = value.typed<MetadataStringArrayValue>()?.propertyValues.orEmpty()
+ entities = value.typed<MetadataGlobalAddressArrayValue>()?.propertyValues.orEmpty()
  )
  TAGS -> TagsMetadataItem(
  tags = value.typed<MetadataStringArrayValue>()?.propertyValues.orEmpty()

app/src/main/java/com/babylon/wallet/android/data/repository/dappmetadata/DAppRepository.kt

@@ -3,6 +3,9 @@ package com.babylon.wallet.android.data.repository.dappmetadata
 import com.babylon.wallet.android.data.gateway.apis.DAppDefinitionApi
 import com.babylon.wallet.android.data.gateway.apis.StateApi
 import com.babylon.wallet.android.data.gateway.extensions.asMetadataItems
+import com.babylon.wallet.android.data.gateway.extensions.calculateResourceBehaviours
+import com.babylon.wallet.android.data.gateway.extensions.divisibility
+import com.babylon.wallet.android.data.gateway.extensions.totalSupply
 import com.babylon.wallet.android.data.gateway.generated.models.ResourceAggregationLevel
 import com.babylon.wallet.android.data.gateway.generated.models.StateEntityDetailsOptIns
 import com.babylon.wallet.android.data.gateway.generated.models.StateEntityDetailsRequest
@@ -206,20 +209,29 @@ class DAppRepositoryImpl @Inject constructor(
  nameMetadataItem = metadataItems.consume(),
  symbolMetadataItem = metadataItems.consume(),
  descriptionMetadataItem = metadataItems.consume(),
- iconUrlMetadataItem = metadataItems.consume()
+ iconUrlMetadataItem = metadataItems.consume(),
+ behaviours = fungibleItem.details?.calculateResourceBehaviours().orEmpty(),
+ currentSupply = fungibleItem.details?.totalSupply()?.toBigDecimal(),
+ validatorMetadataItem = metadataItems.toMutableList().consume(),
+ poolMetadataItem = metadataItems.toMutableList().consume(),
+ divisibility = fungibleItem.details?.divisibility()
  )
  }
 
  val nonFungibleResource = nonFungibleItems.map { nonFungibleItem ->
  val metadataItems = nonFungibleItem.metadata.asMetadataItems().toMutableList()
 
- Resource.NonFungibleResource.Item(
- collectionAddress = nonFungibleItem.address,
- localId = Resource.NonFungibleResource.Item.ID.from(
- nonFungibleItem.ancestorIdentities?.globalAddress.orEmpty()
- ),
- nameMetadataItem = null,
- iconMetadataItem = metadataItems.consume()
+ Resource.NonFungibleResource(
+ resourceAddress = nonFungibleItem.address,
+ amount = 0L,
+ nameMetadataItem = metadataItems.consume(),
+ descriptionMetadataItem = metadataItems.consume(),
+ iconMetadataItem = metadataItems.consume(),
+ tagsMetadataItem = metadataItems.consume(),
+ validatorMetadataItem = metadataItems.consume(),
+ items = emptyList(),
+ behaviours = nonFungibleItem.details?.calculateResourceBehaviours().orEmpty(),
+ currentSupply = nonFungibleItem.details?.totalSupply()?.toBigDecimal()
  )
  }
 

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

@@ -8,11 +8,11 @@ data class DAppWithMetadataAndAssociatedResources(
  val fungibleResources: List<Resource.FungibleResource>
  get() = resources.fungibleResources
 
- val nonFungibleResources: List<Resource.NonFungibleResource.Item>
+ val nonFungibleResources: List<Resource.NonFungibleResource>
  get() = resources.nonFungibleResources
 }
 
 data class DAppResources(
  val fungibleResources: List<Resource.FungibleResource>,
- val nonFungibleResources: List<Resource.NonFungibleResource.Item>
+ val nonFungibleResources: List<Resource.NonFungibleResource>
 )

app/src/main/java/com/babylon/wallet/android/presentation/account/AccountScreen.kt

@@ -308,11 +308,9 @@ private fun SheetContent(
  when (val selected = state.selectedResource) {
  is SelectedResource.SelectedNonFungibleResource -> {
  NonFungibleTokenBottomSheetDetails(
- modifier = modifier
- .fillMaxWidth()
- .verticalScroll(rememberScrollState()),
+ modifier = modifier.fillMaxWidth(),
  item = selected.item,
- nonFungibleItem = selected.nonFungible,
+ nonFungibleResource = selected.nonFungible,
  onCloseClick = {
  scope.launch {
  bottomSheetState.hide()
@@ -323,9 +321,7 @@ private fun SheetContent(
 
  is SelectedResource.SelectedFungibleResource -> {
  FungibleTokenBottomSheetDetails(
- modifier = modifier
- .fillMaxWidth()
- .verticalScroll(rememberScrollState()),
+ modifier = modifier.fillMaxWidth(),
  fungible = selected.fungible,
  onCloseClick = {
  scope.launch {

app/src/main/java/com/babylon/wallet/android/presentation/account/composable/FungibleTokenBottomSheetDetails.kt

@@ -14,6 +14,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.material3.Divider
@@ -53,7 +55,7 @@ fun FungibleTokenBottomSheetDetails(
  modifier: Modifier = Modifier,
 ) {
  Column(
- modifier = modifier,
+ modifier = modifier.verticalScroll(rememberScrollState()),
  horizontalAlignment = Alignment.CenterHorizontally
  ) {
  RadixCenteredTopAppBar(