LSPS1: Filter orders according to backend

ZeusLN · May 22, 2024 · 0a32a76 · 0a32a76
1 parent f9ea1db
commit 0a32a76
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 2 deletions.
diff --git a/views/Settings/LSPS1/OrdersPane.tsx b/views/Settings/LSPS1/OrdersPane.tsx
@@ -12,6 +12,7 @@ import LoadingIndicator from '../../../components/LoadingIndicator';
 
 import { themeColor } from '../../../utils/ThemeUtils';
 import { localeString } from '../../../utils/LocaleUtils';
+import BackendUtils from '../../../utils/BackendUtils';
 
 import LSPStore from '../../../stores/LSPStore';
 import { WarningMessage } from '../../../components/SuccessErrorMessage';
@@ -65,8 +66,20 @@ export default class OrdersPane extends React.Component<
                         JSON.parse(response)
                     );
 
-                    // Extract required information from each order for display
-                    const orders = decodedResponses.map((response) => ({
+                    let selectedOrders;
+                    if (BackendUtils.supportsLSPS1customMessage()) {
+                        selectedOrders = decodedResponses.filter(
+                            (response) => response?.uri
+                        );
+                    } else if (BackendUtils.supportsLSPS1rest()) {
+                        selectedOrders = decodedResponses.filter(
+                            (response) => response?.endpoint
+                        );
+                    } else {
+                        selectedOrders = decodedResponses;
+                    }
+
+                    const orders = selectedOrders.map((response) => ({
                         orderId:
                             response?.order?.result?.order_id ||
                             response?.order?.order_id,

diff --git a/views/Settings/LSPS1/test.json b/views/Settings/LSPS1/test.json
@@ -0,0 +1,60 @@
+[
+    {
+        "order": {
+            "id": "dec6a5f4-c39e-4c45-9fc9-0d8bb9f189f2",
+            "jsonrpc": "2.0",
+            "result": [Object
+            ]
+        },
+        "peer": "03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df",
+        "uri": "03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df@139.144.22.237:9735"
+    },
+    {
+        "order": {
+            "id": "80644820-364b-4765-bae5-f28456142ac8",
+            "jsonrpc": "2.0",
+            "result": [Object
+            ]
+        },
+        "peer": "03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df",
+        "uri": "03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df@139.144.22.237:9735"
+    },
+    {
+        "order": {
+            "id": "70ec06af-05ec-4262-98f1-67823025f3ba",
+            "jsonrpc": "2.0",
+            "result": [Object
+            ]
+        },
+        "peer": "03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df",
+        "uri": "03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df@139.144.22.237:9735"
+    },
+    {
+        "order": {
+            "id": "1472353e-ec73-4640-b44f-77ed000a4426",
+            "jsonrpc": "2.0",
+            "result": [Object
+            ]
+        },
+        "peer": "03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df",
+        "uri": "03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df@139.144.22.237:9735"
+    },
+    {
+        "endpoint": "https://testnet-lsps1.lnolymp.us",
+        "order": {
+            "announce_channel": false,
+            "channel": null,
+            "channel_expiry_blocks": 13000,
+            "client_balance_sat": "0",
+            "created_at": "2024-05-22T12:42:59.965Z",
+            "expires_at": "2024-05-22T13:42:59.941Z",
+            "funding_confirms_within_blocks": 6,
+            "lsp_balance_sat": "1000000",
+            "order_id": "c24fae7859ba5097d89006629e3b71ed",
+            "order_state": "FAILED",
+            "payment": [Object
+            ],
+            "token": ""
+        }
+    }
+]