Removes the need for the payment popup for only one invoice.

app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt

@@ -413,10 +413,21 @@ fun ZapVote(
         }
 
         if (wantsToPay.isNotEmpty()) {
-            PayViaIntentDialog(payingInvoices = wantsToPay, accountViewModel = accountViewModel) {
+            PayViaIntentDialog(
+                payingInvoices = wantsToPay,
+                accountViewModel = accountViewModel,
+                onClose = {
                     wantsToPay = persistentListOf()
+                },
+                onError = {
+                    wantsToPay = persistentListOf()
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
                     }
                 }
+            )
+        }
 
         if (showErrorMessageDialog != null) {
             ErrorMessageDialog(

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt

@@ -1056,10 +1056,21 @@ fun ZapReaction(
         }
 
         if (wantsToPay.isNotEmpty()) {
-            PayViaIntentDialog(payingInvoices = wantsToPay, accountViewModel = accountViewModel) {
+            PayViaIntentDialog(
+                payingInvoices = wantsToPay,
+                accountViewModel = accountViewModel,
+                onClose = {
                     wantsToPay = persistentListOf()
+                },
+                onError = {
+                    wantsToPay = persistentListOf()
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
                     }
                 }
+            )
+        }
 
         if (wantsToSetCustomZap) {
             ZapCustomDialog(

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import androidx.compose.foundation.layout.*
@@ -144,6 +145,7 @@ fun ZapCustomDialog(
                             onPayViaIntent = onPayViaIntent,
                             zapType = selectedZapType
                         )
+                        onClose()
                     }
                 }
 
@@ -298,10 +300,14 @@ fun ErrorMessageDialog(
 fun PayViaIntentDialog(
     payingInvoices: ImmutableList<ZapPaymentHandler.Payable>,
     accountViewModel: AccountViewModel,
-    onClose: () -> Unit
+    onClose: () -> Unit,
+    onError: (String) -> Unit
 ) {
     val context = LocalContext.current
 
+    if (payingInvoices.size == 1) {
+        payViaIntent(payingInvoices.first().invoice, context, onError)
+    } else {
         Dialog(
             onDismissRequest = onClose,
             properties = DialogProperties(
@@ -370,16 +376,27 @@ fun PayViaIntentDialog(
                             PayButton(isActive = !paid.value) {
                                 paid.value = true
 
-                            val uri = "lightning:" + it.invoice
+                                payViaIntent(it.invoice, context, onError)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 
-                            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri))
+fun payViaIntent(invoice: String, context: Context, onError: (String) -> Unit) {
+    try {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$invoice"))
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
 
         ContextCompat.startActivity(context, intent, null)
-                        }
+    } catch (e: Exception) {
-                    }
+        if (e.message != null) {
-                }
+            onError(context.getString(R.string.no_wallet_found_with_error, e.message!!))
-            }
+        } else {
+            onError(context.getString(R.string.no_wallet_found))
         }
     }
 }

app/src/main/res/values/strings.xml

@@ -590,4 +590,7 @@
     <string name="wallet_number">Wallet %1$s</string>
     <string name="error_opening_external_signer">Error opening signer app</string>
     <string name="sign_request_rejected">Sign request rejected</string>
+
+    <string name="no_wallet_found_with_error">No Wallets found to pay a lightning invoice (Error: %1$s). Please install a Lightning wallet to use zaps</string>
+    <string name="no_wallet_found">No Wallets found to pay a lightning invoice. Please install a Lightning wallet to use zaps</string>
 </resources>