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

nervosnetwork · Aug 2, 2019 · b438509 · b438509
1 parent 315623a
commit b438509
Showing 1 changed file with 7 additions and 3 deletions.
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)