Skip to content

Commit ee8ca5d

Browse files
committed
fix(tokens): don't filter out USDF when rendering deposit and withdrawal
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent b6ad0fb commit ee8ca5d

3 files changed

Lines changed: 5 additions & 19 deletions

File tree

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenSelectScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ private fun SelectTokenScreenContent(
4545
selectedToken = state.selectedToken,
4646
showSelections = state.purpose is TokenPurpose.Select,
4747
showFlags = state.purpose !is TokenPurpose.Select,
48+
includeReserves = state.purpose is TokenPurpose.Deposit || state.purpose is TokenPurpose.Withdraw,
4849
emptyState = {
4950
Box(
5051
modifier = Modifier

apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ import javax.inject.Inject
3939
class SelectTokenViewModel @Inject constructor(
4040
tokenCoordinator: TokenCoordinator,
4141
exchange: Exchange,
42-
analytics: FlipcashAnalyticsService,
4342
featureFlags: FeatureFlagController,
44-
private val purchaseMethodController: PurchaseMethodController,
4543
resources: ResourceHelper,
4644
dispatchers: DispatcherProvider,
4745
) : BaseViewModel2<SelectTokenViewModel.State, SelectTokenViewModel.Event>(
@@ -87,8 +85,6 @@ class SelectTokenViewModel @Inject constructor(
8785

8886
data class OnDiscoveryEnabled(val enabled: Boolean): Event
8987

90-
data object OnAddCashClicked : Event
91-
data object OpenOnRampAmountModal : Event
9288
data class OpenScreen(val route: AppRoute) : Event
9389
}
9490

@@ -165,17 +161,6 @@ class SelectTokenViewModel @Inject constructor(
165161
}.onEach { dispatchEvent(Event.OnTokensUpdated(it)) }
166162
.launchIn(viewModelScope)
167163

168-
eventFlow
169-
.filterIsInstance<Event.OnAddCashClicked>()
170-
.onEach {
171-
analytics.openOnramp(Analytics.OnrampSource.Balance)
172-
val provider = purchaseMethodController.state.value.preferredProvider
173-
if (provider is OnRampProvider.Coinbase && provider.type == OnRampType.Virtual) {
174-
// has coinbase provider supporting google pay - pop selection for quick add
175-
dispatchEvent(Event.OpenOnRampAmountModal)
176-
}
177-
}.launchIn(viewModelScope)
178-
179164
tokenCoordinator.observeSelectedTokenMint()
180165
.distinctUntilChanged()
181166
.onEach { dispatchEvent(Event.OnTokenSelected(it, fromUser = false)) }
@@ -206,8 +191,6 @@ class SelectTokenViewModel @Inject constructor(
206191
is Event.OnTokensUpdated -> { state -> state.copy(tokens = event.tokens) }
207192
is Event.OnTokenSelected -> { state -> state.copy(selectedToken = event.mint) }
208193
is Event.OnTokenChanged -> { state -> state }
209-
is Event.OnAddCashClicked -> { state -> state }
210-
is Event.OpenOnRampAmountModal -> { state -> state }
211194
is Event.OpenScreen -> { state -> state }
212195
}
213196
}

apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/TokenList.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ fun TokenList(
3434
showFlags: Boolean = false,
3535
selectedToken: Mint? = null,
3636
showSelections: Boolean = false,
37+
includeReserves: Boolean = false,
3738
emptyState: (@Composable LazyItemScope.() -> Unit)? = null,
3839
reserves: (@Composable LazyItemScope.(mint: Mint, cashReserves: LocalFiat) -> Unit)? = null,
3940
footer: (@Composable LazyItemScope.() -> Unit)? = null,
@@ -46,9 +47,10 @@ fun TokenList(
4647
tokens?.find { it.token.address == Mint.usdf }?.balance ?: LocalFiat.Zero
4748
}
4849
}
49-
val filteredTokens by remember(tokens) {
50+
val filteredTokens by remember(tokens, includeReserves) {
5051
derivedStateOf {
51-
tokens?.filter { it.token.address != Mint.usdf }
52+
if (includeReserves) tokens
53+
else tokens?.filterNot { it.token.address == Mint.usdf }
5254
}
5355
}
5456

0 commit comments

Comments
 (0)