Merge pull request #1917 from kaloudis/zeus-1900

ZEUS-1900: In-transit payments: convert to failed payments
ZeusLN · Dec 26, 2023 · 91e7af4 · 91e7af4
2 parents 3e51c3c + abea494
commit 91e7af4
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 12 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -471,6 +471,7 @@
     "views.OpenChannel.private": "Private",
     "views.Payment.title": "Payment",
     "views.Payment.inTransitPayment": "In Transit Payment",
+    "views.Payment.failedPayment": "Failed Payment",
     "views.Payment.fee": "Fee",
     "views.Payment.paymentHash": "Payment Hash",
     "views.Payment.paymentPreimage": "Payment Preimage",
@@ -806,6 +807,7 @@
     "views.ActivityFilter.onChainPayments": "On-chain payments",
     "views.ActivityFilter.minimumAmount": "Minimum Amount (sats)",
     "views.ActivityFilter.inTransit": "In transit payments",
+    "views.ActivityFilter.isFailed": "Failed payments",
     "general.clearChanges": "Clear changes",
     "views.Routing.RoutingEvent.sourceChannel": "Source Channel",
     "views.Routing.RoutingEvent.destinationChannel": "Destination Channel",

diff --git a/models/Payment.ts b/models/Payment.ts
@@ -63,13 +63,45 @@ export default class Payment extends BaseModel {
         return this.preimage || this.payment_preimage;
     }
 
-    @computed public get isInTransit(): boolean {
+    @computed public get isIncomplete(): boolean {
         return (
             this.getPreimage ===
             '0000000000000000000000000000000000000000000000000000000000000000'
         );
     }
 
+    @computed public get isInTransit(): boolean {
+        if (!this.isIncomplete) return false;
+        if (!this.htlcs) return false;
+        let inTransit = false;
+        for (const htlc of this.htlcs) {
+            if (
+                htlc.status === 'IN_FLIGHT' ||
+                htlc.status === lnrpc.HTLCAttempt.HTLCStatus.IN_FLIGHT
+            ) {
+                inTransit = true;
+                break;
+            }
+        }
+        return inTransit;
+    }
+
+    @computed public get isFailed(): boolean {
+        if (!this.isIncomplete) return false;
+        if (!this.htlcs) return false;
+        let isFailed = false;
+        for (const htlc of this.htlcs) {
+            if (
+                htlc.status === 'FAILED' ||
+                htlc.status === lnrpc.HTLCAttempt.HTLCStatus.FAILED
+            ) {
+                isFailed = true;
+                break;
+            }
+        }
+        return isFailed;
+    }
+
     @computed public get getTimestamp(): string | number {
         return this.creation_date || this.created_at || this.timestamp || 0;
     }
@@ -142,7 +174,7 @@ export default class Payment extends BaseModel {
                 const route: any[] = [];
                 if (
                     htlc.status === 'SUCCEEDED' ||
-                    htlc.status === lnrpc.HTLCAttempt.HTLCStatus['SUCCEEDED']
+                    htlc.status === lnrpc.HTLCAttempt.HTLCStatus.SUCCEEDED
                 ) {
                     htlc.route.hops &&
                         htlc.route.hops.forEach((hop: any) => {

diff --git a/stores/ActivityStore.ts b/stores/ActivityStore.ts
@@ -25,6 +25,7 @@ export interface Filter {
     received: boolean;
     unpaid: boolean;
     inTransit: boolean;
+    isFailed: boolean;
     unconfirmed: boolean;
     zeusPay: boolean;
     minimumAmount: number;
@@ -39,6 +40,7 @@ export const DEFAULT_FILTERS = {
     received: true,
     unpaid: true,
     inTransit: false,
+    isFailed: false,
     unconfirmed: true,
     zeusPay: true,
     minimumAmount: 0,
@@ -90,6 +92,7 @@ export default class ActivityStore {
             received: true,
             unpaid: false,
             inTransit: false,
+            isFailed: false,
             unconfirmed: true,
             zeusPay: true,
             minimumAmount: 0,

diff --git a/utils/ActivityFilterUtils.ts b/utils/ActivityFilterUtils.ts
@@ -23,11 +23,7 @@ class ActivityFilterUtils {
 
         if (filter.onChain == false) {
             filteredActivity = filteredActivity.filter(
-                (activity) =>
-                    !(
-                        activity instanceof Transaction &&
-                        Number(activity.getAmount) != 0
-                    )
+                (activity) => !(activity instanceof Transaction)
             );
         }
 
@@ -66,6 +62,13 @@ class ActivityFilterUtils {
             );
         }
 
+        if (filter.isFailed == false) {
+            filteredActivity = filteredActivity.filter(
+                (activity) =>
+                    !(activity instanceof Payment && activity.isFailed)
+            );
+        }
+
         if (filter.unconfirmed == false) {
             filteredActivity = filteredActivity.filter(
                 (activity) =>

diff --git a/views/Activity/Activity.tsx b/views/Activity/Activity.tsx
@@ -278,7 +278,11 @@ export default class Activity extends React.PureComponent<
                                 item.model ===
                                 localeString('views.Payment.title')
                             ) {
-                                displayName = item.isInTransit
+                                displayName = item.isFailed
+                                    ? localeString(
+                                          'views.Payment.failedPayment'
+                                      )
+                                    : item.isInTransit
                                     ? localeString(
                                           'views.Payment.inTransitPayment'
                                       )

diff --git a/views/Activity/ActivityFilter.tsx b/views/Activity/ActivityFilter.tsx
@@ -75,6 +75,7 @@ export default class ActivityFilter extends React.Component<
             received,
             unpaid,
             inTransit,
+            isFailed,
             unconfirmed,
             zeusPay,
             minimumAmount,
@@ -199,7 +200,14 @@ export default class ActivityFilter extends React.Component<
                 value: inTransit,
                 var: 'inTransit',
                 type: 'Toggle',
-                condition: true
+                condition: BackendUtils.isLNDBased()
+            },
+            {
+                label: localeString('views.ActivityFilter.isFailed'),
+                value: isFailed,
+                var: 'isFailed',
+                type: 'Toggle',
+                condition: BackendUtils.isLNDBased()
             },
             {
                 label: 'ZEUS PAY',

diff --git a/views/Payment.tsx b/views/Payment.tsx
@@ -78,7 +78,9 @@ export default class PaymentView extends React.Component<PaymentProps> {
             getPreimage,
             enhancedPath,
             getMemo,
-            isInTransit
+            isIncomplete,
+            isInTransit,
+            isFailed
         } = payment;
         const date = getDisplayTime;
         const noteKey =
@@ -105,7 +107,9 @@ export default class PaymentView extends React.Component<PaymentProps> {
                 <Header
                     leftComponent="Back"
                     centerComponent={{
-                        text: isInTransit
+                        text: isFailed
+                            ? localeString('views.Payment.failedPayment')
+                            : isInTransit
                             ? localeString('views.Payment.inTransitPayment')
                             : localeString('views.Payment.title'),
                         style: {
@@ -185,7 +189,7 @@ export default class PaymentView extends React.Component<PaymentProps> {
                             />
                         )}
 
-                        {getPreimage && !isInTransit && (
+                        {getPreimage && !isIncomplete && (
                             <KeyValue
                                 keyValue={localeString(
                                     'views.Payment.paymentPreimage'