fix: block numberpad input exceeding max amount

Justfile

@@ -12,7 +12,7 @@ list:
         "list" \
         "init" \
         "compile" \
-        "run" \
+        "run [docker]" \
         "build [TASK]" \
         "release" \
         "install" \
@@ -45,12 +45,18 @@ init:
 compile:
     {{ gradle }} compileDevDebugKotlin
 
-run:
+run mode="":
     #!/usr/bin/env sh
     set -eu
 
     app_id="to.bitkit.dev"
     app_dir="app/build/outputs/apk/dev/debug"
+    mode="{{ mode }}"
+
+    if [ -n "$mode" ] && [ "$mode" != "docker" ]; then
+        echo "usage: just run [docker]" >&2
+        exit 1
+    fi
 
     if ! command -v adb >/dev/null 2>&1; then
         echo "adb is required to run the app." >&2
@@ -90,8 +96,19 @@ run:
     fi
 
     echo "Using $device_name ($device_id)"
+
+    build_env=""
+    if [ "$mode" = "docker" ]; then
+        echo "Forwarding bitkit-docker ports via adb reverse..."
+        adb -s "$device_id" reverse tcp:60001 tcp:60001  # local Electrum
+        adb -s "$device_id" reverse tcp:6288 tcp:6288     # local homegate
+        adb -s "$device_id" reverse tcp:9735 tcp:9735     # local lnd peer
+        adb -s "$device_id" reverse tcp:3000 tcp:3000     # local lnurl-server
+        build_env="E2E=true"
+    fi
+
     echo "Building Debug app..."
-    {{ gradle }} assembleDevDebug
+    env $build_env {{ gradle }} assembleDevDebug
 
     app_path="$(
         find "$app_dir" -maxdepth 1 -name '*-universal.apk' -type f \

app/src/main/java/to/bitkit/models/Toast.kt

@@ -11,6 +11,7 @@ data class Toast(
     enum class ToastType { SUCCESS, INFO, LIGHTNING, WARNING, ERROR }
 
     companion object {
+        const val VISIBILITY_TIME_SHORT = 1500L
         const val VISIBILITY_TIME_DEFAULT = 3000L
     }
 }

app/src/main/java/to/bitkit/ui/components/NumberPad.kt

@@ -19,6 +19,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
@@ -170,15 +171,16 @@ fun NumberPad(
     viewModel: AmountInputViewModel,
     modifier: Modifier = Modifier,
     currencies: CurrencyState = LocalCurrencies.current,
+    enabled: Boolean = true,
     type: NumberPadType = viewModel.getNumberPadType(currencies),
     availableHeight: Dp = defaultHeight,
     decimalSeparator: String = KEY_DECIMAL,
     includeNavigationBarsPadding: Boolean = false,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     NumberPad(
-        onPress = { key -> viewModel.handleNumberPadInput(key, currencies) },
-        modifier = modifier,
+        onPress = { key -> if (enabled) viewModel.handleNumberPadInput(key, currencies) },
+        modifier = modifier.alpha(if (enabled) 1f else 0.5f),
         type = type,
         availableHeight = availableHeight,
         decimalSeparator = decimalSeparator,

app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAdvancedScreen.kt

@@ -17,6 +17,7 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Devices.NEXUS_5
@@ -27,6 +28,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import to.bitkit.R
 import to.bitkit.ext.mockOrder
 import to.bitkit.models.Toast
+import to.bitkit.models.formatToModernDisplay
 import to.bitkit.repositories.CurrencyState
 import to.bitkit.ui.LocalCurrencies
 import to.bitkit.ui.appViewModel
@@ -46,6 +48,7 @@ import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
+import to.bitkit.viewmodels.AmountInputEffect
 import to.bitkit.viewmodels.AmountInputViewModel
 import to.bitkit.viewmodels.TransferEffect
 import to.bitkit.viewmodels.TransferToSpendingUiState
@@ -64,12 +67,14 @@ fun SpendingAdvancedScreen(
 ) {
     val currentOnOrderCreated by rememberUpdatedState(onOrderCreated)
     val app = appViewModel ?: return
+    val context = LocalContext.current
     val state by viewModel.spendingUiState.collectAsStateWithLifecycle()
     val order = state.order ?: return
     val amountUiState by amountInputViewModel.uiState.collectAsStateWithLifecycle()
     var isLoading by remember { mutableStateOf(false) }
 
     val transferValues by viewModel.transferValues.collectAsStateWithLifecycle()
+    val currentMaxLspBalance by rememberUpdatedState(transferValues.maxLspBalance)
 
     LaunchedEffect(order.clientBalanceSat) {
         viewModel.updateTransferValues(order.clientBalanceSat)
@@ -79,6 +84,10 @@ fun SpendingAdvancedScreen(
         viewModel.onReceivingAmountChange(amountUiState.sats)
     }
 
+    LaunchedEffect(transferValues.maxLspBalance) {
+        amountInputViewModel.setMaxAmount(transferValues.maxLspBalance.toLong())
+    }
+
     LaunchedEffect(Unit) {
         viewModel.transferEffects.collect { effect ->
             when (effect) {
@@ -100,6 +109,20 @@ fun SpendingAdvancedScreen(
         }
     }
 
+    LaunchedEffect(Unit) {
+        amountInputViewModel.effect.collect {
+            when (it) {
+                AmountInputEffect.MaxExceeded -> app.toast(
+                    type = Toast.ToastType.WARNING,
+                    title = context.getString(R.string.lightning__spending_advanced__error_max__title),
+                    description = context.getString(R.string.lightning__spending_advanced__error_max__description)
+                        .replace("{amount}", currentMaxLspBalance.formatToModernDisplay()),
+                    visibilityTime = Toast.VISIBILITY_TIME_SHORT,
+                )
+            }
+        }
+    }
+
     val isValid = transferValues.let {
         val amount = amountUiState.sats.toULong()
         amount > 0u && it.maxLspBalance > 0u && amount in it.minLspBalance..it.maxLspBalance

app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt

@@ -15,6 +15,7 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -26,6 +27,7 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import to.bitkit.R
+import to.bitkit.models.formatToModernDisplay
 import to.bitkit.repositories.CurrencyState
 import to.bitkit.ui.LocalCurrencies
 import to.bitkit.ui.components.ConnectionIssuesView
@@ -47,6 +49,7 @@ import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
+import to.bitkit.viewmodels.AmountInputEffect
 import to.bitkit.viewmodels.AmountInputViewModel
 import to.bitkit.viewmodels.TransferEffect
 import to.bitkit.viewmodels.TransferToSpendingUiState
@@ -70,6 +73,7 @@ fun SpendingAmountScreen(
     val isNodeRunning by viewModel.isNodeRunning.collectAsStateWithLifecycle()
     val amountUiState by amountInputViewModel.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
+    val currentMaxAllowedToSend by rememberUpdatedState(uiState.maxAllowedToSend)
 
     LaunchedEffect(isOffline) {
         viewModel.updateLimits()
@@ -85,6 +89,18 @@ fun SpendingAmountScreen(
         }
     }
 
+    LaunchedEffect(Unit) {
+        amountInputViewModel.effect.collect {
+            when (it) {
+                AmountInputEffect.MaxExceeded -> toast(
+                    context.getString(R.string.lightning__spending_amount__error_max__title),
+                    context.getString(R.string.lightning__spending_amount__error_max__description)
+                        .replace("{amount}", currentMaxAllowedToSend.formatToModernDisplay()),
+                )
+            }
+        }
+    }
+
     Box {
         Content(
             isNodeRunning = isNodeRunning,
@@ -99,7 +115,7 @@ fun SpendingAmountScreen(
                     toast(
                         context.getString(R.string.lightning__spending_amount__error_max__title),
                         context.getString(R.string.lightning__spending_amount__error_max__description)
-                            .replace("{amount}", "$max"),
+                            .replace("{amount}", max.formatToModernDisplay()),
                     )
                 }
                 val cappedQuarter = min(quarter, max)
@@ -174,6 +190,10 @@ private fun SpendingAmountNodeRunning(
     onClickMaxAmount: () -> Unit,
     onConfirmAmount: () -> Unit,
 ) {
+    LaunchedEffect(uiState.maxAllowedToSend) {
+        amountInputViewModel.setMaxAmount(uiState.maxAllowedToSend)
+    }
+
     Column(
         modifier = Modifier
             .padding(horizontal = 16.dp)
@@ -244,6 +264,7 @@ private fun SpendingAmountNodeRunning(
         NumberPad(
             viewModel = amountInputViewModel,
             currencies = currencies,
+            enabled = !uiState.isLoading,
         )
 
         PrimaryButton(

app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalAmountScreen.kt

@@ -42,6 +42,7 @@ import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
+import to.bitkit.viewmodels.AmountInputEffect
 import to.bitkit.viewmodels.AmountInputViewModel
 import to.bitkit.viewmodels.previewAmountInputViewModel
 import kotlin.math.min
@@ -63,6 +64,18 @@ fun ExternalAmountScreen(
         viewModel.onAmountChange(amountUiState.sats)
     }
 
+    LaunchedEffect(uiState.amount.max) {
+        amountInputViewModel.setMaxAmount(uiState.amount.max)
+    }
+
+    LaunchedEffect(Unit) {
+        amountInputViewModel.effect.collect {
+            when (it) {
+                AmountInputEffect.MaxExceeded -> viewModel.onMaxExceeded()
+            }
+        }
+    }
+
     Content(
         amountInputViewModel = amountInputViewModel,
         amountState = uiState.amount,
@@ -167,7 +180,7 @@ private fun Content(
             PrimaryButton(
                 text = stringResource(R.string.common__continue),
                 onClick = { onContinueClick() },
-                enabled = amountUiState.sats != 0L,
+                enabled = amountUiState.sats in 1..amountState.max,
                 modifier = Modifier.testTag("ExternalAmountContinue")
             )
 

app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalNodeViewModel.kt

@@ -97,21 +97,20 @@ class ExternalNodeViewModel @Inject constructor(
     }
 
     fun onAmountChange(sats: Long) {
-        val maxAmount = _uiState.value.amount.max
+        _uiState.update { it.copy(amount = it.amount.copy(sats = sats)) }
+    }
 
-        if (sats > maxAmount) {
-            viewModelScope.launch {
-                ToastEventBus.send(
-                    type = Toast.ToastType.ERROR,
-                    title = context.getString(R.string.lightning__spending_amount__error_max__title),
-                    description = context.getString(R.string.lightning__spending_amount__error_max__description)
-                        .replace("{amount}", maxAmount.formatToModernDisplay()),
-                )
-            }
-            return
+    fun onMaxExceeded() {
+        val maxAmount = _uiState.value.amount.max
+        viewModelScope.launch {
+            ToastEventBus.send(
+                type = Toast.ToastType.WARNING,
+                title = context.getString(R.string.lightning__spending_amount__error_max__title),
+                description = context.getString(R.string.lightning__spending_amount__error_max__description)
+                    .replace("{amount}", maxAmount.formatToModernDisplay()),
+                visibilityTime = Toast.VISIBILITY_TIME_SHORT,
+            )
         }
-
-        _uiState.update { it.copy(amount = it.amount.copy(sats = sats)) }
     }
 
     fun onAmountContinue() {

app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt

@@ -56,6 +56,7 @@ import to.bitkit.ui.shared.modifiers.sheetHeight
 import to.bitkit.ui.shared.util.gradientBackground
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
+import to.bitkit.viewmodels.AmountInputEffect
 import to.bitkit.viewmodels.AmountInputUiState
 import to.bitkit.viewmodels.AmountInputViewModel
 import to.bitkit.viewmodels.LnurlParams
@@ -73,13 +74,30 @@ fun SendAmountScreen(
     onBack: () -> Unit,
     onEvent: (SendEvent) -> Unit,
     currencies: CurrencyState = LocalCurrencies.current,
+    balances: BalanceState = LocalBalances.current,
     amountInputViewModel: AmountInputViewModel = hiltViewModel(),
 ) {
     val app = appViewModel
     val context = LocalContext.current
     val amountInputUiState: AmountInputUiState by amountInputViewModel.uiState.collectAsStateWithLifecycle()
     val currentOnEvent by rememberUpdatedState(onEvent)
 
+    val maxExceededMessage = run {
+        val lnurl = uiState.lnurl
+        val lnurlPayMaxExceeded = lnurl is LnurlParams.LnurlPay &&
+            lnurl.data.maxSendableSat().toLong() <
+            (balances.maxSendLightningSats.safe() - uiState.estimatedRoutingFee.safe()).toLong()
+        when {
+            lnurl is LnurlParams.LnurlWithdraw ->
+                R.string.wallet__lnurl_w_error_max__title to R.string.wallet__lnurl_w_error_max__description
+            lnurlPayMaxExceeded ->
+                R.string.wallet__lnurl_pay__error_max__title to R.string.wallet__lnurl_pay__error_max__description
+            else ->
+                R.string.wallet__send_amount_exceeded__title to R.string.wallet__send_amount_exceeded__description
+        }
+    }
+    val currentMaxExceededMessage by rememberUpdatedState(maxExceededMessage)
+
     LaunchedEffect(Unit) {
         if (uiState.amount > 0u) {
             amountInputViewModel.setSats(uiState.amount.toLong(), currencies)
@@ -90,6 +108,23 @@ fun SendAmountScreen(
         currentOnEvent(SendEvent.AmountChange(amountInputUiState.sats.toULong()))
     }
 
+    LaunchedEffect(Unit) {
+        amountInputViewModel.effect.collect {
+            when (it) {
+                AmountInputEffect.MaxExceeded -> {
+                    val (titleRes, descriptionRes) = currentMaxExceededMessage
+                    app?.toast(
+                        type = Toast.ToastType.WARNING,
+                        title = context.getString(titleRes),
+                        description = context.getString(descriptionRes),
+                        visibilityTime = Toast.VISIBILITY_TIME_SHORT,
+                        testTag = "SendAmountExceededToast",
+                    )
+                }
+            }
+        }
+    }
+
     LaunchedEffect(uiState.decodedInvoice, uiState.payMethod) {
         if (uiState.payMethod == SendMethod.LIGHTNING && uiState.decodedInvoice != null) {
             currentOnEvent(SendEvent.EstimateMaxRoutingFee)
@@ -203,6 +238,15 @@ private fun SendAmountNodeRunning(
             }
         }
 
+        val maxAllowed = when (val lnurl = uiState.lnurl) {
+            is LnurlParams.LnurlPay -> minOf(lnurl.data.maxSendableSat().toLong(), availableAmount)
+            else -> availableAmount
+        }
+
+        LaunchedEffect(maxAllowed) {
+            amountInputViewModel.setMaxAmount(maxAllowed)
+        }
+
         Column(
             modifier = Modifier.padding(horizontal = 16.dp)
         ) {