From f77cec5f3cf85c4a37666d10c96c2b1cefd97b88 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Fri, 6 May 2022 19:06:29 -0400 Subject: [PATCH 1/5] Removed version.js from repo This file is always recreated when building, using the version number in package.json. --- qortal-ui-core/src/redux/app/version.js | 1 - 1 file changed, 1 deletion(-) delete mode 100644 qortal-ui-core/src/redux/app/version.js diff --git a/qortal-ui-core/src/redux/app/version.js b/qortal-ui-core/src/redux/app/version.js deleted file mode 100644 index dbe4ce76..00000000 --- a/qortal-ui-core/src/redux/app/version.js +++ /dev/null @@ -1 +0,0 @@ -export const UI_VERSION = "1.8.2"; From edb0a2d16c760a3f0bed8aa6332afd72c316dd67 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Fri, 6 May 2022 19:15:46 -0400 Subject: [PATCH 2/5] Added version.js to gitignore file This file is created during build and does not need to be updated with the repo. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 61497b82..f48b5eb6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ yarn.lock # Derived js files qortal-ui-plugins/plugins/core/**/*.js !*.src.js +qortal-ui-core/src/redux/app/version.js # Node modules node_modules/ From 2af9b12c7aeaded7553c96dbc145440963fcab12 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Fri, 6 May 2022 19:17:00 -0400 Subject: [PATCH 3/5] Removed extra character This L appears to be a minor typo. --- qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js index b547c6c8..7203e51a 100644 --- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js +++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js @@ -1145,7 +1145,7 @@ class MultiWallet extends LitElement {

- ${translate("walletpage.wchange24")}: ${(this.dogeFeePerByte / 1e8).toFixed(8)} DOGE
L${translate("walletpage.wchange25")} + ${translate("walletpage.wchange24")}: ${(this.dogeFeePerByte / 1e8).toFixed(8)} DOGE
${translate("walletpage.wchange25")}

Date: Fri, 6 May 2022 19:49:50 -0400 Subject: [PATCH 4/5] Added tx fee estimates to Trade Portal This can be updated with a more exact system later. --- .../core/trade-portal/trade-portal.src.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js index 6dfe2ea1..63aa7fc9 100644 --- a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js +++ b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js @@ -239,7 +239,7 @@ class TradePortal extends LitElement { overflow: hidden; } - .you-have { + .amt-text { color: var(--tradehave); font-size: 15px; text-align: right; @@ -411,7 +411,8 @@ class TradePortal extends LitElement { name: "QORTAL", balance: "0", coinCode: "QORT", - coinAmount: this.amountString + coinAmount: this.amountString, + tradeFee: "0.002" } let litecoin = { @@ -426,7 +427,8 @@ class TradePortal extends LitElement { myOfferingOrders: [], openTradeOrders: null, tradeOffersSocketCounter: 1, - coinAmount: this.amountString + coinAmount: this.amountString, + tradeFee: "~0.00005" } let dogecoin = { @@ -441,7 +443,8 @@ class TradePortal extends LitElement { myOfferingOrders: [], openTradeOrders: null, tradeOffersSocketCounter: 1, - coinAmount: this.amountString + coinAmount: this.amountString, + tradeFee: "~0.005" } this.listedCoins = new Map() @@ -637,7 +640,8 @@ class TradePortal extends LitElement { >

- ${translate("tradepage.tchange16")}: ${this.listedCoins.get(this.selectedCoin).balance} ${this.listedCoins.get(this.selectedCoin).coinCode} + ${translate("tradepage.tchange16")}: ${this.listedCoins.get(this.selectedCoin).balance} ${this.listedCoins.get(this.selectedCoin).coinCode} + ${translate("walletpage.wchange12")}: ${this.listedCoins.get(this.selectedCoin).tradeFee} ${this.listedCoins.get(this.selectedCoin).coinCode}
@@ -696,7 +700,8 @@ class TradePortal extends LitElement { >

- ${translate("tradepage.tchange16")}: ${this.listedCoins.get("QORTAL").balance} QORT + ${translate("tradepage.tchange16")}: ${this.listedCoins.get("QORTAL").balance} QORT + ${translate("walletpage.wchange12")}: ${this.listedCoins.get("QORTAL").tradeFee} QORT
From 0ca6dc8894d69e5b230911ebb60036d776437000 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Fri, 6 May 2022 20:32:39 -0400 Subject: [PATCH 5/5] Removed unused imports These mwc elements are not used here. --- qortal-ui-core/src/components/app-view.js | 3 --- qortal-ui-core/src/components/sidenav-menu.js | 1 - 2 files changed, 4 deletions(-) diff --git a/qortal-ui-core/src/components/app-view.js b/qortal-ui-core/src/components/app-view.js index 81cd764a..a481d5f3 100644 --- a/qortal-ui-core/src/components/app-view.js +++ b/qortal-ui-core/src/components/app-view.js @@ -13,9 +13,6 @@ import './show-plugin.js' import './qort-theme-toggle.js' import './language-selector.js' -import '@material/mwc-drawer' -import '@material/mwc-icon' - import '@polymer/app-layout/app-layout.js' import '@polymer/paper-ripple' diff --git a/qortal-ui-core/src/components/sidenav-menu.js b/qortal-ui-core/src/components/sidenav-menu.js index c730c05d..20c5f31b 100644 --- a/qortal-ui-core/src/components/sidenav-menu.js +++ b/qortal-ui-core/src/components/sidenav-menu.js @@ -3,7 +3,6 @@ import { connect } from 'pwa-helpers' import { store } from '../store.js' import { translate, translateUnsafeHTML } from 'lit-translate' -import '@material/mwc-icon' import '@polymer/paper-ripple' import '@vaadin/icon' import '@vaadin/icons'