diff --git a/js/page/my_files.js b/js/page/my_files.js index c368cda48..fb207f9ac 100644 --- a/js/page/my_files.js +++ b/js/page/my_files.js @@ -158,7 +158,11 @@ var MyFilesPage = React.createClass({ }, render: function() { if (this.state.filesInfo === null) { - return null; + return ( +
+ Loading... +
+ ); } if (!this.state.filesInfo.length) { diff --git a/js/page/wallet.js b/js/page/wallet.js index acfd5e67b..b9cbd9cab 100644 --- a/js/page/wallet.js +++ b/js/page/wallet.js @@ -117,6 +117,7 @@ var WalletPage = React.createClass({ getInitialState: function() { return { balance: "Checking balance...", + txlog: "Loading transactions...", } }, componentWillMount: function() { @@ -125,6 +126,21 @@ var WalletPage = React.createClass({ balance: results, }); }); + console.log('Trying to get transaction history...') + lbry.call('get_transaction_history', {}, (results) => { + console.log('Got transaction history:') + console.log(results) + var out = 'Transaction history loaded.' + if (results.length == 0) { + out = 'No transactions yet.' + } else { + out = JSON.stringify(results) + } + console.log(out) + this.setState({ + txlog: out, + }) + }); }, render: function() { return ( @@ -139,6 +155,10 @@ var WalletPage = React.createClass({

Claim Invite Code

+
+

Transaction History

+ {this.state.txlog} +
); }