fix import mnemonic bug

ontio · Aug 15, 2018 · 85001db · 85001db
1 parent 4beff07
commit 85001db
Show file tree

Hide file tree

Showing 10 changed files with 10,952 additions and 5,483 deletions.
diff --git a/build/icons/256x256.png b/build/icons/256x256.png
diff --git a/build/icons/512x512.png b/build/icons/512x512.png
diff --git a/build/icons/icon.icns b/build/icons/icon.icns
diff --git a/build/icons/icon.ico b/build/icons/icon.ico
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "ont-wallet-test",
   "productName": "OWallet",
   "homepage": "http://ont.io",
-  "version": "v0.8.2",
+  "version": "v0.8.3",
   "author": "MickeyWang <wangdashuang@onchain.com>",
   "description": "ledger",
   "license": "Apache-2.0",
@@ -70,7 +70,7 @@
       "icon": "build/icons"
     },
     "directories": {
-      "buildResources": "resources",
+      "buildResources": "build",
       "output": "release"
     },
     "mac": {

diff --git a/src/renderer/components/Dashboard.vue b/src/renderer/components/Dashboard.vue
@@ -302,6 +302,17 @@
     color: #5E6369;
     border: none;
   }
+  .copy-icon {
+    width:18px;
+    height:18px;
+    display: inline-block;
+    margin-left: 10px;
+    background: url('../assets/copy.png') center center;
+    background-size: cover;
+    cursor: pointer;
+    position: relative;
+    top: 5px;
+}
 </style>
 <template>
   <div class="home-container">
@@ -310,7 +321,10 @@
     <div class="content-container">
       <div class="left-half">
         <div class="wallet-info">
-          <p>{{$t('sharedWalletHome.address')}}: {{this.address}}</p>
+          <p>
+            <span>{{$t('sharedWalletHome.address')}}: {{this.address}}</span>
+            <span class="copy-icon" @click="copy(address)"></span>
+          </p>
           <!-- <div>
             <span>{{$t('sharedWalletHome.publicKey')}}:</span>
             <span class="wallet-pk">{{this.publicKey}}</span>
@@ -543,7 +557,7 @@ import { BigNumber } from 'bignumber.js';
                 this.balance.ont = r.Balance;
               }
             }
-            this.getExchangeCurrency()
+            // this.getExchangeCurrency()
           }
         })
 
@@ -688,6 +702,10 @@ import { BigNumber } from 'bignumber.js';
           url += '/testnet'
         }
         window.location.href = url;
+      },
+      copy(value) {
+            this.$copyText(value);
+            this.$message.success(this.$t('common.copied'))
       }
     }
   }

diff --git a/src/renderer/components/Home.vue b/src/renderer/components/Home.vue
@@ -86,7 +86,7 @@
       </div>
 
       <div class="div-footer-version">
-        <p>Version: 0.8.2</p>
+        <p>Version: 0.8.3</p>
         <p>Powered by Ontology</p>
       </div>
     </div>

diff --git a/src/renderer/components/JsonWallet/Import/BasicInfo.vue b/src/renderer/components/JsonWallet/Import/BasicInfo.vue
@@ -261,15 +261,17 @@
       },
       importAccountForMnemonic() {
         // 助记词导入
-        const res = Ont.SDK.importAccountMnemonic(this.mnemonicLabel, this.mnemonic, this.mnemonicPassword);
-        if (res.error === 0) {
-          this.mnemonicAccount = JSON.parse(res.result)
-          this.saveToDb(this.mnemonicAccount)
-        } else if (res.error === 42002) {
-          this.$message.error(this.$t('basicInfo.InvalidMnemonic'));
+        let account
+        try {
+          account = Ont.Account.importWithMnemonic(this.mnemonicLabel, this.mnemonic, this.mnemonicPassword, DEFAULT_SCRYPT)
+        } catch (err) {
+          this.message.error(this.t('basicInfo.InvalidMnemonic'))
         }
+        this.mnemonicAccount = account.toJsonObj()
+        this.saveToDb(this.mnemonicAccount)
       },
       saveToDb(account) {
+        account.isDefault = true;
         const that = this;
         const wallet = {
           type: 'CommonWallet',

diff --git a/src/renderer/components/SharedWallet/SharedWalletHome.vue b/src/renderer/components/SharedWallet/SharedWalletHome.vue
@@ -246,6 +246,17 @@
     border-radius: 0;
     background: rgba(0,0,0,0.1);
 }
+.copy-icon {
+    width:18px;
+    height:18px;
+    display: inline-block;
+    margin-left: 10px;
+    background: url('../../assets/copy.png') center center;
+    background-size: cover;
+    cursor: pointer;
+    position: relative;
+    top: 5px;
+}
 </style>
 <template>
     <div class="home-container">
@@ -254,7 +265,10 @@
         <div class="content-container">
             <div class="left-half">
                 <div class="wallet-info">
-                    <p>{{$t('sharedWalletHome.walletAddress')}}: {{this.sharedWallet.sharedWalletAddress}}</p>
+                    <p>
+                        <span>{{$t('sharedWalletHome.walletAddress')}}: {{this.sharedWallet.sharedWalletAddress}}</span>
+                        <span class="copy-icon" @click="copy()"></span>
+                    </p>
 
                 </div>
                 <div class="wallet-balance">
@@ -438,7 +452,7 @@ export default {
             restClient.getBalance(from).then(res => {
             this.balance.ont = res.Result.ont
             this.balance.ong = new BigNumber(res.Result.ong).div(1e9).toFixed(9)
-            this.getExchangeCurrency()
+            // this.getExchangeCurrency()
             })
         },
         getExchangeCurrency() {
@@ -545,6 +559,10 @@ export default {
             url += '/testnet'
         }
         window.location.href = url;
+      },
+      copy() {
+            this.$copyText(this.sharedWallet.sharedWalletAddress);
+            this.$message.success(this.$t('common.copied'))
       }
     }
 }