From 3b75e896abf35ceedd2e8dbcf5cc17f86763c918 Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Sun, 11 Aug 2019 19:54:18 +0800
Subject: [PATCH 01/38] chore(wallet-deps): Add @types/webdriverio

---
 packages/neuron-wallet/package.json | 1 +
 yarn.lock                           | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index fd958ac931..892f64de99 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -56,6 +56,7 @@
     "@types/elliptic": "6.4.8",
     "@types/sqlite3": "3.1.5",
     "@types/uuid": "3.4.4",
+    "@types/webdriverio": "4.13.0",
     "devtron": "1.4.0",
     "electron": "5.0.7",
     "electron-builder": "21.2.0",
diff --git a/yarn.lock b/yarn.lock
index 8f9a46e38d..8d77c7e161 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3291,6 +3291,13 @@
     "@types/unist" "*"
     "@types/vfile-message" "*"
 
+"@types/webdriverio@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@types/webdriverio/-/webdriverio-4.13.0.tgz#05acc3cbea6de5251c7adad16da1ee626858350e"
+  integrity sha512-4SpsMUy6MatxIQidOZR4HpAgIi5Lzpvo7nCdq+7SdLvUGCNLPLaWSwdtpHK+En3CqQTb559kSIWR4SKFWT8H3w==
+  dependencies:
+    "@types/node" "*"
+
 "@types/webpack-env@*":
   version "1.13.9"
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a"

From 503e948f648b8dabee61d23db66ba2c48d646c69 Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Mon, 12 Aug 2019 00:58:27 +0800
Subject: [PATCH 02/38] chore: Add wallet e2e test

---
 .../neuron-wallet/tests-e2e/example.test.ts   |  37 -----
 packages/neuron-wallet/tests-e2e/utils.ts     |  20 +++
 .../neuron-wallet/tests-e2e/wallet.test.ts    | 156 ++++++++++++++++++
 3 files changed, 176 insertions(+), 37 deletions(-)
 delete mode 100644 packages/neuron-wallet/tests-e2e/example.test.ts
 create mode 100644 packages/neuron-wallet/tests-e2e/utils.ts
 create mode 100644 packages/neuron-wallet/tests-e2e/wallet.test.ts

diff --git a/packages/neuron-wallet/tests-e2e/example.test.ts b/packages/neuron-wallet/tests-e2e/example.test.ts
deleted file mode 100644
index fbdb3b6907..0000000000
--- a/packages/neuron-wallet/tests-e2e/example.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Application } from 'spectron'
-import path from 'path'
-
-describe('setup tests', () => {
-  let app: Application
-
-  beforeAll(async () => {
-    let electronPath = path.join(__dirname, '..', 'node_modules', '.bin', 'electron')
-    if (process.platform === 'win32') {
-      electronPath += '.cmd'
-    }
-
-    app = new Application({
-      path: electronPath,
-      args: [path.join(__dirname, '..', 'dist', 'main.js')],
-    })
-
-    return app.start()
-  })
-
-  afterAll(() => {
-    if (app.isRunning) {
-      return app.stop()
-    }
-    return null
-  })
-
-  it('opens app window', async () => {
-    if (app) {
-      const { client, browserWindow } = app
-      await client.waitUntilWindowLoaded()
-      const title = await browserWindow.getTitle()
-
-      expect(title).toBe('Neuron')
-    }
-  })
-})
diff --git a/packages/neuron-wallet/tests-e2e/utils.ts b/packages/neuron-wallet/tests-e2e/utils.ts
new file mode 100644
index 0000000000..fc1b776c1f
--- /dev/null
+++ b/packages/neuron-wallet/tests-e2e/utils.ts
@@ -0,0 +1,20 @@
+import { SpectronClient } from 'spectron'
+
+export const getElementByTagName = async (client: SpectronClient, tagName: string, textContent: string) => {
+  const elements = await client.elements(`<${tagName} />`)        
+  for (let index = 0; index < elements.value.length; index++) {
+    const element = elements.value[index];
+    const text = await client.elementIdText(element.ELEMENT)    
+    if (text.value === textContent) {
+      return element
+    }
+  }
+  return null
+}
+
+export const sleep = (delay: number) => {
+  var start = (new Date()).getTime();
+  while ((new Date()).getTime() - start < delay) {
+    continue;
+  }
+}
diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
new file mode 100644
index 0000000000..aa9f2b1c3e
--- /dev/null
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -0,0 +1,156 @@
+import { Application } from 'spectron'
+import path from 'path'
+import { sleep, getElementByTagName } from './utils'
+
+// Test create/import/switch/edit wallet
+describe('wallet tests', () => {
+  let app: Application
+
+  beforeAll(() => {
+    let electronPath = path.join(__dirname, '..', 'node_modules', '.bin', 'electron')
+    if (process.platform === 'win32') {
+      electronPath += '.cmd'
+    }
+    app = new Application({
+      path: electronPath,
+      args: [path.join(__dirname, '..', 'dist', 'main.js')],
+    })
+    return app.start()
+  })
+
+  afterAll(() => {
+    if (app.isRunning) {
+      return app.stop()
+    }
+  })
+
+  it('create wallet', async () => {
+    const { client } = app
+    await client.waitUntilWindowLoaded()
+
+    // click create wallet
+    const createWalletButton = await getElementByTagName(client, 'button', '创建新钱包')
+    expect(createWalletButton).not.toBeNull()
+    await client.elementIdClick(createWalletButton!.ELEMENT)
+
+    // copy mnemonic
+    const mnemonicTextarea = await client.element('<textarea />')
+    const mnemonic = await client.elementIdText(mnemonicTextarea.value.ELEMENT)
+    const mnemonicText = mnemonic.value
+    // next
+    const mnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
+    expect(mnemonicNextButton).not.toBeNull()
+    await client.elementIdClick(mnemonicNextButton!.ELEMENT)
+
+    // input mnemonic
+    const inputMnemonicTextarea = await client.element('<textarea />')
+    expect(inputMnemonicTextarea.value).not.toBeNull()
+    await client.elementIdValue(inputMnemonicTextarea.value.ELEMENT, mnemonicText)
+    // next
+    const inputMnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
+    expect(inputMnemonicNextButton).not.toBeNull()
+    await client.elementIdClick(inputMnemonicNextButton!.ELEMENT)
+
+    // setup wallet
+    const inputElements = await client.elements('<input />')
+    expect(inputElements.value).not.toBeNull()
+    expect(inputElements.value.length).toBe(3)
+    const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
+    await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
+    await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
+    // next
+    const setupWalletNextButton = await getElementByTagName(client, 'button', '下一步')
+    expect(setupWalletNextButton).not.toBeNull()
+    await client.elementIdClick(setupWalletNextButton!.ELEMENT)
+    sleep(200)
+
+    // test create success
+    const walletNameElement = await client.element('//MAIN/DIV/H1')
+    expect(walletNameElement.value).not.toBeNull()
+    const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
+    expect(walletName.value).toBe(walletNameInputText.value)
+  })
+
+  it('import wallet', async () => {
+    const { client } = app
+
+    // Go to setting page
+    const networkElement = await client.element('//FOOTER/DIV[1]/DIV[2]')
+    expect(networkElement.value).not.toBeNull()
+    await client.elementIdClick(networkElement.value.ELEMENT)
+
+    // Switch to wallet setting
+    const walletSettingButton = await getElementByTagName(client, 'button', '钱包')
+    expect(walletSettingButton).not.toBeNull()
+    await client.elementIdClick(walletSettingButton!.ELEMENT)
+
+    // Go to import wallet page
+    const importWalletButton = await getElementByTagName(client, 'button', '导入钱包')
+    expect(importWalletButton).not.toBeNull()
+    await client.elementIdClick(importWalletButton!.ELEMENT)
+
+    // Input mnemonic
+    const mnemonicTextarea = await client.element('<textarea />')
+    expect(mnemonicTextarea.value).not.toBeNull()
+    const mnemonicText = 'refuse ecology globe virus demand gentle couch scrub bulk project chronic dog'
+    // next
+    await client.elementIdValue(mnemonicTextarea.value.ELEMENT, mnemonicText)
+    const mnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
+    expect(mnemonicNextButton).not.toBeNull()
+    await client.elementIdClick(mnemonicNextButton!.ELEMENT)
+
+    // // setup wallet
+    const inputElements = await client.elements('<input />')
+    expect(inputElements.value).not.toBeNull()
+    expect(inputElements.value.length).toBe(3)
+    const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
+    await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
+    await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
+    // next
+    const setupWalletNextButton = await getElementByTagName(client, 'button', '下一步')
+    expect(setupWalletNextButton).not.toBeNull()
+    await client.elementIdClick(setupWalletNextButton!.ELEMENT)
+    sleep(200)
+
+    // test create success
+    const walletNameElement = await client.element('//MAIN/DIV/H1')
+    expect(walletNameElement.value).not.toBeNull()
+    const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
+    expect(walletName.value).toBe(walletNameInputText.value)
+  })
+
+  it('switch wallet', async () => {
+    const { client } = app
+
+    // Go to setting page
+    const networkElement = await client.element('//FOOTER/DIV[1]/DIV[2]')
+    expect(networkElement).not.toBeNull()
+    await client.elementIdClick(networkElement.value.ELEMENT)
+
+    // Switch to wallet setting
+    const walletSettingButton = await getElementByTagName(client, 'button', '钱包')
+    expect(walletSettingButton).not.toBeNull()
+    await client.elementIdClick(walletSettingButton!.ELEMENT)
+    sleep(200)
+
+    // Switch to first wallet
+    const firstWallet = await client.element('//MAIN/DIV[1]/DIV[3]/DIV[1]/DIV[1]/DIV[1]/DIV[1]/DIV[1]')
+    expect(firstWallet).not.toBeNull()
+    const firstWalletName = await client.elementIdText(firstWallet.value.ELEMENT)
+    await client.elementIdClick(firstWallet.value.ELEMENT)
+    sleep(200)
+
+    // test create success
+    const walletNameElement = await client.element('//MAIN/DIV/H1')
+    expect(walletNameElement.value).not.toBeNull()
+    const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
+    expect(walletName.value).toBe(firstWalletName.value)
+  })
+
+
+  // TODO: edit wallet
+  // await client.rightClick('//MAIN/DIV[1]/DIV[3]/DIV[1]/DIV[1]/DIV[1]/DIV[1]/DIV[1]')
+
+  // TODO: wallet menu
+  // const menu = electron.Menu.getApplicationMenu()
+})

From e922383bcc3fd6226c79f236e6664ebfbf941b20 Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Mon, 12 Aug 2019 17:51:47 +0800
Subject: [PATCH 03/38] chore(wallet-deps): Add spectron-menu-addon

---
 packages/neuron-wallet/package.json | 3 ++-
 yarn.lock                           | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 892f64de99..f02b446485 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -67,6 +67,7 @@
     "rimraf": "2.6.3",
     "spectron": "7.0.0",
     "ts-transformer-imports": "0.4.3",
-    "ttypescript": "1.5.7"
+    "ttypescript": "1.5.7",
+    "spectron-menu-addon": "0.4.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 8d77c7e161..81953c2f9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15713,6 +15713,11 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
+spectron-menu-addon@0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/spectron-menu-addon/-/spectron-menu-addon-0.4.1.tgz#df89fdbd5b969bd94358d73bf9ad0d1808877cce"
+  integrity sha512-svtOzWRfH5z6sxkO281v31gL1l52ZsVjco9ux4GVshujKeZXGk9luKjeHTkLVR9H+LIylxO6GtFsCQWxIasrvg==
+
 spectron@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/spectron/-/spectron-7.0.0.tgz#2a16ea2b2fbe6149f5fa9fa1a2be601f5878e00c"

From d3b0b3c9c4c9232899089f9652c20d929a18dd2c Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Mon, 12 Aug 2019 17:54:57 +0800
Subject: [PATCH 04/38] chore: Add delete wallet e2e test

---
 packages/neuron-wallet/tests-e2e/utils.ts     |  7 --
 .../neuron-wallet/tests-e2e/wallet.test.ts    | 96 ++++++++++++++-----
 2 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/packages/neuron-wallet/tests-e2e/utils.ts b/packages/neuron-wallet/tests-e2e/utils.ts
index fc1b776c1f..85dc690c04 100644
--- a/packages/neuron-wallet/tests-e2e/utils.ts
+++ b/packages/neuron-wallet/tests-e2e/utils.ts
@@ -11,10 +11,3 @@ export const getElementByTagName = async (client: SpectronClient, tagName: strin
   }
   return null
 }
-
-export const sleep = (delay: number) => {
-  var start = (new Date()).getTime();
-  while ((new Date()).getTime() - start < delay) {
-    continue;
-  }
-}
diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index aa9f2b1c3e..df1e896582 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -1,6 +1,7 @@
 import { Application } from 'spectron'
 import path from 'path'
-import { sleep, getElementByTagName } from './utils'
+import { getElementByTagName } from './utils'
+import menuAddon from 'spectron-menu-addon'
 
 // Test create/import/switch/edit wallet
 describe('wallet tests', () => {
@@ -11,9 +12,9 @@ describe('wallet tests', () => {
     if (process.platform === 'win32') {
       electronPath += '.cmd'
     }
-    app = new Application({
-      path: electronPath,
-      args: [path.join(__dirname, '..', 'dist', 'main.js')],
+    app = menuAddon.createApplication({ 
+      args: [path.join(__dirname, '..', 'dist', 'main.js')], 
+      path: electronPath 
     })
     return app.start()
   })
@@ -28,43 +29,43 @@ describe('wallet tests', () => {
     const { client } = app
     await client.waitUntilWindowLoaded()
 
-    // click create wallet
+    // Click create wallet
     const createWalletButton = await getElementByTagName(client, 'button', '创建新钱包')
     expect(createWalletButton).not.toBeNull()
     await client.elementIdClick(createWalletButton!.ELEMENT)
 
-    // copy mnemonic
+    // Copy mnemonic
     const mnemonicTextarea = await client.element('<textarea />')
     const mnemonic = await client.elementIdText(mnemonicTextarea.value.ELEMENT)
     const mnemonicText = mnemonic.value
-    // next
+    // Next
     const mnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
     expect(mnemonicNextButton).not.toBeNull()
     await client.elementIdClick(mnemonicNextButton!.ELEMENT)
 
-    // input mnemonic
+    // Input mnemonic
     const inputMnemonicTextarea = await client.element('<textarea />')
     expect(inputMnemonicTextarea.value).not.toBeNull()
     await client.elementIdValue(inputMnemonicTextarea.value.ELEMENT, mnemonicText)
-    // next
+    // Next
     const inputMnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
     expect(inputMnemonicNextButton).not.toBeNull()
     await client.elementIdClick(inputMnemonicNextButton!.ELEMENT)
 
-    // setup wallet
+    // Setup wallet
     const inputElements = await client.elements('<input />')
     expect(inputElements.value).not.toBeNull()
     expect(inputElements.value.length).toBe(3)
     const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
-    // next
+    // Next
     const setupWalletNextButton = await getElementByTagName(client, 'button', '下一步')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    sleep(200)
+    await client.pause(200)
 
-    // test create success
+    // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
     expect(walletNameElement.value).not.toBeNull()
     const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
@@ -93,33 +94,33 @@ describe('wallet tests', () => {
     const mnemonicTextarea = await client.element('<textarea />')
     expect(mnemonicTextarea.value).not.toBeNull()
     const mnemonicText = 'refuse ecology globe virus demand gentle couch scrub bulk project chronic dog'
-    // next
+    // Next
     await client.elementIdValue(mnemonicTextarea.value.ELEMENT, mnemonicText)
     const mnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
     expect(mnemonicNextButton).not.toBeNull()
     await client.elementIdClick(mnemonicNextButton!.ELEMENT)
 
-    // // setup wallet
+    // Setup wallet
     const inputElements = await client.elements('<input />')
     expect(inputElements.value).not.toBeNull()
     expect(inputElements.value.length).toBe(3)
     const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
-    // next
+    // Next
     const setupWalletNextButton = await getElementByTagName(client, 'button', '下一步')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    sleep(200)
+    await client.pause(200)
 
-    // test create success
+    // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
     expect(walletNameElement.value).not.toBeNull()
     const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
     expect(walletName.value).toBe(walletNameInputText.value)
   })
 
-  it('switch wallet', async () => {
+  it('switch to first wallet', async () => {
     const { client } = app
 
     // Go to setting page
@@ -131,26 +132,71 @@ describe('wallet tests', () => {
     const walletSettingButton = await getElementByTagName(client, 'button', '钱包')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
-    sleep(200)
+    await client.pause(200)
 
     // Switch to first wallet
     const firstWallet = await client.element('//MAIN/DIV[1]/DIV[3]/DIV[1]/DIV[1]/DIV[1]/DIV[1]/DIV[1]')
     expect(firstWallet).not.toBeNull()
     const firstWalletName = await client.elementIdText(firstWallet.value.ELEMENT)
     await client.elementIdClick(firstWallet.value.ELEMENT)
-    sleep(200)
+    await client.pause(200)
 
-    // test create success
+    // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
     expect(walletNameElement.value).not.toBeNull()
     const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
     expect(walletName.value).toBe(firstWalletName.value)
   })
 
+  it('delete wallet from menu', async () => {
+    const { client } = app
+
+    // Get current wallet name
+    const walletNameElement = await client.element('//MAIN/DIV/H1')
+    expect(walletNameElement.value).not.toBeNull()
+    const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
+    
+    // Click delete wallet menu item
+    await menuAddon.clickMenu('Wallet', 'Delete Current Wallet')
+    await client.pause(200)
+    
+    // Input password
+    const inputElement = await client.element('//INPUT')
+    expect(inputElement.value).not.toBeNull()
+    await client.elementIdValue(inputElement.value.ELEMENT, 'Azusa2233')
+    // Confirm
+    const confirmButton = await getElementByTagName(client, 'button', '确认')
+    expect(confirmButton).not.toBeNull()
+    await client.elementIdClick(confirmButton!.ELEMENT)
+
+    // Check wallet name
+    const newWalletNameElement = await client.element('//MAIN/DIV/H1')
+    expect(newWalletNameElement.value).not.toBeNull()
+    const newWalletName = await client.elementIdText(newWalletNameElement.value.ELEMENT)
+    expect(newWalletName.value).not.toBe(walletName.value)
+  })
+
 
   // TODO: edit wallet
-  // await client.rightClick('//MAIN/DIV[1]/DIV[3]/DIV[1]/DIV[1]/DIV[1]/DIV[1]/DIV[1]')
+  // Unable to get context menu directly
+  it('edit wallet', async () => {
+    return
+    const { client } = app
 
-  // TODO: wallet menu
-  // const menu = electron.Menu.getApplicationMenu()
+    // Go to setting page
+    await menuAddon.clickMenu('Electron', 'Preferences...')
+    await client.pause(200)
+
+    // Switch to wallet setting
+    const walletSettingButton = await getElementByTagName(client, 'button', '钱包')
+    expect(walletSettingButton).not.toBeNull()
+    await client.elementIdClick(walletSettingButton!.ELEMENT)
+    await client.pause(200)
+
+    // Trigger context menu
+    await client.rightClick('//MAIN/DIV[1]/DIV[3]/DIV[1]/DIV[1]/DIV[1]/DIV[1]/DIV[2]', 40, 5 + 10)
+    await client.pause(200)
+
+    // TODO: Click edit menu item
+  })
 })

From 5e8d16c998a8f61a6452ee3da07afc4bf634d2c5 Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Mon, 12 Aug 2019 17:57:47 +0800
Subject: [PATCH 05/38] chore: Update wallet e2e test

---
 packages/neuron-wallet/tests-e2e/wallet.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index df1e896582..b6fcb88780 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import { getElementByTagName } from './utils'
 import menuAddon from 'spectron-menu-addon'
 
-// Test create/import/switch/edit wallet
+// Test create/import/switch/delete/edit wallet
 describe('wallet tests', () => {
   let app: Application
 

From 9a7212558f90e4a9c7c7a9b874a3a5d4c7ae1399 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Mon, 12 Aug 2019 20:12:44 +0800
Subject: [PATCH 06/38] refactor(neuron-ui): tag a tx as sending or receiving
 if its status is pending

---
 .../src/components/Overview/index.tsx          | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
index 04c2269a66..52c496fdd1 100644
--- a/packages/neuron-ui/src/components/Overview/index.tsx
+++ b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -34,16 +34,26 @@ import { backToTop } from 'utils/animations'
 const TITLE_FONT_SIZE = 'xxLarge'
 export type ActivityItem = State.Transaction & { confirmations: string; typeLabel: string }
 
-const genTypeLabel = (type: 'send' | 'receive', confirmationCount: number) => {
+const genTypeLabel = (
+  type: 'send' | 'receive',
+  confirmationCount: number,
+  status: 'pending' | 'success' | 'failed'
+) => {
   switch (type) {
     case 'send': {
-      if (confirmationCount < CONFIRMATION_THRESHOLD) {
+      if (status === 'failed') {
+        return 'send'
+      }
+      if (status === 'pending' || confirmationCount < CONFIRMATION_THRESHOLD) {
         return 'sending'
       }
       return 'sent'
     }
     case 'receive': {
-      if (confirmationCount < CONFIRMATION_THRESHOLD) {
+      if (status === 'failed') {
+        return 'receive'
+      }
+      if (status === 'pending' || confirmationCount < CONFIRMATION_THRESHOLD) {
         return 'receiving'
       }
       return 'received'
@@ -293,7 +303,7 @@ const Overview = ({
             status = 'pending'
           }
 
-          typeLabel = genTypeLabel(item.type, confirmationCount)
+          typeLabel = genTypeLabel(item.type, confirmationCount, status)
 
           if (confirmationCount === 1) {
             confirmations = `(${t('overview.confirmation', {

From 56571d73fd3ed2fd047f54fcf6a6b6887ac06f02 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Mon, 12 Aug 2019 22:12:37 +0800
Subject: [PATCH 07/38] refactor(neuron-ui): tag a tx as sent or received if
 it's failed

---
 packages/neuron-ui/src/components/Overview/index.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
index 52c496fdd1..904f280756 100644
--- a/packages/neuron-ui/src/components/Overview/index.tsx
+++ b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -42,7 +42,7 @@ const genTypeLabel = (
   switch (type) {
     case 'send': {
       if (status === 'failed') {
-        return 'send'
+        return 'sent'
       }
       if (status === 'pending' || confirmationCount < CONFIRMATION_THRESHOLD) {
         return 'sending'
@@ -51,7 +51,7 @@ const genTypeLabel = (
     }
     case 'receive': {
       if (status === 'failed') {
-        return 'receive'
+        return 'received'
       }
       if (status === 'pending' || confirmationCount < CONFIRMATION_THRESHOLD) {
         return 'receiving'
@@ -297,7 +297,8 @@ const Overview = ({
         let typeLabel: string = item.type
         let { status } = item
         if (item.blockNumber !== undefined) {
-          const confirmationCount = 1 + Math.max(+syncedBlockNumber, +tipBlockNumber) - +item.blockNumber
+          const confirmationCount =
+            item.blockNumber === undefined ? 0 : 1 + Math.max(+syncedBlockNumber, +tipBlockNumber) - +item.blockNumber
 
           if (status === 'success' && confirmationCount < CONFIRMATION_THRESHOLD) {
             status = 'pending'

From 37c863929c7f369a551955ee108014e7379525a9 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Tue, 13 Aug 2019 09:54:42 +0900
Subject: [PATCH 08/38] feat: Show available update's version

---
 packages/neuron-wallet/src/controllers/update.ts | 8 +++++---
 packages/neuron-wallet/src/locales/en.ts         | 2 +-
 packages/neuron-wallet/src/locales/zh.ts         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/neuron-wallet/src/controllers/update.ts b/packages/neuron-wallet/src/controllers/update.ts
index b799e99636..5df8711751 100644
--- a/packages/neuron-wallet/src/controllers/update.ts
+++ b/packages/neuron-wallet/src/controllers/update.ts
@@ -1,5 +1,5 @@
 import { dialog } from 'electron'
-import { autoUpdater } from 'electron-updater'
+import { autoUpdater, UpdateInfo } from 'electron-updater'
 import i18n from 'utils/i18n'
 
 export default class UpdateController {
@@ -27,11 +27,13 @@ export default class UpdateController {
       this.enableSender()
     })
 
-    autoUpdater.on('update-available', () => {
+    autoUpdater.on('update-available', (info: UpdateInfo) => {
+      const { version } = info
       dialog.showMessageBox(
         {
           type: 'info',
-          message: i18n.t('updater.updates-found-do-you-want-to-update'),
+          title: version,
+          message: i18n.t('updater.updates-found-do-you-want-to-update', { version }),
           buttons: [i18n.t('updater.update-now'), i18n.t('common.no')],
         },
         buttonIndex => {
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 9c05a28f5d..5ebd9db4ff 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -137,7 +137,7 @@ export default {
     },
     updater: {
       'update-not-available': 'There are currently no updates available.',
-      'updates-found-do-you-want-to-update': 'An update is available, do you want to update now?',
+      'updates-found-do-you-want-to-update': 'An update ({{version}}) is available, do you want to update now?',
       'update-now': 'Update now',
       'updates-downloaded-about-to-quit-and-install': 'Update downloaded. Neuron will quit and install the update...',
     },
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index 37a13f593e..abf657e15b 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -136,7 +136,7 @@ export default {
     },
     updater: {
       'update-not-available': '没有可供升级的新版本。',
-      'updates-found-do-you-want-to-update': '有可供升级的新版本。马上进行升级吗？',
+      'updates-found-do-you-want-to-update': '有可供升级的新版本({{version}})。现在进行升级吗？',
       'update-now': '马上升级',
       'updates-downloaded-about-to-quit-and-install': '下载完成。Neuron 将退出并安装新版本...',
     },

From b4bd95d56d0b4af4e038a0db0362122205e5e3b7 Mon Sep 17 00:00:00 2001
From: classicalliu <classicalliu@gmail.com>
Date: Tue, 13 Aug 2019 11:31:18 +0800
Subject: [PATCH 09/38] chore: don't show error when network off

---
 packages/neuron-wallet/src/services/sync/queue.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/src/services/sync/queue.ts b/packages/neuron-wallet/src/services/sync/queue.ts
index 8dffd78db1..a6071e7056 100644
--- a/packages/neuron-wallet/src/services/sync/queue.ts
+++ b/packages/neuron-wallet/src/services/sync/queue.ts
@@ -67,7 +67,11 @@ export default class Queue {
           await this.pipeline(rangeArr)
         }
       } catch (err) {
-        logger.error(`sync error:`, err)
+        if (err.message.startsWith('connect ECONNREFUSED')) {
+          logger.debug(`sync error:`, err)
+        } else {
+          logger.error(`sync error:`, err)
+        }
       } finally {
         await this.yield(this.yieldTime)
         this.inProcess = false

From 1ad483323b4addcd0967bcdeb069f33c72c684ed Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 15:13:36 +0800
Subject: [PATCH 10/38] chore: Add edit wallet e2e test

---
 packages/neuron-wallet/tests-e2e/preload.js   | 39 +++++++++++++
 packages/neuron-wallet/tests-e2e/utils.ts     | 13 +++++
 .../neuron-wallet/tests-e2e/wallet.test.ts    | 56 +++++++++++++------
 3 files changed, 91 insertions(+), 17 deletions(-)
 create mode 100644 packages/neuron-wallet/tests-e2e/preload.js

diff --git a/packages/neuron-wallet/tests-e2e/preload.js b/packages/neuron-wallet/tests-e2e/preload.js
new file mode 100644
index 0000000000..b06a0b89f0
--- /dev/null
+++ b/packages/neuron-wallet/tests-e2e/preload.js
@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var electron_1 = require("electron");
+const app = require("../dist/controllers/app/index");
+electron_1.ipcMain.on('E2E_WALLET_EDIT', function (event, arg) {
+    const walletId = arg[0];
+    app.default.navTo(`/editwallet/${walletId}`);
+});
+
+/// ApplicationMenu
+function findItem(menuItems, labels) {
+    var target = labels[0];
+    var rest = labels.slice(1);
+    var foundItem = menuItems.find(function (item) { return item.label === target; });
+    if (rest.length === 0) {
+        return foundItem;
+    }
+    return findItem(foundItem.submenu.items, rest);
+}
+electron_1.ipcMain.on('E2E_GET_MENU_ITEM', function (e, labels) {
+    var menuItem = findItem(electron_1.Menu.getApplicationMenu().items, labels);
+    if (menuItem) {
+        e.returnValue = new electron_1.MenuItem({
+            checked: menuItem.checked,
+            enabled: menuItem.enabled,
+            label: menuItem.label,
+            visible: menuItem.visible
+        });
+    }
+    else {
+        e.returnValue = ({
+            label: ''
+        });
+    }
+});
+electron_1.ipcMain.on('E2E_CLICK_MENU_ITEM', function (e, labels) {
+    var item = findItem(electron_1.Menu.getApplicationMenu().items, labels);
+    item.click();
+});
diff --git a/packages/neuron-wallet/tests-e2e/utils.ts b/packages/neuron-wallet/tests-e2e/utils.ts
index 85dc690c04..7607234574 100644
--- a/packages/neuron-wallet/tests-e2e/utils.ts
+++ b/packages/neuron-wallet/tests-e2e/utils.ts
@@ -1,4 +1,5 @@
 import { SpectronClient } from 'spectron'
+import { AllElectron } from 'electron'
 
 export const getElementByTagName = async (client: SpectronClient, tagName: string, textContent: string) => {
   const elements = await client.elements(`<${tagName} />`)        
@@ -11,3 +12,15 @@ export const getElementByTagName = async (client: SpectronClient, tagName: strin
   }
   return null
 }
+
+export const clickMenu = (electron: AllElectron, labels: string[]) => {
+  return electron.ipcRenderer.send('E2E_CLICK_MENU_ITEM', labels)
+}
+
+export const getMenuItem = (electron: AllElectron, labels: string[]) => {
+  return electron.ipcRenderer.sendSync('E2E_GET_MENU_ITEM', labels)
+}
+
+export const editWallet = (electron: AllElectron, walletId: string) => {
+  return electron.ipcRenderer.send('E2E_WALLET_EDIT', [walletId])
+}
diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index b6fcb88780..f11c257ae2 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -1,7 +1,6 @@
 import { Application } from 'spectron'
 import path from 'path'
-import { getElementByTagName } from './utils'
-import menuAddon from 'spectron-menu-addon'
+import { getElementByTagName, clickMenu, editWallet } from './utils'
 
 // Test create/import/switch/delete/edit wallet
 describe('wallet tests', () => {
@@ -12,8 +11,12 @@ describe('wallet tests', () => {
     if (process.platform === 'win32') {
       electronPath += '.cmd'
     }
-    app = menuAddon.createApplication({ 
-      args: [path.join(__dirname, '..', 'dist', 'main.js')], 
+    app = new Application({ 
+      args: [
+        '--require',
+        path.join(__dirname, 'preload.js'),
+        path.join(__dirname, '..', 'dist', 'main.js')
+      ], 
       path: electronPath 
     })
     return app.start()
@@ -124,7 +127,7 @@ describe('wallet tests', () => {
     const { client } = app
 
     // Go to setting page
-    const networkElement = await client.element('//FOOTER/DIV[1]/DIV[2]')
+    const networkElement = await client.element('//FOOTER/DIV/DIV[2]')
     expect(networkElement).not.toBeNull()
     await client.elementIdClick(networkElement.value.ELEMENT)
 
@@ -135,7 +138,7 @@ describe('wallet tests', () => {
     await client.pause(200)
 
     // Switch to first wallet
-    const firstWallet = await client.element('//MAIN/DIV[1]/DIV[3]/DIV[1]/DIV[1]/DIV[1]/DIV[1]/DIV[1]')
+    const firstWallet = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV')
     expect(firstWallet).not.toBeNull()
     const firstWalletName = await client.elementIdText(firstWallet.value.ELEMENT)
     await client.elementIdClick(firstWallet.value.ELEMENT)
@@ -149,7 +152,7 @@ describe('wallet tests', () => {
   })
 
   it('delete wallet from menu', async () => {
-    const { client } = app
+    const { client, electron } = app
 
     // Get current wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -157,7 +160,7 @@ describe('wallet tests', () => {
     const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
     
     // Click delete wallet menu item
-    await menuAddon.clickMenu('Wallet', 'Delete Current Wallet')
+    await clickMenu(electron, ['Wallet', 'Delete Current Wallet'])
     await client.pause(200)
     
     // Input password
@@ -168,6 +171,7 @@ describe('wallet tests', () => {
     const confirmButton = await getElementByTagName(client, 'button', '确认')
     expect(confirmButton).not.toBeNull()
     await client.elementIdClick(confirmButton!.ELEMENT)
+    await client.pause(200)
 
     // Check wallet name
     const newWalletNameElement = await client.element('//MAIN/DIV/H1')
@@ -176,15 +180,11 @@ describe('wallet tests', () => {
     expect(newWalletName.value).not.toBe(walletName.value)
   })
 
-
-  // TODO: edit wallet
-  // Unable to get context menu directly
   it('edit wallet', async () => {
-    return
-    const { client } = app
+    const { client, electron } = app
 
     // Go to setting page
-    await menuAddon.clickMenu('Electron', 'Preferences...')
+    await clickMenu(electron, ['Electron', 'Preferences...'])
     await client.pause(200)
 
     // Switch to wallet setting
@@ -193,10 +193,32 @@ describe('wallet tests', () => {
     await client.elementIdClick(walletSettingButton!.ELEMENT)
     await client.pause(200)
 
-    // Trigger context menu
-    await client.rightClick('//MAIN/DIV[1]/DIV[3]/DIV[1]/DIV[1]/DIV[1]/DIV[1]/DIV[2]', 40, 5 + 10)
+    // Get wallet id
+    const walletItemElement = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV[1]/DIV/INPUT')
+    expect(walletItemElement.value).not.toBeNull()
+    const walletItemElementId = await client.elementIdAttribute(walletItemElement.value.ELEMENT, 'id')
+    const walletItemElementName = await client.elementIdAttribute(walletItemElement.value.ELEMENT, 'name')
+    const walletId = walletItemElementId.value.slice(walletItemElementName.value.length + 1)
+
+    // Go to edit wallet page
+    await editWallet(electron, walletId)
+    await client.pause(200)
+
+    // Update wallet name
+    const walletNameInputElement = await client.element('<input />')
+    expect(walletNameInputElement.value).not.toBeNull()
+    await client.elementIdValue(walletNameInputElement.value.ELEMENT, 'Azusa')
+    const walletNameInputText = await client.elementIdAttribute(walletNameInputElement.value.ELEMENT, 'value')
+    // Save
+    const saveButton = await getElementByTagName(client, 'button', '保存')
+    expect(saveButton).not.toBeNull()
+    await client.elementIdClick(saveButton!.ELEMENT)
     await client.pause(200)
 
-    // TODO: Click edit menu item
+    // Check wallet name
+    const newWalletNameElement = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV[1]')
+    expect(newWalletNameElement).not.toBeNull()
+    const newWalletName = await client.elementIdText(newWalletNameElement.value.ELEMENT)
+    expect(newWalletName.value).toBe(walletNameInputText.value)
   })
 })

From 5b8ea955ed30e7062fe816c1850f8267994a3a26 Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 15:19:54 +0800
Subject: [PATCH 11/38] chore(wallet-deps): Remove spectron-menu-addon

---
 packages/neuron-wallet/package.json         |  3 +--
 packages/neuron-wallet/tests-e2e/preload.js | 16 ++++++++--------
 yarn.lock                                   |  5 -----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index f02b446485..892f64de99 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -67,7 +67,6 @@
     "rimraf": "2.6.3",
     "spectron": "7.0.0",
     "ts-transformer-imports": "0.4.3",
-    "ttypescript": "1.5.7",
-    "spectron-menu-addon": "0.4.1"
+    "ttypescript": "1.5.7"
   }
 }
diff --git a/packages/neuron-wallet/tests-e2e/preload.js b/packages/neuron-wallet/tests-e2e/preload.js
index b06a0b89f0..85df336422 100644
--- a/packages/neuron-wallet/tests-e2e/preload.js
+++ b/packages/neuron-wallet/tests-e2e/preload.js
@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var electron_1 = require("electron");
+const electron = require("electron");
 const app = require("../dist/controllers/app/index");
-electron_1.ipcMain.on('E2E_WALLET_EDIT', function (event, arg) {
+
+electron.ipcMain.on('E2E_WALLET_EDIT', function (event, arg) {
     const walletId = arg[0];
     app.default.navTo(`/editwallet/${walletId}`);
 });
 
-/// ApplicationMenu
 function findItem(menuItems, labels) {
     var target = labels[0];
     var rest = labels.slice(1);
@@ -17,10 +17,10 @@ function findItem(menuItems, labels) {
     }
     return findItem(foundItem.submenu.items, rest);
 }
-electron_1.ipcMain.on('E2E_GET_MENU_ITEM', function (e, labels) {
-    var menuItem = findItem(electron_1.Menu.getApplicationMenu().items, labels);
+electron.ipcMain.on('E2E_GET_MENU_ITEM', function (e, labels) {
+    var menuItem = findItem(electron.Menu.getApplicationMenu().items, labels);
     if (menuItem) {
-        e.returnValue = new electron_1.MenuItem({
+        e.returnValue = new electron.MenuItem({
             checked: menuItem.checked,
             enabled: menuItem.enabled,
             label: menuItem.label,
@@ -33,7 +33,7 @@ electron_1.ipcMain.on('E2E_GET_MENU_ITEM', function (e, labels) {
         });
     }
 });
-electron_1.ipcMain.on('E2E_CLICK_MENU_ITEM', function (e, labels) {
-    var item = findItem(electron_1.Menu.getApplicationMenu().items, labels);
+electron.ipcMain.on('E2E_CLICK_MENU_ITEM', function (e, labels) {
+    var item = findItem(electron.Menu.getApplicationMenu().items, labels);
     item.click();
 });
diff --git a/yarn.lock b/yarn.lock
index 81953c2f9c..8d77c7e161 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15713,11 +15713,6 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-spectron-menu-addon@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/spectron-menu-addon/-/spectron-menu-addon-0.4.1.tgz#df89fdbd5b969bd94358d73bf9ad0d1808877cce"
-  integrity sha512-svtOzWRfH5z6sxkO281v31gL1l52ZsVjco9ux4GVshujKeZXGk9luKjeHTkLVR9H+LIylxO6GtFsCQWxIasrvg==
-
 spectron@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/spectron/-/spectron-7.0.0.tgz#2a16ea2b2fbe6149f5fa9fa1a2be601f5878e00c"

From d3a917cbb984035e0bf159c886b5ca0d24705e12 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 10:24:38 +0800
Subject: [PATCH 12/38] feat(neuron-ui): add import keystore

add import wallet with keystore action creator

add import keystore menuitem in the application menu
---
 .../src/components/ImportKeystore/index.tsx   | 102 ++++++++++++++++++
 .../src/components/WalletSetting/index.tsx    |   6 +-
 .../src/components/WalletWizard/index.tsx     |   9 +-
 .../neuron-ui/src/containers/Main/hooks.ts    |   6 +-
 .../neuron-ui/src/containers/Main/index.tsx   |   9 +-
 packages/neuron-ui/src/locales/en.json        |  22 +++-
 packages/neuron-ui/src/locales/zh.json        |  22 +++-
 .../neuron-ui/src/services/remote/index.ts    |  14 +++
 .../neuron-ui/src/services/remote/wallets.ts  |   5 +
 .../stateProvider/actionCreators/wallets.ts   |  30 +++++-
 packages/neuron-ui/src/theme.tsx              |   2 +
 .../neuron-ui/src/types/Controller/index.d.ts |   6 ++
 packages/neuron-ui/src/utils/const.ts         |   2 +
 .../src/controllers/app/index.ts              |   8 +-
 .../src/controllers/app/options.ts            |   3 +-
 .../src/controllers/wallets/index.ts          |   6 +-
 .../neuron-wallet/src/exceptions/wallet.ts    |   7 ++
 packages/neuron-wallet/src/locales/en.ts      |   3 +
 packages/neuron-wallet/src/locales/zh.ts      |   3 +
 .../neuron-wallet/src/models/keys/keystore.ts |  10 +-
 .../src/utils/application-menu.ts             |  25 ++++-
 21 files changed, 274 insertions(+), 26 deletions(-)
 create mode 100644 packages/neuron-ui/src/components/ImportKeystore/index.tsx

diff --git a/packages/neuron-ui/src/components/ImportKeystore/index.tsx b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
new file mode 100644
index 0000000000..28c834ed27
--- /dev/null
+++ b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
@@ -0,0 +1,102 @@
+import React, { useState, useCallback, useMemo } from 'react'
+import { RouteComponentProps } from 'react-router-dom'
+import { Stack, DefaultButton, PrimaryButton, TextField } from 'office-ui-fabric-react'
+import { useTranslation } from 'react-i18next'
+import { showOpenDialog } from 'services/remote'
+import { importWalletWithKeystore } from 'states/stateProvider/actionCreators'
+import { StateWithDispatch } from 'states/stateProvider/reducer'
+import { useGoBack } from 'utils/hooks'
+
+const defaultFields = {
+  path: '',
+  name: '',
+  password: '',
+}
+
+const ImportKeystore = (props: React.PropsWithoutRef<StateWithDispatch & RouteComponentProps>) => {
+  const [t] = useTranslation()
+  const {
+    history,
+    dispatch,
+    settings: { wallets },
+  } = props
+  const [fields, setFields] = useState(defaultFields)
+  const goBack = useGoBack(history)
+
+  const exsitingNames = useMemo(() => {
+    return wallets.map(w => w.name)
+  }, [wallets])
+
+  const onFileClick = useCallback(() => {
+    showOpenDialog({
+      title: 'import keystore',
+      onUpload: (filePaths: string[]) => {
+        if (!filePaths || filePaths.length === 0) {
+          return
+        }
+        const filePath = filePaths[0]
+        const filename = filePath.split('/').pop() || 'Imported wallet'
+        setFields({
+          ...fields,
+          path: filePath,
+          name: filename,
+        })
+      },
+    })
+  }, [fields])
+
+  const onSubmit = useCallback(() => {
+    importWalletWithKeystore({
+      name: fields.name,
+      keystorePath: fields.path,
+      password: fields.password,
+    })(dispatch, history)
+  }, [fields.name, fields.password, fields.path, history, dispatch])
+
+  return (
+    <Stack tokens={{ childrenGap: 15 }}>
+      <Stack tokens={{ childrenGap: 15 }}>
+        {Object.entries(fields).map(([key, value]) => {
+          return (
+            <TextField
+              key={key}
+              onClick={key === 'path' ? onFileClick : undefined}
+              label={t(`import-keystore.label.${key}`)}
+              placeholder={t(`import-keystore.placeholder.${key}`)}
+              type={key === 'password' ? 'password' : 'text'}
+              readOnly={key === 'path'}
+              value={value}
+              validateOnLoad={false}
+              onGetErrorMessage={(text?: string) => {
+                if (text === '') {
+                  return t('messages.is-required', { field: t(`import-keystore.label.${key}`) })
+                }
+                if (key === 'name' && exsitingNames.includes(text || '')) {
+                  return t('messages.is-used', { field: t(`import-keystore.label.${key}`) })
+                }
+                return ''
+              }}
+              onChange={(_e: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>, newValue?: string) => {
+                if (newValue !== undefined) {
+                  setFields({
+                    ...fields,
+                    [key]: newValue,
+                  })
+                }
+              }}
+            />
+          )
+        })}
+      </Stack>
+      <Stack horizontal horizontalAlign="end" tokens={{ childrenGap: 15 }}>
+        <DefaultButton onClick={goBack}>{t('import-keystore.button.back')}</DefaultButton>
+        <PrimaryButton disabled={!(fields.name && fields.path && fields.password)} onClick={onSubmit}>
+          {t('import-keystore.button.submit')}
+        </PrimaryButton>
+      </Stack>
+    </Stack>
+  )
+}
+
+ImportKeystore.displayName = 'ImportKeystore'
+export default ImportKeystore
diff --git a/packages/neuron-ui/src/components/WalletSetting/index.tsx b/packages/neuron-ui/src/components/WalletSetting/index.tsx
index 0a745e1b4a..5842b2de62 100644
--- a/packages/neuron-ui/src/components/WalletSetting/index.tsx
+++ b/packages/neuron-ui/src/components/WalletSetting/index.tsx
@@ -17,9 +17,13 @@ const buttons = [
     url: `${Routes.WalletWizard}${WalletWizardPath.Mnemonic}/${MnemonicAction.Create}`,
   },
   {
-    label: 'wizard.import-wallet',
+    label: 'wizard.import-mnemonic',
     url: `${Routes.WalletWizard}${WalletWizardPath.Mnemonic}/${MnemonicAction.Import}`,
   },
+  {
+    label: 'wizard.import-keystore',
+    url: Routes.ImportKeystore,
+  },
 ]
 
 const WalletSetting = ({
diff --git a/packages/neuron-ui/src/components/WalletWizard/index.tsx b/packages/neuron-ui/src/components/WalletWizard/index.tsx
index 777788aad4..3ec3a37f06 100644
--- a/packages/neuron-ui/src/components/WalletWizard/index.tsx
+++ b/packages/neuron-ui/src/components/WalletWizard/index.tsx
@@ -74,11 +74,18 @@ const Welcome = ({ rootPath = '/wizard', wallets = [], history }: WizardElementP
       <Stack horizontal horizontalAlign="center" verticalAlign="center" tokens={{ childrenGap: 40 }}>
         <PrimaryButton
           styles={{ root: [{ height: '60px' }] }}
-          text={t('wizard.import-wallet')}
+          text={t('wizard.import-mnemonic')}
           onClick={next(`${rootPath}${WalletWizardPath.Mnemonic}/${MnemonicAction.Import}`)}
           iconProps={{ iconName: 'Import', styles: buttonGrommetIconStyles }}
         />
         <span>{t('common.or')}</span>
+        <PrimaryButton
+          styles={{ root: [{ height: '60px' }] }}
+          text={t('wizard.import-keystore')}
+          onClick={next(Routes.ImportKeystore)}
+          iconProps={{ iconName: 'Keystore', styles: buttonGrommetIconStyles }}
+        />
+        <span>{t('common.or')}</span>
         <DefaultButton
           styles={{ root: [{ height: '60px' }] }}
           text={t('wizard.create-new-wallet')}
diff --git a/packages/neuron-ui/src/containers/Main/hooks.ts b/packages/neuron-ui/src/containers/Main/hooks.ts
index ed0ce061e6..785f8a1337 100644
--- a/packages/neuron-ui/src/containers/Main/hooks.ts
+++ b/packages/neuron-ui/src/containers/Main/hooks.ts
@@ -152,12 +152,12 @@ export const useSubscription = ({
           break
         }
         case 'current-wallet': {
-          updateCurrentWallet()(dispatch)
+          updateCurrentWallet()(dispatch, history)
           break
         }
         case 'wallets': {
-          updateWalletList()(dispatch)
-          updateCurrentWallet()(dispatch)
+          updateWalletList()(dispatch, history)
+          updateCurrentWallet()(dispatch, history)
           break
         }
         default: {
diff --git a/packages/neuron-ui/src/containers/Main/index.tsx b/packages/neuron-ui/src/containers/Main/index.tsx
index e5685aa3ea..bc7f75d89f 100644
--- a/packages/neuron-ui/src/containers/Main/index.tsx
+++ b/packages/neuron-ui/src/containers/Main/index.tsx
@@ -7,6 +7,7 @@ import { StateDispatch } from 'states/stateProvider/reducer'
 
 import Overview from 'components/Overview'
 import WalletWizard from 'components/WalletWizard'
+import ImportKeystore from 'components/ImportKeystore'
 import Send from 'components/Send'
 import Receive from 'components/Receive'
 import History from 'components/History'
@@ -24,7 +25,7 @@ import { useSubscription, useSyncChainData, useOnCurrentWalletChange } from './h
 
 export const mainContents: CustomRouter.Route[] = [
   {
-    name: `launch`,
+    name: `Launch`,
     path: Routes.Launch,
     exact: true,
     comp: LaunchScreen,
@@ -94,6 +95,12 @@ export const mainContents: CustomRouter.Route[] = [
     exact: false,
     comp: WalletWizard,
   },
+  {
+    name: `ImportKeystore`,
+    path: Routes.ImportKeystore,
+    exact: false,
+    comp: ImportKeystore,
+  },
   {
     name: `PasswordRequest`,
     path: '/',
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index e4f72c9b34..3b95d3a2e1 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -42,6 +42,8 @@
       "welcome-to-nervos-neuron": "Welcome to Neuron",
       "create-or-import-your-first-wallet": "Create or import your first wallet",
       "create-new-wallet": "Create a Wallet",
+      "import-mnemonic": "Import mnemonic words",
+      "import-keystore": "Import a keystore file",
       "import-wallet": "Import a Wallet",
       "next": "Next",
       "back": "Back",
@@ -59,6 +61,22 @@
       "complex-password": "The password is a string of 8 to 50 characters consisting of three types of characters: uppercase letters, lowercase letters, numbers, and special symbols, and must start with a letter or a number.",
       "same-password": "The password and confirm password should be same"
     },
+    "import-keystore": {
+      "label": {
+        "path": "Keystore File",
+        "name": "Wallet Name",
+        "password": "Password"
+      },
+      "placeholder": {
+        "path": "Click to select the Keystore",
+        "name": "Name for the new wallet",
+        "password": "Password to verify the keystore"
+      },
+      "button": {
+        "back": "Back",
+        "submit": "Submit"
+      }
+    },
     "detail": {
       "more-transactions": "More"
     },
@@ -252,7 +270,9 @@
       "lock-arg-copied": "Lock Arg has been copied to the clipboard",
       "transaction-not-found": "The transaction is not found",
       "rpc-url-should-have-protocol": "The RPC URL should start with http(s)://",
-      "rpc-url-should-have-no-whitespaces": "The RPC URL should have no whitespaces"
+      "rpc-url-should-have-no-whitespaces": "The RPC URL should have no whitespaces",
+      "is-required": "{{field}} is required",
+      "is-used": "{{field}} is used"
     },
     "sync": {
       "syncing": "Syncing",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index d9b6349fc9..d2c6d97b7c 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -42,6 +42,8 @@
       "welcome-to-nervos-neuron": "欢迎使用 Neuron",
       "create-or-import-your-first-wallet": "创建或导入您的第一个钱包",
       "create-new-wallet": "创建新钱包",
+      "import-mnemonic": "导入助记词",
+      "import-keystore": "导入 Keystore 文件",
       "import-wallet": "导入钱包",
       "next": "下一步",
       "back": "上一步",
@@ -59,6 +61,22 @@
       "complex-password": "密码为 8 至 50 位由大写字母、小写字母、数字、特殊符号中三类字符组成的字符串, 且必须以字母或者数字开头",
       "same-password": "两次输入密码应一致"
     },
+    "import-keystore": {
+      "label": {
+        "path": "Keystore 文件",
+        "name": "钱包名称",
+        "password": "密码"
+      },
+      "placeholder": {
+        "path": "选择 Keystore 文件",
+        "name": "新钱包名称",
+        "password": "输入密码以验证 Keystore"
+      },
+      "button": {
+        "back": "返回",
+        "submit": "提交"
+      }
+    },
     "detail": {
       "more-transactions": "更多交易记录"
     },
@@ -252,7 +270,9 @@
       "lock-arg-copied": "Lock Arg 已复制到剪贴板",
       "transaction-not-found": "未找到交易",
       "network-address-should-have-protocol": "RPC 地址应以 http(s)//: 开始",
-      "network-address-should-have-no-whitespaces": "RPC 地址不能包含空格"
+      "network-address-should-have-no-whitespaces": "RPC 地址不能包含空格",
+      "is-required": "{{field}}是必须的",
+      "is-used": "{{field}}已使用"
     },
     "sync": {
       "syncing": "同步中",
diff --git a/packages/neuron-ui/src/services/remote/index.ts b/packages/neuron-ui/src/services/remote/index.ts
index c6b832ccec..fff8b2c7ca 100644
--- a/packages/neuron-ui/src/services/remote/index.ts
+++ b/packages/neuron-ui/src/services/remote/index.ts
@@ -55,11 +55,25 @@ export const showErrorMessage = (title: string, content: string) => {
   }
 }
 
+export const showOpenDialog = (opt: { title: string; message?: string; onUpload: Function }) => {
+  if (!window.remote) {
+    window.alert('remote is not supported')
+  }
+  const { onUpload, ...options } = opt
+  return window.remote.require('electron').dialog.showOpenDialog(
+    {
+      ...options,
+    },
+    onUpload
+  )
+}
+
 export default {
   getLocale,
   validateMnemonic,
   generateMnemonic,
   showMessage,
   showErrorMessage,
+  showOpenDialog,
   getWinID,
 }
diff --git a/packages/neuron-ui/src/services/remote/wallets.ts b/packages/neuron-ui/src/services/remote/wallets.ts
index c5c83aebb3..abfdfde469 100644
--- a/packages/neuron-ui/src/services/remote/wallets.ts
+++ b/packages/neuron-ui/src/services/remote/wallets.ts
@@ -11,6 +11,10 @@ export const importMnemonic = controllerMethodWrapper(CONTROLLER_NAME)(
   controller => (params: Controller.ImportMnemonicParams) => controller.importMnemonic(params)
 )
 
+export const importKeystore = controllerMethodWrapper(CONTROLLER_NAME)(
+  controller => (params: Controller.ImportKeystoreParams) => controller.importKeystore(params)
+)
+
 export const deleteWallet = controllerMethodWrapper(CONTROLLER_NAME)(
   controller => (params: Controller.DeleteWalletParams) => controller.delete(params)
 )
@@ -38,6 +42,7 @@ export default {
   updateWallet,
   getWalletList,
   importMnemonic,
+  importKeystore,
   deleteWallet,
   backupWallet,
   getCurrentWallet,
diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
index 6da176aa74..3b32527432 100644
--- a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
+++ b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
@@ -2,6 +2,7 @@ import { AppActions, StateDispatch } from 'states/stateProvider/reducer'
 import {
   getWalletList,
   importMnemonic,
+  importKeystore,
   getCurrentWallet,
   updateWallet,
   setCurrentWallet as setRemoteCurrentWallet,
@@ -13,6 +14,7 @@ import {
   showErrorMessage,
 } from 'services/remote'
 import initStates from 'states/initStates'
+import { WalletWizardPath } from 'components/WalletWizard'
 import i18n from 'utils/i18n'
 import { wallets as walletsCache, currentWallet as currentWalletCache } from 'utils/localCache'
 import { Routes } from 'utils/const'
@@ -20,10 +22,13 @@ import addressesToBalance from 'utils/addressesToBalance'
 import { NeuronWalletActions } from '../reducer'
 import { addNotification, addPopup } from './app'
 
-export const updateCurrentWallet = () => (dispatch: StateDispatch) => {
+export const updateCurrentWallet = () => (dispatch: StateDispatch, history: any) => {
   getCurrentWallet().then(res => {
     if (res.status) {
       const payload = res.result || initStates.wallet
+      if (!payload || !payload.id) {
+        history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
+      }
       dispatch({
         type: NeuronWalletActions.UpdateCurrentWallet,
         payload,
@@ -43,7 +48,7 @@ export const createWalletWithMnemonic = (params: Controller.ImportMnemonicParams
     if (res.status) {
       history.push(Routes.Overview)
     } else {
-      showErrorMessage(i18n.t('error'), i18n.t(res.message.title))
+      showErrorMessage(i18n.t('messages.error'), i18n.t(res.message.title))
     }
   })
 }
@@ -56,14 +61,31 @@ export const importWalletWithMnemonic = (params: Controller.ImportMnemonicParams
     if (res.status) {
       history.push(Routes.Overview)
     } else {
-      showErrorMessage(i18n.t('error'), i18n.t(res.message.title))
+      showErrorMessage(i18n.t('messages.error'), i18n.t(res.message.title))
     }
   })
 }
-export const updateWalletList = () => (dispatch: StateDispatch) => {
+
+export const importWalletWithKeystore = (params: Controller.ImportKeystoreParams) => (
+  _dispatch: StateDispatch,
+  history: any
+) => {
+  importKeystore(params).then(res => {
+    if (res.status) {
+      history.push(Routes.Overview)
+    } else {
+      showErrorMessage(i18n.t('messages.error'), i18n.t(res.message.title))
+    }
+  })
+}
+
+export const updateWalletList = () => (dispatch: StateDispatch, history: any) => {
   getWalletList().then(res => {
     if (res.status) {
       const payload = res.result || []
+      if (!payload.length) {
+        history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
+      }
       dispatch({
         type: NeuronWalletActions.UpdateWalletList,
         payload,
diff --git a/packages/neuron-ui/src/theme.tsx b/packages/neuron-ui/src/theme.tsx
index e2021beea1..05d77db401 100644
--- a/packages/neuron-ui/src/theme.tsx
+++ b/packages/neuron-ui/src/theme.tsx
@@ -15,6 +15,7 @@ import {
   FormPreviousLink as LeaveIcon,
   FormUp as ExpandIcon,
   FormUpload as ImportIcon,
+  License as KeystoreIcon,
   LinkBottom as LinkBottomIcon,
   LinkDown as LinkDownIcon,
   LinkTop as LinkTopIcon,
@@ -81,6 +82,7 @@ registerIcons({
     TransactionSuccess: <SuccessIcon size="14px" color="green" />,
     TransactionFailure: <FailIcon size="14px" color="#d50000" />,
     TransactionPending: <PendingIcon size="14px" style={{ animation: 'rotate360 3s linear infinite' }} />,
+    Keystore: <KeystoreIcon color="white" style={{ transform: 'scale(0.6)' }} />,
   },
 })
 
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index 55e0beeb6c..d6680bbe21 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -4,6 +4,12 @@ declare namespace Controller {
     mnemonic: string
     password: string
   }
+
+  interface ImportKeystoreParams {
+    name: string
+    keystorePath: string
+    password: string
+  }
   interface UpdateWalletParams {
     id: string
     password?: string
diff --git a/packages/neuron-ui/src/utils/const.ts b/packages/neuron-ui/src/utils/const.ts
index 2e90e2ab09..076c5e389f 100644
--- a/packages/neuron-ui/src/utils/const.ts
+++ b/packages/neuron-ui/src/utils/const.ts
@@ -29,6 +29,7 @@ export enum Routes {
   SettingsNetworks = '/settings/networks',
   CreateWallet = '/wallets/new',
   ImportWallet = '/wallets/import',
+  ImportKeystore = '/keystore/import',
   NetworkEditor = '/network',
   WalletEditor = '/editwallet',
   Prompt = '/prompt',
@@ -69,6 +70,7 @@ export enum MnemonicAction {
 export const FULL_SCREENS = [
   `${Routes.Transaction}/`,
   `/wizard/`,
+  `/keystore/`,
   `${Routes.Settings}/`,
   `${Routes.WalletEditor}/`,
   `${Routes.NetworkEditor}/`,
diff --git a/packages/neuron-wallet/src/controllers/app/index.ts b/packages/neuron-wallet/src/controllers/app/index.ts
index 63d1c586eb..a8643734d8 100644
--- a/packages/neuron-wallet/src/controllers/app/index.ts
+++ b/packages/neuron-wallet/src/controllers/app/index.ts
@@ -182,8 +182,12 @@ export default class AppController {
     AppController.navTo(URL.CreateWallet)
   }
 
-  public static importWallet() {
-    AppController.navTo(URL.ImportWallet)
+  public static importWallet(type: 'mnemonic' | 'keystore') {
+    if (type === 'mnemonic') {
+      AppController.navTo(URL.ImportMnemonic)
+    } else if (type === 'keystore') {
+      AppController.navTo(URL.ImportKeystore)
+    }
   }
 
   public static async showTransactionDetails(hash: string) {
diff --git a/packages/neuron-wallet/src/controllers/app/options.ts b/packages/neuron-wallet/src/controllers/app/options.ts
index f4a9a281c5..d2211a8ad9 100644
--- a/packages/neuron-wallet/src/controllers/app/options.ts
+++ b/packages/neuron-wallet/src/controllers/app/options.ts
@@ -20,7 +20,8 @@ export enum URL {
   Repository = 'https://github.com/nervosnetwork/neuron',
   Preference = '/settings/general',
   CreateWallet = '/wizard/mnemonic/create',
-  ImportWallet = '/wizard/mnemonic/import',
+  ImportMnemonic = '/wizard/mnemonic/import',
+  ImportKeystore = '/keystore/import',
 }
 
 const networksService = NetworksService.getInstance()
diff --git a/packages/neuron-wallet/src/controllers/wallets/index.ts b/packages/neuron-wallet/src/controllers/wallets/index.ts
index b8ce99aef9..2fcfe40a63 100644
--- a/packages/neuron-wallet/src/controllers/wallets/index.ts
+++ b/packages/neuron-wallet/src/controllers/wallets/index.ts
@@ -151,16 +151,16 @@ export default class WalletsController {
   public static async importKeystore({
     name,
     password,
-    keystore,
+    keystorePath,
   }: {
     name: string
     password: string
-    keystore: string
+    keystorePath: string
   }): Promise<Controller.Response<Wallet>> {
     if (password === undefined) {
       throw new IsRequired('Password')
     }
-
+    const keystore = fs.readFileSync(keystorePath, 'utf8')
     const keystoreObject = Keystore.fromJson(keystore)
     const masterPrivateKey = keystoreObject.extendedPrivateKey(password)
     const masterKeychain = new Keychain(
diff --git a/packages/neuron-wallet/src/exceptions/wallet.ts b/packages/neuron-wallet/src/exceptions/wallet.ts
index 286b8f2b37..25c23ac783 100644
--- a/packages/neuron-wallet/src/exceptions/wallet.ts
+++ b/packages/neuron-wallet/src/exceptions/wallet.ts
@@ -35,6 +35,12 @@ export class CapacityNotEnough extends Error {
   }
 }
 
+export class InvalidKeystore extends Error {
+  constructor() {
+    super(i18n.t('messages.invalid-keystore'))
+  }
+}
+
 export default {
   WalletNotFound,
   CurrentWalletNotSet,
@@ -42,4 +48,5 @@ export default {
   EmptyPassword,
   CodeHashNotLoaded,
   CapacityNotEnough,
+  InvalidKeystore,
 }
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 9c05a28f5d..9862edd677 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -20,6 +20,8 @@ export default {
         backup: 'Backup Current Wallet',
         delete: 'Delete Current Wallet',
         'change-password': 'Change Password',
+        'import-mnemonic': 'Import Mnemonic Words',
+        'import-keystore': 'Import Keystore File',
       },
       edit: {
         label: 'Edit',
@@ -90,6 +92,7 @@ export default {
       'capacity-not-enough': 'Capacity is not enough',
       'capacity-too-small': 'Capacity less than min',
       'should-be-type-of': '{{field}} should be type of {{type}}',
+      'invalid-keystore': 'Keystore is invalid',
     },
     contextMenu: {
       select: 'Select',
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index 37a13f593e..c357f638fd 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -20,6 +20,8 @@ export default {
         backup: '备份当前钱包',
         delete: '删除当前钱包',
         'change-password': '修改密码',
+        'import-mnemonic': '导入助记词',
+        'import-keystore': '导入 Keystore 文件',
       },
       edit: {
         label: '编辑',
@@ -89,6 +91,7 @@ export default {
       'capacity-not-enough': '余额不足',
       'capacity-too-small': '金额小于最低金额',
       'should-be-type-of': '{{field}} 应该为 {{type}} 类型',
+      'invalid-keystore': 'Keystore 格式不正确',
     },
     contextMenu: {
       select: '选择',
diff --git a/packages/neuron-wallet/src/models/keys/keystore.ts b/packages/neuron-wallet/src/models/keys/keystore.ts
index 7278e2d236..97fe3f4ed4 100644
--- a/packages/neuron-wallet/src/models/keys/keystore.ts
+++ b/packages/neuron-wallet/src/models/keys/keystore.ts
@@ -2,7 +2,7 @@ import crypto from 'crypto'
 import SHA3 from 'sha3'
 import { v4 as uuid } from 'uuid'
 
-import { UnsupportedCipher, IncorrectPassword } from 'exceptions'
+import { UnsupportedCipher, IncorrectPassword, InvalidKeystore } from 'exceptions'
 import { ExtendedPrivateKey } from './key'
 
 const CIPHER = 'aes-128-ctr'
@@ -40,8 +40,12 @@ export default class Keystore {
   }
 
   static fromJson = (json: string) => {
-    const object = JSON.parse(json)
-    return new Keystore(object.crypto, object.id)
+    try {
+      const object = JSON.parse(json)
+      return new Keystore(object.crypto, object.id)
+    } catch {
+      throw new InvalidKeystore()
+    }
   }
 
   static create = (extendedPrivateKey: ExtendedPrivateKey, password: string) => {
diff --git a/packages/neuron-wallet/src/utils/application-menu.ts b/packages/neuron-wallet/src/utils/application-menu.ts
index 77da0bb5c2..72900df7d5 100644
--- a/packages/neuron-wallet/src/utils/application-menu.ts
+++ b/packages/neuron-wallet/src/utils/application-menu.ts
@@ -74,11 +74,26 @@ const generateTemplate = () => {
       {
         id: 'import',
         label: i18n.t('application-menu.wallet.import'),
-        click: () => {
-          if (AppController) {
-            AppController.importWallet()
-          }
-        },
+        submenu: [
+          {
+            id: 'import-with-mnemonic',
+            label: i18n.t('application-menu.wallet.import-mnemonic'),
+            click: () => {
+              if (AppController) {
+                AppController.importWallet('mnemonic')
+              }
+            },
+          },
+          {
+            id: 'import-with-keystore',
+            label: i18n.t('application-menu.wallet.import-keystore'),
+            click: () => {
+              if (AppController) {
+                AppController.importWallet('keystore')
+              }
+            },
+          },
+        ],
       },
       separator,
       {

From 0dc23ae9945754d16db77f5b5854e044653ef1f3 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 17:22:35 +0800
Subject: [PATCH 13/38] Update packages/neuron-ui/src/locales/en.json

Co-Authored-By: James Chen <james@ashchan.com>
---
 packages/neuron-ui/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 3b95d3a2e1..f83e794619 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -42,7 +42,7 @@
       "welcome-to-nervos-neuron": "Welcome to Neuron",
       "create-or-import-your-first-wallet": "Create or import your first wallet",
       "create-new-wallet": "Create a Wallet",
-      "import-mnemonic": "Import mnemonic words",
+      "import-mnemonic": "Import Mnemonic Seed",
       "import-keystore": "Import a keystore file",
       "import-wallet": "Import a Wallet",
       "next": "Next",

From d942f620f71e9d4e995d75c6664f62816f9863d9 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 17:22:47 +0800
Subject: [PATCH 14/38] Update packages/neuron-wallet/src/locales/en.ts

Co-Authored-By: James Chen <james@ashchan.com>
---
 packages/neuron-wallet/src/locales/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 9862edd677..77951fb495 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -21,7 +21,7 @@ export default {
         delete: 'Delete Current Wallet',
         'change-password': 'Change Password',
         'import-mnemonic': 'Import Mnemonic Words',
-        'import-keystore': 'Import Keystore File',
+        'import-keystore': 'Import from Keystore',
       },
       edit: {
         label: 'Edit',

From 01a76658a8ac320ab520edc9262e80add0f32f0e Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 17:22:56 +0800
Subject: [PATCH 15/38] Update packages/neuron-wallet/src/locales/en.ts

Co-Authored-By: James Chen <james@ashchan.com>
---
 packages/neuron-wallet/src/locales/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 77951fb495..50f62f7656 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -20,7 +20,7 @@ export default {
         backup: 'Backup Current Wallet',
         delete: 'Delete Current Wallet',
         'change-password': 'Change Password',
-        'import-mnemonic': 'Import Mnemonic Words',
+        'import-mnemonic': 'Import Mnemonic Seed',
         'import-keystore': 'Import from Keystore',
       },
       edit: {

From 6d8bfcfb48421b14f734de3a793f29dcbd7fce3b Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 17:23:04 +0800
Subject: [PATCH 16/38] Update packages/neuron-ui/src/locales/en.json

Co-Authored-By: James Chen <james@ashchan.com>
---
 packages/neuron-ui/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index f83e794619..bdce3e157e 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -43,7 +43,7 @@
       "create-or-import-your-first-wallet": "Create or import your first wallet",
       "create-new-wallet": "Create a Wallet",
       "import-mnemonic": "Import Mnemonic Seed",
-      "import-keystore": "Import a keystore file",
+      "import-keystore": "Import from Keystore",
       "import-wallet": "Import a Wallet",
       "next": "Next",
       "back": "Back",

From 5410369dea5a6c5fb45d5372b5b9863cd8c16b65 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 17:23:14 +0800
Subject: [PATCH 17/38] Update packages/neuron-ui/src/locales/en.json

Co-Authored-By: James Chen <james@ashchan.com>
---
 packages/neuron-ui/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index bdce3e157e..4c4c91db02 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -68,7 +68,7 @@
         "password": "Password"
       },
       "placeholder": {
-        "path": "Click to select the Keystore",
+        "path": "Click to select the keystore file",
         "name": "Name for the new wallet",
         "password": "Password to verify the keystore"
       },

From f8a479673742a23ac9d7428b9cf32f52b1804267 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 17:30:58 +0800
Subject: [PATCH 18/38] refactor(neuron-ui): align components in the import
 keystore view vertically center

---
 packages/neuron-ui/src/components/ImportKeystore/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-ui/src/components/ImportKeystore/index.tsx b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
index 28c834ed27..27fdf0c52e 100644
--- a/packages/neuron-ui/src/components/ImportKeystore/index.tsx
+++ b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
@@ -54,7 +54,7 @@ const ImportKeystore = (props: React.PropsWithoutRef<StateWithDispatch & RouteCo
   }, [fields.name, fields.password, fields.path, history, dispatch])
 
   return (
-    <Stack tokens={{ childrenGap: 15 }}>
+    <Stack verticalFill verticalAlign="center" tokens={{ childrenGap: 15 }}>
       <Stack tokens={{ childrenGap: 15 }}>
         {Object.entries(fields).map(([key, value]) => {
           return (

From d5621e52622efe518fe4a95f9ec191c76719a3e5 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 18:09:27 +0800
Subject: [PATCH 19/38] feat(neuron-ui): check the JSON format before keystore
 validation

---
 packages/neuron-wallet/src/controllers/wallets/index.ts | 6 ++++++
 packages/neuron-wallet/src/exceptions/common.ts         | 7 +++++++
 packages/neuron-wallet/src/locales/en.ts                | 1 +
 packages/neuron-wallet/src/locales/zh.ts                | 1 +
 4 files changed, 15 insertions(+)

diff --git a/packages/neuron-wallet/src/controllers/wallets/index.ts b/packages/neuron-wallet/src/controllers/wallets/index.ts
index 2fcfe40a63..b0ad9055d0 100644
--- a/packages/neuron-wallet/src/controllers/wallets/index.ts
+++ b/packages/neuron-wallet/src/controllers/wallets/index.ts
@@ -15,6 +15,7 @@ import {
   ServiceHasNoResponse,
   EmptyPassword,
   IncorrectPassword,
+  InvalidJSON,
 } from 'exceptions'
 import i18n from 'utils/i18n'
 import AddressService from 'services/addresses'
@@ -161,6 +162,11 @@ export default class WalletsController {
       throw new IsRequired('Password')
     }
     const keystore = fs.readFileSync(keystorePath, 'utf8')
+    try {
+      JSON.parse(keystore)
+    } catch {
+      throw new InvalidJSON()
+    }
     const keystoreObject = Keystore.fromJson(keystore)
     const masterPrivateKey = keystoreObject.extendedPrivateKey(password)
     const masterKeychain = new Keychain(
diff --git a/packages/neuron-wallet/src/exceptions/common.ts b/packages/neuron-wallet/src/exceptions/common.ts
index 8412e78eb5..840ddc4d63 100644
--- a/packages/neuron-wallet/src/exceptions/common.ts
+++ b/packages/neuron-wallet/src/exceptions/common.ts
@@ -40,6 +40,12 @@ export class ShouldBeTypeOf extends Error {
   }
 }
 
+export class InvalidJSON extends Error {
+  constructor() {
+    super(i18n.t('messages.invalid-JSON'))
+  }
+}
+
 export default {
   InvalidName,
   UsedName,
@@ -47,4 +53,5 @@ export default {
   MissingRequiredArgument,
   ServiceHasNoResponse,
   ShouldBeTypeOf,
+  InvalidJSON,
 }
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 50f62f7656..16d76ef658 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -93,6 +93,7 @@ export default {
       'capacity-too-small': 'Capacity less than min',
       'should-be-type-of': '{{field}} should be type of {{type}}',
       'invalid-keystore': 'Keystore is invalid',
+      'invalid-JSON': 'Invalid JSON file',
     },
     contextMenu: {
       select: 'Select',
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index c357f638fd..d5b08b5704 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -92,6 +92,7 @@ export default {
       'capacity-too-small': '金额小于最低金额',
       'should-be-type-of': '{{field}} 应该为 {{type}} 类型',
       'invalid-keystore': 'Keystore 格式不正确',
+      'invalid-JSON': 'JSON 文件格式不正确',
     },
     contextMenu: {
       select: '选择',

From 914890aa7154755da4316f4d3516dc6c14a3efba Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 18:26:08 +0800
Subject: [PATCH 20/38] chore:  Set default locale of e2e test

---
 .../neuron-wallet/tests-e2e/wallet.test.ts    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index f11c257ae2..27e1225319 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -15,7 +15,8 @@ describe('wallet tests', () => {
       args: [
         '--require',
         path.join(__dirname, 'preload.js'),
-        path.join(__dirname, '..', 'dist', 'main.js')
+        path.join(__dirname, '..', 'dist', 'main.js'),
+        '--lang=en'
       ], 
       path: electronPath 
     })
@@ -33,7 +34,7 @@ describe('wallet tests', () => {
     await client.waitUntilWindowLoaded()
 
     // Click create wallet
-    const createWalletButton = await getElementByTagName(client, 'button', '创建新钱包')
+    const createWalletButton = await getElementByTagName(client, 'button', 'Create a Wallet')
     expect(createWalletButton).not.toBeNull()
     await client.elementIdClick(createWalletButton!.ELEMENT)
 
@@ -42,7 +43,7 @@ describe('wallet tests', () => {
     const mnemonic = await client.elementIdText(mnemonicTextarea.value.ELEMENT)
     const mnemonicText = mnemonic.value
     // Next
-    const mnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
+    const mnemonicNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(mnemonicNextButton).not.toBeNull()
     await client.elementIdClick(mnemonicNextButton!.ELEMENT)
 
@@ -51,7 +52,7 @@ describe('wallet tests', () => {
     expect(inputMnemonicTextarea.value).not.toBeNull()
     await client.elementIdValue(inputMnemonicTextarea.value.ELEMENT, mnemonicText)
     // Next
-    const inputMnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
+    const inputMnemonicNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(inputMnemonicNextButton).not.toBeNull()
     await client.elementIdClick(inputMnemonicNextButton!.ELEMENT)
 
@@ -63,7 +64,7 @@ describe('wallet tests', () => {
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
     // Next
-    const setupWalletNextButton = await getElementByTagName(client, 'button', '下一步')
+    const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
     await client.pause(200)
@@ -84,12 +85,12 @@ describe('wallet tests', () => {
     await client.elementIdClick(networkElement.value.ELEMENT)
 
     // Switch to wallet setting
-    const walletSettingButton = await getElementByTagName(client, 'button', '钱包')
+    const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
 
     // Go to import wallet page
-    const importWalletButton = await getElementByTagName(client, 'button', '导入钱包')
+    const importWalletButton = await getElementByTagName(client, 'button', 'Import a Wallet')
     expect(importWalletButton).not.toBeNull()
     await client.elementIdClick(importWalletButton!.ELEMENT)
 
@@ -99,7 +100,7 @@ describe('wallet tests', () => {
     const mnemonicText = 'refuse ecology globe virus demand gentle couch scrub bulk project chronic dog'
     // Next
     await client.elementIdValue(mnemonicTextarea.value.ELEMENT, mnemonicText)
-    const mnemonicNextButton = await getElementByTagName(client, 'button', '下一步')
+    const mnemonicNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(mnemonicNextButton).not.toBeNull()
     await client.elementIdClick(mnemonicNextButton!.ELEMENT)
 
@@ -111,7 +112,7 @@ describe('wallet tests', () => {
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
     // Next
-    const setupWalletNextButton = await getElementByTagName(client, 'button', '下一步')
+    const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
     await client.pause(200)
@@ -132,7 +133,7 @@ describe('wallet tests', () => {
     await client.elementIdClick(networkElement.value.ELEMENT)
 
     // Switch to wallet setting
-    const walletSettingButton = await getElementByTagName(client, 'button', '钱包')
+    const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
     await client.pause(200)
@@ -168,7 +169,7 @@ describe('wallet tests', () => {
     expect(inputElement.value).not.toBeNull()
     await client.elementIdValue(inputElement.value.ELEMENT, 'Azusa2233')
     // Confirm
-    const confirmButton = await getElementByTagName(client, 'button', '确认')
+    const confirmButton = await getElementByTagName(client, 'button', 'Confirm')
     expect(confirmButton).not.toBeNull()
     await client.elementIdClick(confirmButton!.ELEMENT)
     await client.pause(200)
@@ -188,7 +189,7 @@ describe('wallet tests', () => {
     await client.pause(200)
 
     // Switch to wallet setting
-    const walletSettingButton = await getElementByTagName(client, 'button', '钱包')
+    const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
     await client.pause(200)
@@ -210,7 +211,7 @@ describe('wallet tests', () => {
     await client.elementIdValue(walletNameInputElement.value.ELEMENT, 'Azusa')
     const walletNameInputText = await client.elementIdAttribute(walletNameInputElement.value.ELEMENT, 'value')
     // Save
-    const saveButton = await getElementByTagName(client, 'button', '保存')
+    const saveButton = await getElementByTagName(client, 'button', 'Save')
     expect(saveButton).not.toBeNull()
     await client.elementIdClick(saveButton!.ELEMENT)
     await client.pause(200)

From 227448f041be587a3df49849fd77e0833ee4b9c7 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Tue, 13 Aug 2019 18:56:05 +0800
Subject: [PATCH 21/38] refactor(neuron-ui): rename invalid-JSON to
 invalid-json

---
 packages/neuron-wallet/src/exceptions/common.ts | 2 +-
 packages/neuron-wallet/src/locales/en.ts        | 2 +-
 packages/neuron-wallet/src/locales/zh.ts        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/neuron-wallet/src/exceptions/common.ts b/packages/neuron-wallet/src/exceptions/common.ts
index 840ddc4d63..d478824828 100644
--- a/packages/neuron-wallet/src/exceptions/common.ts
+++ b/packages/neuron-wallet/src/exceptions/common.ts
@@ -42,7 +42,7 @@ export class ShouldBeTypeOf extends Error {
 
 export class InvalidJSON extends Error {
   constructor() {
-    super(i18n.t('messages.invalid-JSON'))
+    super(i18n.t('messages.invalid-json'))
   }
 }
 
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 16d76ef658..23174fc688 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -93,7 +93,7 @@ export default {
       'capacity-too-small': 'Capacity less than min',
       'should-be-type-of': '{{field}} should be type of {{type}}',
       'invalid-keystore': 'Keystore is invalid',
-      'invalid-JSON': 'Invalid JSON file',
+      'invalid-json': 'Invalid JSON file',
     },
     contextMenu: {
       select: 'Select',
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index d5b08b5704..bbad754437 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -92,7 +92,7 @@ export default {
       'capacity-too-small': '金额小于最低金额',
       'should-be-type-of': '{{field}} 应该为 {{type}} 类型',
       'invalid-keystore': 'Keystore 格式不正确',
-      'invalid-JSON': 'JSON 文件格式不正确',
+      'invalid-json': 'JSON 文件格式不正确',
     },
     contextMenu: {
       select: '选择',

From 74934928626a9e4f8b28a65eabb1c09101c2676b Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 19:57:53 +0800
Subject: [PATCH 22/38] chore: Add debug log for e2e test

---
 .../neuron-wallet/tests-e2e/wallet.test.ts    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index 27e1225319..9708864ec8 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -63,21 +63,26 @@ describe('wallet tests', () => {
     const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
+    await client.pause(200)
+
     // Next
     const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    await client.pause(200)
+    await client.pause(400)
+    await client.waitUntilWindowLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
     expect(walletNameElement.value).not.toBeNull()
     const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
     expect(walletName.value).toBe(walletNameInputText.value)
+    console.log(`walletName = ${walletName.value}`);
   })
 
   it('import wallet', async () => {
     const { client } = app
+    await client.waitUntilWindowLoaded()
 
     // Go to setting page
     const networkElement = await client.element('//FOOTER/DIV[1]/DIV[2]')
@@ -111,11 +116,13 @@ describe('wallet tests', () => {
     const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
+    console.log(`walletNameInputText - ${walletNameInputText.value}`);
     // Next
     const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    await client.pause(200)
+    // await client.pause(200)
+    await client.waitUntilWindowLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -125,12 +132,12 @@ describe('wallet tests', () => {
   })
 
   it('switch to first wallet', async () => {
-    const { client } = app
+    const { client, electron } = app
+    await client.waitUntilWindowLoaded()
 
     // Go to setting page
-    const networkElement = await client.element('//FOOTER/DIV/DIV[2]')
-    expect(networkElement).not.toBeNull()
-    await client.elementIdClick(networkElement.value.ELEMENT)
+    await clickMenu(electron, ['Electron', 'Preferences...'])
+    await client.pause(200)
 
     // Switch to wallet setting
     const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
@@ -154,6 +161,7 @@ describe('wallet tests', () => {
 
   it('delete wallet from menu', async () => {
     const { client, electron } = app
+    await client.waitUntilWindowLoaded()
 
     // Get current wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -183,6 +191,7 @@ describe('wallet tests', () => {
 
   it('edit wallet', async () => {
     const { client, electron } = app
+    await client.waitUntilWindowLoaded()
 
     // Go to setting page
     await clickMenu(electron, ['Electron', 'Preferences...'])
@@ -210,6 +219,8 @@ describe('wallet tests', () => {
     expect(walletNameInputElement.value).not.toBeNull()
     await client.elementIdValue(walletNameInputElement.value.ELEMENT, 'Azusa')
     const walletNameInputText = await client.elementIdAttribute(walletNameInputElement.value.ELEMENT, 'value')
+    console.log(`walletNameInputText - ${walletNameInputText}`);
+    
     // Save
     const saveButton = await getElementByTagName(client, 'button', 'Save')
     expect(saveButton).not.toBeNull()
@@ -221,5 +232,6 @@ describe('wallet tests', () => {
     expect(newWalletNameElement).not.toBeNull()
     const newWalletName = await client.elementIdText(newWalletNameElement.value.ELEMENT)
     expect(newWalletName.value).toBe(walletNameInputText.value)
+    console.log(`newWalletName - ${newWalletName}`);
   })
 })

From e45c9a9a231b385723338f87248333d06658964c Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 20:18:51 +0800
Subject: [PATCH 23/38] chore(e2e): Save screenshot when the test fails

---
 packages/neuron-wallet/tests-e2e/wallet.test.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index 9708864ec8..e3dcb392fd 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -1,6 +1,7 @@
 import { Application } from 'spectron'
 import path from 'path'
 import { getElementByTagName, clickMenu, editWallet } from './utils'
+import fs from 'fs'
 
 // Test create/import/switch/delete/edit wallet
 describe('wallet tests', () => {
@@ -74,6 +75,10 @@ describe('wallet tests', () => {
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
+    if (walletNameElement.value === null) {
+      const imageBuffer = await app.browserWindow.capturePage()
+      fs.writeFileSync(path.join(__dirname, 'fail-create-wallet_check-wallet-name.png'), imageBuffer)
+    }
     expect(walletNameElement.value).not.toBeNull()
     const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
     expect(walletName.value).toBe(walletNameInputText.value)

From c39d457d1e17fb64a1cadd0e40e401a903bcd77e Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 20:59:27 +0800
Subject: [PATCH 24/38] chore(e2e): Update import-mnemonic-seed button text

---
 .../neuron-wallet/tests-e2e/wallet.test.ts    | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index e3dcb392fd..e7b878de75 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -30,9 +30,15 @@ describe('wallet tests', () => {
     }
   })
 
-  it('create wallet', async () => {
+  const waitUntilLoaded = async () => {
     const { client } = app
+    await client.pause(100)
     await client.waitUntilWindowLoaded()
+  }
+
+  it('create wallet', async () => {
+    const { client } = app
+    await client.waitUntilWindowLoaded(10000)
 
     // Click create wallet
     const createWalletButton = await getElementByTagName(client, 'button', 'Create a Wallet')
@@ -47,6 +53,7 @@ describe('wallet tests', () => {
     const mnemonicNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(mnemonicNextButton).not.toBeNull()
     await client.elementIdClick(mnemonicNextButton!.ELEMENT)
+    await waitUntilLoaded()
 
     // Input mnemonic
     const inputMnemonicTextarea = await client.element('<textarea />')
@@ -64,14 +71,11 @@ describe('wallet tests', () => {
     const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
-    await client.pause(200)
-
     // Next
     const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    await client.pause(400)
-    await client.waitUntilWindowLoaded()
+    await waitUntilLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -93,14 +97,16 @@ describe('wallet tests', () => {
     const networkElement = await client.element('//FOOTER/DIV[1]/DIV[2]')
     expect(networkElement.value).not.toBeNull()
     await client.elementIdClick(networkElement.value.ELEMENT)
+    await waitUntilLoaded()
 
     // Switch to wallet setting
     const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
+    await waitUntilLoaded()
 
     // Go to import wallet page
-    const importWalletButton = await getElementByTagName(client, 'button', 'Import a Wallet')
+    const importWalletButton = await getElementByTagName(client, 'button', 'Import Mnemonic Seed')
     expect(importWalletButton).not.toBeNull()
     await client.elementIdClick(importWalletButton!.ELEMENT)
 
@@ -126,8 +132,7 @@ describe('wallet tests', () => {
     const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    // await client.pause(200)
-    await client.waitUntilWindowLoaded()
+    await waitUntilLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -142,20 +147,20 @@ describe('wallet tests', () => {
 
     // Go to setting page
     await clickMenu(electron, ['Electron', 'Preferences...'])
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Switch to wallet setting
     const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Switch to first wallet
     const firstWallet = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV')
     expect(firstWallet).not.toBeNull()
     const firstWalletName = await client.elementIdText(firstWallet.value.ELEMENT)
     await client.elementIdClick(firstWallet.value.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -175,7 +180,7 @@ describe('wallet tests', () => {
     
     // Click delete wallet menu item
     await clickMenu(electron, ['Wallet', 'Delete Current Wallet'])
-    await client.pause(200)
+    await waitUntilLoaded()
     
     // Input password
     const inputElement = await client.element('//INPUT')
@@ -185,7 +190,7 @@ describe('wallet tests', () => {
     const confirmButton = await getElementByTagName(client, 'button', 'Confirm')
     expect(confirmButton).not.toBeNull()
     await client.elementIdClick(confirmButton!.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Check wallet name
     const newWalletNameElement = await client.element('//MAIN/DIV/H1')
@@ -200,13 +205,13 @@ describe('wallet tests', () => {
 
     // Go to setting page
     await clickMenu(electron, ['Electron', 'Preferences...'])
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Switch to wallet setting
     const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Get wallet id
     const walletItemElement = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV[1]/DIV/INPUT')
@@ -217,26 +222,25 @@ describe('wallet tests', () => {
 
     // Go to edit wallet page
     await editWallet(electron, walletId)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Update wallet name
     const walletNameInputElement = await client.element('<input />')
     expect(walletNameInputElement.value).not.toBeNull()
     await client.elementIdValue(walletNameInputElement.value.ELEMENT, 'Azusa')
     const walletNameInputText = await client.elementIdAttribute(walletNameInputElement.value.ELEMENT, 'value')
-    console.log(`walletNameInputText - ${walletNameInputText}`);
-    
+    console.log(`walletNameInputText - ${walletNameInputText.value}`);
     // Save
     const saveButton = await getElementByTagName(client, 'button', 'Save')
     expect(saveButton).not.toBeNull()
     await client.elementIdClick(saveButton!.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Check wallet name
     const newWalletNameElement = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV[1]')
     expect(newWalletNameElement).not.toBeNull()
     const newWalletName = await client.elementIdText(newWalletNameElement.value.ELEMENT)
     expect(newWalletName.value).toBe(walletNameInputText.value)
-    console.log(`newWalletName - ${newWalletName}`);
+    console.log(`newWalletName - ${newWalletName.value}`);
   })
 })

From 0529ff85074aaa428b531d6d095b1cabe87dfb1f Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 14 Aug 2019 02:25:17 +0800
Subject: [PATCH 25/38] refactor(neuron-ui): disable submit button when the
 wallet name is used

---
 .../neuron-ui/src/components/ImportKeystore/index.tsx     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-ui/src/components/ImportKeystore/index.tsx b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
index 27fdf0c52e..2eb1fbf04e 100644
--- a/packages/neuron-ui/src/components/ImportKeystore/index.tsx
+++ b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
@@ -27,6 +27,10 @@ const ImportKeystore = (props: React.PropsWithoutRef<StateWithDispatch & RouteCo
     return wallets.map(w => w.name)
   }, [wallets])
 
+  const isNameUsed = useMemo(() => {
+    return exsitingNames.includes(fields.name || '')
+  }, [exsitingNames, fields.name])
+
   const onFileClick = useCallback(() => {
     showOpenDialog({
       title: 'import keystore',
@@ -71,7 +75,7 @@ const ImportKeystore = (props: React.PropsWithoutRef<StateWithDispatch & RouteCo
                 if (text === '') {
                   return t('messages.is-required', { field: t(`import-keystore.label.${key}`) })
                 }
-                if (key === 'name' && exsitingNames.includes(text || '')) {
+                if (key === 'name' && isNameUsed) {
                   return t('messages.is-used', { field: t(`import-keystore.label.${key}`) })
                 }
                 return ''
@@ -90,7 +94,7 @@ const ImportKeystore = (props: React.PropsWithoutRef<StateWithDispatch & RouteCo
       </Stack>
       <Stack horizontal horizontalAlign="end" tokens={{ childrenGap: 15 }}>
         <DefaultButton onClick={goBack}>{t('import-keystore.button.back')}</DefaultButton>
-        <PrimaryButton disabled={!(fields.name && fields.path && fields.password)} onClick={onSubmit}>
+        <PrimaryButton disabled={!(fields.name && fields.path && fields.password && !isNameUsed)} onClick={onSubmit}>
           {t('import-keystore.button.submit')}
         </PrimaryButton>
       </Stack>

From 3406bfa173e82a83ef32d4b8714c3b8453330205 Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 19:57:53 +0800
Subject: [PATCH 26/38] chore: Add debug log for e2e test

---
 .../neuron-wallet/tests-e2e/wallet.test.ts    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index 27e1225319..9708864ec8 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -63,21 +63,26 @@ describe('wallet tests', () => {
     const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
+    await client.pause(200)
+
     // Next
     const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    await client.pause(200)
+    await client.pause(400)
+    await client.waitUntilWindowLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
     expect(walletNameElement.value).not.toBeNull()
     const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
     expect(walletName.value).toBe(walletNameInputText.value)
+    console.log(`walletName = ${walletName.value}`);
   })
 
   it('import wallet', async () => {
     const { client } = app
+    await client.waitUntilWindowLoaded()
 
     // Go to setting page
     const networkElement = await client.element('//FOOTER/DIV[1]/DIV[2]')
@@ -111,11 +116,13 @@ describe('wallet tests', () => {
     const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
+    console.log(`walletNameInputText - ${walletNameInputText.value}`);
     // Next
     const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    await client.pause(200)
+    // await client.pause(200)
+    await client.waitUntilWindowLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -125,12 +132,12 @@ describe('wallet tests', () => {
   })
 
   it('switch to first wallet', async () => {
-    const { client } = app
+    const { client, electron } = app
+    await client.waitUntilWindowLoaded()
 
     // Go to setting page
-    const networkElement = await client.element('//FOOTER/DIV/DIV[2]')
-    expect(networkElement).not.toBeNull()
-    await client.elementIdClick(networkElement.value.ELEMENT)
+    await clickMenu(electron, ['Electron', 'Preferences...'])
+    await client.pause(200)
 
     // Switch to wallet setting
     const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
@@ -154,6 +161,7 @@ describe('wallet tests', () => {
 
   it('delete wallet from menu', async () => {
     const { client, electron } = app
+    await client.waitUntilWindowLoaded()
 
     // Get current wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -183,6 +191,7 @@ describe('wallet tests', () => {
 
   it('edit wallet', async () => {
     const { client, electron } = app
+    await client.waitUntilWindowLoaded()
 
     // Go to setting page
     await clickMenu(electron, ['Electron', 'Preferences...'])
@@ -210,6 +219,8 @@ describe('wallet tests', () => {
     expect(walletNameInputElement.value).not.toBeNull()
     await client.elementIdValue(walletNameInputElement.value.ELEMENT, 'Azusa')
     const walletNameInputText = await client.elementIdAttribute(walletNameInputElement.value.ELEMENT, 'value')
+    console.log(`walletNameInputText - ${walletNameInputText}`);
+    
     // Save
     const saveButton = await getElementByTagName(client, 'button', 'Save')
     expect(saveButton).not.toBeNull()
@@ -221,5 +232,6 @@ describe('wallet tests', () => {
     expect(newWalletNameElement).not.toBeNull()
     const newWalletName = await client.elementIdText(newWalletNameElement.value.ELEMENT)
     expect(newWalletName.value).toBe(walletNameInputText.value)
+    console.log(`newWalletName - ${newWalletName}`);
   })
 })

From 4709c3aa1d862e95495282437250e363d4914fac Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 20:18:51 +0800
Subject: [PATCH 27/38] chore(e2e): Save screenshot when the test fails

---
 packages/neuron-wallet/tests-e2e/wallet.test.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index 9708864ec8..e3dcb392fd 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -1,6 +1,7 @@
 import { Application } from 'spectron'
 import path from 'path'
 import { getElementByTagName, clickMenu, editWallet } from './utils'
+import fs from 'fs'
 
 // Test create/import/switch/delete/edit wallet
 describe('wallet tests', () => {
@@ -74,6 +75,10 @@ describe('wallet tests', () => {
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
+    if (walletNameElement.value === null) {
+      const imageBuffer = await app.browserWindow.capturePage()
+      fs.writeFileSync(path.join(__dirname, 'fail-create-wallet_check-wallet-name.png'), imageBuffer)
+    }
     expect(walletNameElement.value).not.toBeNull()
     const walletName = await client.elementIdText(walletNameElement.value.ELEMENT)
     expect(walletName.value).toBe(walletNameInputText.value)

From d1303a2033ed30a6268a51cbfa6e43f00cc095d9 Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Tue, 13 Aug 2019 20:59:27 +0800
Subject: [PATCH 28/38] chore(e2e): Update import-mnemonic-seed button text

---
 .../neuron-wallet/tests-e2e/wallet.test.ts    | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index e3dcb392fd..e7b878de75 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -30,9 +30,15 @@ describe('wallet tests', () => {
     }
   })
 
-  it('create wallet', async () => {
+  const waitUntilLoaded = async () => {
     const { client } = app
+    await client.pause(100)
     await client.waitUntilWindowLoaded()
+  }
+
+  it('create wallet', async () => {
+    const { client } = app
+    await client.waitUntilWindowLoaded(10000)
 
     // Click create wallet
     const createWalletButton = await getElementByTagName(client, 'button', 'Create a Wallet')
@@ -47,6 +53,7 @@ describe('wallet tests', () => {
     const mnemonicNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(mnemonicNextButton).not.toBeNull()
     await client.elementIdClick(mnemonicNextButton!.ELEMENT)
+    await waitUntilLoaded()
 
     // Input mnemonic
     const inputMnemonicTextarea = await client.element('<textarea />')
@@ -64,14 +71,11 @@ describe('wallet tests', () => {
     const walletNameInputText = await client.elementIdAttribute(inputElements.value[0].ELEMENT, 'value')
     await client.elementIdValue(inputElements.value[1].ELEMENT, 'Azusa2233')
     await client.elementIdValue(inputElements.value[2].ELEMENT, 'Azusa2233')
-    await client.pause(200)
-
     // Next
     const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    await client.pause(400)
-    await client.waitUntilWindowLoaded()
+    await waitUntilLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -93,14 +97,16 @@ describe('wallet tests', () => {
     const networkElement = await client.element('//FOOTER/DIV[1]/DIV[2]')
     expect(networkElement.value).not.toBeNull()
     await client.elementIdClick(networkElement.value.ELEMENT)
+    await waitUntilLoaded()
 
     // Switch to wallet setting
     const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
+    await waitUntilLoaded()
 
     // Go to import wallet page
-    const importWalletButton = await getElementByTagName(client, 'button', 'Import a Wallet')
+    const importWalletButton = await getElementByTagName(client, 'button', 'Import Mnemonic Seed')
     expect(importWalletButton).not.toBeNull()
     await client.elementIdClick(importWalletButton!.ELEMENT)
 
@@ -126,8 +132,7 @@ describe('wallet tests', () => {
     const setupWalletNextButton = await getElementByTagName(client, 'button', 'Next')
     expect(setupWalletNextButton).not.toBeNull()
     await client.elementIdClick(setupWalletNextButton!.ELEMENT)
-    // await client.pause(200)
-    await client.waitUntilWindowLoaded()
+    await waitUntilLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -142,20 +147,20 @@ describe('wallet tests', () => {
 
     // Go to setting page
     await clickMenu(electron, ['Electron', 'Preferences...'])
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Switch to wallet setting
     const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Switch to first wallet
     const firstWallet = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV')
     expect(firstWallet).not.toBeNull()
     const firstWalletName = await client.elementIdText(firstWallet.value.ELEMENT)
     await client.elementIdClick(firstWallet.value.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
@@ -175,7 +180,7 @@ describe('wallet tests', () => {
     
     // Click delete wallet menu item
     await clickMenu(electron, ['Wallet', 'Delete Current Wallet'])
-    await client.pause(200)
+    await waitUntilLoaded()
     
     // Input password
     const inputElement = await client.element('//INPUT')
@@ -185,7 +190,7 @@ describe('wallet tests', () => {
     const confirmButton = await getElementByTagName(client, 'button', 'Confirm')
     expect(confirmButton).not.toBeNull()
     await client.elementIdClick(confirmButton!.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Check wallet name
     const newWalletNameElement = await client.element('//MAIN/DIV/H1')
@@ -200,13 +205,13 @@ describe('wallet tests', () => {
 
     // Go to setting page
     await clickMenu(electron, ['Electron', 'Preferences...'])
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Switch to wallet setting
     const walletSettingButton = await getElementByTagName(client, 'button', 'Wallets')
     expect(walletSettingButton).not.toBeNull()
     await client.elementIdClick(walletSettingButton!.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Get wallet id
     const walletItemElement = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV[1]/DIV/INPUT')
@@ -217,26 +222,25 @@ describe('wallet tests', () => {
 
     // Go to edit wallet page
     await editWallet(electron, walletId)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Update wallet name
     const walletNameInputElement = await client.element('<input />')
     expect(walletNameInputElement.value).not.toBeNull()
     await client.elementIdValue(walletNameInputElement.value.ELEMENT, 'Azusa')
     const walletNameInputText = await client.elementIdAttribute(walletNameInputElement.value.ELEMENT, 'value')
-    console.log(`walletNameInputText - ${walletNameInputText}`);
-    
+    console.log(`walletNameInputText - ${walletNameInputText.value}`);
     // Save
     const saveButton = await getElementByTagName(client, 'button', 'Save')
     expect(saveButton).not.toBeNull()
     await client.elementIdClick(saveButton!.ELEMENT)
-    await client.pause(200)
+    await waitUntilLoaded()
 
     // Check wallet name
     const newWalletNameElement = await client.element('//MAIN/DIV/DIV[3]/DIV/DIV/DIV/DIV/DIV[1]')
     expect(newWalletNameElement).not.toBeNull()
     const newWalletName = await client.elementIdText(newWalletNameElement.value.ELEMENT)
     expect(newWalletName.value).toBe(walletNameInputText.value)
-    console.log(`newWalletName - ${newWalletName}`);
+    console.log(`newWalletName - ${newWalletName.value}`);
   })
 })

From ae2b1135736b0b7dfb611af42586c2545e27c722 Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Wed, 14 Aug 2019 10:19:38 +0800
Subject: [PATCH 29/38] chore(e2e): Update pause time

---
 packages/neuron-wallet/tests-e2e/wallet.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index e7b878de75..7790c4e294 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -32,7 +32,7 @@ describe('wallet tests', () => {
 
   const waitUntilLoaded = async () => {
     const { client } = app
-    await client.pause(100)
+    await client.pause(200)
     await client.waitUntilWindowLoaded()
   }
 

From 494c94eca3b91bd4aed5b0448000886584b845da Mon Sep 17 00:00:00 2001
From: cezres <cezr@sina.com>
Date: Wed, 14 Aug 2019 10:32:13 +0800
Subject: [PATCH 30/38] chore(e2e): Add main text log for test fail

---
 packages/neuron-wallet/tests-e2e/wallet.test.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/neuron-wallet/tests-e2e/wallet.test.ts b/packages/neuron-wallet/tests-e2e/wallet.test.ts
index 7790c4e294..3e1d173d2d 100644
--- a/packages/neuron-wallet/tests-e2e/wallet.test.ts
+++ b/packages/neuron-wallet/tests-e2e/wallet.test.ts
@@ -80,6 +80,11 @@ describe('wallet tests', () => {
     // Check wallet name
     const walletNameElement = await client.element('//MAIN/DIV/H1')
     if (walletNameElement.value === null) {
+      const mainElement = await client.element('//MAIN')
+      expect(mainElement.value).not.toBeNull()
+      const mainText = await client.elementIdText(mainElement.value.ELEMENT)
+      console.log(`mainText = ${mainText.value}`);
+      
       const imageBuffer = await app.browserWindow.capturePage()
       fs.writeFileSync(path.join(__dirname, 'fail-create-wallet_check-wallet-name.png'), imageBuffer)
     }

From 92398c4d569660ed8bfd3b4d523905f827b1371b Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Wed, 14 Aug 2019 15:56:09 +0900
Subject: [PATCH 31/38] chore: Enable integration tests to always run

---
 azure-pipelines.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b76ce2a572..6f62d0933a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -85,11 +85,6 @@ jobs:
       name: Test
 
   - job: Integration
-    condition: |
-      or(
-        eq(variables['build.sourceBranch'], 'refs/heads/e2e-tests'),
-        startsWith(variables['Build.SourceBranch'], 'refs/heads/rc/')
-      )
     pool:
       vmImage: 'macos-10.14'
     steps:

From 07c8667e4cad89c7eafcfa59a5aa2fc826ca286a Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Thu, 15 Aug 2019 00:31:26 +0800
Subject: [PATCH 32/38] feat(neuron-ui): memorize lists for performance

memorize the lists of transactions and addresses.
---
 .../src/components/Addresses/index.tsx        | 30 +++---
 .../src/components/History/index.tsx          | 98 +++++++++++--------
 2 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/packages/neuron-ui/src/components/Addresses/index.tsx b/packages/neuron-ui/src/components/Addresses/index.tsx
index 480e95c114..7d51198ac4 100644
--- a/packages/neuron-ui/src/components/Addresses/index.tsx
+++ b/packages/neuron-ui/src/components/Addresses/index.tsx
@@ -158,20 +158,24 @@ const Addresses = ({
       semanticColors,
     ]
   )
-
-  return (
-    <ShimmeredDetailsList
-      enableShimmer={isLoading}
-      checkboxVisibility={CheckboxVisibility.hidden}
-      columns={addressColumns.map(col => ({ ...col, name: t(col.name) }))}
-      items={addresses}
-      onItemContextMenu={item => {
-        contextMenu({ type: 'addressList', id: item.identifier })
-      }}
-      className="listWithDesc"
-      onRenderRow={onRenderRow}
-    />
+  const List = useMemo(
+    () => (
+      <ShimmeredDetailsList
+        enableShimmer={isLoading}
+        checkboxVisibility={CheckboxVisibility.hidden}
+        columns={addressColumns.map(col => ({ ...col, name: t(col.name) }))}
+        items={addresses}
+        onItemContextMenu={item => {
+          contextMenu({ type: 'addressList', id: item.identifier })
+        }}
+        className="listWithDesc"
+        onRenderRow={onRenderRow}
+      />
+    ),
+    [isLoading, addressColumns, addresses, t]
   )
+
+  return List
 }
 
 Addresses.displayName = 'Addresses'
diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
index a47fa6266a..d6b0250847 100644
--- a/packages/neuron-ui/src/components/History/index.tsx
+++ b/packages/neuron-ui/src/components/History/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react'
+import React, { useCallback, useEffect, useMemo } from 'react'
 import { RouteComponentProps } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { Stack, SearchBox } from 'office-ui-fabric-react'
@@ -33,47 +33,65 @@ const History = ({
   }, [id, history])
   const onSearch = useCallback(() => history.push(`${Routes.History}?keywords=${keywords}`), [history, keywords])
 
-  return (
-    <Stack>
-      <Stack horizontal horizontalAlign="end" tokens={{ childrenGap: 15 }}>
-        <SearchBox
-          value={keywords}
-          styles={{ root: { width: 500 } }}
-          placeholder={t('history.search.placeholder')}
-          onChange={onKeywordsChange}
-          onSearch={onSearch}
-          iconProps={{ iconName: 'Search', styles: { root: { height: '18px' } } }}
+  const List = useMemo(() => {
+    return (
+      <Stack>
+        <Stack horizontal horizontalAlign="end" tokens={{ childrenGap: 15 }}>
+          <SearchBox
+            value={keywords}
+            styles={{ root: { width: 500 } }}
+            placeholder={t('history.search.placeholder')}
+            onChange={onKeywordsChange}
+            onSearch={onSearch}
+            iconProps={{ iconName: 'Search', styles: { root: { height: '18px' } } }}
+          />
+        </Stack>
+        <TransactionList
+          isLoading={isLoading}
+          isUpdatingDescription={isUpdatingDescription}
+          walletID={id}
+          items={items}
+          dispatch={dispatch}
+        />
+        <Pagination
+          selectedPageIndex={pageNo - 1}
+          pageCount={Math.ceil(totalCount / pageSize)}
+          itemsPerPage={pageSize}
+          totalItemCount={totalCount}
+          previousPageAriaLabel={t('pagination.previous-page')}
+          nextPageAriaLabel={t('pagination.next-page')}
+          firstPageAriaLabel={t('pagination.first-page')}
+          lastPageAriaLabel={t('pagination.last-page')}
+          pageAriaLabel={t('pagination-page')}
+          selectedAriaLabel={t('pagination-selected')}
+          firstPageIconProps={{ iconName: 'FirstPage' }}
+          previousPageIconProps={{ iconName: 'PrevPage' }}
+          nextPageIconProps={{ iconName: 'NextPage' }}
+          lastPageIconProps={{ iconName: 'LastPage' }}
+          format="buttons"
+          onPageChange={(idx: number) => {
+            history.push(`${Routes.History}?pageNo=${idx + 1}`)
+          }}
         />
       </Stack>
-      <TransactionList
-        isLoading={isLoading}
-        isUpdatingDescription={isUpdatingDescription}
-        walletID={id}
-        items={items}
-        dispatch={dispatch}
-      />
-      <Pagination
-        selectedPageIndex={pageNo - 1}
-        pageCount={Math.ceil(totalCount / pageSize)}
-        itemsPerPage={pageSize}
-        totalItemCount={totalCount}
-        previousPageAriaLabel={t('pagination.previous-page')}
-        nextPageAriaLabel={t('pagination.next-page')}
-        firstPageAriaLabel={t('pagination.first-page')}
-        lastPageAriaLabel={t('pagination.last-page')}
-        pageAriaLabel={t('pagination-page')}
-        selectedAriaLabel={t('pagination-selected')}
-        firstPageIconProps={{ iconName: 'FirstPage' }}
-        previousPageIconProps={{ iconName: 'PrevPage' }}
-        nextPageIconProps={{ iconName: 'NextPage' }}
-        lastPageIconProps={{ iconName: 'LastPage' }}
-        format="buttons"
-        onPageChange={(idx: number) => {
-          history.push(`${Routes.History}?pageNo=${idx + 1}`)
-        }}
-      />
-    </Stack>
-  )
+    )
+  }, [
+    keywords,
+    onKeywordsChange,
+    onSearch,
+    isLoading,
+    isUpdatingDescription,
+    id,
+    items,
+    dispatch,
+    pageNo,
+    totalCount,
+    pageSize,
+    history,
+    t,
+  ])
+
+  return List
 }
 
 History.displayName = 'History'

From a3e49ff90f917a6a8f2572d42dd554817169c70b Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Fri, 16 Aug 2019 10:35:47 +0900
Subject: [PATCH 33/38] feat: Add report issue menu item

---
 .../neuron-wallet/src/controllers/app/index.ts    |  8 --------
 .../neuron-wallet/src/controllers/app/options.ts  |  2 --
 packages/neuron-wallet/src/locales/en.ts          |  3 ++-
 packages/neuron-wallet/src/locales/zh.ts          |  3 ++-
 .../neuron-wallet/src/utils/application-menu.ts   | 15 ++++++++++++---
 packages/neuron-wallet/src/utils/const.ts         |  6 ++++++
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/neuron-wallet/src/controllers/app/index.ts b/packages/neuron-wallet/src/controllers/app/index.ts
index a8643734d8..c188471c5a 100644
--- a/packages/neuron-wallet/src/controllers/app/index.ts
+++ b/packages/neuron-wallet/src/controllers/app/index.ts
@@ -166,14 +166,6 @@ export default class AppController {
     new UpdateController().checkUpdates(menuItem)
   }
 
-  public static openWebsite() {
-    AppController.openExternal(URL.Website)
-  }
-
-  public static openRepository() {
-    AppController.openExternal(URL.Repository)
-  }
-
   public static showPreference() {
     AppController.navTo(URL.Preference)
   }
diff --git a/packages/neuron-wallet/src/controllers/app/options.ts b/packages/neuron-wallet/src/controllers/app/options.ts
index d2211a8ad9..5f35756958 100644
--- a/packages/neuron-wallet/src/controllers/app/options.ts
+++ b/packages/neuron-wallet/src/controllers/app/options.ts
@@ -16,8 +16,6 @@ export enum MenuCommand {
 }
 
 export enum URL {
-  Website = 'https://www.nervos.org/',
-  Repository = 'https://github.com/nervosnetwork/neuron',
   Preference = '/settings/general',
   CreateWallet = '/wizard/mnemonic/create',
   ImportMnemonic = '/wizard/mnemonic/import',
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index c3791d5d2a..1c235c9092 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -42,7 +42,8 @@ export default {
       },
       help: {
         label: 'Help',
-        sourceCode: 'Source Code',
+        'source-code': 'Source Code',
+        'report-issue': 'Report Issue',
         settings: 'Settings',
       },
       develop: {
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index e0df3cdfb2..6ab0987ec4 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -42,7 +42,8 @@ export default {
       },
       help: {
         label: '帮助',
-        sourceCode: '源代码',
+        'source-code': '源代码',
+        'report-issue': '报告问题',
         settings: '设置',
       },
       develop: {
diff --git a/packages/neuron-wallet/src/utils/application-menu.ts b/packages/neuron-wallet/src/utils/application-menu.ts
index 72900df7d5..69c6847895 100644
--- a/packages/neuron-wallet/src/utils/application-menu.ts
+++ b/packages/neuron-wallet/src/utils/application-menu.ts
@@ -4,6 +4,7 @@ import env from 'env'
 import i18n from 'utils/i18n'
 import AppController from 'controllers/app'
 import WalletsService from 'services/wallets'
+import { ExternalURL } from 'utils/const'
 
 const isMac = process.platform === 'darwin'
 
@@ -189,15 +190,23 @@ const generateTemplate = () => {
       label: 'Nervos',
       click: () => {
         if (AppController) {
-          AppController.openWebsite()
+          AppController.openExternal(ExternalURL.Website)
         }
       },
     },
     {
-      label: i18n.t('application-menu.help.sourceCode'),
+      label: i18n.t('application-menu.help.source-code'),
       click: () => {
         if (AppController) {
-          AppController.openRepository()
+          AppController.openExternal(ExternalURL.Repository)
+        }
+      },
+    },
+    {
+      label: i18n.t('application-menu.help.report-issue'),
+      click: () => {
+        if (AppController) {
+          AppController.openExternal(ExternalURL.Issues)
         }
       },
     },
diff --git a/packages/neuron-wallet/src/utils/const.ts b/packages/neuron-wallet/src/utils/const.ts
index db587ce125..098d492af7 100644
--- a/packages/neuron-wallet/src/utils/const.ts
+++ b/packages/neuron-wallet/src/utils/const.ts
@@ -13,6 +13,12 @@ export enum ResponseCode {
   Success,
 }
 
+export enum ExternalURL {
+  Website = 'https://www.nervos.org/',
+  Repository = 'https://github.com/nervosnetwork/neuron',
+  Issues = 'https://github.com/nervosnetwork/neuron/issues',
+}
+
 export default {
   Channel,
   ResponseCode,

From e7ab34c8ab458aaf83c84e6ec5b42722baa32be7 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Fri, 16 Aug 2019 10:55:07 +0900
Subject: [PATCH 34/38] chore: Bump to 0.18.0-beta.0, the initial public beta

---
 lerna.json                          | 2 +-
 package.json                        | 2 +-
 packages/neuron-ui/package.json     | 2 +-
 packages/neuron-wallet/package.json | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lerna.json b/lerna.json
index dc16d698f1..2a550a9c45 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-beta.0",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/package.json b/package.json
index 3b7eb8de49..988e79ce47 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-beta.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index b27bb08e58..699106d43f 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-beta.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index cc0aab332f..7768d0ce89 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-beta.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -63,7 +63,7 @@
     "electron-devtools-installer": "2.2.4",
     "electron-notarize": "0.1.1",
     "lint-staged": "9.2.0",
-    "neuron-ui": "0.18.0-alpha.1",
+    "neuron-ui": "0.18.0-beta.0",
     "rimraf": "2.6.3",
     "spectron": "7.0.0",
     "ts-transformer-imports": "0.4.3",

From a41f528a56df61b875d50705419dcbacd22a473a Mon Sep 17 00:00:00 2001
From: classicalliu <classicalliu@gmail.com>
Date: Fri, 16 Aug 2019 11:19:42 +0800
Subject: [PATCH 35/38] chore: set busy timeout to 3000ms

---
 .../neuron-wallet/src/database/address/ormconfig.ts | 13 +++++++++----
 .../neuron-wallet/src/database/chain/ormconfig.ts   |  5 +++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/neuron-wallet/src/database/address/ormconfig.ts b/packages/neuron-wallet/src/database/address/ormconfig.ts
index f1f4e0bbf0..7e4731830e 100644
--- a/packages/neuron-wallet/src/database/address/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/address/ormconfig.ts
@@ -27,13 +27,18 @@ const connectOptions = (): SqliteConnectionOptions => {
   }
 }
 
+export const getConnection = () => {
+  return ormGetConnection(connectionName)
+}
+
+const setBusyTimeout = async () => {
+  await getConnection().manager.query(`PRAGMA busy_timeout = 3000;`)
+}
+
 export const initConnection = async () => {
   const connectionOptions = connectOptions()
   await createConnection(connectionOptions)
-}
-
-export const getConnection = () => {
-  return ormGetConnection(connectionName)
+  await setBusyTimeout()
 }
 
 export default initConnection
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index 167b66613e..da39c8fc03 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -36,6 +36,10 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
   }
 }
 
+const setBusyTimeout = async () => {
+  await getConnection().manager.query(`PRAGMA busy_timeout = 3000;`)
+}
+
 export const initConnection = async (genesisBlockHash: string) => {
   // try to close connection, if not exist, will throw ConnectionNotFoundError when call getConnection()
   try {
@@ -47,6 +51,7 @@ export const initConnection = async (genesisBlockHash: string) => {
 
   try {
     await createConnection(connectionOptions)
+    await setBusyTimeout()
   } catch (err) {
     logger.error(err.message)
   }

From 57c13c9f24afb000f891d1ac5969c4ece797627c Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Fri, 16 Aug 2019 11:20:07 +0800
Subject: [PATCH 36/38] feat(neuron-ui): update display of recent activities

use absolute value of transaction's amount in the recent activities
---
 packages/neuron-ui/src/components/Overview/index.tsx |  1 +
 packages/neuron-ui/src/stories/data/transactions.ts  | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
index 904f280756..b948fc2b25 100644
--- a/packages/neuron-ui/src/components/Overview/index.tsx
+++ b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -320,6 +320,7 @@ const Overview = ({
         return {
           ...item,
           status,
+          value: item.value.replace(/^-/, ''),
           confirmations: item.status === 'success' ? confirmations : '',
           typeLabel: t(`overview.${typeLabel}`),
         }
diff --git a/packages/neuron-ui/src/stories/data/transactions.ts b/packages/neuron-ui/src/stories/data/transactions.ts
index 6de401e1b1..60f063901c 100644
--- a/packages/neuron-ui/src/stories/data/transactions.ts
+++ b/packages/neuron-ui/src/stories/data/transactions.ts
@@ -8,7 +8,7 @@ const transactions: {
       createdAt: (new Date(1565240655845).getTime() - 100000).toString(),
       updatedAt: '',
       timestamp: '',
-      value: '10000',
+      value: '-10000',
       hash: '0x70abeeaa2ed08b7d7659341a122b9a2f2ede99bb6bd0df7398d7ffe488beab61',
       description: 'description of send transaction',
       blockNumber: '120',
@@ -30,7 +30,7 @@ const transactions: {
       createdAt: '',
       updatedAt: '',
       timestamp: (new Date(1565240655845).getTime() - 300000).toString(),
-      value: '10000',
+      value: '-10000',
       hash: '0x70abeeaa2ed08b7d7659341a122b9a2f2ede99bb6bd0df7398d7ffe488beab63',
       description: 'description of send transaction',
       blockNumber: '0',
@@ -52,7 +52,7 @@ const transactions: {
       createdAt: (new Date(1565240655845).getTime() - 500000).toString(),
       updatedAt: '',
       timestamp: '',
-      value: '10000',
+      value: '-10000',
       hash: '0x70abeeaa2ed08b7d7659341a122b9a2f2ede99bb6bd0df7398d7ffe488beab65',
       description: 'description of send transaction',
       blockNumber: '0',
@@ -74,7 +74,7 @@ const transactions: {
       createdAt: new Date('2019-05-18').getTime().toString(),
       updatedAt: '',
       timestamp: '',
-      value: '10000',
+      value: '-10000',
       hash: '0x70abeeaa2ed08b7d7659341a122b9a2f2ede99bb6bd0df7398d7ffe488beab67',
       description: 'description of send transaction',
       blockNumber: '0',
@@ -96,7 +96,7 @@ const transactions: {
       createdAt: new Date('2019-04-18').getTime().toString(),
       updatedAt: '',
       timestamp: '',
-      value: '10000',
+      value: '-10000',
       hash: '0x70abeeaa2ed08b7d7659341a122b9a2f2ede99bb6bd0df7398d7ffe488beab69',
       description: 'description of send transaction',
       blockNumber: '0',
@@ -118,7 +118,7 @@ const transactions: {
       createdAt: new Date('2019-04-17').getTime().toString(),
       updatedAt: '',
       timestamp: '',
-      value: '10000',
+      value: '-10000',
       hash: '0x70abeeaa2ed08b7d7659341a122b9a2f2ede99bb6bd0df7398d7ffe488beab11',
       description: 'description of send transaction',
       blockNumber: '0',

From 9eaf2f3b9165d620b82b4a53b94f9a229275ac89 Mon Sep 17 00:00:00 2001
From: classicalliu <classicalliu@gmail.com>
Date: Fri, 16 Aug 2019 13:10:32 +0800
Subject: [PATCH 37/38] fix: generate address and notify wallet created when
 import keystore

---
 packages/neuron-wallet/src/controllers/wallets/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/neuron-wallet/src/controllers/wallets/index.ts b/packages/neuron-wallet/src/controllers/wallets/index.ts
index b0ad9055d0..e551102c25 100644
--- a/packages/neuron-wallet/src/controllers/wallets/index.ts
+++ b/packages/neuron-wallet/src/controllers/wallets/index.ts
@@ -186,6 +186,10 @@ export default class WalletsController {
       extendedKey: accountExtendedPublicKey.serialize(),
       keystore: keystoreObject,
     })
+
+    await walletsService.generateAddressesById(wallet.id)
+    WalletCreatedSubject.getSubject().next('import')
+
     return {
       status: ResponseCode.Success,
       result: wallet,

From f115279cde93a258cc57dd3a269012b0114b414a Mon Sep 17 00:00:00 2001
From: ZengBing15 <zengBing15@users.noreply.github.com>
Date: Fri, 16 Aug 2019 13:35:50 +0800
Subject: [PATCH 38/38] chore: Bump to 0.18.0-beta.0

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd302f70a7..5c249b021c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# [0.18.0-beta.0](https://github.com/nervosnetwork/neuron/compare/v0.18.0-alpha.1...v0.18.0-beta.0) (2019-08-16)
+
+
+### Bug Fixes
+
+* generate address and notify wallet created when import keystore ([9eaf2f3](https://github.com/nervosnetwork/neuron/commit/9eaf2f3))
+
+
+### Features
+
+* **neuron-ui:** update display of recent activities ([57c13c9](https://github.com/nervosnetwork/neuron/commit/57c13c9))
+* Add report issue menu item ([a3e49ff](https://github.com/nervosnetwork/neuron/commit/a3e49ff))
+* **neuron-ui:** add import keystore ([d3a917c](https://github.com/nervosnetwork/neuron/commit/d3a917c))
+* **neuron-ui:** check the JSON format before keystore validation ([d5621e5](https://github.com/nervosnetwork/neuron/commit/d5621e5))
+* **neuron-ui:** memorize lists for performance ([07c8667](https://github.com/nervosnetwork/neuron/commit/07c8667))
+* Show available update's version ([37c8639](https://github.com/nervosnetwork/neuron/commit/37c8639))
+
+
+
 # [0.18.0-alpha.1](https://github.com/nervosnetwork/neuron/compare/v0.18.0-alpha.0...v0.18.0-alpha.1) (2019-08-12)