OSDN Git Service

change the position of netwrok info
authorZhiting Lin <zlin035@uottawa.ca>
Wed, 18 Apr 2018 05:55:45 +0000 (13:55 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Wed, 18 Apr 2018 05:55:45 +0000 (13:55 +0800)
src/features/app/components/Navigation/Navigation.jsx
src/features/app/components/Sync/Sync.jsx

index 00742ba..2f5782b 100644 (file)
@@ -88,11 +88,6 @@ class Navigation extends React.Component {
           lang={lang}
         />
 
-
-        <ul className={`${styles.navigation} ${styles.networkStatus}`}>
-          <li className={`${styles.navigationTitle} ${styles.networkWord}`}>{coreData? coreData['networkId']: ''}</li>
-        </ul>
-
       </div>
     )
   }
index ed90d45..31318f0 100644 (file)
@@ -9,17 +9,16 @@ class Sync extends React.Component {
     if(!coreData){
       return <ul></ul>
     }
+    const networkID = coreData.networkId
     const syncing = coreData.syncing
-    // const syncing = true
     const peerCount = coreData.peerCount
     const currentBlock = coreData.currentBlock
-    // const currentBlock = 1
     const highestBlock = coreData.highestBlock
-    // const highestBlock = currentBlock
     const lang = this.props.lang
 
     if (syncing) {
       return <ul className={`${navStyles.navigation} ${styles.main}`}>
+        <li key='sync-networkID' className={navStyles.navigationTitle}>{ networkID }</li>
         <li key='sync-title' className={navStyles.navigationTitle}>{ lang === 'zh' ? '网络同步状态' : 'Network Sync Status'}</li>
         <li key='sync-status'>{lang === 'zh' ? '同步中: ' : 'Synchronizing: '}  {currentBlock}/{highestBlock}</li>
         <li key='sync-peer-count'>{lang === 'zh' ? '节点数' : 'Peer Count'}: {peerCount}</li>
@@ -28,6 +27,7 @@ class Sync extends React.Component {
 
     const elems = []
 
+    elems.push(<li key='sync-networkID' className={navStyles.navigationTitle}>{ networkID }</li>)
     elems.push(<li key='sync-title' className={navStyles.navigationTitle}>{ lang === 'zh' ? '网络同步状态' : 'Network Sync Status' }</li>)
 
     if(!syncing && currentBlock == highestBlock){