native section toggle

react/src/actions/actionCreators.js

@@ -47,10 +47,13 @@ export function toggleDashboardActiveSection(name) {
   }
 }
 
-export function toggleDashboardTxInfoModal(display) {
+export function toggleDashboardTxInfoModal(display, txIndex) {
+      console.log('toggleTxInfoModal', txIndex);
+
   return {
     type: DASHBOARD_ACTIVE_TXINFO_MODAL,
     showTransactionInfo: display,
+    showTransactionInfoTxIndex: txIndex,
   }
 }
 

react/src/components/dashboard/dashboard.js

@@ -16,6 +16,7 @@ import About from './about';
 import WalletsBasiliskRefresh from './walletsBasiliskRefresh';
 import WalletsBasiliskConnection from './walletsBasiliskConnection';
 import WalletsNative from './walletsNative';
+import WalletsNativeTxInfo from './walletsNativeTxInfo';
 
 class Dashboard extends React.Component {
   constructor(props) {
@@ -42,6 +43,7 @@ class Dashboard extends React.Component {
             <WalletsBasiliskRefresh {...this.props} />
             <WalletsBasiliskConnection {...this.props} />
             <WalletsNative {...this.props} />
+            <WalletsNativeTxInfo {...this.props} />
           </div>
           <div className={this.props.Dashboard.activeSection === 'edex' ? 'show' : 'hide'}>
             <EDEX {...this.props} />

react/src/components/dashboard/walletsNative.js

@@ -7,17 +7,12 @@ import WalletsNativeReceive from './walletsNativeReceive';
 import WalletsNativeSend from './walletsNativeSend';
 import WalletsNativeSyncProgress from './walletsNativeSyncProgress';
 import WalletsNativeTxHistory from './walletsNativeTxHistory';
-import WalletsNativeTxInfo from './walletsNativeTxInfo';
 
 class WalletsNative extends React.Component {
   constructor(props) {
     super(props);
   }
 
-      /*$('.header-easydex-section')
-      .html('<img src="assets/images/native/' + imgSrcName + '_header_title_logo.png"> <span style="font-size: 35px; vertical-align: middle">' + _coin + '</span>');
-    $('#easydex-header-div').css('background-image', 'url("assets/images/bg/' + imgBgName + '_transparent_header_bg.png")');*/
-
   render() {
     if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.mode === 'native') {
       return (
@@ -42,7 +37,6 @@ class WalletsNative extends React.Component {
                 <WalletsNativeInfo {...this.props} />
               </div>
             </div>
-            <WalletsNativeTxInfo {...this.props} />
           </div>
         </div>
       );

react/src/components/dashboard/walletsNativeBalance.js

@@ -3,6 +3,7 @@ import { translate } from '../../translate/translate';
 
 class WalletsNativeBalance extends React.Component {
   render() {
+    if (this.props && this.props.ActiveCoin.nativeActiveSection === 'default') {
       return (
         <div className="col-xs-12">
           <div className="col-lg-3 col-xs-12" data-extcoin="COIN" id="kmd_widget_get_total_balance_t">
@@ -66,6 +67,9 @@ class WalletsNativeBalance extends React.Component {
           </div>
         </div>
       );
+    } else {
+      return null;
+    }
   }
 }
 

react/src/components/dashboard/walletsNativeInfo.js

@@ -7,7 +7,7 @@ class WalletsNativeInfo extends React.Component {
   }
 
   render() {
-    if (this.props && this.props.Dashboard && this.props.Dashboard.progress) {
+    if (this.props && this.props.Dashboard && this.props.Dashboard.progress && this.props.ActiveCoin.nativeActiveSection === 'settings') {
       return (
         <div data-extcoin="COIN" id="kmd_wallet_settings">
           <div className="col-xlg-6 col-md-4">

react/src/components/dashboard/walletsNativeReceive.js

@@ -36,7 +36,7 @@ class WalletsNativeReceive extends React.Component {
   }
 
   render() {
-    if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.receive) {
+    if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.nativeActiveSection === 'receive') {
       return (
         <div data-extcoin="COIN" id="kmd_wallet_recieve">
           <div className="col-xs-12 margin-top-20">

react/src/components/dashboard/walletsNativeSend.js

@@ -3,7 +3,7 @@ import { translate } from '../../translate/translate';
 
 class WalletsNativeSend extends React.Component {
   render() {
-    if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.send) {
+    if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.nativeActiveSection === 'send') {
       return (
         <div data-extcoin="COIN" id="kmd_wallet_send">
           <div className="col-xlg-12 col-md-12 col-sm-12 col-xs-12">

react/src/reducers/activeCoin.js

@@ -19,6 +19,7 @@ export function ActiveCoin(state = {
   balance: 0,
   nativeActiveSection: 'default',
   showTransactionInfo: false,
+  showTransactionInfoTxIndex: null,
   txhistory: [],
 }, action) {
   switch (action.type) {
@@ -56,7 +57,8 @@ export function ActiveCoin(state = {
       });
     case DASHBOARD_ACTIVE_TXINFO_MODAL:
       return Object.assign({}, state, {
-        showTransactionInfo: action.display,
+        showTransactionInfo: action.showTransactionInfo,
+        showTransactionInfoTxIndex: action.showTransactionInfoTxIndex,
       });
     case DASHBOARD_ACTIVE_COIN_NATIVE_BALANCE:
       return Object.assign({}, state, {

react/src/styles/index.scss

@@ -77,7 +77,8 @@ body {
 }
 
 #edexcoin_dashboardinfo a,
-.nav-top-menu {
+.nav-top-menu,
+#kmd_txid_info_mdl .nav-tabs li {
   cursor: pointer;
   cursor: hand;
 }