Merge pull request #240 from MickWang/master

update ledger connector
ontio · Jul 7, 2020 · 2fc42dc · 2fc42dc
2 parents 83f01a2 + 715ce75
commit 2fc42dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/renderer/components/Common/SelectWallet.vue b/src/renderer/components/Common/SelectWallet.vue
@@ -81,7 +81,9 @@ export default {
 			this.walletType = e.target.value;
 			if (e.target.value === "ledgerWallet") {
 				this.$store.dispatch("getLedgerStatus");
-            }
+            } else {
+				this.$store.dispatch('stopGetLedgerStatus')
+			}
             this.$emit("walletSelected", {
 				walletType: this.walletType,
 				wallet: null

diff --git a/src/renderer/store/modules/LedgerConnector.js b/src/renderer/store/modules/LedgerConnector.js
@@ -36,9 +36,10 @@ function getDevice(commit, state) {
 }
 
 function getLedgerPublicKey(commit, state) {
-    if (state.publicKey) {
-        return;
-    }
+    // 这里如果去掉，再SelectWallet组件里，切换类型后不再重新获取ledger地址，会产生bug。
+    // if (state.publicKey) {
+    //     return;
+    // }
     getPublicKey().then(res => {
         console.log('pk info: ' + res);
         commit('UPDATE_LEDGER_PUBLICKEY', { publicKey: res })