diff --git a/src/Angor/Client/Pages/Settings.razor b/src/Angor/Client/Pages/Settings.razor index b48b1972..674847f6 100644 --- a/src/Angor/Client/Pages/Settings.razor +++ b/src/Angor/Client/Pages/Settings.razor @@ -1,9 +1,4 @@ @page "/settings" -@using Angor.Client.Storage; -@using Angor.Shared -@using Angor.Shared.Models; -@using Angor.Client.Services -@using Angor.Shared.Services @inject INetworkConfiguration _networkConfiguration @inject INetworkService _networkService @@ -13,9 +8,12 @@ @inject NavMenuState NavMenuState @inject ILogger Logger; @inject NavigationManager _navManager - +@using Angor.Client.Storage +@using Angor.Shared +@using Angor.Shared.Models +@using Angor.Shared.Services @inherits BaseComponent - + @* Settings *@
@@ -23,7 +21,7 @@
- +
@@ -70,7 +68,7 @@
- +
@@ -117,7 +115,7 @@
-
+
@@ -188,40 +186,42 @@
- - - - - - + + + + + + - @foreach (var indexer in settingsInfo.Indexers) - { - - - - - - - } + @foreach (var indexer in settingsInfo.Indexers) + { + + + + + + + }
LinkStatusDefault
LinkStatusDefault
@indexer.Url@indexer.Status.ToString() - @if (indexer.IsPrimary) - { - - - - } - else - { - - - - } - - -
+ @indexer.Url + @indexer.Status.ToString() + @if (indexer.IsPrimary) + { + + + + } + else + { + + + + } + + +
@@ -260,44 +260,46 @@
- - - - - - - + + + + + + + - @foreach (var relay in settingsInfo.Relays) - { - - - - - - - - } + @foreach (var relay in settingsInfo.Relays) + { + + + + + + + + }
LinkNameStatusDefault
LinkNameStatusDefault
@relay.Url@relay.Name - @relay.Status.ToString() - - @if (relay.IsPrimary) - { - - - - } - else - { - - - - } - - -
+ @relay.Url + @relay.Name + @relay.Status.ToString() + + @if (relay.IsPrimary) + { + + + + } + else + { + + + + } + + +
@@ -338,6 +340,39 @@ + +
+
+
+
+ + + +
+
+ WebSocket Services +
+

Select a WebSocket service for real-time cryptocurrency updates.

+
+
+
+ + + + + +
+
Currently Selected WebSocket Service:
+

@selectedWebSocketUrl

+
+
+
+ @* Wipe Storage *@
@@ -369,7 +404,7 @@
- +
@@ -417,18 +452,20 @@ private string newRelayLink; private string networkType; - private bool refreshSpinner = false; + private bool refreshSpinner; - private bool showWipeallModal = false; - private bool showChangeNetworkModal = false; + private bool showWipeallModal; + private bool showChangeNetworkModal; - private bool confirmWipe = false; - private bool showConfirmWipeMessage = false; + private bool confirmWipe; + private bool showConfirmWipeMessage; private string selectedNetwork = "testnet"; // Default to "testnet" - + private string currencyDisplaySetting = "BTC"; // Default to BTC + private string selectedWebSocketUrl; + private SettingsInfo settingsInfo; protected override Task OnInitializedAsync() @@ -440,12 +477,14 @@ networkType = _networkConfiguration.GetNetwork().Name; _networkService.OnStatusChanged += UpdateUI; - - currencyDisplaySetting = _clientStorage.GetCurrencyDisplaySetting(); + + currencyDisplaySetting = _clientStorage.GetCurrencyDisplaySetting(); + + selectedWebSocketUrl = settingsInfo.SelectedWebSocketUrl; if (!networkType.ToLower().Contains("test")) selectedNetwork = "mainnet"; - + return base.OnInitializedAsync(); } @@ -472,7 +511,7 @@ { if (!string.IsNullOrWhiteSpace(newIndexerLink)) { - if (!Uri.TryCreate(newIndexerLink, UriKind.Absolute, out Uri? uri)) + if (!Uri.TryCreate(newIndexerLink, UriKind.Absolute, out var uri)) { notificationComponent.ShowErrorMessage($"invalid url {newIndexerLink}"); return; @@ -504,7 +543,7 @@ { if (!string.IsNullOrWhiteSpace(newRelayLink)) { - if (!Uri.TryCreate(newRelayLink, UriKind.Absolute, out Uri? uri)) + if (!Uri.TryCreate(newRelayLink, UriKind.Absolute, out var uri)) { notificationComponent.ShowErrorMessage($"invalid url {newRelayLink}"); return; @@ -546,7 +585,6 @@ } _clientStorage.SetSettingsInfo(settingsInfo); - } } @@ -687,7 +725,7 @@ NavMenuState.NotifyStateChanged(); } - + private async Task OnCurrencyDisplaySettingChanged(ChangeEventArgs e) { currencyDisplaySetting = e.Value.ToString(); @@ -695,4 +733,17 @@ StateHasChanged(); } + private void OnWebSocketUrlChanged() + { + settingsInfo.SelectedWebSocketUrl = selectedWebSocketUrl; + _clientStorage.SetSettingsInfo(settingsInfo); + } + + private void SaveSelectedWebSocketUrl() + { + settingsInfo.SelectedWebSocketUrl = selectedWebSocketUrl; + _clientStorage.SetSettingsInfo(settingsInfo); + } + + } \ No newline at end of file diff --git a/src/Angor/Client/Pages/Wallet.razor b/src/Angor/Client/Pages/Wallet.razor index 1e7248ec..44dedab9 100644 --- a/src/Angor/Client/Pages/Wallet.razor +++ b/src/Angor/Client/Pages/Wallet.razor @@ -1,14 +1,4 @@ @page "/wallet" -@using Blockcore.NBitcoin -@using Angor.Shared -@using Angor.Client.Services -@using Angor.Client.Storage -@using Angor.Shared.Models -@using Angor.Shared.Services -@using Angor.Client.Components -@using Blockcore.Networks -@using System.Text.Json -@using System.Globalization @inject HttpClient _httpClient; @inject IClientStorage storage; @@ -18,23 +8,30 @@ @inject IWalletOperations _walletOperations @inject IClipboardService _clipboardService @inject ICurrencyService _currencyService +@inject ICurrencyRateService _CurrencyRateService @inject IDerivationOperations _derivationOperations @inject NavMenuState NavMenuState @inject IEncryptionService _encryptionService @inject IClipboardService ClipboardService +@using System.Text.Json +@using Angor.Client.Storage +@using Angor.Shared +@using Angor.Shared.Models +@using Blockcore.NBitcoin +@using Blockcore.Networks @inherits BaseComponent Wallet and balances - - + +
- +
@@ -59,13 +56,12 @@ @if (!hasWallet) { -
- + No Wallet Found
@@ -77,7 +73,7 @@
Create Wallet
@@ -87,7 +83,7 @@
Recover Wallet
@@ -105,7 +101,7 @@
@createWalletTitle
- +
@@ -118,8 +114,6 @@ } else { - - @if (isNewWallet) {
@@ -145,12 +139,13 @@ @if (isShowExtraWord) {
- +
} +
- +
- }
@@ -220,17 +214,17 @@ else -
- -
+
+ +
- @if (network.NetworkType != NetworkType.Mainnet && accountBalanceInfo.TotalUnconfirmedBalance <= 0 & accountBalanceInfo.TotalBalance <= 0) + @if (network.NetworkType != NetworkType.Mainnet && (accountBalanceInfo.TotalUnconfirmedBalance <= 0) & (accountBalanceInfo.TotalBalance <= 0)) {
@@ -615,96 +604,94 @@ else
- - - - - - + + + + + + - @foreach (var addressInfo in accountBalanceInfo.AccountInfo.AllAddresses()) - { - var total = addressInfo.Balance; - var count = addressInfo.UtxoData.Count(); + @foreach (var addressInfo in accountBalanceInfo.AccountInfo.AllAddresses()) + { + var total = addressInfo.Balance; + var count = addressInfo.UtxoData.Count(); - if (total > 0) - { - - - + + - - - + } + + + + @if (IsExpanded(addressInfo.Address)) - { - - + - - } + + + } } + }
AddressAmountPathUTXO count
AddressAmountPathUTXO count
@addressInfo.Address - @{ + if (total > 0) + { +
@addressInfo.Address + @{ // Attempt to get the fiat value from the dictionary if (fiatValues.TryGetValue(addressInfo.Address, out var fiatValue)) { - + } else { - // Handle missing fiat value - Loading... - } + // Handle missing fiat value + Loading... } - @addressInfo.HdPath@count
@addressInfo.HdPath@count
-
-
- -
- - - - - - - - - @foreach (var addressUtxoItem in addressInfo.UtxoData) - { - - - - - } - -
CoinAmount
@($"{addressUtxoItem.outpoint}")@Money.Satoshis(addressUtxoItem.value).ToUnit(MoneyUnit.BTC) @network.CoinTicker
-
+ { +
+
+
+ +
+ + + + + + + + + @foreach (var addressUtxoItem in addressInfo.UtxoData) + { + + + + + } + +
CoinAmount
@($"{addressUtxoItem.outpoint}")@Money.Satoshis(addressUtxoItem.value).ToUnit(MoneyUnit.BTC) @network.CoinTicker
-
- } - @code { - private bool balanceSpinner = false; - private bool createWalletSpinner = false; - private bool testCoinsSpinner = false; - private bool sendLoadSpinner = false; - private bool sendConfirmSpinner = false; + private bool balanceSpinner; + private bool createWalletSpinner; + private bool testCoinsSpinner; + private bool sendLoadSpinner; + private bool sendConfirmSpinner; private string? showWalletWords; private string? showWalletWordsPassphrase; @@ -717,7 +704,7 @@ else private string passwordInputType = "password"; private string passwordToggleText = "Show"; - private bool isNewWallet = false; + private bool isNewWallet; private string createWalletTitle = "Create Wallet"; private string createWalletDescription = "Generate a new wallet"; @@ -726,10 +713,10 @@ else private bool walletWordsModal; private bool walletWordsCreateModal; - private bool isShowExtraWord = false; + private bool isShowExtraWord; - private bool backupConfirmation = false; - private bool showBackupConfirmationError = false; + private bool backupConfirmation; + private bool showBackupConfirmationError; private int activeTab = 1; @@ -738,26 +725,24 @@ else private int FeePosition = 1; private SendInfo _sendInfo = new(); - private AccountBalanceInfo accountBalanceInfo = new AccountBalanceInfo(); + private readonly AccountBalanceInfo accountBalanceInfo = new(); - private FeeEstimations FeeEstimations = new(); + private readonly FeeEstimations FeeEstimations = new(); // Max index for the range input - private int FeeMin = 1; + private readonly int FeeMin = 1; private int _feeMax = 3; DateTime _lastFeeRefresh = DateTime.MinValue; ShowQrCode showQrCode; - Dictionary collapseStates = new Dictionary(); + readonly Dictionary collapseStates = new(); private string btcBalanceInUsd; - private Dictionary fiatValues = new(); + private readonly Dictionary fiatValues = new(); protected override async Task OnInitializedAsync() { - - if (hasWallet) { var accountInfo = storage.GetAccountInfo(network.Name); @@ -789,7 +774,7 @@ else storage.SetAccountInfo(network.Name, accountInfo); // lets log the entire account class to see what has changed - Logger.LogInformation(System.Text.Json.JsonSerializer.Serialize(accountInfo, new JsonSerializerOptions { WriteIndented = true })); + Logger.LogInformation(JsonSerializer.Serialize(accountInfo, new JsonSerializerOptions { WriteIndented = true })); var utxos = accountInfo.AllUtxos() .Select(x => x.outpoint.ToString()).ToList(); @@ -856,6 +841,7 @@ else notificationComponent.ShowErrorMessage("New wallet password is null or empty"); return; } + if (!backupConfirmation) { showBackupConfirmationError = true; @@ -868,8 +854,7 @@ else try { - - WalletWords data = new WalletWords { Words = newWalletWords, Passphrase = newWalletWordsPassphrase }; + var data = new WalletWords { Words = newWalletWords, Passphrase = newWalletWordsPassphrase }; var accountInfo = _walletOperations.BuildAccountInfoForWalletWords(data); await _walletOperations.UpdateAccountInfoWithNewAddressesAsync(accountInfo); @@ -880,7 +865,7 @@ else accountBalanceInfo.UpdateAccountBalanceInfo(accountInfo, new List()); // pre-derive the angor wallet keys - FounderKeyCollection founderKeyCollection = _derivationOperations.DeriveProjectKeys(data, _networkConfiguration.GetAngorKey()); + var founderKeyCollection = _derivationOperations.DeriveProjectKeys(data, _networkConfiguration.GetAngorKey()); _walletStorage.SetFounderKeys(founderKeyCollection); hasWallet = _walletStorage.HasWallet(); @@ -1174,7 +1159,7 @@ else if (selected != null) { - if (int.TryParse(selected, out int res)) + if (int.TryParse(selected, out var res)) { if (res <= FeeEstimations.Fees.Count) { @@ -1222,7 +1207,6 @@ else unconfirmedInboundFunds.Add(new UtxoData { PendingSpent = true, address = receiveAddress, value = trx.Outputs.FirstOrDefault()?.Value.Satoshi ?? Money.Coins(50).Satoshi, outpoint = new Outpoint(trx.GetHash().ToString(), 0) }); _cacheStorage.SetUnconfirmedInboundFunds(unconfirmedInboundFunds); accountBalanceInfo.UpdateAccountBalanceInfo(accountBalanceInfo.AccountInfo, unconfirmedInboundFunds); - } catch (Exception e) { @@ -1276,24 +1260,25 @@ else { isShowExtraWord = !isShowExtraWord; } - + public async Task GetBtcValueInPreferredCurrency(decimal btcBalance) { return await _currencyService.GetBtcValueInPreferredCurrency(btcBalance); } - + private async Task PrecomputeFiatValues() { fiatValues.Clear(); var addresses = accountBalanceInfo.AccountInfo.AllAddresses(); + foreach (var addressInfo in addresses) { var total = Money.Satoshis(addressInfo.Balance).ToUnit(MoneyUnit.BTC); - var fiatValue = await _currencyService.GetBtcValueInPreferredCurrency(total); // Calls the method from ICurrencyService + var fiatValue = await _currencyService.GetBtcValueInPreferredCurrency(total); // Calls the method from ICurrencyService fiatValues[addressInfo.Address] = fiatValue; } } -} +} \ No newline at end of file diff --git a/src/Angor/Shared/Models/SettingsUrl.cs b/src/Angor/Shared/Models/SettingsUrl.cs index 0b0d7769..5fc81ac4 100644 --- a/src/Angor/Shared/Models/SettingsUrl.cs +++ b/src/Angor/Shared/Models/SettingsUrl.cs @@ -4,6 +4,12 @@ public class SettingsInfo { public List Indexers { get; set; } = new(); public List Relays { get; set; } = new(); + + public List WebSocketOptions { get; set; } = + WebSocketServiceOptions.GetAvailableWebSocketOptions(); + + public string SelectedWebSocketUrl { get; set; } = + WebSocketServiceOptions.GetAvailableWebSocketOptions().FirstOrDefault()?.Url ?? string.Empty; } public class SettingsUrl @@ -25,3 +31,22 @@ public enum UrlStatus Online } +public static class WebSocketServiceOptions +{ + public static List GetAvailableWebSocketOptions() + { + return new List + { + new() { Name = "Binance (BTC/USDT)", Url = "wss://stream.binance.com:9443/ws/btcusdt@trade" }, + new() { Name = "Bitfinex (BTC/USD)", Url = "wss://api-pub.bitfinex.com/ws/2" }, + new() { Name = "Kraken (BTC/USD)", Url = "wss://ws.kraken.com" } + // Add more WebSocket URLs for different cryptocurrency exchanges or pairs + }; + } +} + +public class WebSocketOption +{ + public string Name { get; set; } // Display name for the dropdown + public string Url { get; set; } // Actual WebSocket URL +} \ No newline at end of file