fix(dash-dex): improve enter amount and other parts of the flow

.gitignore

@@ -35,5 +35,6 @@ service.properties
 wallet/assets/explore/*.db
 .deploy/*.json
 *.keystore
-.java-version # used by jenv for choosing java version at the command line
+# used by jenv for choosing java version at the command line
+.java-version
 .bundle/config

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         kotlin_version = '2.1.0'
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.12.0'
-        dashjVersion = '22.0.4'
+        dashjVersion = '22.0.5-SNAPSHOT'
         dppVersion = "4.0.0"
         hiltVersion = '2.53'
         hiltCompilerVersion = '1.2.0'

common/src/main/java/org/dash/wallet/common/ui/components/EnterAmount.kt

@@ -184,11 +184,19 @@ fun EnterAmount(
             // Wrap the picker to its content instead of letting its options' fillMaxWidth grab the
             // whole row: width = widest option label, height = the stacked options' natural height
             // (so it sits compact on the right rather than stretching across the amount area).
+            // Figma (node 38680:47341) shows these as plain stacked labels with no pill/background
+            // behind them, unlike the segmented-toggle style this component normally renders.
             SegmentedPicker(
                 options = pickerIndices.map { SegmentedOption(currencyCodes[it]) },
                 showSelection = false,
                 style = SegmentedPickerStyle(
                     displayMode = PickerDisplayMode.Vertical,
+                    backgroundColor = Color.Transparent,
+                    cornerRadius = 0f,
+                    shadowElevation = 0,
+                    textStyle = MyTheme.Typography.LabelSmallMedium,
+                    optionPaddingHorizontal = 6f,
+                    optionPaddingVertical = 4f
                 ),
                 onOptionSelected = { option, index ->
                     onCurrencyPickerSelect(option, pickerIndices[index])

common/src/main/java/org/dash/wallet/common/ui/components/MenuItem.kt

@@ -32,12 +32,16 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import android.content.res.Configuration
+import androidx.compose.ui.text.TextMeasurer
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -49,6 +53,10 @@ fun MenuItem(
     helpTextAbove: String? = null,
     subtitle: String? = null,
     subtitleMaxLines: Int = Int.MAX_VALUE,
+    // Truncates `subtitle` from the middle to fit the available width (e.g. for addresses,
+    // where both the start and end need to stay checkable) instead of the standard end-ellipsis.
+    // Width-measured so it stays correct at any font scale, unlike a fixed character count.
+    subtitleMiddleEllipsis: Boolean = false,
     subtitle2: String? = null,
     icon: Int? = null,
     // Custom icon slot (e.g. a Coil AsyncImage for coin logos); used when `icon` is null
@@ -168,14 +176,23 @@ fun MenuItem(
 
                 // Subtitle
                 subtitle?.let {
-                    Text(
-                        text = it,
-                        style = MyTheme.Typography.BodyMedium,
-                        color = colors.textSecondary,
-                        maxLines = subtitleMaxLines,
-                        overflow = TextOverflow.Ellipsis,
-                        modifier = Modifier.fillMaxWidth()
-                    )
+                    if (subtitleMiddleEllipsis) {
+                        MiddleEllipsisText(
+                            text = it,
+                            style = MyTheme.Typography.BodyMedium,
+                            color = colors.textSecondary,
+                            modifier = Modifier.fillMaxWidth()
+                        )
+                    } else {
+                        Text(
+                            text = it,
+                            style = MyTheme.Typography.BodyMedium,
+                            color = colors.textSecondary,
+                            maxLines = subtitleMaxLines,
+                            overflow = TextOverflow.Ellipsis,
+                            modifier = Modifier.fillMaxWidth()
+                        )
+                    }
                 }
 
                 // Second subtitle
@@ -271,6 +288,44 @@ fun MenuItem(
         }
 }
 
+/**
+ * Single-line text that keeps the start and end of [text] visible, truncating the middle
+ * with "…" only as much as needed to fit the measured width. Unlike a fixed character-count
+ * cut, this stays correct across screen widths, locales and font scales.
+ */
+@Composable
+private fun MiddleEllipsisText(
+    text: String,
+    style: TextStyle,
+    color: Color,
+    modifier: Modifier = Modifier
+) {
+    val measurer = rememberTextMeasurer()
+    val density = LocalDensity.current
+    BoxWithConstraints(modifier = modifier) {
+        val maxWidthPx = with(density) { maxWidth.toPx() }
+        val display = remember(text, maxWidthPx, style) {
+            middleEllipsizeToFit(text, maxWidthPx, style, measurer)
+        }
+        Text(text = display, style = style, color = color, maxLines = 1, overflow = TextOverflow.Clip)
+    }
+}
+
+private fun middleEllipsizeToFit(text: String, maxWidthPx: Float, style: TextStyle, measurer: TextMeasurer): String {
+    fun widthOf(s: String) = measurer.measure(text = s, style = style, softWrap = false).size.width
+
+    if (maxWidthPx <= 0f || widthOf(text) <= maxWidthPx) return text
+
+    var head = (text.length + 1) / 2
+    var tail = text.length - head
+    while (head + tail > 1) {
+        val candidate = "${text.take(head)}…${text.takeLast(tail)}"
+        if (widthOf(candidate) <= maxWidthPx) return candidate
+        if (head >= tail) head-- else tail--
+    }
+    return "…"
+}
+
 @Preview(name = "MenuItem Light", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
 @Preview(name = "MenuItem Dark", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable

common/src/main/java/org/dash/wallet/common/ui/segmented_picker/SegmentedPicker.kt

@@ -42,6 +42,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import org.dash.wallet.common.R
@@ -67,7 +68,12 @@ data class SegmentedPickerStyle(
     val thumbColor: Color? = null,
     val cornerRadius: Float = 12f,
     val textStyle: TextStyle = MyTheme.CaptionMedium,
-    val shadowElevation: Int = 2
+    val shadowElevation: Int = 2,
+    // Extra inset drawn around each option's text/icon, on top of the option's own weighted
+    // slot. Zero by default so existing fixed-height horizontal/vertical toggles are unaffected;
+    // set this for pickers whose options should have visible breathing room between them.
+    val optionPaddingHorizontal: Float = 0f,
+    val optionPaddingVertical: Float = 0f
 )
 
 @Composable
@@ -205,7 +211,9 @@ fun SegmentedPicker(
                             internalSelectedIndex = index
                             onOptionSelected(option, index)
                         },
-                        modifier = Modifier.weight(1f)
+                        modifier = Modifier.weight(1f),
+                        paddingHorizontal = style.optionPaddingHorizontal.dp,
+                        paddingVertical = style.optionPaddingVertical.dp
                     )
                 }
             }
@@ -225,7 +233,9 @@ fun SegmentedPicker(
                             onOptionSelected(option, index)
                         },
                         modifier = Modifier.weight(1f),
-                        isHorizontal = false
+                        isHorizontal = false,
+                        paddingHorizontal = style.optionPaddingHorizontal.dp,
+                        paddingVertical = style.optionPaddingVertical.dp
                     )
                 }
             }
@@ -240,7 +250,9 @@ private fun OptionContent(
     textStyle: TextStyle,
     onSelect: () -> Unit,
     modifier: Modifier = Modifier,
-    isHorizontal: Boolean = true
+    isHorizontal: Boolean = true,
+    paddingHorizontal: Dp = 0.dp,
+    paddingVertical: Dp = 0.dp
 ) {
     Box(
         modifier = modifier
@@ -254,9 +266,9 @@ private fun OptionContent(
         Row(
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.Center,
-            modifier = Modifier.then(
-                if (isHorizontal) Modifier.fillMaxHeight() else Modifier.fillMaxWidth()
-            )
+            modifier = Modifier
+                .then(if (isHorizontal) Modifier.fillMaxHeight() else Modifier.fillMaxWidth())
+                .padding(horizontal = paddingHorizontal, vertical = paddingVertical)
         ) {
             val colors = LocalDashColors.current
             option.icon?.let {

common/src/main/java/org/dash/wallet/common/util/ContextExtensions.kt

@@ -20,11 +20,14 @@ package org.dash.wallet.common.util
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
+import android.content.res.Configuration
 import androidx.fragment.app.FragmentActivity
 import android.net.Uri
 import android.os.Build
 import android.provider.Settings
+import androidx.annotation.ArrayRes
 import androidx.annotation.RequiresApi
+import java.util.Locale
 
 fun Context.openAppSettings() {
     val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
@@ -59,6 +62,23 @@ fun Context.findFragmentActivity(): FragmentActivity {
     throw IllegalStateException("No FragmentActivity found in context chain")
 }
 
+/**
+ * A locale replaces a string array wholesale, so a partially translated array can be shorter
+ * than the default one. When the localized array has fewer than [expectedSize] items,
+ * this returns the array from the default (untranslated) resources instead.
+ */
+fun Context.getStringArrayOrDefault(@ArrayRes id: Int, expectedSize: Int): Array<String> {
+    val localized = resources.getStringArray(id)
+
+    if (localized.size >= expectedSize) {
+        return localized
+    }
+
+    val config = Configuration(resources.configuration)
+    config.setLocale(Locale.ROOT)
+    return createConfigurationContext(config).resources.getStringArray(id)
+}
+
 fun Context.shareText(textToShare: String, title: String) {
     val intent = Intent(Intent.ACTION_SEND)
     intent.type = "text/plain"

integrations/maya/SWAPKIT_PROTOCOL.md

@@ -485,6 +485,28 @@ Output amounts shown are already net of all fees except inbound.
 - A top-level `error` for request-level failures (auth, malformed body, no routes at all).
 - `providerErrors[]` for per-provider failures while other providers still produced routes — **do not treat these as fatal**; they're informational.
 
+But when **every** provider declines, the response is still `200` with `routes: []`, a **null** top-level `error`, and the only explanation in `providerErrors[].errorCode` — e.g. a 0.0005 DASH → `THOR.RUNE` quote answers:
+
+```json
+{ "routes": [], "providerErrors": [
+  { "provider": "MAYACHAIN_STREAMING", "errorCode": "sellAssetAmountTooSmall",
+    "message": "Sell asset amount too small for provider MAYACHAIN." } ] }
+```
+
+So a no-route response must derive its error from `providerErrors[0].errorCode` (see
+`SwapKitApiAggregator.noRouteError()`, which renders `"<errorCode>: <message>"` via
+`SwapKitErrors.providerErrorMessage()` and falls back to `noRoutesFound` when no provider reported
+a code). Forwarding the human `message` alone loses the code and sends the failure to the
+generic-error dialog instead of the inline below-minimum banner.
+
+Provider error codes are not enumerated in SwapKit's docs; anything ending in `AmountTooSmall` or
+`AmountTooLow` (`sellAssetAmountTooSmall`, …) is classified as below-minimum by
+`SwapKitErrors.isAmountTooLow` (which also accepts the ambiguous top-level `noRoutesFound`).
+
+Conversely, `providerErrors` **alongside returned routes** stay informational: `mapToSwapQuote`
+sets `SwapQuote.error` only when no route came back, because callers read a non-null `error` as
+"unusable quote" (`MayaAddressInputFragment` refuses to continue on it).
+
 ### Compatibility With Existing Maya Module
 
 - Asset notation and the general routing model overlap heavily, so `model/Amount.kt`, `model/SwapQuoteRequest.kt`, and the existing fiat-rate stack can mostly be reused.
@@ -494,19 +516,26 @@ Output amounts shown are already net of all fees except inbound.
 
 ## User-Facing Error Display (per flow / screen)
 
-SwapKit failures carry a machine code in the top-level `error` field (§4 quote, §5 swap).
-`swapkit/SwapKitErrors.messageResFor()` maps the code to a localized string in
+SwapKit failures carry a machine code in the top-level `error` field (§4 quote, §5 swap) — or, when
+all providers declined a quote, in `providerErrors[].errorCode` (see "Provider Errors vs Top-Level
+Errors"). `swapkit/SwapKitErrors.messageResFor()` maps the code to a localized string in
 `res/values/strings-maya.xml`; which screens use that mapping — and which show their own
 fixed copy instead — is listed below. English text as of this writing; `%1$s` is the coin
 code (e.g. "BTC"). Codes not listed fall back to `dex_error_generic`.
 
 ### Buy flow (SwapKit backend only)
 
-**Enter Amount** (`DEXEnterAmountScreen`) — red text under the amount bar. Does NOT use the
-code→message table: every Continue-validation quote failure (including `noRoutesFound`) shows
-the single fixed string `dex_enter_amount_invalid`:
+**Enter Amount** (`DEXEnterAmountScreen`) — red text under the amount bar. Uses the table only for
+amount-too-low-classified failures (`SwapProvider.isAmountTooLowError`), since those are the only
+ones the user can act on by changing the amount; everything else shows the neutral catch-all, as
+the remaining codes either can't distinguish too-low from temporarily-unroutable or describe the
+placeholder refund address this screen quotes with rather than anything the user entered:
 
-> This amount can't be swapped right now. Try a different amount, or try again shortly.
+| Error | String id | English text |
+|---|---|---|
+| `*AmountTooSmall` (provider error) | `dex_error_amount_too_small` | This amount is below the minimum for this swap. Please enter a larger amount. |
+| `noRoutesFound` | `dex_error_no_route` | This amount can't be swapped right now. Routes can be briefly unavailable — try again shortly, or try a different amount. |
+| anything else | `dex_enter_amount_invalid` | This amount can't be swapped right now. Try a different amount, or try again shortly. |
 
 **Refund Address** (`DEXRefundAddressScreen`) — red text under the address field. The only buy
 screen using the full `SwapKitErrors` table; `createBuyOrder` calls both `/v3/quote` and
@@ -516,6 +545,7 @@ screen using the full `SwapKitErrors` table; `createBuyOrder` calls both `/v3/qu
 |---|---|---|
 | local address check (not a SwapKit code) | `not_valid_address` (common) | Not a valid %1$s Address or URL request |
 | `noRoutesFound` | `dex_error_no_route` | This amount can't be swapped right now. Routes can be briefly unavailable — try again shortly, or try a different amount. |
+| `*AmountTooSmall` (provider error, e.g. `sellAssetAmountTooSmall`) | `dex_error_amount_too_small` | This amount is below the minimum for this swap. Please enter a larger amount. |
 | `blackListAsset` | `dex_error_blacklisted` | %1$s can't be swapped at the moment. |
 | `invalidRequest`, `validation_error` | `dex_error_validation` | We couldn't set up your swap. Please check the amount and address, then try again. |
 | `apiKeyInvalid`, `unauthorized` | `dex_error_unavailable` | Swaps are temporarily unavailable. Please try again later. |
@@ -546,19 +576,26 @@ transaction is built locally).
 | Error | String id | English text |
 |---|---|---|
 | `noRoutesFound` | `dex_error_no_route` | This amount can't be swapped right now. Routes can be briefly unavailable — try again shortly, or try a different amount. |
+| `*AmountTooSmall` (provider error, e.g. `sellAssetAmountTooSmall`) | `dex_error_amount_too_small` | This amount is below the minimum for this swap. Please enter a larger amount. |
 | `blackListAsset` | `dex_error_blacklisted` | %1$s can't be swapped at the moment. |
 | `invalidRequest`, `validation_error` | `dex_error_validation` | We couldn't set up your swap. Please check the amount and address, then try again. |
 | `apiKeyInvalid`, `unauthorized` | `dex_error_unavailable` | Swaps are temporarily unavailable. Please try again later. |
 | anything else | `dex_error_generic` | Something went wrong setting up your swap. Please try again. |
 
+(The bootstrap quote here also *retries* an amount-too-low error at 2× then 4× the indicative
+1 DASH before surfacing it — see `MayaAddressInputViewModel.getDefaultQuote`, which classifies via
+the same `isAmountTooLowError`.)
+
 **Sell Enter Amount** (`MayaConvertCryptoFragment`) — an amount-too-low-classified error shows
 the red banner (no modal, so the user can raise the amount and retry); all other codes pop an
 `AdaptiveDialog` with the mapped message. The banner text comes from the active backend's
-`errorMessageRes`, so Maya's genuine amount-too-low keeps its minimum copy while SwapKit's
-ambiguous `noRoutesFound` gets the neutral no-route copy:
+`errorMessageRes`, so Maya's genuine amount-too-low keeps its minimum copy, SwapKit's explicit
+`*AmountTooSmall` gets below-the-minimum copy, and its ambiguous `noRoutesFound` gets the neutral
+no-route copy:
 
 | Error | Shown as | String id | English text |
 |---|---|---|---|
+| `*AmountTooSmall` (SwapKit provider error) | banner | `dex_error_amount_too_small` | This amount is below the minimum for this swap. Please enter a larger amount. |
 | `noRoutesFound` (SwapKit backend) | banner | `dex_error_no_route` | This amount can't be swapped right now. Routes can be briefly unavailable — try again shortly, or try a different amount. |
 | amount too low (Maya backend) | banner | `maya_error_below_allowed_minimum` | Entered amount is lower than the allowed minimum |
 | `blackListAsset` | dialog | `dex_error_blacklisted` | %1$s can't be swapped at the moment. |

integrations/maya/src/main/java/org/dash/wallet/integrations/maya/api/FiatExchangeRateApi.kt

@@ -17,7 +17,9 @@
 
 package org.dash.wallet.integrations.maya.api
 
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -108,7 +110,7 @@ class FiatExchangeRateAggregatedProvider @Inject constructor(
     }
 
     private val responseScope = CoroutineScope(
-        Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+        SupervisorJob() + Executors.newSingleThreadExecutor().asCoroutineDispatcher()
     )
     private var poolListLastUpdated: Long = 0
     override val fiatExchangeRate = MutableStateFlow(ExchangeRate(MayaConstants.DEFAULT_EXCHANGE_CURRENCY, "1.0"))
@@ -120,8 +122,14 @@ class FiatExchangeRateAggregatedProvider @Inject constructor(
 
     private fun refreshRates(currencyCode: String) {
         responseScope.launch {
-            updateExchangeRates(currencyCode)
-            poolListLastUpdated = System.currentTimeMillis()
+            try {
+                updateExchangeRates(currencyCode)
+                poolListLastUpdated = System.currentTimeMillis()
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+                log.error("failed to refresh fiat exchange rates", e)
+            }
         }
     }