Skip to content

ISSUE - Estimated token value in incorrect #49 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jonsey wants to merge 3 commits into
base: master
Choose a base branch
from
Open

ISSUE - Estimated token value in incorrect #49 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93cccbe
Fixed comma replacement bug in wallet value
Jonsey Apr 20, 2019
73167fd
Merge branch 'master' into fix/wallet-balance
Jonsey Apr 20, 2019
aa1419e
Reverted config import
Jonsey Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

<script src="scripts/Config.js?v=190415"></script>
<script src="scripts/utils.js?v=190415"></script>
<script src="scripts/SE.js?v=190415"></script>
<link rel="stylesheet" href="styles/main.css?v=190415" />
<script src="scripts/SE.js?v=190415"></script>
<link rel="stylesheet" href="styles/main.css?v=190415" />
<title>Steem Engine - Smart Contracts on the STEEM blockchain</title>

<script type="text/javascript">
Expand Down
27 changes: 14 additions & 13 deletions views/balances.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,34 @@ <h1><%= data.account == SE.User.name ? 'MY' : '@' + data.account + "'s" %> TOKEN
</div>

<script>
function IconColumn(value, options, rowdata) {
function IconColumn(value, options, rowdata) {
return `<i class="fas fa-info-circle" onclick="SE.ShowDialog('token_info', SE.GetToken('${value}'));"></i>&nbsp;&nbsp;&nbsp;` +
`<i class="fas fa-exchange-alt" onclick="SE.ShowMarket('${value}');"></i>&nbsp;&nbsp;&nbsp;` +
`<i class="fas fa-share-square" onclick="SE.ShowSendTokenDialog('${value}', ${rowdata.balance});"></i>&nbsp;&nbsp;&nbsp;` +
`<i class="fas fa-list-ul" onclick="SE.ShowHistory('${value}', '${rowdata.name}')"></i>`;
`<i class="fas fa-exchange-alt" onclick="SE.ShowMarket('${value}');"></i>&nbsp;&nbsp;&nbsp;` +
`<i class="fas fa-share-square" onclick="SE.ShowSendTokenDialog('${value}', ${rowdata.balance});"></i>&nbsp;&nbsp;&nbsp;` +
`<i class="fas fa-list-ul" onclick="SE.ShowHistory('${value}', '${rowdata.name}')"></i>`;
}

function SymbolColumn(value, options, rowdata) {
function SymbolColumn(value, options, rowdata) {
var token = SE.GetToken(value);

if(token && token.metadata && token.metadata.icon)
return '<img class="icon" src="' + token.metadata.icon + '"/>';
else
return '';
return '';
}

function BalanceColumn(value, options, rowdata) { return addCommas(value) + ' ' + rowdata.symbol; }
function USDValueColumn(value, options, rowdata) { return '<span class="' + (rowdata.priceChangePercent > 0 ? 'green' : (rowdata.priceChangePercent < 0 ? 'red' : '')) + '">' + usdFormat(value * SE.Tokens.find(t => t.symbol == rowdata.symbol).lastPrice, 2) + '</span>'; }
function PctColumn(value, options, rowdata) { return '<span class="' + (value > 0 ? 'green' : (value < 0 ? 'red' : '')) + '">' + value.toFixed(2) + '%</span>'; }

var data = <%= JSON.stringify(data.balances.filter(b => !Config.DISABLED_TOKENS.includes(b.symbol))) %>;

data = data.map(d => {
var token = SE.Tokens.find(t => t.symbol == d.symbol);

return Object.assign(d, {
name: token.name,
lastPrice: token.lastPrice,
return Object.assign(d, {
name: token.name,
lastPrice: token.lastPrice,
priceChangePercent: token.priceChangePercent,
usdValue: usdFormat(d.balance * token.lastPrice, 2)
});
Expand All @@ -58,7 +58,8 @@ <h1><%= data.account == SE.User.name ? 'MY' : '@' + data.account + "'s" %> TOKEN

var totalInUsd = 0.00;
data.forEach(function(o) {
var amount = parseFloat(o.usdValue.replace('$', '').replace(',', ''));
var raw = o.usdValue.replace('$', '').split(',').join('');
var amount = parseFloat(raw);
totalInUsd += amount;
});

Expand All @@ -76,4 +77,4 @@ <h1><%= data.account == SE.User.name ? 'MY' : '@' + data.account + "'s" %> TOKEN
],
"rows": data
});
</script>
</script>