LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Packages Projects Releases 238 Wiki Activity

Merge pull request #79 from lbryio/transaction-date-placeholder

Browse source 
On Wallet page, show placeholder text for dates on pending transactions
This commit is contained in:
alexliebowitz 2016-11-15 01:09:27 -05:00 committed by GitHub
parent 0db4c8df13 ee56a38b0d
commit 3471184828
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/page/wallet.js
View file

@ -179,7 +179,7 @@ var TransactionList = React.createClass({
{ {
transactionItems.push({ transactionItems.push({
id: txid, id: txid,
date: new Date(parseInt(tx["timestamp"]) * 1000), date: tx["timestamp"] ? (new Date(parseInt(tx["timestamp"]) * 1000)) : null,
amount: condensedTransactions[txid] amount: condensedTransactions[txid]
}); });
delete condensedTransactions[txid]; delete condensedTransactions[txid];
@ -198,8 +198,8 @@ var TransactionList = React.createClass({
rows.push( rows.push(
<tr key={item.id}> <tr key={item.id}>
<td>{ (item.amount > 0 ? '+' : '' ) + item.amount }</td> <td>{ (item.amount > 0 ? '+' : '' ) + item.amount }</td>
<td>{ item.date.toLocaleDateString() }</td> <td>{ item.date ? item.date.toLocaleDateString() : <span className="empty">(Transaction pending)</span> }</td>
<td>{ item.date.toLocaleTimeString() }</td> <td>{ item.date ? item.date.toLocaleTimeString() : <span className="empty">(Transaction pending)</span> }</td>
<td> <td>
<a className="button-text" href={"https://explorer.lbry.io/tx/"+item.id} target="_blank">{item.id.substr(0, 7)}</a> <a className="button-text" href={"https://explorer.lbry.io/tx/"+item.id} target="_blank">{item.id.substr(0, 7)}</a>
</td> </td>