Merge pull request #1 from nervosnetwork/develop

REBASE

.eslintrc.js

@@ -24,7 +24,6 @@ module.exports = {
       "args": "after-used",
       "ignoreRestSiblings": false
     }],
-    "operator-linebreak": [2, "after"],
     "arrow-parens": [2, "as-needed"],
     "max-len": [2, {
       "code": 120,
@@ -36,9 +35,11 @@ module.exports = {
       "ignoreRegExpLiterals": true,
     }],
     "object-curly-newline": ["error", {
-      "ObjectExpression": "always",
+      "ObjectExpression": {
+        "consistent": true
+      },
       "ObjectPattern": {
-        "multiline": true
+        "consistent": true
       },
       "ImportDeclaration": {
         "consistent": true,
@@ -53,6 +54,9 @@ module.exports = {
       "allow": ["warn", "error", "info"]
     }]
   },
+  "globals": {
+    "BigInt": "readonly"
+  },
   "env": {
     "jest": true,
     "browser": true,

.gitignore

@@ -34,3 +34,9 @@ lerna-debug.log
 
 #docs
 docs
+
+# vscode config
+./packages/neuron-wallet/.vscode
+
+# sqlite db
+*.db.*

.travis.yml

@@ -28,5 +28,5 @@ before_script:
 
 script:
   - git diff --exit-code yarn.lock
-  - yarn build
+  - CI=false yarn build
   - yarn test

README.md

@@ -12,6 +12,8 @@ Nervos CKB Wallet
 
 You will need `node >= 11.10` and `yarn >= 1.12` to build and run this Neuron.
 
+Please be noted that Neuron depends on [node-gyp](https://github.com/nodejs/node-gyp) to build native NPM modules. Follow [this](https://github.com/nodejs/node-gyp#installation) to install node-gyp dependencies.
+
 In the project directory, you can run:
 
 ### `yarn install && yarn bootstrap`

ormconfig.json

@@ -0,0 +1,19 @@
+{
+  "type": "sqlite",
+  "synchronize": true,
+  "logging": true,
+  "entities": [
+     "packages/neuron-wallet/src/entities/**/*.ts"
+  ],
+  "migrations": [
+     "packages/neuron-wallet/src/migration/**/*.ts"
+  ],
+  "subscribers": [
+     "packages/neuron-wallet/src/subscriber/**/*.ts"
+  ],
+  "cli": {
+     "entitiesDir": "packages/neuron-wallet/src/entities",
+     "migrationsDir": "packages/neuron-wallet/src/migration",
+     "subscribersDir": "packages/neuron-wallet/src/subscriber"
+  }
+}

package.json

@@ -20,17 +20,14 @@
   "scripts": {
     "start:ui": "lerna run --scope=@nervosnetwork/neuron-ui start",
     "start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on http://localhost:3000 && cd packages/neuron-wallet && yarn run start:dev\"",
-
     "build": "lerna run build",
     "clean": "lerna run clean",
-
     "package": "yarn clean && yarn build && ./packages/neuron-wallet/script/package.sh",
-
     "bootstrap": "lerna bootstrap && lerna link",
     "lint": "lerna run lint",
     "test": "lerna run --parallel test",
     "precommit": "lint-staged",
-    "postinstall": "npm rebuild tiny-secp256k1 && lerna run postinstall"
+    "postinstall": "npm rebuild tiny-secp256k1 && lerna run rebuild:nativemodules"
   },
   "lint-staged": {
     "packages/*/src/**/*.{ts,tsx}": [
@@ -40,26 +37,26 @@
   },
   "devDependencies": {
     "@cryptape/sdk-ts-config": "0.0.1",
-    "@types/jest": "^24.0.0",
-    "@typescript-eslint/eslint-plugin": "1.5.0",
-    "@typescript-eslint/parser": "1.5.0",
+    "@types/jest": "^24.0.11",
+    "@typescript-eslint/eslint-plugin": "1.6.0",
+    "@typescript-eslint/parser": "1.6.0",
     "concurrently": "^4.1.0",
     "cross-env": "^5.2.0",
     "cz-conventional-changelog": "^2.1.0",
-    "eslint": "5.12.0",
+    "eslint": "5.15.1",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-config-prettier": "^4.0.0",
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-prettier": "^3.0.1",
     "eslint-plugin-react": "^7.12.4",
     "husky": "^1.3.1",
-    "lerna": "^3.11.1",
-    "lint-staged": "^8.1.0",
-    "nodemon": "^1.18.9",
-    "prettier": "^1.16.0",
-    "ts-jest": "^24.0.0",
-    "typescript": "^3.3.1",
+    "lerna": "^3.13.2",
+    "lint-staged": "^8.1.5",
+    "nodemon": "^1.18.11",
+    "prettier": "^1.17.0",
+    "ts-jest": "^24.0.2",
+    "typescript": "^3.4.1",
     "wait-on": "^3.2.0"
   },
   "dependencies": {},
@@ -68,4 +65,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}

packages/neuron-ui/package.json

@@ -15,7 +15,7 @@
     "lint": "eslint 'src/**/*.{js,jsx,ts,tsx}'",
     "test": "react-app-rewired test --env=jsdom --color",
     "build": "react-app-rewired build",
-    "clean": "rm -rf build/*",
+    "clean": "rimraf build/*",
     "postinstall": "npm rebuild tiny-secp256k1"
   },
   "publishConfig": {
@@ -32,14 +32,12 @@
   ],
   "dependencies": {
     "@nervosnetwork/ckb-sdk-core": "^0.0.1-alpha.3",
-    "@types/jest": "23.3.12",
     "@types/node": "10.12.18",
     "@types/react": "16.8.2",
     "@types/react-dom": "16.8.0",
     "@types/styled-components": "^4.1.6",
     "bootstrap": "^4.3.1",
-    "cross-env": "^5.2.0",
-    "electron": "^4.0.3",
+    "dayjs": "^1.8.12",
     "grommet-icons": "^4.2.0",
     "i18next": "^15.0.5",
     "node-sass": "^4.11.0",
@@ -49,9 +47,8 @@
     "react-dom": "^16.8.1",
     "react-i18next": "^10.2.0",
     "react-router-dom": "^4.3.1",
-    "react-scripts": "2.1.5",
-    "styled-components": "^4.1.3",
-    "typescript": "3.2.2"
+    "react-scripts": "3.0.0-next.b0cbf2ca",
+    "styled-components": "^4.1.3"
   },
   "devDependencies": {
     "@nervosnetwork/ckb-types": "^0.0.1-alpha.3",
@@ -64,6 +61,7 @@
     "eslint-plugin-react-hooks": "^1.0.1",
     "jest-styled-components": "^6.3.1",
     "jsqr": "^1.2.0",
-    "react-app-rewired": "^2.0.2"
+    "react-app-rewired": "^2.0.2",
+    "rimraf": "^2.6.3"
   }
 }

packages/neuron-ui/public/index.html

@@ -27,9 +27,9 @@
 <body>
   <aside class="sidebar"></aside>
   <header class="header"></header>
-  <div id="root" class="main-content"></div>
   <div id="notification" class="notification"></div>
-  <div id="dialog"></div>
+  <div id="root" class="main-content"></div>
+  <div id="dialog" class="dialog"></div>
 </body>
 
 </html>

packages/neuron-ui/src/components/Addresses/Address.ts

@@ -1,5 +1,5 @@
 export const Change = 'Change'
-export const Receive = 'Receive'
+export const Receiving = 'Receiving'
 
 export interface Address {
   type: string