Merge pull request #937 from nervosnetwork/rc/v0.20.0-beta.1

[ᚬmaster] Release v0.20.0-beta.1

Author: ashchan

.eslintignore

@@ -1,3 +1,25 @@
+# [0.20.0-beta.1](https://github.com/nervosnetwork/neuron/compare/v0.20.0-beta.0...v0.20.0-beta.1) (2019-09-17)
+
+
+### Bug Fixes
+
+* **neuron-ui:** disable the submit button once a sending request is sent ([0c72b01](https://github.com/nervosnetwork/neuron/commit/0c72b01))
+* **neuron-ui:** fix the transaction detail view ([9e6da54](https://github.com/nervosnetwork/neuron/commit/9e6da54))
+* **neuron-ui:** fix typo in class name ([3417445](https://github.com/nervosnetwork/neuron/commit/3417445))
+* **neuron-ui:** sort outputs of a transaction by outPoint.index ([c9aef30](https://github.com/nervosnetwork/neuron/commit/c9aef30))
+
+
+### Features
+
+* **neuron-ui:** add a settings icon in the navbar component ([8d929a3](https://github.com/nervosnetwork/neuron/commit/8d929a3))
+* Improve localization translations ([44b3642](https://github.com/nervosnetwork/neuron/commit/44b3642))
+* **neuron-ui:** add a blank margin around the QRCode for improving recognization ([8a7b246](https://github.com/nervosnetwork/neuron/commit/8a7b246))
+* **neuron-ui:** refine transaction list and address list ([e78dd9f](https://github.com/nervosnetwork/neuron/commit/e78dd9f))
+* **neuron-ui:** remove hover effect on table header ([a21bc7e](https://github.com/nervosnetwork/neuron/commit/a21bc7e))
+* Remove hover background effect on property list and overview details lists ([91a1c6e](https://github.com/nervosnetwork/neuron/commit/91a1c6e))
+
+
+
 # [0.20.0-beta.0](https://github.com/nervosnetwork/neuron/compare/v0.19.0-beta.1...v0.20.0-beta.0) (2019-09-09)
 
 

CHANGELOG.md

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.20.0-beta.0",
+  "version": "0.20.0-beta.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

lerna.json

@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.20.0-beta.0",
+  "version": "0.20.0-beta.1",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -44,24 +44,17 @@
   },
   "devDependencies": {
     "@types/jest": "24.0.18",
-    "@typescript-eslint/eslint-plugin": "2.1.0",
-    "@typescript-eslint/parser": "2.1.0",
+    "@typescript-eslint/eslint-plugin": "2.2.0",
+    "@typescript-eslint/parser": "2.2.0",
     "concurrently": "4.1.2",
     "cross-env": "5.2.1",
     "eslint": "6.3.0",
-    "eslint-config-airbnb": "18.0.1",
-    "eslint-config-prettier": "6.2.0",
-    "eslint-plugin-import": "2.18.2",
-    "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-prettier": "3.1.0",
-    "eslint-plugin-react": "7.14.3",
     "husky": "3.0.5",
     "lerna": "3.16.4",
     "ncp": "2.0.0",
     "nodemon": "1.19.2",
-    "prettier": "1.18.2",
     "ts-jest": "24.0.2",
-    "typescript": "3.6.2",
+    "typescript": "3.6.3",
     "wait-on": "3.3.0"
   },
   "dependencies": {}

package.json

@@ -1,13 +1,69 @@
 module.exports = {
-  "extends": [
-    "../../.eslintrc.js"
-  ],
+  "extends": ["airbnb", "plugin:prettier/recommended"],
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
   "settings": {
+    "import/resolver": {
+      "node": {
+        "paths": ["src"],
+        "extensions": [".js", ".ts", ".jsx", ".tsx"]
+      }
+    },
     "react": {
       "version": "detect"
     }
   },
   "rules": {
+    "prettier/prettier": [2, {
+      "printWidth": 120
+    }],
+    "semi": [2, "never"],
+    "curly": [2, "all"],
+    "comma-dangle": [2, {
+      "arrays": "always-multiline",
+      "objects": "always-multiline",
+      "imports": "always-multiline",
+      "exports": "always-multiline",
+      "functions": "ignore"
+    }],
+    "import/no-extraneous-dependencies": [2, {
+      "devDependencies": true
+    }],
+    "no-unused-vars": "off",
+    "implicit-arrow-linebreak": "off",
+    "@typescript-eslint/no-unused-vars": ["error", {
+      "vars": "local",
+      "args": "after-used",
+      "ignoreRestSiblings": false
+    }],
+    "arrow-parens": [2, "as-needed"],
+    "max-len": [2, {
+      "code": 120,
+      "ignoreComments": true,
+      "ignoreTrailingComments": true,
+      "ignoreUrls": true,
+      "ignoreStrings": true,
+      "ignoreTemplateLiterals": true,
+      "ignoreRegExpLiterals": true,
+    }],
+    "object-curly-newline": ["error", {
+      "ObjectExpression": {
+        "consistent": true
+      },
+      "ObjectPattern": {
+        "consistent": true
+      },
+      "ImportDeclaration": {
+        "consistent": true,
+      },
+      "ExportDeclaration": {
+        "multiline": true,
+        "minProperties": 3
+      }
+    }],
+    "no-plusplus": [0],
+    "lines-between-class-members": ["error", "always", { exceptAfterSingleLine: true }],
+    "max-classes-per-file": [0],
     "react/jsx-filename-extension": [1, {
       "extensions": [".ts", ".tsx"]
     }],
@@ -17,5 +73,13 @@ module.exports = {
     "no-console": [2, {
       "allow": ["info", "warn", "error", "group", "groupEnd"]
     }]
-  }
+  },
+  "env": {
+    "jest": true,
+    "node": true,
+    "browser": true
+  },
+  "globals": {
+    "BigInt": "readonly"
+  },
 }

packages/neuron-ui/.eslintrc.js

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.20.0-beta.0",
+  "version": "0.20.0-beta.1",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -81,10 +81,17 @@
     "babel-jest": "24.9.0",
     "enzyme": "3.10.0",
     "enzyme-adapter-react-16": "1.14.0",
+    "eslint-config-airbnb": "18.0.1",
+    "eslint-config-prettier": "6.2.0",
+    "eslint-plugin-import": "2.18.2",
+    "eslint-plugin-jsx-a11y": "6.2.3",
+    "eslint-plugin-prettier": "3.1.0",
+    "eslint-plugin-react": "7.14.3",
     "jest-styled-components": "7.0.0-beta.1",
     "jsqr": "1.2.0",
     "lint-staged": "9.2.5",
     "node-sass": "4.12.0",
+    "prettier": "1.18.2",
     "react-app-rewired": "2.1.3",
     "react-test-renderer": "16.9.0",
     "rimraf": "3.0.0",

.prettierrc packages/neuron-ui/.prettierrc.prettierrc renamed to packages/neuron-ui/.prettierrc

@@ -70,10 +70,24 @@ const Addresses = ({
         className: 'monospacedFont',
         minWidth: 100,
         maxWidth: 500,
-        onRender: (item?: State.Address) => {
+        onRender: (item?: State.Address, _index?: number, column?: IColumn) => {
           if (item) {
+            if (column && (column.calculatedWidth || 0) < 400) {
+              return (
+                <div
+                  title={item.address}
+                  style={{
+                    overflow: 'hidden',
+                    display: 'flex',
+                  }}
+                >
+                  <span className="text-overflow">{item.address.slice(0, -6)}</span>
+                  <span>{item.address.slice(-6)}</span>
+                </div>
+              )
+            }
             return (
-              <span className="text-overflow" title={item.address}>
+              <span className="textOverflow" title={item.address}>
                 {item.address}
               </span>
             )
@@ -86,7 +100,6 @@ const Addresses = ({
         key: 'description',
         fieldName: 'description',
         minWidth: 100,
-        maxWidth: 300,
         onRender: (item?: State.Address) => {
           const isSelected = item && localDescription.key === item.address
           return item ? (
@@ -130,7 +143,7 @@ const Addresses = ({
         onRender: (item?: State.Address) => {
           if (item) {
             return (
-              <span title={`${item.balance} shannon`} className="text-overflow">
+              <span title={`${item.balance} shannon`} className="textOverflow">
                 {`${shannonToCKBFormatter(item.balance)} CKB`}
               </span>
             )

packages/neuron-ui/package.json

@@ -127,6 +127,7 @@ const ActivityList = ({
       onItemInvoked={item => {
         showTransactionDetails(item.hash)
       }}
+      className="listNoHover"
       styles={{
         root: {
           backgroundColor: 'transparent',
@@ -326,6 +327,7 @@ const Overview = ({
           items={activityItems}
           onRenderRow={onTransactionRowRender}
           onGoToHistory={onGoToHistory}
+          className="listNoHover"
           t={t}
         />
       ) : (

packages/neuron-ui/src/components/Addresses/index.tsx

@@ -8,7 +8,8 @@ import { priceToFee, CKBToShannonFormatter } from 'utils/formatters'
 
 const PasswordRequest = ({
   app: {
-    send: { txID, outputs, description, price, cycles, loading: isSending },
+    send: { txID, outputs, description, price, cycles },
+    loadings: { sending: isSending = false },
     passwordRequest: { walletID = '', actionType = null, password = '' },
   },
   settings: { wallets = [] },