Amount route consolidation#281
Open
gemdev111 wants to merge 24 commits into
Open
Conversation
…e for Stake.Rewards
gemdev111
changed the title
gemcoder21
reviewed
May 12, 2026
gemcoder21
reviewed
May 12, 2026
|
|
||
| private val perpetual = getPerpetual.getPerpetual(params.perpetualId) | ||
| .onEach { current -> | ||
| val session = sessionRepository.session().firstOrNull() ?: return@onEach |
Contributor
There was a problem hiding this comment.
you just need to get this perpetual, no need to do anything else
gemcoder21
reviewed
May 12, 2026
| val leverage: StateFlow<Int> = selectedLeverage.asStateFlow() | ||
| fun setLeverage(value: Int) { selectedLeverage.update { value } } | ||
|
|
||
| val availableLeverages: StateFlow<List<Int>> = perpetual.filterNotNull().map { current -> |
gemcoder21
reviewed
May 12, 2026
| ) | ||
| } | ||
|
|
||
| private fun perpetualUsdcAssetId(chain: Chain): AssetId = when (chain) { |
Contributor
There was a problem hiding this comment.
we already have this somwhere else, reuse
gemcoder21
reviewed
May 12, 2026
| transactionBalanceService = transactionBalanceService, | ||
| scope = scope, | ||
| ) | ||
| is AmountParams.Freeze -> AmountFreezeProvider( |
Contributor
There was a problem hiding this comment.
can you merge AmountFreezeProvider into AmountStakeProvider
gemcoder21
reviewed
May 12, 2026
|
|
||
| private val delegation: StateFlow<Delegation?> = run { | ||
| val source = when (params) { | ||
| is AmountParams.Stake.Undelegate -> |
gemcoder21
reviewed
May 12, 2026
| val currentDelegation = delegation.value ?: throw AmountError.NoDelegationSelected | ||
| builder.redelegate(validator, currentDelegation) | ||
| } | ||
| is AmountParams.Stake.Undelegate -> { |
gemcoder21
reviewed
May 12, 2026
| } | ||
| } | ||
|
|
||
| private fun initialValidatorId(params: AmountParams.Stake): String? = when (params) { |
gemcoder21
approved these changes
May 12, 2026
gemcoder21
reviewed
May 12, 2026
| @OptIn(ExperimentalCoroutinesApi::class) | ||
| class AmountStakeProvider( | ||
| private val params: AmountParams.Stake, | ||
| assetsRepository: AssetsRepository, |
Contributor
There was a problem hiding this comment.
use coordinator instead of injecting repositories
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces the dual-route amount flow (AmountRoute + PerpetualAmountRoute backed by AmountViewModel + AmountBaseViewModel + PerpetualAmountViewModel) with a single AmountRoute, AmountScreen, and AmountViewModel that delegates per-flow logic to a sealed AmountDataProvider strategy. Mirrors iOS's AmountSceneViewModel + AmountDataProvidable architecture using Kotlin idioms (sealed interfaces, Hilt, StateFlow).
AmountParams becomes a sealed interface with one variant per flow (Transfer, Stake.Delegate/Undelegate/Redelegate/Withdraw/Rewards, Freeze, Perpetual); polymorphic JSON via @SerialName preserves route packing. Each provider (AmountTransferProvider, AmountStakeProvider, AmountFreezeProvider, AmountPerpetualProvider) owns its title, capability flags, balance flow, and ConfirmParams construction. AmountProviderFactory dispatches variants to the right provider via Hilt.
AmountViewModel holds amount input, validation, currency toggle, and max/equivalent state and forwards everything else to the injected provider. Read-only flows (Withdraw, Rewards) auto-prefill via combine(provider.assetInfo.filterNotNull(), provider.availableBalance) so subsequent balance updates keep the displayed amount in sync. AmountScene takes canSwitchInputType, readOnly, and showsAssetBalance booleans plus a slot for provider-specific controls (validator picker for Stake, Bandwidth/Energy tabs for Freeze, leverage row for Perpetual). The validator picker overlay moved to AmountScreen via AnimatedContent + BackHandler. Stake.Rewards keeps the balance row visible to mirror iOS.
Other fixes:
Removes AmountBaseViewModel, PerpetualAmountViewModel, PerpetualAmountRoute, and the obsolete txType helpers and presentation models.
closes #258