Merge branch 'master' into fix/msat-invoice-precision

Author: ben-kaufman

AGENTS.md

@@ -240,7 +240,8 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 
 ### Changelog
 
-- ALWAYS add an entry under `## [Unreleased]` in `CHANGELOG.md` for `feat:` and `fix:` PRs; skip for `chore:`, `ci:`, `refactor:`, `test:`, `docs:` unless the change is user-facing
+- ALWAYS add exactly ONE entry per PR under `## [Unreleased]` in `CHANGELOG.md` for `feat:` and `fix:` PRs; skip for `chore:`, `ci:`, `refactor:`, `test:`, `docs:` unless the change is user-facing
+- NEVER add multiple changelog lines for the same PR — summarize all changes in a single concise entry
 - USE standard Keep a Changelog categories: `### Added`, `### Changed`, `### Deprecated`, `### Removed`, `### Fixed`, `### Security`
 - ALWAYS append `#PR_NUMBER` at the end of each changelog entry when the PR number is known
 - ALWAYS place new entries at the top of their category section (newest first)

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mnemonic warning text transitions on reveal #857
 
 ### Changed
+- Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863
 - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857
 - Icons added to all settings rows for faster scanning #857
 - Selected values displayed on right side of settings rows #857

app/src/main/java/to/bitkit/ext/DateTime.kt

@@ -109,6 +109,34 @@ fun Long.toRelativeTimeString(
     }
 }
 
+fun formatInvoiceExpiryRelative(
+    expirySeconds: ULong,
+    locale: Locale = Locale.getDefault(),
+): String {
+    val seconds = expirySeconds.toLong()
+    if (seconds <= 0) return ""
+
+    val uLocale = ULocale.forLocale(locale)
+    val numberFormat = NumberFormat.getNumberInstance(uLocale)?.apply { maximumFractionDigits = 0 }
+    val formatter = RelativeDateTimeFormatter.getInstance(
+        uLocale,
+        numberFormat,
+        RelativeDateTimeFormatter.Style.LONG,
+        DisplayContext.CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE,
+    ) ?: return ""
+
+    val minutes = seconds / Factor.SECONDS_TO_MINUTES.toLong()
+    val hours = minutes / Factor.MINUTES_TO_HOURS.toLong()
+    val days = hours / Factor.HOURS_TO_DAYS.toLong()
+
+    return when {
+        minutes < 1 -> formatter.format(seconds.toDouble(), Direction.NEXT, RelativeUnit.SECONDS)
+        hours < 1 -> formatter.format(minutes.toDouble(), Direction.NEXT, RelativeUnit.MINUTES)
+        days < 1 -> formatter.format(hours.toDouble(), Direction.NEXT, RelativeUnit.HOURS)
+        else -> formatter.format(days.toDouble(), Direction.NEXT, RelativeUnit.DAYS)
+    }
+}
+
 fun getDaysInMonth(month: LocalDate): List<LocalDate?> {
     val firstDayOfMonth = LocalDate(month.year, month.month, Constants.FIRST_DAY_OF_MONTH)
     val daysInMonth = month.month.toJavaMonth().length(isLeapYear(month.year))

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

@@ -15,6 +15,13 @@ enum class FeeRate(
     @DrawableRes val icon: Int,
     val color: Color,
 ) {
+    INSTANT(
+        title = R.string.fee__instant__title,
+        description = R.string.fee__instant__description,
+        shortDescription = R.string.fee__instant__shortDescription,
+        color = Colors.Purple,
+        icon = R.drawable.ic_speed_fast,
+    ),
     FAST(
         title = R.string.fee__fast__title,
         description = R.string.fee__fast__description,
@@ -53,7 +60,7 @@ enum class FeeRate(
 
     fun toSpeed(): TransactionSpeed {
         return when (this) {
-            FAST -> TransactionSpeed.Fast
+            INSTANT, FAST -> TransactionSpeed.Fast
             NORMAL -> TransactionSpeed.Medium
             MINIMUM, SLOW -> TransactionSpeed.Slow
             CUSTOM -> TransactionSpeed.Custom(0u)

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

@@ -0,0 +1,37 @@
+package to.bitkit.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import to.bitkit.ui.theme.AppThemeSurface
+import to.bitkit.ui.theme.Colors
+
+@Composable
+fun SendCell(
+    caption: String,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit,
+) {
+    Column(modifier = modifier.fillMaxWidth()) {
+        Caption13Up(text = caption, color = Colors.White64)
+        VerticalSpacer(8.dp)
+        content()
+        VerticalSpacer(16.dp)
+        HorizontalDivider(modifier = Modifier.fillMaxWidth())
+    }
+}
+
+@Preview(showSystemUi = true)
+@Composable
+private fun Preview() {
+    AppThemeSurface {
+        SendCell(caption = "AMOUNT") {
+            Text("0.001 BTC", color = Colors.White)
+        }
+    }
+}

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

@@ -23,6 +23,8 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableFloatState
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -61,15 +63,16 @@ private val Padding = 8.dp
 
 @Composable
 fun SwipeToConfirm(
+    onConfirm: () -> Unit,
+    modifier: Modifier = Modifier,
     text: String = stringResource(R.string.other__swipe),
     color: Color = Colors.Brand,
     icon: ImageVector = Icons.AutoMirrored.Default.ArrowForward,
     @DrawableRes endIcon: Int = R.drawable.ic_check,
     endIconTint: Color = Colors.Black,
     loading: Boolean = false,
     confirmed: Boolean = false,
-    onConfirm: () -> Unit,
-    modifier: Modifier = Modifier,
+    progress: MutableFloatState? = null,
 ) {
     val scope = rememberCoroutineScope()
     val trailColor = remember(color) { color.copy(alpha = 0.24f) }
@@ -94,6 +97,10 @@ fun SwipeToConfirm(
         )
     }
 
+    SideEffect {
+        progress?.floatValue = (panX.value / maxPanX).coerceIn(0f, 1f)
+    }
+
     Box(
         modifier = modifier
             .requiredHeight(CircleSize + Padding * 2)