Merge pull request #1060 from nervosnetwork/rc/v0.24.2

[ᚬmaster] Release v0.24.2

Author: ashchan

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [0.24.2](https://github.com/nervosnetwork/neuron/compare/v0.24.1...v0.24.2) (2019-11-08)
+
+
+### Bug Fixes
+
+* replace with empty string in input group rename witness ([5d59f3d](https://github.com/nervosnetwork/neuron/commit/5d59f3d))
+* skip get previous tx when cellbase ([41600ea](https://github.com/nervosnetwork/neuron/commit/41600ea))
+* skip get previous tx when cellbase in indexer ([7e8a578](https://github.com/nervosnetwork/neuron/commit/7e8a578))
+* skip the cellbase tx, not the first input ([aeeb464](https://github.com/nervosnetwork/neuron/commit/aeeb464))
+
+
+### Features
+
+* Disable search history by amount ([9bdece6](https://github.com/nervosnetwork/neuron/commit/9bdece6))
+* remove skip data and type toggle ([879d227](https://github.com/nervosnetwork/neuron/commit/879d227))
+
+
+
 ## [0.24.1](https://github.com/nervosnetwork/neuron/compare/v0.24.0...v0.24.1) (2019-11-07)
 
 

lerna.json

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

package.json

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

packages/neuron-ui/package.json

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

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

@@ -1,32 +1,8 @@
-import React, { useMemo } from 'react'
-import { Stack, Toggle } from 'office-ui-fabric-react'
-import { useTranslation } from 'react-i18next'
+import React from 'react'
+import { Stack } from 'office-ui-fabric-react'
 
-import { StateWithDispatch } from 'states/stateProvider/reducer'
-import { setSkipDataAndType } from 'states/stateProvider/actionCreators'
-
-const GeneralSetting = ({
-  settings: {
-    general: { skipDataAndType },
-  },
-  dispatch,
-}: React.PropsWithoutRef<StateWithDispatch>) => {
-  const [t] = useTranslation()
-  const [onSetSkipDataAndType] = useMemo(() => [() => setSkipDataAndType(!skipDataAndType)(dispatch)], [
-    dispatch,
-    skipDataAndType,
-  ])
-  return (
-    <Stack tokens={{ childrenGap: 15 }}>
-      <Toggle
-        checked={skipDataAndType}
-        label={t('settings.general.skip-data-and-type')}
-        onText={t('common.toggle.on')}
-        offText={t('common.toggle.off')}
-        onChange={onSetSkipDataAndType}
-      />
-    </Stack>
-  )
+const GeneralSetting = () => {
+  return <Stack tokens={{ childrenGap: 15 }} />
 }
 
 GeneralSetting.displayName = 'GeneralSetting'

packages/neuron-ui/src/services/remote/index.ts

@@ -2,7 +2,6 @@ export * from './app'
 export * from './wallets'
 export * from './networks'
 export * from './transactions'
-export * from './skipDataAndType'
 
 const REMOTE_MODULE_NOT_FOUND =
   'The remote module is not found, please make sure the UI is running inside the Electron App'

packages/neuron-ui/src/services/remote/skipDataAndType.ts

@@ -1,9 +1,7 @@
 import { wallets, networks } from 'services/localCache'
 
 export const settingsState: State.Settings = {
-  general: {
-    skipDataAndType: false,
-  },
+  general: {},
   networks: networks.load(),
   wallets: wallets.load(),
 }

packages/neuron-ui/src/states/initStates/settings.ts

@@ -26,7 +26,6 @@ export const initAppState = () => (dispatch: StateDispatch, history: any) => {
           syncedBlockNumber = '',
           connectionStatus = false,
           codeHash = '',
-          skipDataAndType = false,
         } = res.result
         dispatch({
           type: NeuronWalletActions.InitAppState,
@@ -39,7 +38,6 @@ export const initAppState = () => (dispatch: StateDispatch, history: any) => {
             syncedBlockNumber,
             connectionStatus,
             codeHash,
-            skipDataAndType,
           },
         })
         if (!wallet) {

packages/neuron-ui/src/states/stateProvider/actionCreators/app.ts

@@ -2,19 +2,16 @@ import app from './app'
 import wallets from './wallets'
 import transactions from './transactions'
 import settings from './settings'
-import skipDataAndType from './skipDataAndType'
 
 export * from './app'
 export * from './wallets'
 export * from './transactions'
 export * from './settings'
-export * from './skipDataAndType'
 export const actionCreators = {
   ...app,
   ...wallets,
   ...transactions,
   ...settings,
-  ...skipDataAndType,
 }
 
 export default actionCreators