make invoices retriable once more with feecredits and qr

api/paidAction/index.js

@@ -175,7 +175,9 @@ async function performFeeCreditAction (invoiceData, actionType, paidAction, args
       return {
         result,
         paymentMethod: 'FEE_CREDIT',
-        retriable: invoiceData.retriable
+        retriable: invoiceEntry.retriable,
+        retriableWithFeeCredits: invoiceEntry.retriableWithFeeCredits,
+        retriableManually: invoiceEntry.retriableManually
       }
     } catch (e) {
       console.error('fee credit action failed', e)
@@ -220,7 +222,9 @@ async function performOptimisticAction (invoiceData, actionType, paidAction, arg
       invoice: invoiceEntry,
       result: await performAction(invoiceEntry, paidAction, args, context),
       paymentMethod: 'OPTIMISTIC',
-      retriable: invoiceData.retriable
+      retriable: invoiceEntry.retriable,
+      retriableWithFeeCredits: invoiceEntry.retriableWithFeeCredits,
+      retriableManually: invoiceEntry.retriableManually
     }
   }
   if (context.tx) return await performInvoicedAction(context.tx)
@@ -243,7 +247,9 @@ async function performPessimisticAction (invoiceData, actionType, paidAction, ar
     return {
       invoice: invoiceEntry,
       paymentMethod: 'PESSIMISTIC',
-      retriable: invoiceData.retriable
+      retriable: invoiceEntry.retriable,
+      retriableWithFeeCredits: invoiceEntry.retriableWithFeeCredits,
+      retriableManually: invoiceEntry.retriableManually
     }
   }
   if (context.tx) return await performInvoicedAction(context.tx)

api/typeDefs/paidAction.js

@@ -20,41 +20,53 @@ interface PaidAction {
   invoice: Invoice
   paymentMethod: PaymentMethod!
   retriable: Boolean
+  retriableWithFeeCredits: Boolean
+  retriableManually: Boolean
 }
 
 type ItemPaidAction implements PaidAction {
   result: Item
   invoice: Invoice
   paymentMethod: PaymentMethod!
   retriable: Boolean
+  retriableWithFeeCredits: Boolean
+  retriableManually: Boolean
 }
 
 type ItemActPaidAction implements PaidAction {
   result: ItemActResult
   invoice: Invoice
   paymentMethod: PaymentMethod!
   retriable: Boolean
+  retriableWithFeeCredits: Boolean
+  retriableManually: Boolean
 }
 
 type PollVotePaidAction implements PaidAction {
   result: PollVoteResult
   invoice: Invoice
   paymentMethod: PaymentMethod!
   retriable: Boolean
+  retriableWithFeeCredits: Boolean
+  retriableManually: Boolean
 }
 
 type SubPaidAction implements PaidAction {
   result: Sub
   invoice: Invoice
   paymentMethod: PaymentMethod!
   retriable: Boolean
+  retriableWithFeeCredits: Boolean
+  retriableManually: Boolean
 }
 
 type DonatePaidAction implements PaidAction {
   result: DonateResult
   invoice: Invoice
   paymentMethod: PaymentMethod!
   retriable: Boolean
+  retriableWithFeeCredits: Boolean
+  retriableManually: Boolean
 }
 
 `

components/item-act.js

@@ -272,7 +272,7 @@ export function useZap () {
     const sats = nextTip(meSats, { ...me?.privates })
 
     const variables = { id: item.id, sats, act: 'TIP' }
-    const optimisticResponse = { act: { __typename: 'ItemActPaidAction', result: { path: item.path, ...variables } } }
+    const optimisticResponse = { act: { __typename: 'ItemActPaidAction', result: { path: item.path, ...variables }, retriable: true, retriableManually: true, retriableWithFeeCredits: true } }
 
     try {
       await abortSignal.pause({ me, amount: sats })

components/pay-bounty.js

@@ -50,7 +50,7 @@ export default function PayBounty ({ children, item }) {
   const variables = { id: item.id, sats: root.bounty, act: 'TIP' }
   const act = useAct({
     variables,
-    optimisticResponse: { act: { __typename: 'ItemActPaidAction', result: { ...variables, path: item.path } } },
+    optimisticResponse: { act: { __typename: 'ItemActPaidAction', result: { ...variables, path: item.path }, retriable: true, retriableManually: true, retriableWithFeeCredits: true } },
     ...payBountyCacheMods
   })
 

components/poll.js

@@ -23,7 +23,7 @@ export default function Poll ({ item }) {
           onClick={me
             ? async () => {
               const variables = { id: v.id }
-              const optimisticResponse = { pollVote: { __typename: 'PollVotePaidAction', result: { id: v.id } } }
+              const optimisticResponse = { pollVote: { __typename: 'PollVotePaidAction', result: { id: v.id }, retriable: true, retriableManually: true, retriableWithFeeCredits: true } }
               try {
                 const { error } = await pollVote({
                   variables,

components/use-paid-mutation.js

@@ -65,6 +65,7 @@ export function usePaidMutation (mutation,
         console.error('could not cancel old invoice', err)
       }
 
+      console.log(response)
       if (response.retriable) {
         // every wallet failed, but we can still retry, so let's ask for a better invoice
         console.log('could not pay with any wallet, will retry with a new invoice...')
@@ -77,19 +78,25 @@ export function usePaidMutation (mutation,
       }
     }
 
-    // we try one last time using fee credits
-    try {
-      console.log('could not pay with any wallet, will try with fee credits...')
-      const retry = await retryPaidAction({ variables: { invoiceId: parseInt(invoice.id), forceFeeCredits: true } })
-      response = retry.data?.retryPaidAction
-      invoice = undefined
-      return { invoice, response }
-    } catch (err) {
-      console.log('could not pay with fee credits, will fallback to another method')
-      walletErrors.push(err)
+    console.log(response)
+    if (response.retriableWithFeeCredits) {
+      // we try one last time using fee credits
+      try {
+        console.log('could not pay with any wallet, will try with fee credits...')
+        const retry = await retryPaidAction({ variables: { invoiceId: parseInt(invoice.id), forceFeeCredits: true } })
+        response = retry.data?.retryPaidAction
+        invoice = undefined
+        return { invoice, response }
+      } catch (err) {
+        console.log('could not pay with fee credits, will fallback to another method')
+        walletErrors.push(err)
+      }
+    } else {
+      console.log('actions is not retriable with fee credits, will fallback to another method')
     }
 
-    if (alwaysShowQROnFailure) {
+    console.log(response)
+    if (alwaysShowQROnFailure && response.retriableManually) {
       console.log('show qr code for manual payment')
       const retry = await retryPaidAction({ variables: { invoiceId: parseInt(invoice.id) } })
       response = retry.data?.retryPaidAction
@@ -187,7 +194,7 @@ export function usePaidMutation (mutation,
 function addOptimisticResponseExtras (optimisticResponse) {
   if (!optimisticResponse) return optimisticResponse
   const key = Object.keys(optimisticResponse)[0]
-  optimisticResponse[key] = { invoice: null, paymentMethod: 'OPTIMISTIC', ...optimisticResponse[key] }
+  optimisticResponse[key] = { invoice: null, paymentMethod: 'OPTIMISTIC', retriable: true, retriableManually: true, retriableWithFeeCredits: true, ...optimisticResponse[key] }
   return optimisticResponse
 }
 

fragments/paidAction.js

@@ -14,6 +14,8 @@ export const PAID_ACTION = gql`
     }
     paymentMethod
     retriable
+    retriableWithFeeCredits
+    retriableManually
   }`
 
 const ITEM_PAID_ACTION_FIELDS = gql`

prisma/migrations/20241106101356_retriable_invoiced_paidactions/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Invoice" ADD COLUMN     "actionAttempt" INTEGER NOT NULL DEFAULT 0,
+ADD COLUMN     "retriable" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "retriableManually" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "retriableWithFeeCredits" BOOLEAN NOT NULL DEFAULT false;

prisma/schema.prisma

@@ -913,8 +913,8 @@ model Invoice {
   comment        String?
   lud18Data      Json?
   retriable      Boolean         @default(false)
-  retriableWithFeeCredits Boolean  @default(true)
-  retriableManually      Boolean  @default(true)
+  retriableWithFeeCredits Boolean  @default(false)
+  retriableManually      Boolean  @default(false)
 
   user           User            @relation(fields: [userId], references: [id], onDelete: Cascade)
   invoiceForward InvoiceForward?