Merge pull request #1762 from kaloudis/in-transit

Activity: display In Transit Payments
ZeusLN · Oct 16, 2023 · 127a5bf · 127a5bf
2 parents 66e1063 + 1cf70fd
commit 127a5bf
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 10 deletions.
diff --git a/backends/LND.ts b/backends/LND.ts
@@ -252,7 +252,7 @@ export default class LND {
                 ? Base64Utils.hexToBase64(data.preimage)
                 : undefined
         });
-    getPayments = () => this.getRequest('/v1/payments');
+    getPayments = () => this.getRequest('/v1/payments?include_incomplete=true');
     getNewAddress = (data: any) => this.getRequest('/v1/newaddress', data);
     openChannel = (data: OpenChannelRequest) =>
         this.postRequest(

diff --git a/backends/LightningNodeConnect.ts b/backends/LightningNodeConnect.ts
@@ -135,7 +135,9 @@ export default class LightningNodeConnect {
             .then((data: lnrpc.AddInvoiceResponse) => snakeize(data));
     getPayments = async () =>
         await this.lnc.lnd.lightning
-            .listPayments({})
+            .listPayments({
+                include_incomplete: true
+            })
             .then((data: lnrpc.ListPaymentsResponse) => snakeize(data));
     getNewAddress = async (data: any) =>
         await this.lnc.lnd.lightning

diff --git a/lndmobile/index.ts b/lndmobile/index.ts
@@ -625,7 +625,9 @@ export const listPayments = async (): Promise<lnrpc.ListPaymentsResponse> => {
         request: lnrpc.ListPaymentsRequest,
         response: lnrpc.ListPaymentsResponse,
         method: 'ListPayments',
-        options: {}
+        options: {
+            include_incomplete: true
+        }
     });
     return response;
 };

diff --git a/locales/en.json b/locales/en.json
@@ -471,6 +471,7 @@
     "views.OpenChannel.satsPerVbyte": "Satoshis per vByte",
     "views.OpenChannel.private": "Private",
     "views.Payment.title": "Payment",
+    "views.Payment.inTransitPayment": "In Transit Payment",
     "views.Payment.fee": "Fee",
     "views.Payment.paymentHash": "Payment Hash",
     "views.Payment.paymentPreimage": "Payment Preimage",

diff --git a/models/Payment.ts b/models/Payment.ts
@@ -63,6 +63,13 @@ export default class Payment extends BaseModel {
         return this.preimage || this.payment_preimage;
     }
 
+    @computed public get isInTransit(): boolean {
+        return (
+            this.getPreimage ===
+            '0000000000000000000000000000000000000000000000000000000000000000'
+        );
+    }
+
     @computed public get getTimestamp(): string | number {
         return this.creation_date || this.created_at || this.timestamp || 0;
     }

diff --git a/views/Activity/Activity.tsx b/views/Activity/Activity.tsx
@@ -278,9 +278,11 @@ export default class Activity extends React.PureComponent<
                                 item.model ===
                                 localeString('views.Payment.title')
                             ) {
-                                displayName = localeString(
-                                    'views.Activity.youSent'
-                                );
+                                displayName = item.isInTransit
+                                    ? localeString(
+                                          'views.Payment.inTransitPayment'
+                                      )
+                                    : localeString('views.Activity.youSent');
                                 subTitle = item.memo
                                     ? `${localeString('general.lightning')}: ${
                                           item.memo

diff --git a/views/Payment.tsx b/views/Payment.tsx
@@ -77,7 +77,8 @@ export default class PaymentView extends React.Component<PaymentProps> {
             payment_hash,
             getPreimage,
             enhancedPath,
-            getMemo
+            getMemo,
+            isInTransit
         } = payment;
         const date = getDisplayTime;
         const noteKey =
@@ -102,7 +103,9 @@ export default class PaymentView extends React.Component<PaymentProps> {
                 <Header
                     leftComponent="Back"
                     centerComponent={{
-                        text: localeString('views.Payment.title'),
+                        text: isInTransit
+                            ? localeString('views.Payment.inTransitPayment')
+                            : localeString('views.Payment.title'),
                         style: {
                             color: themeColor('text'),
                             fontFamily: 'Lato-Regular'
@@ -119,6 +122,7 @@ export default class PaymentView extends React.Component<PaymentProps> {
                             jumboText
                             sensitive
                             toggleable
+                            pending={isInTransit}
                         />
                     </View>
 
@@ -178,7 +182,7 @@ export default class PaymentView extends React.Component<PaymentProps> {
                             />
                         )}
 
-                        {getPreimage && (
+                        {getPreimage && !isInTransit && (
                             <KeyValue
                                 keyValue={localeString(
                                     'views.Payment.paymentPreimage'
@@ -198,7 +202,7 @@ export default class PaymentView extends React.Component<PaymentProps> {
                             />
                         )}
 
-                        {enhancedPath.length > 0 && (
+                        {enhancedPath.length > 0 && enhancedPath[0][0] && (
                             <ListItem
                                 containerStyle={{
                                     borderBottomWidth: 0,