Merge branch 'feat/new-receive-sheet' into feat/send-sheet-redesign

Author: jvsena42

app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/CustomTabRowWithSpacing.kt

@@ -61,16 +61,21 @@ fun <T : TabItem> CustomTabRowWithSpacing(
                         )
                     }
 
-                    // Animated indicator
                     val animatedAlpha by animateFloatAsState(
                         targetValue = if (isSelected) 1f else 0.2f,
-                        animationSpec = tween(durationMillis = 300, easing = FastOutSlowInEasing),
+                        animationSpec = tween(
+                            durationMillis = 250,
+                            easing = FastOutSlowInEasing
+                        ),
                         label = "indicatorAlpha"
                     )
 
                     val animatedColor by animateColorAsState(
                         targetValue = if (isSelected) selectedColor else Colors.White,
-                        animationSpec = tween(durationMillis = 300, easing = FastOutSlowInEasing),
+                        animationSpec = tween(
+                            durationMillis = 250,
+                            easing = FastOutSlowInEasing
+                        ),
                         label = "indicatorColor"
                     )
 

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveInvoiceUtils.kt

@@ -22,7 +22,8 @@ fun getInvoiceForTab(
 ): String {
     return when (tab) {
         ReceiveTab.SAVINGS -> {
-            onchainAddress
+            // Return BIP21 without lightning parameter to preserve amount and other parameters
+            removeLightningFromBip21(bip21, onchainAddress)
         }
 
         ReceiveTab.AUTO -> {
@@ -37,6 +38,25 @@ fun getInvoiceForTab(
     }
 }
 
+/**
+ * Removes the lightning parameter from a BIP21 URI while preserving all other parameters.
+ *
+ * @param bip21 Full BIP21 URI (e.g., bitcoin:address?amount=0.001&lightning=lnbc...)
+ * @param fallbackAddress Fallback address if BIP21 is empty or invalid
+ * @return BIP21 URI without the lightning parameter (e.g., bitcoin:address?amount=0.001)
+ */
+fun removeLightningFromBip21(bip21: String, fallbackAddress: String): String {
+    if (bip21.isBlank()) return fallbackAddress
+
+    // Remove lightning parameter using regex
+    // Handles both "?lightning=..." and "&lightning=..." cases
+    val withoutLightning = bip21
+        .replace(Regex("[?&]lightning=[^&]*"), "")
+        .replace(Regex("\\?$"), "") // Remove trailing ? if it's the last char
+
+    return withoutLightning.ifBlank { fallbackAddress }
+}
+
 /**
  * Returns the appropriate QR code logo resource for the selected tab.
  *