Improve reserved banner

Fixed 93
gemwalletcom · Dec 8, 2024 · e532c02 · e532c02
1 parent 2f8f8d9
commit e532c02
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/app/src/main/java/com/gemwallet/android/features/banners/viewmodels/BannersViewModel.kt b/app/src/main/java/com/gemwallet/android/features/banners/viewmodels/BannersViewModel.kt
@@ -5,12 +5,15 @@ import androidx.lifecycle.viewModelScope
 import com.gemwallet.android.cases.banners.CancelBannerCase
 import com.gemwallet.android.cases.banners.GetBannersCase
 import com.gemwallet.android.data.repositoreis.session.SessionRepository
+import com.gemwallet.android.model.Crypto
+import com.gemwallet.android.model.format
 import com.wallet.core.primitives.Asset
 import com.wallet.core.primitives.Banner
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import uniffi.gemstone.Config
 import javax.inject.Inject
 
 @HiltViewModel
@@ -34,6 +37,12 @@ class BannersViewModel @Inject constructor(
         }
     }
 
+    fun getActivationFee(asset: Asset?): String {
+        asset ?: return ""
+        val value = Config().getChainConfig(asset.id.chain.string).accountActivationFee?.toString() ?: return ""
+        return asset.format(Crypto(value))
+    }
+
     fun onCancel(banner: Banner) = viewModelScope.launch {
         cancelBannerCase.cancelBanner(banner)
         init(banner.asset, banner.wallet == null)

diff --git a/app/src/main/java/com/gemwallet/android/features/banners/views/BannersScene.kt b/app/src/main/java/com/gemwallet/android/features/banners/views/BannersScene.kt
@@ -32,6 +32,8 @@ import com.gemwallet.android.R
 import com.gemwallet.android.ext.chain
 import com.gemwallet.android.ext.toIdentifier
 import com.gemwallet.android.features.banners.viewmodels.BannersViewModel
+import com.gemwallet.android.model.Crypto
+import com.gemwallet.android.model.format
 import com.gemwallet.android.ui.components.image.getIconUrl
 import com.gemwallet.android.ui.components.image.IconWithBadge
 import com.gemwallet.android.ui.components.designsystem.Spacer16
@@ -42,6 +44,8 @@ import com.wallet.core.primitives.Asset
 import com.wallet.core.primitives.Banner
 import com.wallet.core.primitives.BannerEvent
 import com.wallet.core.primitives.BannerState
+import com.wallet.core.primitives.Chain
+import uniffi.gemstone.Config
 
 @Composable
 fun BannersScene(
@@ -51,8 +55,10 @@ fun BannersScene(
     viewModel: BannersViewModel = hiltViewModel(),
 ) {
     LaunchedEffect(asset?.id?.toIdentifier(), isGlobal) { viewModel.init(asset, isGlobal) }
+
     val banners by viewModel.banners.collectAsStateWithLifecycle()
     val pageState = rememberPagerState { banners.size }
+
     HorizontalPager(pageState, pageSpacing = padding16) { page ->
         val banner = banners[page]
         Box(modifier = Modifier.clickable { onClick(banner) }) {
@@ -63,8 +69,9 @@ fun BannersScene(
                 )
                 BannerEvent.AccountActivation -> Pair(
                     stringResource(R.string.banner_account_activation_title, asset?.name ?: ""),
-                    stringResource(R.string.banner_account_activation_description, asset?.name ?: "", "10 XRP")
-                )
+                    stringResource(R.string.banner_account_activation_description, asset?.name ?: "",
+                        viewModel.getActivationFee(asset)
+                ))
                 BannerEvent.EnableNotifications -> Pair(
                     stringResource(R.string.banner_enable_notifications_title, asset?.name ?: ""),
                     stringResource(R.string.banner_enable_notifications_description)

diff --git a/blockchain/src/main/java/com/gemwallet/android/blockchain/clients/xrp/XrpBalanceClient.kt b/blockchain/src/main/java/com/gemwallet/android/blockchain/clients/xrp/XrpBalanceClient.kt
@@ -5,19 +5,23 @@ import com.gemwallet.android.ext.asset
 import com.gemwallet.android.ext.getReserveBalance
 import com.gemwallet.android.model.AssetBalance
 import com.wallet.core.primitives.Chain
+import uniffi.gemstone.Config
 import java.math.BigInteger
 
 class XrpBalanceClient(
     private val chain: Chain,
     private val rpcClient: XrpRpcClient,
 ) : BalanceClient {
-    private val reservedBalance = BigInteger.valueOf(1_000_000)
 
     override suspend fun getNativeBalance(chain: Chain, address: String): AssetBalance {
         val amount = rpcClient.account(address).mapCatching {
             it.result.account_data.Balance.toBigInteger() - chain.getReserveBalance()
         }.getOrNull() ?: BigInteger.ZERO
-        return AssetBalance.create(chain.asset(), available = amount.toString(), reserved = reservedBalance.toString())
+        return AssetBalance.create(
+            chain.asset(),
+            available = amount.toString(),
+            reserved = (Config().getChainConfig(chain.string).accountActivationFee?.toString() ?: 0).toString()
+        )
     }
 
     override fun supported(chain: Chain): Boolean = this.chain == chain

diff --git a/core b/core
+88 −57		Cargo.lock
+1 −1		Cargo.toml
+0 −3		apps/api/src/asset.rs
+4 −5		apps/api/src/asset_client.rs
+12 −8		apps/daemon/src/pricer/asset_updater.rs
+2 −3		apps/daemon/src/pricer/price_updater.rs
+1 −1		crates/fiat/src/providers/banxa/client.rs
+1 −1		crates/fiat/src/providers/kado/client.rs
+1 −1		crates/fiat/src/providers/mercuryo/client.rs
+1 −1		crates/fiat/src/providers/transak/client.rs
+1 −1		crates/gem_evm/src/address.rs
+3 −3		crates/gem_evm/src/jsonrpc.rs
+1 −0		crates/gem_evm/src/uniswap/mod.rs
+198 −0		crates/gem_evm/src/uniswap/path.rs
+1 −1		crates/gem_sui/Cargo.toml
+1 −1		crates/gem_ton/src/address.rs
+46 −3		crates/primitives/src/chain.rs
+4 −5		crates/storage/src/database.rs
+2 −2		crates/storage/src/models/transaction.rs
+6 −2		gemstone/src/chain/mod.rs
+13 −0		gemstone/src/config/evm_chain.rs
+2 −17		gemstone/src/network/jsonrpc.rs
+24 −28		gemstone/src/network/mock.rs
+49 −5		gemstone/src/swapper/approval.rs
+3 −3		gemstone/src/swapper/models.rs
+3 −3		gemstone/src/swapper/permit2_data.rs
+177 −78		gemstone/src/swapper/universal_router/mod.rs
+1 −1		gemstone/src/swapper/universal_router/uniswap_router.rs
+4 −0		gemstone/tests/ios/GemTest/GemTest.xcodeproj/project.pbxproj
+39 −67		gemstone/tests/ios/GemTest/GemTest/ContentView.swift
+6 −2		gemstone/tests/ios/GemTest/GemTest/Provider.swift
+66 −0		gemstone/tests/ios/GemTest/GemTest/Request.swift