Merge pull request #1028 from nervosnetwork/rc/v0.23.1

[ᚬmaster] Rc/v0.23.1

Author: ashchan

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.23.1](https://github.com/nervosnetwork/neuron/compare/v0.23.0...v0.23.1) (2019-10-28)
+
+
+### Bug Fixes
+
+* break => continue ([05ae69e](https://github.com/nervosnetwork/neuron/commit/05ae69e))
+* return => break ([97b8ea4](https://github.com/nervosnetwork/neuron/commit/97b8ea4))
+
+
+### Features
+
+* Add a few db indices ([83dffb5](https://github.com/nervosnetwork/neuron/commit/83dffb5))
+* display disconnection errors and dismiss them on getting connec… ([#1019](https://github.com/nervosnetwork/neuron/issues/1019)) ([e866c66](https://github.com/nervosnetwork/neuron/commit/e866c66))
+* Optimize output db query ([6e36550](https://github.com/nervosnetwork/neuron/commit/6e36550))
+* stringify the result from api controller ([1f4d4ea](https://github.com/nervosnetwork/neuron/commit/1f4d4ea))
+* **neuron-ui:** add a tooltip to display synchronized block number and the tip block number ([9e52fef](https://github.com/nervosnetwork/neuron/commit/9e52fef))
+* **neuron-ui:** display confirmations of pending transactions in the recent activity list ([9aebede](https://github.com/nervosnetwork/neuron/commit/9aebede))
+* **neuron-ui:** update history list to make it more compact ([35d8b87](https://github.com/nervosnetwork/neuron/commit/35d8b87))
+* **neuron-ui:** update the Send View according to the new transaction fee model. ([dc415f3](https://github.com/nervosnetwork/neuron/commit/dc415f3))
+
+
+
 # [0.23.0](https://github.com/nervosnetwork/neuron/compare/v0.22.2...v0.23.0) (2019-10-23)
 
 

lerna.json

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

package.json

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

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

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

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

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

@@ -0,0 +1,27 @@
+import React from 'react'
+import { Stack, Text, getTheme } from 'office-ui-fabric-react'
+
+const {
+  palette: { neutralLighterAlt, neutralSecondary, neutralLighter },
+} = getTheme()
+
+const GroupHeader = ({ group }: any) => {
+  const { name } = group
+  return (
+    <Stack
+      tokens={{ padding: 15 }}
+      styles={{
+        root: {
+          background: neutralLighterAlt,
+          borderTop: `1px solid ${neutralSecondary}`,
+          borderBottom: `1px solid ${neutralLighter}`,
+          padding: `15px 12px 5px`,
+          minWidth: '100%!important',
+        },
+      }}
+    >
+      <Text variant="medium">{name}</Text>
+    </Stack>
+  )
+}
+export default GroupHeader

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

@@ -0,0 +1,22 @@
+import React from 'react'
+import { DetailsRow, IDetailsRowProps } from 'office-ui-fabric-react'
+
+const HistoryRow = (props?: IDetailsRowProps) => {
+  return props ? (
+    <DetailsRow
+      {...props}
+      styles={{
+        root: {
+          animationDuration: '0!important',
+          minWidth: '100%!important',
+        },
+        cell: {
+          paddingTop: 0,
+          paddingBottom: 0,
+        },
+      }}
+    />
+  ) : null
+}
+
+export default HistoryRow

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

@@ -118,7 +118,7 @@ const Overview = ({
   const activityItems: ActivityItem[] = useMemo(
     () =>
       items.map(item => {
-        let confirmations = '(-)'
+        let confirmations = ''
         let typeLabel: string = item.type
         let { status } = item
         if (item.blockNumber !== undefined) {
@@ -147,7 +147,7 @@ const Overview = ({
           status,
           statusLabel: t(`overview.statusLabel.${status}`),
           value: item.value.replace(/^-/, ''),
-          confirmations: item.status === 'success' ? confirmations : '',
+          confirmations: ['success', 'pending'].includes(item.status) ? confirmations : '',
           typeLabel: t(`overview.${typeLabel}`),
         }
       }),

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

@@ -4,11 +4,10 @@ import { useTranslation } from 'react-i18next'
 import { Stack, Text, Label, Modal, TextField, PrimaryButton, DefaultButton } from 'office-ui-fabric-react'
 import { StateWithDispatch, AppActions } from 'states/stateProvider/reducer'
 import { sendTransaction, deleteWallet, backupWallet } from 'states/stateProvider/actionCreators'
-import { priceToFee, CKBToShannonFormatter } from 'utils/formatters'
 
 const PasswordRequest = ({
   app: {
-    send: { txID, outputs, description, price, cycles },
+    send: { description, generatedTx },
     loadings: { sending: isSending = false },
     passwordRequest: { walletID = '', actionType = null, password = '' },
   },
@@ -32,15 +31,10 @@ const PasswordRequest = ({
           break
         }
         sendTransaction({
-          id: txID,
           walletID,
-          items: outputs.map(output => ({
-            address: output.address,
-            capacity: CKBToShannonFormatter(output.amount, output.unit),
-          })),
+          tx: generatedTx,
           description,
           password,
-          fee: priceToFee(price, cycles),
         })(dispatch, history)
         break
       }
@@ -62,7 +56,7 @@ const PasswordRequest = ({
         break
       }
     }
-  }, [dispatch, walletID, password, actionType, txID, description, outputs, cycles, price, history, isSending])
+  }, [dispatch, walletID, password, actionType, description, history, isSending, generatedTx])
 
   const onChange = useCallback(
     (_e, value?: string) => {

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

@@ -1,15 +1,16 @@
 import React, { useState, useCallback, useEffect, useMemo } from 'react'
 
 import { AppActions, StateDispatch } from 'states/stateProvider/reducer'
-import { calculateCycles } from 'services/remote/wallets'
+import { generateTx } from 'services/remote/wallets'
 
-import { outputsToTotalAmount, priceToFee } from 'utils/formatters'
+import { outputsToTotalAmount, CKBToShannonFormatter } from 'utils/formatters'
 import { verifyAddress, verifyAmount, verifyAmountRange, verifyTransactionOutputs } from 'utils/validators'
-import { ErrorCode } from 'utils/const'
-import { MAX_DECIMAL_DIGITS } from '../../utils/const'
+import { ErrorCode, MAX_DECIMAL_DIGITS } from 'utils/const'
+import calculateFee from 'utils/calculateFee'
+
 import { TransactionOutput } from '.'
 
-let cyclesTimer: ReturnType<typeof setTimeout>
+let generateTxTimer: ReturnType<typeof setTimeout>
 
 const useUpdateTransactionOutput = (dispatch: StateDispatch) =>
   useCallback(
@@ -49,49 +50,47 @@ const useRemoveTransactionOutput = (dispatch: StateDispatch) =>
 const useOnTransactionChange = (
   walletID: string,
   items: TransactionOutput[],
+  price: string,
   dispatch: StateDispatch,
   setIsTransactionValid: Function,
   setTotalAmount: Function
 ) => {
   useEffect(() => {
-    clearTimeout(cyclesTimer)
-    cyclesTimer = setTimeout(() => {
+    clearTimeout(generateTxTimer)
+    generateTxTimer = setTimeout(() => {
+      dispatch({
+        type: AppActions.UpdateGeneratedTx,
+        payload: null,
+      })
       if (verifyTransactionOutputs(items)) {
         setIsTransactionValid(true)
         const totalAmount = outputsToTotalAmount(items)
         setTotalAmount(totalAmount)
-        calculateCycles({
+        const realParams = {
           walletID,
-          capacities: totalAmount,
-        })
-          .then(response => {
-            if (response.status) {
-              if (Number.isNaN(+response.result)) {
-                throw new Error('Invalid Cycles')
-              }
+          items: items.map(item => ({
+            address: item.address,
+            capacity: CKBToShannonFormatter(item.amount, item.unit),
+          })),
+          feeRate: price,
+        }
+        generateTx(realParams)
+          .then((res: any) => {
+            if (res.status === 1) {
               dispatch({
-                type: AppActions.UpdateSendCycles,
-                payload: response.result,
+                type: AppActions.UpdateGeneratedTx,
+                payload: res.result,
               })
-            } else {
-              throw new Error('Cycles Not Calculated')
             }
           })
-          .catch(() => {
-            dispatch({
-              type: AppActions.UpdateSendCycles,
-              payload: '0',
-            })
+          .catch((err: Error) => {
+            console.error(err)
           })
       } else {
         setIsTransactionValid(false)
-        dispatch({
-          type: AppActions.UpdateSendCycles,
-          payload: '0',
-        })
       }
     }, 300)
-  }, [walletID, items, dispatch, setIsTransactionValid, setTotalAmount])
+  }, [walletID, items, price, dispatch, setIsTransactionValid, setTotalAmount])
 }
 
 const useOnSubmit = (items: TransactionOutput[], dispatch: StateDispatch) =>
@@ -170,12 +169,12 @@ const useClear = (dispatch: StateDispatch) => useCallback(() => clear(dispatch),
 
 export const useInitialize = (
   items: TransactionOutput[],
-  price: string,
-  cycles: string,
+  generatedTx: any | null,
   dispatch: React.Dispatch<any>,
   t: any
 ) => {
-  const fee = useMemo(() => priceToFee(price, cycles), [price, cycles]) // in shannon
+  const fee = useMemo(() => calculateFee(generatedTx), [generatedTx])
+
   const [isTransactionValid, setIsTransactionValid] = useState(false)
   const [totalAmount, setTotalAmount] = useState('0')