From 4a9689fecac9f50571b66eaabdf23f5c96b3b61f Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Tue, 25 Oct 2022 18:37:43 -0700
Subject: [PATCH] lnd all peers channels page layout

---
 .../channel-active-htlcs-table.component.html | 37 +++++++++++++++++++
 .../channel-active-htlcs-table.component.scss | 12 +++---
 src/app/shared/models/lndModels.ts            |  3 ++
 .../shared/services/consts-enums-functions.ts |  4 +-
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.html
index 885e380a..37eaeb03 100644
--- a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.html
+++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.html
@@ -33,6 +33,43 @@
           </ng-container>
         </td>
       </ng-container>
+      <ng-container matColumnDef="forwarding_channel">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Forwarding Channel</th>
+        <td mat-cell *matCellDef="let channel">
+          <span fxLayoutAlign="start center" class="htlc-row-span">{{' '}}</span>
+          <ng-container *ngIf="channel.is_expanded">
+            <span *ngFor="let htlc of channel?.pending_htlcs" fxLayoutAlign="start center" class="htlc-row-span">
+              {{htlc?.forwarding_channel}}
+            </span>
+          </ng-container>
+        </td>
+      </ng-container>
+      <ng-container matColumnDef="htlc_index">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before">
+          <span fxLayoutAlign="end center" class="htlc-row-span">HTLC Index</span>
+        </th>
+        <td mat-cell *matCellDef="let channel">
+          <span fxLayoutAlign="end center" class="htlc-row-span">{{' '}}</span>
+          <span *ngIf="channel.is_expanded">
+            <span *ngFor="let htlc of channel?.pending_htlcs" fxLayoutAlign="end center" class="htlc-row-span">
+              {{htlc?.htlc_index | number}}
+            </span>
+          </span>
+        </td>
+      </ng-container>
+      <ng-container matColumnDef="forwarding_htlc_index">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before">
+          <span fxLayoutAlign="end center" class="htlc-row-span">Forwarding HTLC Index</span>
+        </th>
+        <td mat-cell *matCellDef="let channel">
+          <span fxLayoutAlign="end center" class="htlc-row-span">{{' '}}</span>
+          <span *ngIf="channel.is_expanded">
+            <span *ngFor="let htlc of channel?.pending_htlcs" fxLayoutAlign="end center" class="htlc-row-span">
+              {{htlc?.forwarding_htlc_index | number}}
+            </span>
+          </span>
+        </td>
+      </ng-container>
       <ng-container matColumnDef="expiration_height">
         <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before">
           <span fxLayoutAlign="end center" class="htlc-row-span">Expiration Height</span>
diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss
index 7c4d3ffc..a8e90fdb 100644
--- a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss
+++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss
@@ -1,11 +1,11 @@
-.mat-column-amount, .mat-column-expiration_height {
-  flex: 0 0 30%;
-  width: 30%;
+.mat-column-amount, .mat-column-expiration_height, .mat-column-htlc_index, .mat-column-forwarding_htlc_index {
+  flex: 0 0 10%;
+  width: 10%;
 }
 
-.mat-column-incoming, .mat-column-hash_lock {
-  flex: 0 0 25%;
-  width: 25%;
+.mat-column-incoming, .mat-column-hash_lock, .mat-column-forwarding_channel {
+  flex: 0 0 15%;
+  width: 15%;
   text-overflow: ellipsis;
 }
 
diff --git a/src/app/shared/models/lndModels.ts b/src/app/shared/models/lndModels.ts
index eaeca307..db4a6ec1 100644
--- a/src/app/shared/models/lndModels.ts
+++ b/src/app/shared/models/lndModels.ts
@@ -40,6 +40,9 @@ export interface ChannelHTLC {
   amount?: string;
   hash_lock?: string;
   expiration_height?: number;
+  htlc_index?: number;
+  forwarding_channel?: string;
+  forwarding_htlc_index?: number;
 }
 
 export interface ChannelsSummary {
diff --git a/src/app/shared/services/consts-enums-functions.ts b/src/app/shared/services/consts-enums-functions.ts
index ad8cf06c..1543cb12 100644
--- a/src/app/shared/services/consts-enums-functions.ts
+++ b/src/app/shared/services/consts-enums-functions.ts
@@ -970,8 +970,8 @@ export const LND_TABLES_DEF = {
       allowedColumns: ['close_type', 'remote_alias', 'remote_pubkey', 'channel_point', 'chan_id', 'closing_tx_hash', 'chain_hash', 'open_initiator', 'close_initiator', 'time_locked_balance', 'capacity', 'close_height', 'settled_balance']
     },
     active_HTLCs: {
-      maxColumns: 4,
-      allowedColumns: ['amount', 'incoming', 'expiration_height', 'hash_lock']
+      maxColumns: 7,
+      allowedColumns: ['amount', 'incoming', 'forwarding_channel', 'htlc_index', 'forwarding_htlc_index', 'expiration_height', 'hash_lock']
     },
     peers: {
       maxColumns: 8,