diff --git a/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js b/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js index 3742cea..03a021b 100644 --- a/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js +++ b/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js @@ -35,7 +35,10 @@ class WalletsTxInfo extends React.Component { render() { if (this.props && this.props.ActiveCoin.showTransactionInfo && - this.props.ActiveCoin.mode !== 'native') { + // TODO the conditions below should be merged once the native mode components are fully merged + // into the rest of the components + (!this.isNativeMode() || + (this.isNativeMode() && this.props.ActiveCoin.nativeActiveSection === 'default'))) { const txInfo = this.props.ActiveCoin.txhistory[this.props.ActiveCoin.showTransactionInfoTxIndex]; return WalletsTxInfoRender.call(this, txInfo); } diff --git a/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js b/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js index a9dfa98..07299a2 100644 --- a/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js +++ b/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js @@ -88,24 +88,33 @@ const WalletsTxInfoRender = function(txInfo) { { txInfo.txid } + + { this.isNativeMode() && walletconflicts { txInfo.walletconflicts.length } + } + + { this.isNativeMode() && time { secondsToString(txInfo.time) } + } + + { this.isNativeMode() && timereceived { secondsToString(txInfo.timereceived) } + }