Qortal/qortal-ui
1
0
Fork 0
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-03-27 15:55:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from QuickMythril/edits

Browse Source 
Added trade fees and some code cleanup
This commit is contained in:
QuickMythril 2022-05-06 23:50:29 -04:00 committed by GitHub
commit 1fe50a37f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,6 +4,7 @@ yarn.lock
# Derived js files # Derived js files
qortal-ui-plugins/plugins/core/**/*.js qortal-ui-plugins/plugins/core/**/*.js
!*.src.js !*.src.js
qortal-ui-core/src/redux/app/version.js
# Node modules # Node modules
node_modules/ node_modules/

3
qortal-ui-core/src/components/app-view.js
View File

@ -13,9 +13,6 @@ import './show-plugin.js'
import './qort-theme-toggle.js' import './qort-theme-toggle.js'
import './language-selector.js' import './language-selector.js'
import '@material/mwc-drawer'
import '@material/mwc-icon'
import '@polymer/app-layout/app-layout.js' import '@polymer/app-layout/app-layout.js'
import '@polymer/paper-ripple' import '@polymer/paper-ripple'

1
qortal-ui-core/src/components/sidenav-menu.js
View File

@ -3,7 +3,6 @@ import { connect } from 'pwa-helpers'
import { store } from '../store.js' import { store } from '../store.js'
import { translate, translateUnsafeHTML } from 'lit-translate' import { translate, translateUnsafeHTML } from 'lit-translate'
import '@material/mwc-icon'
import '@polymer/paper-ripple' import '@polymer/paper-ripple'
import '@vaadin/icon' import '@vaadin/icon'
import '@vaadin/icons' import '@vaadin/icons'

1
qortal-ui-core/src/redux/app/version.js
View File

@ -1 +0,0 @@
export const UI_VERSION = "1.8.2";

17
qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
View File

@ -239,7 +239,7 @@ class TradePortal extends LitElement {
overflow: hidden; overflow: hidden;
} }
.you-have { .amt-text {
color: var(--tradehave); color: var(--tradehave);
font-size: 15px; font-size: 15px;
text-align: right; text-align: right;
@ -411,7 +411,8 @@ class TradePortal extends LitElement {
name: "QORTAL", name: "QORTAL",
balance: "0", balance: "0",
coinCode: "QORT", coinCode: "QORT",
coinAmount: this.amountString coinAmount: this.amountString,
tradeFee: "0.002"
} }
let litecoin = { let litecoin = {
@ -426,7 +427,8 @@ class TradePortal extends LitElement {
myOfferingOrders: [], myOfferingOrders: [],
openTradeOrders: null, openTradeOrders: null,
tradeOffersSocketCounter: 1, tradeOffersSocketCounter: 1,
coinAmount: this.amountString coinAmount: this.amountString,
tradeFee: "~0.00005"
} }
let dogecoin = { let dogecoin = {
@ -441,7 +443,8 @@ class TradePortal extends LitElement {
myOfferingOrders: [], myOfferingOrders: [],
openTradeOrders: null, openTradeOrders: null,
tradeOffersSocketCounter: 1, tradeOffersSocketCounter: 1,
coinAmount: this.amountString coinAmount: this.amountString,
tradeFee: "~0.005"
} }
this.listedCoins = new Map() this.listedCoins = new Map()
@ -637,7 +640,8 @@ class TradePortal extends LitElement {
> >
</mwc-textfield> </mwc-textfield>
</p> </p>
<span class="you-have">${translate("tradepage.tchange16")}: ${this.listedCoins.get(this.selectedCoin).balance} ${this.listedCoins.get(this.selectedCoin).coinCode}</span> <span class="amt-text">${translate("tradepage.tchange16")}: ${this.listedCoins.get(this.selectedCoin).balance} ${this.listedCoins.get(this.selectedCoin).coinCode}</span>
<span class="amt-text">${translate("walletpage.wchange12")}: ${this.listedCoins.get(this.selectedCoin).tradeFee} ${this.listedCoins.get(this.selectedCoin).coinCode}</span>
<div class="buttons"> <div class="buttons">
<div> <div>
<mwc-button class="buy-button" ?disabled="${this.buyBtnDisable}" style="width:100%;" raised @click="${(e) => this.buyAction(e)}"> <mwc-button class="buy-button" ?disabled="${this.buyBtnDisable}" style="width:100%;" raised @click="${(e) => this.buyAction(e)}">
@ -696,7 +700,8 @@ class TradePortal extends LitElement {
> >
</mwc-textfield> </mwc-textfield>
</p> </p>
<span class="you-have">${translate("tradepage.tchange16")}: ${this.listedCoins.get("QORTAL").balance} QORT</span> <span class="amt-text">${translate("tradepage.tchange16")}: ${this.listedCoins.get("QORTAL").balance} QORT</span>
<span class="amt-text">${translate("walletpage.wchange12")}: ${this.listedCoins.get("QORTAL").tradeFee} QORT</span>
<div class="buttons"> <div class="buttons">
<div> <div>
<mwc-button class="sell-button" ?disabled="${this.sellBtnDisable}" style="width:100%;" raised @click="${(e) => this.sellAction()}"> <mwc-button class="sell-button" ?disabled="${this.sellBtnDisable}" style="width:100%;" raised @click="${(e) => this.sellAction()}">

2
qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js
View File

@ -1145,7 +1145,7 @@ class MultiWallet extends LitElement {
</p> </p>
<div style="margin-bottom: 0;"> <div style="margin-bottom: 0;">
<p style="margin-bottom: 0;"> <p style="margin-bottom: 0;">
${translate("walletpage.wchange24")}: <span style="font-weight: bold;">${(this.dogeFeePerByte / 1e8).toFixed(8)} DOGE</span><br>L${translate("walletpage.wchange25")} ${translate("walletpage.wchange24")}: <span style="font-weight: bold;">${(this.dogeFeePerByte / 1e8).toFixed(8)} DOGE</span><br>${translate("walletpage.wchange25")}
</p> </p>
<paper-slider <paper-slider
class="blue" class="blue"