From 20632b6ac376f8706a0d39f8b1ecd02ae21f5aa4 Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Tue, 25 Oct 2022 18:24:43 -0700
Subject: [PATCH] lnd closed channels page layout

---
 .../channel-closed-table.component.html       | 37 ++++++++++++++++++-
 .../channel-closed-table.component.scss       |  3 +-
 src/app/shared/models/lndModels.ts            |  2 +
 .../shared/services/consts-enums-functions.ts |  4 +-
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html
index eb8f36e1..804475c5 100644
--- a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html
+++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html
@@ -21,8 +21,41 @@
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Peer </th>
         <td mat-cell *matCellDef="let channel" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : '20rem'}"> {{channel.remote_alias}} </td>
       </ng-container>
+      <ng-container matColumnDef="remote_pubkey">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Pubkey </th>
+        <td mat-cell *matCellDef="let channel" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : '20rem'}"> {{channel.remote_pubkey}} </td>
+      </ng-container>
+      <ng-container matColumnDef="channel_point">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel Point </th>
+        <td mat-cell *matCellDef="let channel" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : '20rem'}"> {{channel.channel_point}} </td>
+      </ng-container>
+      <ng-container matColumnDef="chan_id">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Channel Id </th>
+        <td mat-cell *matCellDef="let channel" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : '20rem'}"> {{channel.chan_id}} </td>
+      </ng-container>
+      <ng-container matColumnDef="closing_tx_hash">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Closing Tx Hash </th>
+        <td mat-cell *matCellDef="let channel" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : '20rem'}"> {{channel.closing_tx_hash}} </td>
+      </ng-container>
+      <ng-container matColumnDef="chain_hash">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Chain Hash </th>
+        <td mat-cell *matCellDef="let channel" [ngStyle]="{'max-width': (screenSize === screenSizeEnum.XS) ? '10rem' : '20rem'}"> {{channel.chain_hash}} </td>
+      </ng-container>
+      <ng-container matColumnDef="open_initiator">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Open Initiator </th>
+        <td mat-cell *matCellDef="let channel"> {{channel.open_initiator | camelcaseWithReplace:'initiator_'}} </td>
+      </ng-container>
+      <ng-container matColumnDef="close_initiator">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Close Initiator </th>
+        <td mat-cell *matCellDef="let channel"> {{channel.close_initiator | camelcaseWithReplace:'initiator_'}} </td>
+      </ng-container>
+      <ng-container matColumnDef="time_locked_balance">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before"> Timelocked Balance (Sats) </th>
+        <td mat-cell *matCellDef="let channel"><span fxLayoutAlign="end center"> {{channel.time_locked_balance | number}} </span>
+        </td>
+      </ng-container>
       <ng-container matColumnDef="capacity">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before"> Capacity </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before"> Capacity (Sats) </th>
         <td mat-cell *matCellDef="let channel"><span fxLayoutAlign="end center"> {{channel.capacity | number}} </span>
         </td>
       </ng-container>
@@ -32,7 +65,7 @@
           </span></td>
       </ng-container>
       <ng-container matColumnDef="settled_balance">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before"> Settled Balance </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header arrowPosition="before"> Settled Balance (Sats) </th>
         <td mat-cell *matCellDef="let channel"><span fxLayoutAlign="end center"> {{channel.settled_balance | number}}
           </span></td>
       </ng-container>
diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.scss b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.scss
index f680cc76..760c785f 100644
--- a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.scss
+++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.scss
@@ -3,7 +3,8 @@
   min-width: 5rem;
 }
 
-.mat-column-remote_alias {
+.mat-column-remote_alias, .mat-column-remote_pubkey, .mat-column-channel_point,
+.mat-column-chan_id, .mat-column-closing_tx_hash, .mat-column-chain_hash {
   flex: 1 1 20%;
   white-space: nowrap;
   overflow: hidden;  
diff --git a/src/app/shared/models/lndModels.ts b/src/app/shared/models/lndModels.ts
index bbb0c31b..eaeca307 100644
--- a/src/app/shared/models/lndModels.ts
+++ b/src/app/shared/models/lndModels.ts
@@ -150,6 +150,8 @@ export interface ClosedChannel {
   remote_pubkey?: string;
   capacity?: string;
   settled_balance?: string;
+  open_initiator?: string;
+  close_initiator?: string;
 }
 
 export interface NodeAddress {
diff --git a/src/app/shared/services/consts-enums-functions.ts b/src/app/shared/services/consts-enums-functions.ts
index 19b1fdd8..ad8cf06c 100644
--- a/src/app/shared/services/consts-enums-functions.ts
+++ b/src/app/shared/services/consts-enums-functions.ts
@@ -966,8 +966,8 @@ export const LND_TABLES_DEF = {
       allowedColumns: ['remote_alias', 'remote_node_pub', 'channel_point', 'initiator', 'commitment_type', 'limbo_balance', 'capacity', 'local_balance', 'remote_balance']
     },
     closed: {
-      maxColumns: 5,
-      allowedColumns: ['close_type', 'remote_alias', 'capacity', 'close_height', 'settled_balance']
+      maxColumns: 7,
+      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,