fix(neuron-wallet): set current wallet empty if wallet list is empty

Keith-CY · Keith-CY · commit b43850965217 · 2019-08-02T17:32:44.000+08:00
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
@@ -245,6 +245,8 @@ export default class WalletService {
     if (currentID === id) {
       if (newWallets.length > 0) {
         this.setCurrent(newWallets[0].id)
+      } else {
+        this.setCurrent('')
       }
     }
 
@@ -258,9 +260,11 @@ export default class WalletService {
       throw new IsRequired('ID')
     }
 
-    const wallet = this.get(id)
-    if (!wallet) {
-      throw new WalletNotFound(id)
+    if (id !== '') {
+      const wallet = this.get(id)
+      if (!wallet) {
+        throw new WalletNotFound(id)
+      }
     }
 
     this.listStore.writeSync(this.currentWalletKey, id)

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,8 @@ export default class WalletService {`
`245`	`245`	`if (currentID === id) {`
`246`	`246`	`if (newWallets.length > 0) {`
`247`	`247`	`this.setCurrent(newWallets[0].id)`
	`248`	`+ } else {`
	`249`	`+ this.setCurrent('')`
`248`	`250`	`}`
`249`	`251`	`}`
`250`	`252`
`@@ -258,9 +260,11 @@ export default class WalletService {`
`258`	`260`	`throw new IsRequired('ID')`
`259`	`261`	`}`
`260`	`262`
`261`		`- const wallet = this.get(id)`
`262`		`- if (!wallet) {`
`263`		`- throw new WalletNotFound(id)`
	`263`	`+ if (id !== '') {`
	`264`	`+ const wallet = this.get(id)`
	`265`	`+ if (!wallet) {`
	`266`	`+ throw new WalletNotFound(id)`
	`267`	`+ }`
`264`	`268`	`}`
`265`	`269`
`266`	`270`	`this.listStore.writeSync(this.currentWalletKey, id)`