import dashboard UI.

diff --git a/src/features/backup/actions.js b/src/features/backup/actions.js
index bba6994..d3956c0 100644 (file)
--- a/src/features/backup/actions.js
+++ b/src/features/backup/actions.js
@@ -11,7 +11,7 @@ let actions = {
           const date = new Date()
           const dateStr = date.toLocaleDateString().split(' ')[0]
           const timestamp = date.getTime()
-          const fileName = ['vapor-wallet-backup-', dateStr, timestamp].join('-')
+          const fileName = ['vapor-wallet-backup-', dateStr, timestamp].join('-')+'.dat'
 
           let element = document.createElement('a')
           element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(resp.data)))

diff --git a/src/features/core/components/CoreIndex/CoreIndex.jsx b/src/features/core/components/CoreIndex/CoreIndex.jsx
index cbe2fb8..0af1326 100644 (file)
--- a/src/features/core/components/CoreIndex/CoreIndex.jsx
+++ b/src/features/core/components/CoreIndex/CoreIndex.jsx
@@ -189,8 +189,8 @@ class CoreIndex extends React.Component {
         <PageTitle
           title={t('coreIndex.coreStatus')}
           actions={[
-            <button className={`btn btn-link ${styles.actionBtn}`} onClick={this.consolePopup}>
-              <span>{t('console.title')}</span> <img src={require('images/console-window.svg')}/>
+            <button className='btn btn-link' onClick={this.consolePopup}>
+              <img src={require('images/console-window.svg')}/>
             </button>
           ]}
         />

diff --git a/src/features/initialization/components/Index/Index.scss b/src/features/initialization/components/Index/Index.scss
index 1507f4a..4e16863 100644 (file)
--- a/src/features/initialization/components/Index/Index.scss
+++ b/src/features/initialization/components/Index/Index.scss
@@ -25,7 +25,7 @@
   justify-content: space-between;
 
   > div {
-    width: 45%;
+    width: 40%;
     min-height: 100%;
   }
 }

diff --git a/src/features/transactions/components/DetailSummary/DetailSummary.jsx b/src/features/transactions/components/DetailSummary/DetailSummary.jsx
index 30e2b8e..0ae946a 100644 (file)
--- a/src/features/transactions/components/DetailSummary/DetailSummary.jsx
+++ b/src/features/transactions/components/DetailSummary/DetailSummary.jsx
@@ -136,7 +136,7 @@ class DetailSummary extends React.Component {
                 type = 'sent'
                 items.push({
                   type: 'crossOut',
-                  amount: normalizeBtmAmountUnit(assetId,  crossOut, this.props.btmAmountUnit),
+                  amount: asset.decimals? converIntToDec(crossOut, asset.decimals) :normalizeBtmAmountUnit(assetId,  crossOut, this.props.btmAmountUnit),
                   asset: assetAlias ? assetAlias : <code className={styles.rawId}>{assetId}</code>,
                   assetId: assetId,
                   account: account.alias ? account.alias : <code className={styles.rawId}>{accountId}</code>,
@@ -183,7 +183,7 @@ class DetailSummary extends React.Component {
                 type = 'received'
                 items.push({
                   type: 'crossIn',
-                  amount: normalizeBtmAmountUnit(assetId,  crossIn, this.props.btmAmountUnit),
+                  amount: asset.decimals? converIntToDec(crossIn, asset.decimals) :normalizeBtmAmountUnit(assetId,  crossIn, this.props.btmAmountUnit),
                   asset: assetAlias ? assetAlias : <code className={styles.rawId}>{assetId}</code>,
                   assetId: assetId,
                   account: account.alias ? account.alias : <code className={styles.rawId}>{accountId}</code>,

diff --git a/src/features/transactions/components/DetailSummary/DetailSummary.scss b/src/features/transactions/components/DetailSummary/DetailSummary.scss
index dd9f5bb..6187f94 100644 (file)
--- a/src/features/transactions/components/DetailSummary/DetailSummary.scss
+++ b/src/features/transactions/components/DetailSummary/DetailSummary.scss
@@ -49,7 +49,7 @@
 }
 
 .colAction{
-  width: 25%;
+  width: 22%;
   flex-grow: 1;
 }
 
@@ -65,7 +65,7 @@
 }
 
 .end{
-  width: 25%;
+  width: 28%;
   display: flex;
   flex-grow: 1;
   justify-content: flex-end;

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index fcc6b38..1ab9fdb 100644 (file)
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -155,7 +155,9 @@
   "xpub":{
     "methodOptions" : {
       "mockhsm": "Use existing key",
-      "provide": "Provide existing xpub"
+      "provide": "Provide existing xpub",
+      "generate": "Generate a new key",
+      "currentAccount": "Current account xpub"
     },
     "providePlaceholder": "Enter xpub"
   },

diff --git a/src/locales/zh/translation.json b/src/locales/zh/translation.json
index ea30a12..a8b1dfe 100644 (file)
--- a/src/locales/zh/translation.json
+++ b/src/locales/zh/translation.json
@@ -155,7 +155,9 @@
   "xpub":{
     "methodOptions" : {
       "mockhsm": "使用已有的密钥",
-      "provide": "提供已有的扩展公钥"
+      "provide": "提供已有的扩展公钥",
+      "generate": "新建密钥",
+      "currentAccount": "本账户扩展密钥"
     },
     "providePlaceholder": "输入扩展公钥"
   },