diff --git a/src/Angor/Client/Pages/Settings.razor b/src/Angor/Client/Pages/Settings.razor index 0d6b9f9d..6b9b4e8f 100644 --- a/src/Angor/Client/Pages/Settings.razor +++ b/src/Angor/Client/Pages/Settings.razor @@ -79,33 +79,23 @@
This will wipe your wallet!
-
-
-
- Warning -
-
-
-

By confirming, you agree to wiping all data from this device since you have a backup of your wallet words.

+
@@ -379,29 +369,21 @@
-
-
-
- Warning -
-
-
-

By confirming, you agree to wiping all data from this device since you have a backup of your wallet words.

+
@@ -432,7 +414,7 @@ private bool confirmWipe = false; private bool showConfirmWipeMessage = false; private string selectedNetwork = "Main"; // Default to "testnet" - + private string selectedCurrency = "BTC"; // Default to BTC private SettingsInfo settingsInfo; @@ -446,11 +428,11 @@ networkType = _networkConfiguration.GetNetwork().Name; _networkService.OnStatusChanged += UpdateUI; - + selectedCurrency = _clientStorage.GetCurrencyDisplaySetting(); selectedNetwork = networkType; - + return base.OnInitializedAsync(); } @@ -472,66 +454,66 @@ await Refresh(false); } } - + private async Task AddIndexer() { if (!string.IsNullOrWhiteSpace(newIndexerLink)) + { + if (!Uri.TryCreate(newIndexerLink, UriKind.Absolute, out Uri? uri)) { - if (!Uri.TryCreate(newIndexerLink, UriKind.Absolute, out Uri? uri)) - { - notificationComponent.ShowErrorMessage($"Invalid URL: {newIndexerLink}"); - return; - } - - if (uri.Scheme is not ("http" or "https")) + notificationComponent.ShowErrorMessage($"Invalid URL: {newIndexerLink}"); + return; + } + + if (uri.Scheme is not ("http" or "https")) { notificationComponent.ShowErrorMessage($"Invalid URL schema. Must be HTTP or HTTPS."); return; } - - newIndexerLink = $"{uri.Scheme}://{uri.Host}".TrimEnd('/'); - - Logger.LogInformation($"Normalized URL: {newIndexerLink}"); - - if (settingsInfo.Indexers.Any(a => a.Url == newIndexerLink)) - { - notificationComponent.ShowErrorMessage($"URL already exists: {newIndexerLink}"); - return; - } - - // Check indexer status and fetch genesis block hash - var (isOnline, genesisHash) = await _indexerService.CheckIndexerNetwork(newIndexerLink); - if (!isOnline) + + newIndexerLink = $"{uri.Scheme}://{uri.Host}".TrimEnd('/'); + + Logger.LogInformation($"Normalized URL: {newIndexerLink}"); + + if (settingsInfo.Indexers.Any(a => a.Url == newIndexerLink)) + { + notificationComponent.ShowErrorMessage($"URL already exists: {newIndexerLink}"); + return; + } + + // Check indexer status and fetch genesis block hash + var (isOnline, genesisHash) = await _indexerService.CheckIndexerNetwork(newIndexerLink); + if (!isOnline) { notificationComponent.ShowErrorMessage("The indexer is offline or unreachable."); return; } - - var expectedHash = _networkConfiguration.GetGenesisBlockHash(); - if (!_indexerService.ValidateGenesisBlockHash(genesisHash, expectedHash)) - { - var expectedNetworkName = _networkConfiguration.GetNetwork().Name; - var fetchedNetworkName = _networkConfiguration.GetNetworkNameFromGenesisBlockHash(genesisHash); - notificationComponent.ShowErrorMessage($"The indexer is not compatible with the selected network. " + - $"Expected: {expectedNetworkName}, Provided: {fetchedNetworkName ?? "Unknown"}"); - return; + + var expectedHash = _networkConfiguration.GetGenesisBlockHash(); + if (!_indexerService.ValidateGenesisBlockHash(genesisHash, expectedHash)) + { + var expectedNetworkName = _networkConfiguration.GetNetwork().Name; + var fetchedNetworkName = _networkConfiguration.GetNetworkNameFromGenesisBlockHash(genesisHash); + notificationComponent.ShowErrorMessage($"The indexer is not compatible with the selected network. " + + $"Expected: {expectedNetworkName}, Provided: {fetchedNetworkName ?? "Unknown"}"); + return; + } + + // Add indexer to settings + settingsInfo.Indexers.Add(new SettingsUrl + { + Url = newIndexerLink, + LastCheck = DateTime.UtcNow, + Status = UrlStatus.Online + }); + + _clientStorage.SetSettingsInfo(settingsInfo); + notificationComponent.ShowNotificationMessage("Indexer added successfully."); + newIndexerLink = string.Empty; + + await Refresh(false); } - - // Add indexer to settings - settingsInfo.Indexers.Add(new SettingsUrl - { - Url = newIndexerLink, - LastCheck = DateTime.UtcNow, - Status = UrlStatus.Online - }); - - _clientStorage.SetSettingsInfo(settingsInfo); - notificationComponent.ShowNotificationMessage("Indexer added successfully."); - newIndexerLink = string.Empty; - - await Refresh(false); - } - } + } private async Task AddRelay() { diff --git a/src/Angor/Client/Pages/Wallet.razor b/src/Angor/Client/Pages/Wallet.razor index c59bdae6..b4cc3fd9 100644 --- a/src/Angor/Client/Pages/Wallet.razor +++ b/src/Angor/Client/Pages/Wallet.razor @@ -22,14 +22,14 @@ @inject IClipboardService ClipboardService Wallet and balances - - + +
- +
@@ -59,7 +59,7 @@
- + No Wallet Found
@@ -71,7 +71,7 @@
Create Wallet
@@ -81,7 +81,7 @@
Recover Wallet
@@ -99,7 +99,7 @@
@createWalletTitle
- +
@@ -115,7 +115,7 @@ @if (isNewWallet) {
-
@if (isShowExtraWord) {
- +
}
- +
@@ -278,14 +293,14 @@ else
Wallet Words
- +
- @@ -296,7 +311,7 @@ else
- +