From 1598d9b12923a4536b2618a216562649c4a31588 Mon Sep 17 00:00:00 2001
From: petitPapillon <ivana.trajanovska@yahoo.com>
Date: Sun, 18 Jun 2017 12:04:55 +0200
Subject: [PATCH] WalletsTxInfo component - update the render method condition
 to include the native mode tx-s TxInfo tab - walletconflicts, time,
 timereceived should only be displayed in native mode

---
 .../components/dashboard/walletsTxInfo/walletsTxInfo.js  | 5 ++++-
 .../dashboard/walletsTxInfo/walletsTxInfo.render.js      | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

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 }
                           </td>
                         </tr>
+
+                        { this.isNativeMode() &&
                         <tr>
                           <td>walletconflicts</td>
                           <td>
                             { txInfo.walletconflicts.length }
                           </td>
                         </tr>
+                        }
+
+                        { this.isNativeMode() &&
                         <tr>
                           <td>time</td>
                           <td>
                             { secondsToString(txInfo.time) }
                           </td>
                         </tr>
+                        }
+
+                        { this.isNativeMode() &&
                         <tr>
                           <td>timereceived</td>
                           <td>
                             { secondsToString(txInfo.timereceived) }
                           </td>
                         </tr>
+                        }
                         </tbody>
                       </table>
                     </div>