aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-20 15:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Provide better details for unknown error (#1208)

Browse Source
This commit is contained in:
nicolas.dorier
2019-12-05 22:03:17 +09:00
parent 9b8f42cdf6
commit 1d70d935b8
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BTCPayServer/Controllers/VaultController.cs
View File

@@ -318,6 +318,7 @@ namespace BTCPayServer.Controllers
{ {
JObject obj = new JObject(); JObject obj = new JObject();
obj.Add("error", "unknown-error"); obj.Add("error", "unknown-error");
obj.Add("message", ex.Message);
obj.Add("details", ex.ToString()); obj.Add("details", ex.ToString());
try try
{ {

11
BTCPayServer/wwwroot/js/vaultbridge.ui.js
View File

@@ -39,7 +39,7 @@ var vaultui = (function () {
fetchingXpubs: new VaultFeedback("?", "Fetching public keys...", "vault-feedback3", "fetching-xpubs"), fetchingXpubs: new VaultFeedback("?", "Fetching public keys...", "vault-feedback3", "fetching-xpubs"),
askXpubs: new VaultFeedback("?", "Select your address type and account", "vault-feedback3", "fetching-xpubs"), askXpubs: new VaultFeedback("?", "Select your address type and account", "vault-feedback3", "fetching-xpubs"),
fetchedXpubs: new VaultFeedback("ok", "Public keys successfully fetched.", "vault-feedback3", "xpubs-fetched"), fetchedXpubs: new VaultFeedback("ok", "Public keys successfully fetched.", "vault-feedback3", "xpubs-fetched"),
unexpectedError: new VaultFeedback("failed", "An unexpected error happened.", "vault-feedback3", "unknown-error"), unexpectedError: new VaultFeedback("failed", "An unexpected error happened. ({{0}})", "vault-feedback3", "unknown-error"),
invalidNetwork: new VaultFeedback("failed", "The device is targetting a different chain.", "vault-feedback3", "invalid-network"), invalidNetwork: new VaultFeedback("failed", "The device is targetting a different chain.", "vault-feedback3", "invalid-network"),
needPin: new VaultFeedback("?", "Enter the pin.", "vault-feedback3", "need-pin"), needPin: new VaultFeedback("?", "Enter the pin.", "vault-feedback3", "need-pin"),
needPinOnDevice: new VaultFeedback("?", "Please, enter the pin on the device.", "vault-feedback3", "need-pin-on-device"), needPinOnDevice: new VaultFeedback("?", "Please, enter the pin on the device.", "vault-feedback3", "need-pin-on-device"),
@@ -96,13 +96,18 @@ var vaultui = (function () {
if (json.hasOwnProperty("error")) { if (json.hasOwnProperty("error")) {
for (var key in VaultFeedbacks) { for (var key in VaultFeedbacks) {
if (VaultFeedbacks.hasOwnProperty(key) && VaultFeedbacks[key].id == json.error) { if (VaultFeedbacks.hasOwnProperty(key) && VaultFeedbacks[key].id == json.error) {
show(VaultFeedbacks[key]); if (VaultFeedbacks.unexpectedError === VaultFeedbacks[key]) {
show(VaultFeedbacks.unexpectedError.replace("{{0}}", json.message));
}
else {
show(VaultFeedbacks[key]);
}
if (json.hasOwnProperty("details")) if (json.hasOwnProperty("details"))
console.warn(json.details); console.warn(json.details);
return; return;
} }
} }
show(VaultFeedbacks.unexpectedError); show(VaultFeedbacks.unexpectedError.replace("{{0}}", json.message));
if (json.hasOwnProperty("details")) if (json.hasOwnProperty("details"))
console.warn(json.details); console.warn(json.details);
} }