use isConfirmed instead of num_confirmations to make filter work with…

… CLN
ZeusLN · Nov 22, 2023 · 9b7e623 · 9b7e623
1 parent 9fe7183
commit 9b7e623
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/utils/ActivityFilterUtils.test.ts b/utils/ActivityFilterUtils.test.ts
@@ -136,14 +136,28 @@ describe('ActivityFilterUtils', () => {
                 ).toString(),
                 num_confirmations: 0
             }),
+            new Transaction({
+                amount: 3,
+                time_stamp: (
+                    new Date(2000, 1, 2, 3, 4, 4).getTime() / 1000
+                ).toString(),
+                status: 'confirmed'
+            }),
+            new Transaction({
+                amount: 4,
+                time_stamp: (
+                    new Date(2000, 1, 2, 3, 4, 4).getTime() / 1000
+                ).toString(),
+                status: 'unconfirmed'
+            }),
             new Invoice({
-                value: '3',
+                value: '5',
                 creation_date: (
                     new Date(2000, 1, 1, 3, 4, 5).getTime() / 1000
                 ).toString()
             }),
             new Payment({
-                value: '4',
+                value: '6',
                 creation_date: (
                     new Date(2000, 1, 1, 3, 4, 5).getTime() / 1000
                 ).toString()
@@ -159,8 +173,9 @@ describe('ActivityFilterUtils', () => {
 
         expect(filteredActivities.map((a) => a.getAmount)).toEqual([
             '1',
-            3,
-            '4'
+            '3',
+            5,
+            '6'
         ]);
     });
 

diff --git a/utils/ActivityFilterUtils.ts b/utils/ActivityFilterUtils.ts
@@ -68,8 +68,7 @@ class ActivityFilterUtils {
         if (filter.unconfirmed == false) {
             filteredActivity = filteredActivity.filter(
                 (activity) =>
-                    !(activity instanceof Transaction) ||
-                    activity.num_confirmations > 0
+                    !(activity instanceof Transaction) || activity.isConfirmed
             );
         }