From a0d0f1f98b57830fb529c0a2c819f68ee4fa7396 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 27 May 2022 16:34:05 +0900 Subject: [PATCH] Error when broadcasting transactions weren't shown in the UI --- BTCPayServer/Controllers/UIWalletsController.PSBT.cs | 8 ++++---- .../Models/WalletViewModels/WalletPSBTReadyViewModel.cs | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/BTCPayServer/Controllers/UIWalletsController.PSBT.cs b/BTCPayServer/Controllers/UIWalletsController.PSBT.cs index 0bc769853..799dda729 100644 --- a/BTCPayServer/Controllers/UIWalletsController.PSBT.cs +++ b/BTCPayServer/Controllers/UIWalletsController.PSBT.cs @@ -399,7 +399,7 @@ namespace BTCPayServer.Controllers if (vm.InvalidPSBT || psbt is null) { if (vm.InvalidPSBT) - vm.GlobalError = "Invalid PSBT"; + vm.Errors.Add("Invalid PSBT"); return View(nameof(WalletPSBT), vm); } DerivationSchemeSettings derivationSchemeSettings = GetDerivationSchemeSettings(walletId); @@ -503,7 +503,7 @@ namespace BTCPayServer.Controllers return await WalletPSBTReady(walletId, vm, "broadcast"); } - vm.GlobalError = $"RPC Error while broadcasting: {broadcastResult.RPCCode} {broadcastResult.RPCCodeMessage} {broadcastResult.RPCMessage}"; + vm.Errors.Add($"RPC Error while broadcasting: {broadcastResult.RPCCode} {broadcastResult.RPCCodeMessage} {broadcastResult.RPCMessage}"); return View(nameof(WalletPSBT), vm); } else @@ -515,7 +515,7 @@ namespace BTCPayServer.Controllers } catch (Exception ex) { - vm.GlobalError = "Error while broadcasting: " + ex.Message; + vm.Errors.Add("Error while broadcasting: " + ex.Message); return View(nameof(WalletPSBT), vm); } @@ -539,7 +539,7 @@ namespace BTCPayServer.Controllers await FetchTransactionDetails(derivationSchemeSettings, vm, network); return View("WalletPSBTDecoded", vm); default: - vm.GlobalError = "Unknown command"; + vm.Errors.Add("Unknown command"); return View(nameof(WalletPSBT), vm); } } diff --git a/BTCPayServer/Models/WalletViewModels/WalletPSBTReadyViewModel.cs b/BTCPayServer/Models/WalletViewModels/WalletPSBTReadyViewModel.cs index eef5ec347..776179101 100644 --- a/BTCPayServer/Models/WalletViewModels/WalletPSBTReadyViewModel.cs +++ b/BTCPayServer/Models/WalletViewModels/WalletPSBTReadyViewModel.cs @@ -9,7 +9,6 @@ namespace BTCPayServer.Models.WalletViewModels public SigningContextModel SigningContext { get; set; } = new SigningContextModel(); public string SigningKey { get; set; } public string SigningKeyPath { get; set; } - public string GlobalError { get; set; } public class DestinationViewModel {