Merge pull request #1047 from nervosnetwork/rc/v0.24.0

[ᚬmaster] Rc/v0.24.0

Author: ashchan

CHANGELOG.md

@@ -1,3 +1,34 @@
+# [0.24.0](https://github.com/nervosnetwork/neuron/compare/v0.23.1...v0.24.0) (2019-11-04)
+
+
+### Bug Fixes
+
+* sign witness result in test ([92dbaa2](https://github.com/nervosnetwork/neuron/commit/92dbaa2))
+* **neuron-ui:** remove length limitation of password, but should the alert instead ([f25c8fd](https://github.com/nervosnetwork/neuron/commit/f25c8fd))
+* Search history by date ([6df490a](https://github.com/nervosnetwork/neuron/commit/6df490a))
+* **neuron-ui:** hide the colon if description is empty ([3af1ec4](https://github.com/nervosnetwork/neuron/commit/3af1ec4))
+* **neuron-ui:** hide the confirmations of pending txs ([456210d](https://github.com/nervosnetwork/neuron/commit/456210d))
+* **neuron-ui:** hide the pending list if it has no items. ([19d857e](https://github.com/nervosnetwork/neuron/commit/19d857e))
+
+
+### Features
+
+* Always show address book ([940e23a](https://github.com/nervosnetwork/neuron/commit/940e23a))
+* Change confirmation threshold to 30 ([1dabb3c](https://github.com/nervosnetwork/neuron/commit/1dabb3c))
+* Change the way pending confirmations display on overview ([f5cad48](https://github.com/nervosnetwork/neuron/commit/f5cad48))
+* Move explorer URL determination to ChainInfo ([83c69c7](https://github.com/nervosnetwork/neuron/commit/83c69c7))
+* Remove miner info feature ([4dcdad4](https://github.com/nervosnetwork/neuron/commit/4dcdad4))
+* **neuron-ui:** clear send view on wallet switching ([47af746](https://github.com/nervosnetwork/neuron/commit/47af746))
+* **neuron-ui:** disable the submit button if the generated tx is null ([be45889](https://github.com/nervosnetwork/neuron/commit/be45889))
+* **neuron-ui:** use tooltip component instead of element title to display the sync progress. ([6780d45](https://github.com/nervosnetwork/neuron/commit/6780d45))
+
+
+### Performance Improvements
+
+* cache getTransaction result when sync in indexer mode ([756bd30](https://github.com/nervosnetwork/neuron/commit/756bd30))
+
+
+
 ## [0.23.1](https://github.com/nervosnetwork/neuron/compare/v0.23.0...v0.23.1) (2019-10-28)
 
 

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.23.1",
+  "version": "0.24.0",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -43,7 +43,7 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-core": "0.23.1",
+    "@nervosnetwork/ckb-sdk-core": "0.24.0",
     "@uifabric/experiments": "7.16.1",
     "@uifabric/styling": "7.6.2",
     "canvg": "2.0.0",

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo } from 'react'
+import React, { useState, useMemo } from 'react'
 import { RouteComponentProps } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import {
@@ -18,7 +18,6 @@ import { ckbCore } from 'services/chain'
 import { StateWithDispatch } from 'states/stateProvider/reducer'
 
 import { useLocalDescription } from 'utils/hooks'
-import { Routes } from 'utils/const'
 import { localNumberFormatter, shannonToCKBFormatter } from 'utils/formatters'
 import { onRenderRow } from 'utils/fabricUIRender'
 
@@ -28,22 +27,13 @@ const Addresses = ({
   },
   wallet: { addresses = [], id: walletID },
   chain: { networkID },
-  settings: {
-    general: { showAddressBook = false },
-    networks = [],
-  },
-  history,
+  settings: { networks = [] },
   dispatch,
 }: React.PropsWithoutRef<StateWithDispatch & RouteComponentProps>) => {
   const isMainnet =
     (networks.find(n => n.id === networkID) || {}).chain === (process.env.REACT_APP_MAINNET_TAG || 'ckb')
   const [showMainnetAddress, setShowMainnetAddress] = useState(false)
   const [t] = useTranslation()
-  useEffect(() => {
-    if (!showAddressBook) {
-      history.push(Routes.Overview)
-    }
-  }, [showAddressBook, history])
 
   const {
     localDescription,

packages/neuron-ui/src/components/CustomRows/ActivityRow.tsx

@@ -34,7 +34,7 @@ const ActivityRow = (props?: ActivityRowProps) => {
   return (
     <div
       className={`${styles.activityRow} ${styles[status]}`}
-      title={`${hash}: ${description || ''}`}
+      title={`${hash}${description ? `: ${description}` : ''}`}
       onDoubleClick={onDoubleClick}
     >
       <div className={styles.action}>{`${typeLabel} ${shannonToCKBFormatter(value)} CKB`}</div>

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

@@ -3,28 +3,21 @@ import { Stack, Toggle } from 'office-ui-fabric-react'
 import { useTranslation } from 'react-i18next'
 
 import { StateWithDispatch } from 'states/stateProvider/reducer'
-import { toggleAddressBook, setSkipDataAndType } from 'states/stateProvider/actionCreators'
+import { setSkipDataAndType } from 'states/stateProvider/actionCreators'
 
 const GeneralSetting = ({
   settings: {
-    general: { showAddressBook, skipDataAndType },
+    general: { skipDataAndType },
   },
   dispatch,
 }: React.PropsWithoutRef<StateWithDispatch>) => {
   const [t] = useTranslation()
-  const [onToggleAddressVisibility, onSetSkipDataAndType] = useMemo(
-    () => [() => dispatch(toggleAddressBook()), () => setSkipDataAndType(!skipDataAndType)(dispatch)],
-    [dispatch, skipDataAndType]
-  )
+  const [onSetSkipDataAndType] = useMemo(() => [() => setSkipDataAndType(!skipDataAndType)(dispatch)], [
+    dispatch,
+    skipDataAndType,
+  ])
   return (
     <Stack tokens={{ childrenGap: 15 }}>
-      <Toggle
-        checked={showAddressBook}
-        label={t('settings.general.display-address-book-in-the-navbar')}
-        onText={t('common.toggle.on')}
-        offText={t('common.toggle.off')}
-        onChange={onToggleAddressVisibility}
-      />
       <Toggle
         checked={skipDataAndType}
         label={t('settings.general.skip-data-and-type')}

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

@@ -123,31 +123,35 @@ const Overview = ({
         let { status } = item
         if (item.blockNumber !== undefined) {
           const confirmationCount =
-            item.blockNumber === undefined ? 0 : 1 + Math.max(+syncedBlockNumber, +tipBlockNumber) - +item.blockNumber
+            item.blockNumber === null || item.status === 'failed'
+              ? 0
+              : 1 + Math.max(+syncedBlockNumber, +tipBlockNumber) - +item.blockNumber
 
           if (status === 'success' && confirmationCount < CONFIRMATION_THRESHOLD) {
             status = 'pending'
+
+            if (confirmationCount === 1) {
+              confirmations = t('overview.confirmation', {
+                confirmationCount: localNumberFormatter(confirmationCount),
+                threshold: CONFIRMATION_THRESHOLD,
+              })
+            } else if (confirmationCount > 1) {
+              confirmations = `${t('overview.confirmations', {
+                confirmationCount: localNumberFormatter(confirmationCount),
+                threshold: CONFIRMATION_THRESHOLD,
+              })}`
+            }
           }
 
           typeLabel = genTypeLabel(item.type, confirmationCount, status)
-
-          if (confirmationCount === 1) {
-            confirmations = t('overview.confirmation', {
-              confirmationCount: localNumberFormatter(confirmationCount),
-            })
-          } else if (confirmationCount > 1) {
-            confirmations = `${t('overview.confirmations', {
-              confirmationCount: localNumberFormatter(confirmationCount),
-            })}`
-          }
         }
 
         return {
           ...item,
           status,
           statusLabel: t(`overview.statusLabel.${status}`),
           value: item.value.replace(/^-/, ''),
-          confirmations: ['success', 'pending'].includes(item.status) ? confirmations : '',
+          confirmations,
           typeLabel: t(`overview.${typeLabel}`),
         }
       }),

packages/neuron-ui/src/components/Send/hooks.ts

@@ -168,6 +168,7 @@ const clear = (dispatch: StateDispatch) => {
 const useClear = (dispatch: StateDispatch) => useCallback(() => clear(dispatch), [dispatch])
 
 export const useInitialize = (
+  walletID: string,
   items: TransactionOutput[],
   generatedTx: any | null,
   dispatch: React.Dispatch<any>,
@@ -187,6 +188,10 @@ export const useInitialize = (
   const onSubmit = useOnSubmit(items, dispatch)
   const onClear = useClear(dispatch)
 
+  useEffect(() => {
+    clear(dispatch)
+  }, [walletID, dispatch])
+
   const onGetAddressErrorMessage = useCallback(
     (addr: string) => {
       if (addr === '') {

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

@@ -57,7 +57,7 @@ const Send = ({
     onGetAddressErrorMessage,
     onGetAmountErrorMessage,
     onClear,
-  } = useInitialize(send.outputs, send.generatedTx, dispatch, t)
+  } = useInitialize(walletID, send.outputs, send.generatedTx, dispatch, t)
   useOnTransactionChange(walletID, send.outputs, send.price, dispatch, setIsTransactionValid, setTotalAmount)
   const leftStackWidth = '70%'
   const labelWidth = '140px'
@@ -232,7 +232,7 @@ const Send = ({
           <PrimaryButton
             type="submit"
             onClick={onSubmit(walletID)}
-            disabled={sending || !isTransactionValid || !isAffordable}
+            disabled={sending || !isTransactionValid || !isAffordable || !send.generatedTx}
             text={t('send.send')}
           />
         )}