Merge branch 'dapp-v1.4.0' into dev

diff --cc package-lock.json
index 169d110,cba9248..f7ce994
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -10287,15 -10340,9 +10340,15 @@@
        "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
        "dev": true,
        "requires": {
-         "lodash": "4.17.15"
+         "lodash": "^4.17.5"
        }
      },
 +    "webpack-node-externals": {
 +      "version": "1.7.2",
 +      "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz",
 +      "integrity": "sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg==",
 +      "dev": true
 +    },
      "webpack-sources": {
        "version": "1.1.0",
        "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz",

diff --cc package.json
Simple merge

diff --cc src/assets/language/cn.js
index cf80f1f,ff4be84..6c26250
--- 1/src/assets/language/cn.js
--- 2/src/assets/language/cn.js
+++ b/src/assets/language/cn.js
@@@ -1,12 -1,19 +1,24 @@@
  const cn = {
    home:{
 -    title:"比原链插件钱包"
 +    welcome:"欢迎使用",
 +    byone:" Byone 钱包",
 +    create:"创建钱包",
 +    createHint:"创建一个新的钱包来存储和交易您的 BTM 及侧链代币",
 +    import:"导入钱包",
 +    importHint:"如果您在其它网站或 App 上创建过钱包，可以在这里导入"
    },
+   common:{
+     veto: '取消投票',
+     cross_chain_in: '跨入Vapor',
+     spend : '花费',
+     coinbase: 'Coinbase',
+     control : '接受',
+     cross_chain_out: '跨出Vapor',
+     vote: '投票',
+     transfer:'转账',
+     issue:'资产发行',
+     retire:'资产销毁',
+   },
    welcome: {
      title: '欢迎使用BYTOM精简Chrome钱包',
      use: '开始',

diff --cc src/utils/constants.js
index ae75466,29efecc..7334bc5
--- 1/src/utils/constants.js
--- 2/src/utils/constants.js
+++ b/src/utils/constants.js
@@@ -28,7 -27,25 +28,27 @@@ export const networks = 
  export const networksJS = {
    mainnet: `${networks['mainnet']}/bytom/v3/`,
    mainnetvapor: `${networks['mainnet']}/vapor/v3/` ,
 +  testnet: `${networks['testnet']}:4000/bytom/v3/`,
 +  testnetvapor: `${networks['testnet']}:3000/vapor/v3/` ,
  }
  
+ 
+ export const decimalsMap = {
+   mainnet:{
+     '184e1cc4ee4845023888810a79eed7a42c02c544cf2c61ceac05e176d575bd46':6,
+     '25f2069140fa3ff4d6e0dc1d0fcaa11ace01eb721f115f0f1a5a3782db597fb1':6,
+     '78de44ffa1bce37b757c9eae8925b5f199dc4621b412ef0f3f46168865284a93':9,
+     'bda946b3110fa46fd94346ce3f05f0760f1b9de72e238835bc4d19f9d64f1742':8,
+     'c4644dd6643475d57ed624f63129ab815f282b61f4bb07646d73423a6e1a1563':6,
+     'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff':8
+   },
+   tesetnet:{
+     '328d60d8192425beeaea53dbbc7900778ec06f4ca2e4499f92aea6ca17645d4c':8,
+     '4483893ef7d9aac788c0e9e49a12398c1d35a2172adb1c8dc551fd169a6f5703':8,
+     '57e5b3a3040e1c0162f64019838fd93b5f33dcde7069fa72aee48a054143443f':8,
+     'a0889e1080999e59ed552865a1d3ee677202796222141ccc3552041708aad76c':8,
+     'babb18008ba6cf533fed6bc2bb8e98b3978c324f221aa679ba4c2b558a8fa97d':8,
+     'd50a426bdaaf1458d161aba4d8c3ebdd095eac7e1bbeb4a0252a3737ccf2d492':8,
+     'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff':8
+   }
+ }