Merge branch 'master' into feat/rn-migration

Author: ovitrif

app/src/main/java/to/bitkit/ui/screens/widgets/DragDropColumn.kt

@@ -1,13 +1,14 @@
 package to.bitkit.ui.screens.widgets
 
-import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
+import androidx.compose.foundation.gestures.detectVerticalDragGestures
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -24,10 +25,10 @@ fun DragDropColumn(
     items: List<WidgetWithPosition>,
     onMove: (Int, Int) -> Unit,
     modifier: Modifier = Modifier,
-    itemContent: @Composable (WidgetWithPosition, Boolean) -> Unit
+    itemContent: @Composable (WidgetWithPosition, Boolean) -> Unit,
 ) {
     var draggedItem by remember { mutableStateOf<Int?>(null) }
-    var draggedItemOffset by remember { mutableStateOf(0f) }
+    var draggedItemOffset by remember { mutableFloatStateOf(0f) }
 
     Column(
         modifier = modifier
@@ -50,16 +51,16 @@ fun DragDropColumn(
                         }
                     )
                     .pointerInput(Unit) {
-                        detectDragGesturesAfterLongPress(
+                        detectVerticalDragGestures(
                             onDragStart = {
                                 draggedItem = index
                             },
                             onDragEnd = {
                                 draggedItem = null
                                 draggedItemOffset = 0f
                             },
-                            onDrag = { _, dragAmount ->
-                                draggedItemOffset += dragAmount.y
+                            onVerticalDrag = { _, dragAmount ->
+                                draggedItemOffset += dragAmount
 
                                 val itemHeight = 96.dp.toPx() // Item height + spacing (80dp + 16dp)
                                 val draggedIndex = draggedItem ?: index

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -859,6 +859,21 @@ class AppViewModel @Inject constructor(
                 ?.let { it as? Scanner.Lightning }
                 ?.invoice
                 ?.takeIf { invoice ->
+                    if (invoice.isExpired) {
+                        toast(
+                            type = Toast.ToastType.ERROR,
+                            title = context.getString(R.string.other__scan_err_decoding),
+                            description = context.getString(R.string.other__scan__error__expired),
+                        )
+
+                        Logger.debug(
+                            "Lightning invoice expired in unified URI, defaulting to onchain-only",
+                            context = TAG
+                        )
+                        return@takeIf false
+                    }
+
+                    // Then check sending capacity
                     val canSend = lightningRepo.canSend(invoice.amountSatoshis.coerceAtLeast(1u))
                     if (!canSend) {
                         Logger.debug("Cannot pay unified invoice using LN, defaulting to onchain-only", context = TAG)