From 4f6472dc20ab5d14c45afafce06e67f02951f094 Mon Sep 17 00:00:00 2001 From: PhilReact Date: Sun, 10 Dec 2023 13:47:48 +0200 Subject: [PATCH] fix response --- plugins/plugins/core/qdn/browser/browser.src.js | 15 ++++++++++++++- .../plugins/core/trade-portal/trade-portal.src.js | 1 - 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/plugins/core/qdn/browser/browser.src.js b/plugins/plugins/core/qdn/browser/browser.src.js index 88619f42..ffcd5e0d 100644 --- a/plugins/plugins/core/qdn/browser/browser.src.js +++ b/plugins/plugins/core/qdn/browser/browser.src.js @@ -2873,6 +2873,7 @@ class WebBrowser extends LitElement { let errorMsg = get("walletpage.wchange31") let pleaseMsg = get("walletpage.wchange44") showErrorAndWait("TRANSACTION_FAILED", errorMsg, pleaseMsg) + throw new Error(response) } else { this.loader.hide() let errorMsg = response.message @@ -2885,6 +2886,7 @@ class WebBrowser extends LitElement { try { const res = await makeRequest() manageResponse(res) + response = res } catch (error) { console.error(error) response = '{"error": "Request could not be fulfilled"}' @@ -2981,6 +2983,7 @@ class WebBrowser extends LitElement { let errorMsg = get("walletpage.wchange31") let pleaseMsg = get("walletpage.wchange44") showErrorAndWait("TRANSACTION_FAILED", errorMsg, pleaseMsg) + throw new Error(response) } else { this.loader.hide() let errorMsg = response.message @@ -2993,6 +2996,7 @@ class WebBrowser extends LitElement { try { const res = await makeRequest() manageResponse(res) + response = res } catch (error) { console.error(error) response = '{"error": "Request could not be fulfilled"}' @@ -3089,6 +3093,7 @@ class WebBrowser extends LitElement { let errorMsg = get("walletpage.wchange31") let pleaseMsg = get("walletpage.wchange44") showErrorAndWait("TRANSACTION_FAILED", errorMsg, pleaseMsg) + throw new Error(response) } else { this.loader.hide() let errorMsg = response.message @@ -3101,6 +3106,7 @@ class WebBrowser extends LitElement { try { const res = await makeRequest() manageResponse(res) + response = res } catch (error) { console.error(error) response = '{"error": "Request could not be fulfilled"}' @@ -3197,6 +3203,7 @@ class WebBrowser extends LitElement { let errorMsg = get("walletpage.wchange31") let pleaseMsg = get("walletpage.wchange44") showErrorAndWait("TRANSACTION_FAILED", errorMsg, pleaseMsg) + throw new Error(response) } else { this.loader.hide() let errorMsg = response.message @@ -3209,6 +3216,7 @@ class WebBrowser extends LitElement { try { const res = await makeRequest() manageResponse(res) + response = res } catch (error) { console.error(error) response = '{"error": "Request could not be fulfilled"}' @@ -3305,6 +3313,7 @@ class WebBrowser extends LitElement { let errorMsg = get("walletpage.wchange31") let pleaseMsg = get("walletpage.wchange44") showErrorAndWait("TRANSACTION_FAILED", errorMsg, pleaseMsg) + throw new Error(response) } else { this.loader.hide() let errorMsg = response.message @@ -3317,6 +3326,7 @@ class WebBrowser extends LitElement { try { const res = await makeRequest() manageResponse(res) + response = res } catch (error) { console.error(error) response = '{"error": "Request could not be fulfilled"}' @@ -3413,6 +3423,7 @@ class WebBrowser extends LitElement { let errorMsg = get("walletpage.wchange31") let pleaseMsg = get("walletpage.wchange44") showErrorAndWait("TRANSACTION_FAILED", errorMsg, pleaseMsg) + throw new Error(response) } else { this.loader.hide() let errorMsg = response.message @@ -3425,6 +3436,8 @@ class WebBrowser extends LitElement { try { const res = await makeRequest() manageResponse(res) + response = res + break } catch (error) { console.error(error) response = '{"error": "Request could not be fulfilled"}' @@ -3434,7 +3447,7 @@ class WebBrowser extends LitElement { break } } - + break; default: console.log('Unhandled message: ' + JSON.stringify(data)) return diff --git a/plugins/plugins/core/trade-portal/trade-portal.src.js b/plugins/plugins/core/trade-portal/trade-portal.src.js index 41ba9d19..0f743b13 100644 --- a/plugins/plugins/core/trade-portal/trade-portal.src.js +++ b/plugins/plugins/core/trade-portal/trade-portal.src.js @@ -5,7 +5,6 @@ import isElectron from 'is-electron' import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js' import Base58 from '../../../../crypto/api/deps/Base58.js' import {decryptData, encryptData} from '../../../../core/src/lockScreen.js' -import {tradeStyles} from './trade-portal-css.js' import '@material/mwc-button' import '@material/mwc-textfield' import '@material/mwc-icon'