merge dashboardMaster into electron

diff --cc package-lock.json
index a38ec41,d90e885..0b96d64
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -11,11 -11,25 +11,26 @@@
        "dev": true
      },
      "@types/node": {
 -      "version": "8.10.17",
 -      "resolved": "http://registry.npm.taobao.org/@types/node/download/@types/node-8.10.17.tgz",
 -      "integrity": "sha1-1IzxDw3G3PWfgn9aP8ekpgBDGNM=",
 +      "version": "8.10.29",
 +      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz",
 +      "integrity": "sha512-zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ==",
        "dev": true
 +    },
+     "@babel/runtime": {
+       "version": "7.1.2",
+       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz",
+       "integrity": "sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==",
+       "requires": {
+         "regenerator-runtime": "0.12.1"
+       },
+       "dependencies": {
+         "regenerator-runtime": {
+           "version": "0.12.1",
+           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
+           "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
+         }
+       }
+     },
      "abbrev": {
        "version": "1.1.1",
        "resolved": "http://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
@@@ -4931,10 -5238,24 +4974,15 @@@
        "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
        "dev": true
      },
 -    "https-proxy-agent": {
 -      "version": "2.2.1",
 -      "resolved": "http://registry.npm.taobao.org/https-proxy-agent/download/https-proxy-agent-2.2.1.tgz",
 -      "integrity": "sha1-UVUpcPoE1yPgTFbQQXjD+SWSu8A=",
 -      "requires": {
 -        "agent-base": "4.2.0",
 -        "debug": "3.1.0"
 -      }
 -    },
      "i18next": {
-       "version": "10.5.1",
-       "resolved": "http://registry.npm.taobao.org/i18next/download/i18next-10.5.1.tgz",
-       "integrity": "sha1-+OHKThXEQOvDqaXD0BXDptKIeJA="
+       "version": "11.9.1",
+       "resolved": "https://registry.npmjs.org/i18next/-/i18next-11.9.1.tgz",
+       "integrity": "sha512-sUAfCdKYi8EufO6B8aY5RF/hqweCpRKvbxUhlzlmlAr+LgJQ2kXe/5y02kaPu6ApFIiW5WOz8+3ehoy97LUtMw=="
+     },
+     "i18next-browser-languagedetector": {
+       "version": "2.2.3",
+       "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-2.2.3.tgz",
+       "integrity": "sha512-sJZ2n9Vgax0vGer23hJMwyO3FRO7P0dq2DXZPXWE329g3snfJUcw+S24Mp3lqJaxL/0McDu4BD75ds6pzIfhhw=="
      },
      "iconv-lite": {
        "version": "0.4.23",
@@@ -6982,12 -7714,20 +7030,11 @@@
          "asap": "2.0.6"
        }
      },
 -    "promisify-call": {
 -      "version": "2.0.4",
 -      "resolved": "http://registry.npm.taobao.org/promisify-call/download/promisify-call-2.0.4.tgz",
 -      "integrity": "sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=",
 -      "optional": true,
 -      "requires": {
 -        "with-callback": "1.0.2"
 -      }
 -    },
      "prop-types": {
-       "version": "15.6.1",
-       "resolved": "http://registry.npm.taobao.org/prop-types/download/prop-types-15.6.1.tgz",
-       "integrity": "sha1-NmREU1ZCVd3aORGR+zoSXL32VMo=",
+       "version": "15.6.2",
+       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
+       "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
        "requires": {
-         "fbjs": "0.8.16",
          "loose-envify": "1.3.1",
          "object-assign": "4.1.1"
        }

diff --cc package.json
index 9e8891e,842fbfb..d621598
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -92,11 -92,13 +92,12 @@@
      "btoa": "^1.1.2",
      "classnames": "~2.2.5",
      "electron-settings": "~3.1.4",
 -    "glob": "~7.1.2",
 -    "i18next": "~10.5.1",
 -    "log4js": "^2.5.3",
      "fetch-ponyfill": "~3.0.2",
-     "i18next": "~10.5.1",
 +    "glob": "~7.1.2",
+     "i18next": "^11.9.1",
+     "i18next-browser-languagedetector": "^2.2.3",
      "lodash": "~4.17.4",
 +    "log4js": "^3.0.5",
      "moment": "^2.22.1",
      "moment-timezone": "^0.5.17",
      "pluralize": "~3.0.0",

diff --cc src/features/app/components/Navigation/Navigation.jsx
index cc14973,3086ad9..5eb69b5
--- 1/src/features/app/components/Navigation/Navigation.jsx
--- 2/src/features/app/components/Navigation/Navigation.jsx
+++ b/src/features/app/components/Navigation/Navigation.jsx
@@@ -96,11 -98,11 +98,11 @@@ class Navigation extends React.Componen
          </ul>
  
          <ul className={styles.navigation}>
-           <li className={styles.navigationTitle}>{lang === 'zh' ? '开发者' : 'Developer' }</li>
+           <li className={styles.navigationTitle}>{ t('crumbName.developer') }</li>
            <li>
 -            <a href='/equity' target='_blank'>
 +            <a href='http://localhost:9888/equity' target='_blank'>
                {navIcon('transaction', styles)}
-               {lang === 'zh' ? 'Equity 合约' : 'Equity Contract'}
+               { t('crumbName.equity')}
              </a>
            </li>
          </ul>

diff --cc src/features/core/reducers.js
index 2ea095a,9b810d4..4cd332a
--- 1/src/features/core/reducers.js
--- 2/src/features/core/reducers.js
+++ b/src/features/core/reducers.js
@@@ -211,20 -211,16 +211,12 @@@ if(window.remote)
    configuredState = window.remote.getGlobal('fileExist')
  }
  export const configured = (state = configuredState, action) => {
 -  if( mode === 'electron'){
 -    if (action.type == 'SET_CONFIGURED') {
 -      return true
 -    }
 -    return state
 -  }else{
 +  if (action.type == 'SET_CONFIGURED') {
      return true
    }
 +  return state
  }
  
- const defaultLang = window.navigator.language.startsWith('zh') ? 'zh' : 'en'
- const lang = (state = defaultLang, action) => {
-   if (action.type === 'UPDATE_CORE_LANGUAGE') {
-     return action.lang || ''
-   }
-   return state
- }
- 
  const mingStatus = (state = false, action) => {
    if (action.type == 'UPDATE_CORE_INFO') {
      if(window.remote && window.remote.getGlobal('mining').isMining!= action.param.data.mining){