lukechilds
/
EasyDEX-GUI
mirror of https://github.com/lukechilds/EasyDEX-GUI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

AGP-299, Hook to gettransaction & getrawtransaction & print return values in UI

v0.25
Miika Turunen 7 years ago
parent
2fdc565c8e
commit
862f6d80a5
4 changed files with 226 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      react/src/actions/actionCreators.js
  2. 79
      react/src/actions/actions/getTxDetails.js
  3. 39
      react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js
  4. 205
      react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js

1
react/src/actions/actionCreators.js
View File

@ -54,6 +54,7 @@ export * from './actions/update';
export * from './actions/jumblr'; export * from './actions/jumblr';
export * from './actions/interest'; export * from './actions/interest';
export * from './actions/nativeDashboardUpdate'; export * from './actions/nativeDashboardUpdate';
export * from './actions/getTxDetails';
export function changeActiveAddress(address) { export function changeActiveAddress(address) {
return { return {

79
react/src/actions/actions/getTxDetails.js
View File

@ -0,0 +1,79 @@
import {
triggerToaster
} from '../actionCreators';
import Config from '../../config';
export function getTxDetails(coin, txid, type) {
return new Promise((resolve, reject) => {
const payload = {
mode: null,
chain: coin,
cmd: 'gettransaction',
params: [
txid
],
};
fetch(
`http://127.0.0.1:${Config.agamaPort}/shepherd/cli`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ payload: payload })
},
)
.catch(function(error) {
console.log(error);
dispatch(
triggerToaster(
'getTransaction',
'Error',
'error'
)
);
})
.then(response => response.json())
.then(json => {
resolve(json.result ? json.result : json);
})
});
}
export function getRawTxDetails(coin, txid) {
return new Promise((resolve, reject) => {
const payload = {
mode: null,
chain: coin,
cmd: 'getrawtransaction',
params: [
txid,
1
],
};
fetch(
`http://127.0.0.1:${Config.agamaPort}/shepherd/cli`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ payload: payload })
},
)
.catch(function(error) {
console.log(error);
dispatch(
triggerToaster(
'getTransaction',
'Error',
'error'
)
);
})
.then(response => response.json())
.then(json => {
resolve(json.result ? json.result : json);
})
});
}

39
react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js
View File

@ -2,7 +2,11 @@ import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { translate } from '../../../translate/translate'; import { translate } from '../../../translate/translate';
import { sortByDate } from '../../../util/sort'; import { sortByDate } from '../../../util/sort';
import { toggleDashboardTxInfoModal } from '../../../actions/actionCreators'; import {
toggleDashboardTxInfoModal,
getTxDetails,
getRawTxDetails,
} from '../../../actions/actionCreators';
import Store from '../../../store'; import Store from '../../../store';
import WalletsTxInfoRender from './walletsTxInfo.render'; import WalletsTxInfoRender from './walletsTxInfo.render';
@ -11,8 +15,12 @@ class WalletsTxInfo extends React.Component {
super(); super();
this.state = { this.state = {
activeTab: 0, activeTab: 0,
txDetails: null,
rawTxDetails: null,
}; };
this.toggleTxInfoModal = this.toggleTxInfoModal.bind(this); this.toggleTxInfoModal = this.toggleTxInfoModal.bind(this);
this.loadTxDetails = this.loadTxDetails.bind(this);
this.loadRawTxDetails = this.loadRawTxDetails.bind(this);
} }
toggleTxInfoModal() { toggleTxInfoModal() {
@ -23,6 +31,35 @@ class WalletsTxInfo extends React.Component {
})); }));
} }
componentWillReceiveProps(nextProps) {
const texInfo = nextProps.ActiveCoin.txhistory[nextProps.ActiveCoin.showTransactionInfoTxIndex];
if (texInfo &&
this.props.ActiveCoin.showTransactionInfoTxIndex !== nextProps.ActiveCoin.showTransactionInfoTxIndex) {
this.loadTxDetails(nextProps.ActiveCoin.coin, texInfo.txid);
this.loadRawTxDetails(nextProps.ActiveCoin.coin, texInfo.txid);
}
}
loadTxDetails(coin, txid) {
getTxDetails(coin, txid)
.then((json) => {
this.setState(Object.assign({}, this.state, {
txDetails: json,
}));
});
}
loadRawTxDetails(coin, txid) {
getRawTxDetails(coin, txid)
.then((json) => {
this.setState(Object.assign({}, this.state, {
rawTxDetails: json,
}));
});
}
openTab(tab) { openTab(tab) {
this.setState(Object.assign({}, this.state, { this.setState(Object.assign({}, this.state, {
activeTab: tab, activeTab: tab,

205
react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js
View File

@ -36,120 +36,131 @@ const WalletsTxInfoRender = function(txInfo) {
</li> </li>
</ul> </ul>
<div className="panel-body"> <div className="panel-body">
<div className="tab-content"> { this.state.txDetails &&
{ this.state.activeTab === 0 && <div className="tab-content">
<div className="tab-pane active"> { this.state.activeTab === 0 &&
<div className="tab-pane active">
<table className="table table-striped"> <table className="table table-striped">
<tbody> <tbody>
<tr>
<td>{ translate('TX_INFO.ADDRESS') }</td>
<td>
{ txInfo.address }
</td>
</tr>
<tr>
<td>{ translate('TX_INFO.AMOUNT') }</td>
<td>
{ txInfo.amount }
</td>
</tr>
<tr>
<td>{ translate('TX_INFO.CATEGORY') }</td>
<td>
{ txInfo.category || txInfo.type }
</td>
</tr>
<tr>
<td>{ translate('TX_INFO.CONFIRMATIONS') }</td>
<td>
{ txInfo.confirmations }
</td>
</tr>
{ txInfo.blockhash &&
<tr> <tr>
<td>blockhash</td> <td>{ translate('TX_INFO.ADDRESS') }</td>
<td> <td>
{ txInfo.blockhash } { this.state.txDetails.details[0].address }
</td> </td>
</tr> </tr>
}
{ (txInfo.blocktime || txInfo.timestamp) &&
<tr> <tr>
<td>blocktime</td> <td>{ translate('TX_INFO.AMOUNT') }</td>
<td> <td>
{ secondsToString(txInfo.blocktime || txInfo.timestamp) } { txInfo.amount }
</td> </td>
</tr> </tr>
} <tr>
<tr> <td>{ translate('TX_INFO.CATEGORY') }</td>
<td>txid</td> <td>
<td> { this.state.txDetails.details[0].category || txInfo.type }
{ txInfo.txid } </td>
</td> </tr>
</tr> <tr>
<tr> <td>{ translate('TX_INFO.CONFIRMATIONS') }</td>
<td>walletconflicts</td> <td>
<td> { this.state.txDetails.confirmations }
{ txInfo.walletconflicts.length } </td>
</td> </tr>
</tr> { this.state.txDetails.blockindex &&
<tr>
<td>blockindex</td>
<td>
{ this.state.txDetails.blockindex }
</td>
</tr>
}
{ this.state.txDetails.blockhash &&
<tr>
<td>blockhash</td>
<td>
{ this.state.txDetails.blockhash }
</td>
</tr>
}
{ (this.state.txDetails.blocktime || this.state.txDetails.timestamp) &&
<tr>
<td>blocktime</td>
<td>
{ secondsToString(this.state.txDetails.blocktime || this.state.txDetails.timestamp) }
</td>
</tr>
}
<tr>
<td>txid</td>
<td>
{ this.state.txDetails.txid }
</td>
</tr>
<tr>
<td>walletconflicts</td>
<td>
{ this.state.txDetails.walletconflicts.length }
</td>
</tr>
<tr>
<td>time</td>
<td>
{ secondsToString(this.state.txDetails.time) }
</td>
</tr>
<tr>
<td>timereceived</td>
<td>
{ secondsToString(this.state.txDetails.timereceived) }
</td>
</tr>
</tbody>
</table>
</div>
}
{ this.state.activeTab === 1 &&
<div className="tab-pane active">
<table className="table table-striped">
<tbody>
<tr> <tr>
<td>time</td> <td>vjoinsplit</td>
<td> <td>
{ secondsToString(txInfo.time) } { txInfo.vjoinsplit }
</td> </td>
</tr> </tr>
<tr> <tr>
<td>timereceived</td> <td>details</td>
<td> <td>
{ secondsToString(txInfo.timereceived) } { txInfo.details }
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
} }
{ this.state.activeTab === 1 && { this.state.activeTab === 2 &&
<div className="tab-pane active"> <div className="tab-pane active">
<table className="table table-striped"> <textarea
<tbody> className="full-width height-170"
<tr> rows="10"
<td>vjoinsplit</td> cols="80"
<td> defaultValue={ txInfo.hex }
{ txInfo.vjoinsplit } disabled></textarea>
</td> </div>
</tr> }
<tr> { this.state.activeTab === 3 &&
<td>details</td> <div className="tab-pane active">
<td> <textarea
{ txInfo.details } className="full-width height-400"
</td> rows="40"
</tr> cols="80"
</tbody> defaultValue={ JSON.stringify(this.state.rawTxDetails, null, '\t') }
</table> disabled></textarea>
</div> </div>
} }
{ this.state.activeTab === 2 && </div>
<div className="tab-pane active"> }
<textarea
className="full-width height-170"
rows="10"
cols="80"
defaultValue={ txInfo.hex }
disabled></textarea>
</div>
}
{ this.state.activeTab === 3 &&
<div className="tab-pane active">
<textarea
className="full-width height-400"
rows="40"
cols="80"
defaultValue={ JSON.stringify(txInfo, null, '\t') }
disabled></textarea>
</div>
}
</div>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save