Skip to content

fix(chat): tip amount-entry — enforce minimum on send + simplify slide label #1188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 2 commits into from
Aug 6, 2026
Merged

fix(chat): tip amount-entry — enforce minimum on send + simplify slide label #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0f6f2
chore(chat): simplify amount-entry slide label and drop dead standalo…
bmc08gt Aug 6, 2026
26c0dd3
fix(chat): enforce tip minimum on send with an alert
bmc08gt Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/flipcash/core/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,8 +899,8 @@
<string name="action_swipeToTip">Swipe to Tip</string>
<string name="content_description_customTipAmount">Enter a custom amount</string>
<string name="subtitle_tipHintMinimum">Minimum tip %1$s</string>
<string name="error_title_tipMinimum">Tips Start at %1$s</string>
<string name="error_description_tipMinimum">Enter a larger amount to send this tip</string>
<string name="error_title_tipMinimum">%1$s Minimum</string>
<string name="error_description_tipMinimum">Increase the amount to send</string>
<string name="label_viaTipCard">via Tip Card</string>

<string name="title_block">Block</string>
Expand Down
15 changes: 13 additions & 2 deletions ...h/features/messenger/src/main/kotlin/com/flipcash/app/messenger/internal/ChatViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ internal class ChatViewModel @Inject constructor(
}

data class State(
val separatorConfig: SeparatorConfig= SeparatorConfig.Continuous(),
val separatorConfig: SeparatorConfig = SeparatorConfig.Continuous(),
val chatId: ChatId? = null,
val participant: ChatParticipant? = null,
// The kind of DM this conversation is, resolved from the fast local contact lookup ahead of
Expand Down Expand Up @@ -268,7 +268,7 @@ internal class ChatViewModel @Inject constructor(
// tip (from the tip payment delegate); a contact DM swipes to *send* with no minimum.
private fun amountStyle(isTip: Boolean) = AmountEntryStyle(
actionLabel = AmountEntryLabel.Plain(
resources.getString(if (isTip) R.string.action_swipeToTip else R.string.action_swipeToSend)
resources.getString(R.string.action_swipeToSend)
),
actionStyle = ConfirmationStyle.Slide,
infoHint = { resources.getString(R.string.subtitle_sendHint, it) },
Expand Down Expand Up @@ -665,6 +665,17 @@ internal class ChatViewModel @Inject constructor(
val source = owner.withTimelockForToken(token)

val balance = tokenCoordinator.balanceForToken(token)

val minimum = minAmountFlow.value
if (minimum != null && amount.valueLessThan(minimum)) {
dispatchEvent(Event.SendStateUpdated())
BottomBarManager.showAlert(
title = resources.getString(R.string.error_title_tipMinimum, minimum.formatted()),
message = resources.getString(R.string.error_description_tipMinimum),
)
return@launch
}

val verifiedFiat = verifiedFiatCalculator.compute(
amount = amount,
token = token,
Expand Down
28 changes: 0 additions & 28 deletions ...src/main/kotlin/com/flipcash/app/messenger/internal/screens/cash/ChatAmountEntryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.flipcash.app.core.AppRoute
import com.flipcash.app.core.chat.ChatIdentifier
import com.flipcash.app.core.tokens.TokenPurpose
import com.flipcash.app.core.ui.TokenSelectionPill
import com.flipcash.app.messenger.internal.ChatViewModel
Expand All @@ -27,30 +23,6 @@ import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach

/**
* Standalone amount entry screen — used when navigating directly from the contact list
* (messenger disabled). Creates its own [ChatViewModel] scoped to this nav entry.
*/
@Composable
fun ChatAmountEntryScreen(identifier: ChatIdentifier) {
val viewModel = hiltViewModel<ChatViewModel>()
val state by viewModel.stateFlow.collectAsStateWithLifecycle()

val navigator = LocalCodeNavigator.current
LaunchedEffect(viewModel, identifier) {
viewModel.dispatchEvent(ChatViewModel.Event.OnChatOpened(identifier))
}

ChatAmountEntryContent(
amountDelegate = viewModel.amountDelegate,
resolveState = state.resolveState,
token = state.token,
eventFlow = viewModel.eventFlow,
onExit = { navigator.pop() },
onConfirm = { viewModel.dispatchEvent(ChatViewModel.Event.OnConfirmRequested) },
)
}

@Composable
internal fun ChatAmountEntryContent(
amountDelegate: AmountEntryDelegate,
Expand Down
Loading