diff --git a/client/core/helpers.go b/client/core/helpers.go index adc13d1924..93987c87a7 100644 --- a/client/core/helpers.go +++ b/client/core/helpers.go @@ -41,6 +41,22 @@ func (ord *OrderReader) ToSymbol() string { return ord.BaseSymbol } +// FromTicker if the conventional unit for the from asset. +func (ord *OrderReader) FromTicker() string { + if ord.Sell { + return ord.BaseUnitInfo.Conventional.Unit + } + return ord.QuoteUnitInfo.Conventional.Unit +} + +// ToTicker if the conventional unit for the to asset. +func (ord *OrderReader) ToTicker() string { + if ord.Sell { + return ord.QuoteUnitInfo.Conventional.Unit + } + return ord.BaseUnitInfo.Conventional.Unit +} + // FromFeeSymbol is the symbol of the asset used to pay swap fees. func (ord *OrderReader) FromFeeSymbol() string { if ord.Sell { @@ -318,7 +334,7 @@ func (ord *OrderReader) RateString() string { if ord.Type == order.MarketOrderType { return "market" } - return fmt.Sprintf("%s %s/%s", ord.formatRate(ord.Rate), ord.QuoteSymbol, ord.BaseSymbol) + return fmt.Sprintf("%s %s/%s", ord.formatRate(ord.Rate), ord.QuoteUnitInfo.Conventional.Unit, ord.BaseUnitInfo.Conventional.Unit) } // AverageRateString returns a formatting string containing the average rate of diff --git a/client/webserver/site/src/html/bodybuilder.tmpl b/client/webserver/site/src/html/bodybuilder.tmpl index a3a482314d..ce597430db 100644 --- a/client/webserver/site/src/html/bodybuilder.tmpl +++ b/client/webserver/site/src/html/bodybuilder.tmpl @@ -103,7 +103,7 @@ {{end}} {{define "bottom"}} - + {{end}} diff --git a/client/webserver/site/src/html/markets.tmpl b/client/webserver/site/src/html/markets.tmpl index a6b64fc684..3b2f816cc0 100644 --- a/client/webserver/site/src/html/markets.tmpl +++ b/client/webserver/site/src/html/markets.tmpl @@ -284,12 +284,12 @@
[[[:title:lot_size]]]: - +
[[[Rate Step]]]: - +
diff --git a/client/webserver/site/src/html/order.tmpl b/client/webserver/site/src/html/order.tmpl index cf725676a1..ca1ad702b2 100644 --- a/client/webserver/site/src/html/order.tmpl +++ b/client/webserver/site/src/html/order.tmpl @@ -1,5 +1,5 @@ {{define "microIcon"}} - + {{end}} {{define "order"}} @@ -40,7 +40,7 @@
[[[Offering]]]
-
{{$ord.OfferString}} {{$ord.FromSymbol}} {{template "microIcon" $ord.FromSymbol}}
+
{{$ord.OfferString}} {{$ord.FromTicker}} {{template "microIcon" $ord.FromTicker}}
[[[Asking]]]
diff --git a/client/webserver/site/src/html/wallets.tmpl b/client/webserver/site/src/html/wallets.tmpl index 178570b5e0..24add2a071 100644 --- a/client/webserver/site/src/html/wallets.tmpl +++ b/client/webserver/site/src/html/wallets.tmpl @@ -237,15 +237,15 @@ {{- /* SEND */ -}}
-
+
[[[Send]]] - + -
- [[[Token on]]] - - -
+
+
+ [[[Token on]]] + +
diff --git a/client/webserver/site/src/js/forms.ts b/client/webserver/site/src/js/forms.ts index 5617f963a0..ef199c5cdc 100644 --- a/client/webserver/site/src/js/forms.ts +++ b/client/webserver/site/src/js/forms.ts @@ -1802,7 +1802,7 @@ export class DepositAddress { const asset = app().assets[assetID] page.depositLogo.src = Doc.logoPath(asset.symbol) const wallet = app().walletMap[assetID] - page.depositName.textContent = asset.name + page.depositName.textContent = asset.unitInfo.conventional.unit page.depositAddress.textContent = wallet.address page.qrcode.src = `/generateqrcode?address=${wallet.address}` if (asset.token) { diff --git a/client/webserver/site/src/js/wallets.ts b/client/webserver/site/src/js/wallets.ts index 5448c3e9d5..22913a9053 100644 --- a/client/webserver/site/src/js/wallets.ts +++ b/client/webserver/site/src/js/wallets.ts @@ -1137,7 +1137,7 @@ export default class WalletsPage extends BasePage { async showSendForm (assetID: number) { const page = this.page const box = page.sendForm - const { wallet, name, unitInfo: ui, symbol, token } = app().assets[assetID] + const { wallet, unitInfo: ui, symbol, token } = app().assets[assetID] Doc.hide(page.toggleSubtract) page.subtractCheckBox.checked = false @@ -1153,7 +1153,7 @@ export default class WalletsPage extends BasePage { this.showFiatValue(assetID, 0, page.sendValue) page.walletBal.textContent = Doc.formatFullPrecision(wallet.balance.available, ui) page.sendLogo.src = Doc.logoPath(symbol) - page.sendName.textContent = name + page.sendName.textContent = ui.conventional.unit if (token) { const parentAsset = app().assets[token.parentID] page.sendTokenParentLogo.src = Doc.logoPath(parentAsset.symbol) diff --git a/client/webserver/template.go b/client/webserver/template.go index c7b77263dd..39421fb971 100644 --- a/client/webserver/template.go +++ b/client/webserver/template.go @@ -204,4 +204,11 @@ var templateFuncs = template.FuncMap{ } return "/img/coins/" + string(char) + ".png" }, + "baseAssetSymbol": func(symbol string) string { + parts := strings.Split(symbol, ".") + if len(parts) == 0 { + return "wtf" + } + return parts[0] + }, } diff --git a/server/asset/eth/eth.go b/server/asset/eth/eth.go index 6df3239ff1..815e2bd813 100644 --- a/server/asset/eth/eth.go +++ b/server/asset/eth/eth.go @@ -91,7 +91,7 @@ var ( // blockPollInterval is the delay between calls to bestBlockHash to check // for new blocks. Modify at compile time via blockPollIntervalStr: - // go build -tags lgpl -ldflags "-X 'decred.org/dcrdex/server/asset/eth.blockPollIntervalStr=10s'" + // go build -ldflags "-X 'decred.org/dcrdex/server/asset/eth.blockPollIntervalStr=10s'" blockPollInterval = time.Second blockPollIntervalStr string )