Merge pull request #213 from Elenpay/wallet-balance-in-channel-request

Wallet balance in channel request
Elenpay · Jun 26, 2023 · fce918f · fce918f
2 parents d442601 + 902b16a
commit fce918f
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 32 deletions.
diff --git a/src/Pages/ChannelRequests.razor b/src/Pages/ChannelRequests.razor
@@ -91,34 +91,29 @@
                 </DisplayTemplate>
                 <EditTemplate>
                     <Validation Validator="@ValidationRule.IsSelected" @ref="_walletValidation">
-                        @if (context.CellValue == null || (int)context.CellValue == 0)
-                        {
-                            <SelectList TItem="Wallet"
-                                        TValue="int"
-                                        Data="@_allWallets"
-                                        TextField="@((item) => item.Name)"
-                                        ValueField="@((item) => item.Id)"
-                                        SelectedValueChanged="(id) => OnSelectedWallet(id)"
-                                        DefaultItemText="Choose the wallet">
-                                <Feedback>
-                                    <ValidationError/>
-                                </Feedback>
-                            </SelectList>
-                        }
-                        else
-                        {
-                            <SelectList TItem="Wallet"
-                                        TValue="int"
-                                        Data="@_allWallets"
-                                        TextField="@((item) => item.Name)"
-                                        ValueField="@((item) => item.Id)"
-                                        SelectedValueChanged="(id) => OnSelectedWallet(id)"
-                                        SelectedValue="(int)context.CellValue">
-                                <Feedback>
-                                    <ValidationError/>
-                                </Feedback>
-                            </SelectList>
-                        }
+                        <SelectList TItem="Wallet"
+                                    TValue="int?"
+                                    DefaultItemText="Choose the wallet"
+                                    DefaultItemDisabled
+                                    Data="@_allWallets"
+                                    TextField="@((item) => item.Name)"
+                                    ValueField="@((item) => item.Id)"
+                                    SelectedValueChanged="(id) => OnSelectedWallet(id.Value)"
+                                    SelectedValue="@(_selectedWalletId)">
+                            <Feedback>
+                                <ValidationError/>
+                            </Feedback>
+                        </SelectList>
+                        <FieldHelp>
+                            @if (_selectedWalletId != null)
+                            {
+                                @($"{_selectedWalletBalance:f8} BTC ({Math.Round(PriceConversionHelper.BtcToUsdConversion(_selectedWalletBalance, _btcPrice), 2)} USD)")
+                            }
+                            else
+                            {
+                                @("Wallet not selected")
+                            }
+                        </FieldHelp>
                     </Validation>
                 </EditTemplate>
             </DataGridColumn>
@@ -422,6 +417,7 @@
     private int _selectedSourceNodeId;
     private Node? _selectedDestNode;
     private int? _selectedWalletId;
+    private decimal _selectedWalletBalance;
     private string? _destNodeName;
     private static readonly decimal _minimumChannelCapacity = new Money(Constants.MINIMUM_CHANNEL_CAPACITY_SATS).ToUnit(MoneyUnit.BTC);
     private decimal _amount { get; set; } = _minimumChannelCapacity;
@@ -523,9 +519,12 @@
         _selectedSourceNodeId = nodeId;
     }
 
-    private void OnSelectedWallet(int walletId)
+    private async Task OnSelectedWallet(int walletId)
     {
         _selectedWalletId = walletId == 0 ? null : walletId;
+        var wallet = _allWallets.Find(w => w.Id == _selectedWalletId);
+        var balance = (await LightningService.GetWalletBalance(wallet))?.Available ?? new Money(0);
+        _selectedWalletBalance = ((Money)balance).ToUnit(MoneyUnit.BTC);
     }
 
     private async Task SearchNode()

diff --git a/src/Shared/UTXOSelectorModal.razor b/src/Shared/UTXOSelectorModal.razor
@@ -33,7 +33,12 @@
                             @if (_selectedStrategy == CoinSelectionStrategy.ClosestToTargetFirst)
                             {
                                 <Field>
-                                    <FieldLabel>Target</FieldLabel>
+                                    <FieldLabel Class="d-flex">
+                                        Target
+                                        <Tooltip Text="Order of the UTXOs around how close they are to this target amount" Placement="TooltipPlacement.Right">
+                                            <Icon Class="ml-1" Name="IconName.InfoCircle" TextColor="TextColor.Info"></Icon>
+                                        </Tooltip>
+                                    </FieldLabel>
                                     <NumericPicker TValue="decimal" Min="0" Decimals="8" Step="0.00001m" CurrencySymbol=" BTC" CurrencySymbolPlacement="CurrencySymbolPlacement.Suffix" Disabled="@(_selectedStrategy != CoinSelectionStrategy.ClosestToTargetFirst)" Value="_closestTo" ValueChanged="OnClosestToChanged" Debounce="true"/>
                                     <FieldHelp>
                                         @($"{Math.Round(PriceConversionHelper.BtcToUsdConversion(_closestTo, _btcPrice), 2)} USD")
@@ -47,14 +52,24 @@
                             @if (!_isManualSelection)
                             {
                                 <Field>
-                                    <FieldLabel>Amount</FieldLabel>
+                                    <FieldLabel Class="d-flex">
+                                        Amount
+                                        <Tooltip Text="The total amount to reach by adding the selected UTXOs" Placement="TooltipPlacement.Right">
+                                            <Icon Class="ml-1" Name="IconName.InfoCircle" TextColor="TextColor.Info"></Icon>
+                                        </Tooltip>
+                                    </FieldLabel>
                                     <NumericPicker TValue="decimal" Min="0" Decimals="8" Step="0.00001m" CurrencySymbol=" BTC" CurrencySymbolPlacement="CurrencySymbolPlacement.Suffix" Value="_amount" ValueChanged="OnAmountChanged" Debounce="true"/>
                                     <FieldHelp>
                                         @($"{Math.Round(PriceConversionHelper.BtcToUsdConversion(_amount, _btcPrice), 2)} USD")
                                     </FieldHelp>
                                 </Field>
                                 <Field>
-                                    <FieldLabel>Limit</FieldLabel>
+                                    <FieldLabel Class="d-flex">
+                                        Limit
+                                        <Tooltip Text="The maximum number of UTXOs allowed to use" Placement="TooltipPlacement.Right">
+                                            <Icon Class="ml-1" Name="IconName.InfoCircle" TextColor="TextColor.Info"></Icon>
+                                        </Tooltip>
+                                    </FieldLabel>
                                     <NumericPicker TValue="int" Min="0" CurrencySymbol=" UTXOs" CurrencySymbolPlacement="CurrencySymbolPlacement.Suffix" Value="_limit" ValueChanged="OnLimitChanged" Debounce="true"/>
                                 </Field>
                             }