From 16db4abdac64bfb74e412648ad71befa8055a9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20A=2EP?=
 <53834183+Jossec101@users.noreply.github.com>
Date: Thu, 26 Feb 2026 18:55:21 +0100
Subject: [PATCH] Fix loading data on channel requests + various UI fixes

- Update page title from "Channel Operation Requests" to "Channel Requests"
- Add page heading with custom styling
- Reorder filter columns for better user experience
- Change "User" label to "Requestor" for clarity
- Adjust column sizes for improved layout balance
---
 src/Pages/ChannelRequests.razor | 104 ++++++++++++++++++--------------
 src/Pages/Withdrawals.razor     |   4 +-
 2 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/src/Pages/ChannelRequests.razor b/src/Pages/ChannelRequests.razor
index 5ef5dcca..acf4b3ee 100644
--- a/src/Pages/ChannelRequests.razor
+++ b/src/Pages/ChannelRequests.razor
@@ -11,8 +11,8 @@
 @using NodeGuard.Helpers;
 @attribute [Authorize(Roles = "FinanceManager, Superadmin, NodeManager")]
 
-<PageTitle>Channel Operation Requests</PageTitle>
-
+<PageTitle>Channel Requests</PageTitle>
+<h3 class="custom-primary">Channel Requests</h3>
 @if (_isFinanceManager || _isNodeManager)
 {
     <Field Flex="Flex.JustifyContent.Between">
@@ -289,38 +289,6 @@
 </h3>
 <br/>
 <Row Class="mb-3" @key="_filtersResetKey">
-    <Column ColumnSize="ColumnSize.Is1">
-        <Field>
-            <FieldLabel>Status</FieldLabel>
-            <Autocomplete TItem="ChannelOperationRequestStatus?"
-                          TValue="ChannelOperationRequestStatus?"
-                          Data="@_statusOptions"
-                          TextField="@(item => item?.Humanize() ?? "All")"
-                          ValueField="@(item => item)"
-                          @bind-SelectedValue="@_statusFilter"
-                          @bind-SelectedValue:after="OnFiltersChanged"
-                          Placeholder="All"
-                          FreeTyping="false"
-                          MinLength="0"
-                          Filter="AutocompleteFilter.Contains" />
-        </Field>
-    </Column>
-    <Column ColumnSize="ColumnSize.Is1">
-        <Field>
-            <FieldLabel>Type</FieldLabel>
-            <Autocomplete TItem="OperationRequestType?"
-                          TValue="OperationRequestType?"
-                          Data="@_requestTypeOptions"
-                          TextField="@(item => item?.Humanize() ?? "All")"
-                          ValueField="@(item => item)"
-                          @bind-SelectedValue="@_requestTypeFilter"
-                          @bind-SelectedValue:after="OnFiltersChanged"
-                          Placeholder="All"
-                          FreeTyping="false"
-                          MinLength="0"
-                          Filter="AutocompleteFilter.Contains" />
-        </Field>
-    </Column>
     <Column ColumnSize="ColumnSize.Is2">
         <Field>
             <FieldLabel>Source Node</FieldLabel>
@@ -353,7 +321,7 @@
                           Filter="AutocompleteFilter.Contains" />
         </Field>
     </Column>
-    <Column ColumnSize="ColumnSize.Is2">
+    <Column ColumnSize="ColumnSize.Is1">
         <Field>
             <FieldLabel>Wallet</FieldLabel>
             <Autocomplete TItem="Wallet"
@@ -371,7 +339,7 @@
     </Column>
     <Column ColumnSize="ColumnSize.Is1">
         <Field>
-            <FieldLabel>User</FieldLabel>
+            <FieldLabel>Requestor</FieldLabel>
             <Autocomplete TItem="ApplicationUser"
                           TValue="string?"
                           Data="@_availableUsers"
@@ -385,6 +353,38 @@
                           Filter="AutocompleteFilter.Contains" />
         </Field>
     </Column>
+    <Column ColumnSize="ColumnSize.Is2">
+        <Field>
+            <FieldLabel>Status</FieldLabel>
+            <Autocomplete TItem="ChannelOperationRequestStatus?"
+                          TValue="ChannelOperationRequestStatus?"
+                          Data="@_statusOptions"
+                          TextField="@(item => item?.Humanize() ?? "All")"
+                          ValueField="@(item => item)"
+                          @bind-SelectedValue="@_statusFilter"
+                          @bind-SelectedValue:after="OnFiltersChanged"
+                          Placeholder="All"
+                          FreeTyping="false"
+                          MinLength="0"
+                          Filter="AutocompleteFilter.Contains" />
+        </Field>
+    </Column>
+    <Column ColumnSize="ColumnSize.Is1">
+        <Field>
+            <FieldLabel>Type</FieldLabel>
+            <Autocomplete TItem="OperationRequestType?"
+                          TValue="OperationRequestType?"
+                          Data="@_requestTypeOptions"
+                          TextField="@(item => item?.Humanize() ?? "All")"
+                          ValueField="@(item => item)"
+                          @bind-SelectedValue="@_requestTypeFilter"
+                          @bind-SelectedValue:after="OnFiltersChanged"
+                          Placeholder="All"
+                          FreeTyping="false"
+                          MinLength="0"
+                          Filter="AutocompleteFilter.Contains" />
+        </Field>
+    </Column>
     <Column ColumnSize="ColumnSize.Is1">
         <Field>
             <FieldLabel>From</FieldLabel>
@@ -403,15 +403,18 @@
         </Button>
     </Column>
 </Row>
-@* TODO: Convert this grid to paginated ReadData to avoid loading all records in memory. *@
 <DataGrid TItem="ChannelOperationRequest"
           @ref="@_allRequestsDatagrid"
           Data="@_allRequests"
           ReadData="@OnAllRequestsReadData"
           TotalItems="@_totalAllRequests"
+          Responsive="true"
+          ResizeMode="TableResizeMode.Columns"
           ShowPager="true"
           ShowPageSizes="true"
-          Striped="true">
+          Striped="true"
+          Narrow="true"
+          PageSize="@_allRequestsPageSize">
     <ChildContent>
         <DataGridColumn TItem="ChannelOperationRequest" Field="@nameof(ChannelOperationRequest.Id)" Caption="#" Sortable="false" Displayable="true"/>
         <DataGridColumn TItem="ChannelOperationRequest" Field="SourceNode.Name" Caption="Source Node" Sortable="false" Displayable="@IsAllRequestsColumnVisible(AllChannelsColumnName.SourceNode)"/>
@@ -430,7 +433,7 @@
                  }
             </DisplayTemplate>
         </DataGridColumn>
-        <DataGridColumn TItem="ChannelOperationRequest" Field="Wallet.Name" Caption="Source of Funds" Sortable="false" Displayable="@IsAllRequestsColumnVisible(AllChannelsColumnName.SourceOfFunds)"/>
+        <DataGridColumn TItem="ChannelOperationRequest" Field="Wallet.Name" Caption="Wallet" Sortable="false" Displayable="@IsAllRequestsColumnVisible(AllChannelsColumnName.SourceOfFunds)"/>
         <DataGridColumn TItem="ChannelOperationRequest" Field="@nameof(ChannelOperationRequest.Amount)" Caption="Capacity" Sortable="false" Displayable="@IsAllRequestsColumnVisible(AllChannelsColumnName.Capacity)">
             <DisplayTemplate>
                 @{
@@ -577,8 +580,9 @@
 
 @code {
     private List<ChannelOperationRequest>? _channelRequests;
-    private List<ChannelOperationRequest>? _allRequests;
+    private List<ChannelOperationRequest> _allRequests = new();
     private int _totalAllRequests;
+    private const int _allRequestsPageSize = 25;
     private List<ApplicationUser> _availableUsers = new();
     private List<Node> _availableNodes = new();
     
@@ -748,8 +752,6 @@
     {
         if (LoggedUser == null) return;
 
-        _allRequests = await ChannelOperationRequestRepository.GetAll();
-
         if (_isFinanceManager)
         {
             _channelRequests = await ChannelOperationRequestRepository.GetUnsignedPendingRequestsByUser(LoggedUser.Id);
@@ -758,7 +760,10 @@
         {
             _channelRequests = await ChannelOperationRequestRepository.GetPendingRequests();
         }
-        _allRequests = _allRequests.Except(_channelRequests ?? new List<ChannelOperationRequest>()).ToList();
+        else
+        {
+            _channelRequests = new();
+        }
     }
 
     #region New Request Integration
@@ -895,6 +900,7 @@
         }
         await LoadData();
         await FetchRequests();
+        await ReloadAllRequestsGrid();
     }
 
     #endregion
@@ -954,6 +960,7 @@
                     _selectedRequest.Id.ToString(),
                     new { RequestId = _selectedRequest.Id, Status = _selectedStatus, Reason = _selectedRequest.ClosingReason, Description = $"Channel operation request {_selectedStatus.ToString().ToLower()}" });
                 await FetchRequests();
+                await ReloadAllRequestsGrid();
             }
         }
         else
@@ -1046,6 +1053,7 @@
             }
 
             await FetchRequests();
+            await ReloadAllRequestsGrid();
             await _psbtSignRef.HideModal();
             StateHasChanged();
         }
@@ -1118,6 +1126,7 @@
                 _utxoSelectorModalRef.ClearModal();
                 await _approveOperationConfirmationModal.CloseModal();
                 await FetchRequests();
+                await ReloadAllRequestsGrid();
                 StateHasChanged();
                 return;
             }
@@ -1137,6 +1146,7 @@
 
 
             await FetchRequests();
+            await ReloadAllRequestsGrid();
             _utxoSelectorModalRef.ClearModal();
             await _approveOperationConfirmationModal.CloseModal();
         }
@@ -1206,6 +1216,7 @@
         {
             await MarkRequestAsFailedCloseConfirmationModal();
             await FetchRequests();
+            await ReloadAllRequestsGrid();
         }
     }
 
@@ -1280,11 +1291,16 @@
     private async Task RefreshChannelRequestsInformation()
     {
         await FetchRequests();
+        await ReloadAllRequestsGrid();
+        StateHasChanged();
+    }
+
+    private async Task ReloadAllRequestsGrid()
+    {
         if (_allRequestsDatagrid != null)
         {
             await _allRequestsDatagrid.Reload();
         }
-        StateHasChanged();
     }
     
     private async Task OnAllRequestsReadData(DataGridReadDataEventArgs<ChannelOperationRequest> e)
diff --git a/src/Pages/Withdrawals.razor b/src/Pages/Withdrawals.razor
index cd3b0171..0d3b357c 100644
--- a/src/Pages/Withdrawals.razor
+++ b/src/Pages/Withdrawals.razor
@@ -22,7 +22,7 @@
 @if (_isFinanceManager)
 {
     <Column ColumnSize="ColumnSize.Is12">
-    <h3>Withdrawal requests awaiting my signature</h3>
+    <h3>Requests awaiting my signature</h3>
     @* TODO: Convert this grid to paginated ReadData to avoid loading all records in memory. *@
     <DataGrid TItem="WalletWithdrawalRequest"
               Data="@_userPendingRequests"
@@ -274,7 +274,7 @@
 }
 
 <Column ColumnSize="ColumnSize.Is12">
-    <h3>Withdrawal requests</h3>
+    <h3>Requests</h3>
     <Row Class="mb-3" @key="_filtersResetKey">
         <Column ColumnSize="ColumnSize.Is2">
             <Field>