feat: Always show address book

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/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/containers/Main/hooks.ts

@@ -2,7 +2,6 @@ import { useEffect } from 'react'
 
 import { NeuronWalletActions, StateDispatch, AppActions } from 'states/stateProvider/reducer'
 import {
-  toggleAddressBook,
   updateTransactionList,
   updateCurrentWallet,
   updateWalletList,
@@ -214,10 +213,6 @@ export const useSubscription = ({
             history.push(payload)
             break
           }
-          case 'toggle-address-book': {
-            dispatch(toggleAddressBook())
-            break
-          }
           case 'delete-wallet': {
             dispatch({
               type: AppActions.RequestPassword,

packages/neuron-ui/src/containers/Navbar/index.tsx

@@ -42,16 +42,11 @@ const Navbar = ({
 }: React.PropsWithoutRef<StateWithDispatch & RouteComponentProps>) => {
   const neuronWallet = useState()
   const {
-    settings: {
-      wallets = [],
-      general: { showAddressBook = false },
-    },
+    settings: { wallets = [] },
   } = neuronWallet
   const [t] = useTranslation()
 
-  const pivotItems = useMemo(() => (showAddressBook ? menuItems : menuItems.slice(0, menuItems.length - 1)), [
-    showAddressBook,
-  ])
+  const pivotItems = menuItems
 
   const selectedKey = useMemo(() => {
     const selectedTab = pivotItems.find(item => item.key === pathname.split('/')[1])

packages/neuron-ui/src/locales/en.json

@@ -180,7 +180,6 @@
         "network": "Network"
       },
       "general": {
-        "display-address-book-in-the-navbar": "Show the address book",
         "skip-data-and-type": "Skip the Cells which contain Data or Type Script",
         "show": "Show",
         "hide": "Hide"

packages/neuron-ui/src/locales/zh.json

@@ -180,7 +180,6 @@
         "network": "网络"
       },
       "general": {
-        "display-address-book-in-the-navbar": "显示地址簿",
         "skip-data-and-type": "忽略包含 Data 或 Type Script 的 Cells",
         "show": "显示",
         "hide": "隐藏"

packages/neuron-ui/src/services/localCache.ts

@@ -1,30 +1,11 @@
 export enum LocalCacheKey {
-  AddressBookVisibility = 'address-book-visibility',
   Addresses = 'addresses',
   Networks = 'networks',
   Wallets = 'wallets',
   CurrentWallet = 'currentWallet',
   CurrentNetworkID = 'currentNetworkID',
   SystemScript = 'systemScript',
 }
-enum AddressBookVisibility {
-  Invisible = '0',
-  Visible = '1',
-}
-
-export const addressBook = {
-  isVisible: () => {
-    const isVisible = window.localStorage.getItem(LocalCacheKey.AddressBookVisibility)
-    return AddressBookVisibility.Visible === isVisible
-  },
-
-  toggleVisibility: () => {
-    window.localStorage.setItem(
-      LocalCacheKey.AddressBookVisibility,
-      addressBook.isVisible() ? AddressBookVisibility.Invisible : AddressBookVisibility.Visible
-    )
-  },
-}
 
 export const addresses = {
   save: (addressList: State.Address[]) => {
@@ -143,7 +124,6 @@ export const systemScript = {
 
 export default {
   LocalCacheKey,
-  addressBook,
   addresses,
   networks,
   wallets,

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

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

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

@@ -1,19 +1,10 @@
 import { createNetwork as createRemoteNetwork, updateNetwork as updateRemoteNetwork } from 'services/remote'
-import { addressBook } from 'services/localCache'
 import { Routes } from 'utils/const'
 import { failureResToNotification } from 'utils/formatters'
 import { addNotification, addPopup } from './app'
 
 import { AppActions, StateDispatch } from '../reducer'
 
-export const toggleAddressBook = () => {
-  addressBook.toggleVisibility()
-  return {
-    type: AppActions.ToggleAddressBookVisibility,
-    payload: null,
-  }
-}
-
 export const createNetwork = (params: Controller.CreateNetworkParams) => (dispatch: StateDispatch, history: any) => {
   dispatch({
     type: AppActions.UpdateLoadings,
@@ -67,7 +58,6 @@ export const updateNetwork = (params: Controller.UpdateNetworkParams) => (dispat
 }
 
 export default {
-  toggleAddressBook,
   createNetwork,
   updateNetwork,
 }

packages/neuron-ui/src/states/stateProvider/reducer.ts

@@ -22,7 +22,6 @@ export enum NeuronWalletActions {
   UpdateSkipDataAndType = 'updateSkipDataAndType',
 }
 export enum AppActions {
-  ToggleAddressBookVisibility = 'toggleAddressBookVisibility',
   UpdateTransactionID = 'updateTransactionID',
   AddSendOutput = 'addSendOutput',
   RemoveSendOutput = 'removeSendOutput',
@@ -103,18 +102,6 @@ export const reducer = (
         },
       }
     }
-    case AppActions.ToggleAddressBookVisibility: {
-      return {
-        ...state,
-        settings: {
-          ...settings,
-          general: {
-            ...settings.general,
-            showAddressBook: !settings.general.showAddressBook,
-          },
-        },
-      }
-    }
     case NeuronWalletActions.UpdateSkipDataAndType: {
       return {
         ...state,

packages/neuron-ui/src/stories/GeneralSetting.stories.tsx

@@ -1,27 +1,16 @@
 import React from 'react'
 import { storiesOf } from '@storybook/react'
-import { withKnobs, boolean } from '@storybook/addon-knobs'
+import { withKnobs } from '@storybook/addon-knobs'
 import GeneralSetting from 'components/GeneralSetting'
 import initStates from 'states/initStates'
 
-const states: { [title: string]: boolean } = {
-  'Show address book on': true,
-  'Show address book off': false,
-}
-
 const stories = storiesOf('GeneralSettings', module)
 
-Object.entries(states).forEach(([title, showAddressBook]) => {
-  const props = { ...initStates, settings: { ...initStates.settings, showAddressBook }, dispatch: () => {} }
-  stories.add(title, () => <GeneralSetting {...props} />)
-})
-
 stories.addDecorator(withKnobs).add('With knobs', () => {
   const props = {
     ...initStates,
     settings: {
       ...initStates.settings,
-      showAddressBook: boolean('Show Address Book', false),
     },
   }
   return <GeneralSetting {...props} dispatch={() => {}} />

packages/neuron-ui/src/types/App/index.d.ts

@@ -146,7 +146,6 @@ declare namespace State {
   interface Settings {
     general: {
       skipDataAndType: boolean
-      showAddressBook: boolean
     }
     networks: Network[]
     wallets: WalletIdentity[]

packages/neuron-ui/src/types/Subject/index.d.ts

@@ -7,7 +7,7 @@ interface NeuronWalletSubject<T = any> {
 }
 
 declare namespace Command {
-  type Type = 'nav' | 'toggle-address-book' | 'delete-wallet' | 'backup-wallet'
+  type Type = 'nav' | 'delete-wallet' | 'backup-wallet'
   type Payload = string | null
 }
 

packages/neuron-wallet/src/controllers/app/menu.ts

@@ -186,31 +186,6 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
     ],
   }
 
-  const viewMenuItem: MenuItemConstructorOptions = {
-    id: 'view',
-    label: i18n.t('application-menu.view.label'),
-    submenu: [
-      {
-        label: i18n.t('application-menu.view.fullscreen'),
-        role: 'togglefullscreen',
-      },
-      {
-        label: i18n.t('application-menu.view.address-book'),
-        enabled: isMainWindow && hasCurrentWallet,
-        click: () => {
-          if (mainWindow) {
-            CommandSubject.next({
-              winID: mainWindow.id,
-              type: 'toggle-address-book',
-              payload: null,
-            })
-          }
-        },
-        accelerator: 'CmdOrCtrl+B',
-      },
-    ],
-  }
-
   const windowMenuItem: MenuItemConstructorOptions = {
     id: 'window',
     label: i18n.t('application-menu.window.label'),
@@ -289,8 +264,8 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
   }
 
   const applicationMenuTemplate = env.isDevMode
-    ? [walletMenuItem, editMenuItem, viewMenuItem, developMenuItem, windowMenuItem, helpMenuItem]
-    : [walletMenuItem, editMenuItem, viewMenuItem, windowMenuItem, helpMenuItem]
+    ? [walletMenuItem, editMenuItem, developMenuItem, windowMenuItem, helpMenuItem]
+    : [walletMenuItem, editMenuItem, windowMenuItem, helpMenuItem]
 
   if (isMac) {
     applicationMenuTemplate.unshift(appMenuItem)

packages/neuron-wallet/src/locales/en.ts

@@ -30,11 +30,6 @@ export default {
         paste: 'Paste',
         selectall: 'Select All',
       },
-      view: {
-        label: 'View',
-        fullscreen: 'Enter Full Screen',
-        'address-book': 'Address Book',
-      },
       window: {
         label: 'Window',
         minimize: 'Minimize',

packages/neuron-wallet/src/locales/zh.ts

@@ -30,11 +30,6 @@ export default {
         paste: '粘贴',
         selectall: '全部选中',
       },
-      view: {
-        label: '视图',
-        fullscreen: '进入全屏模式',
-        'address-book': '地址簿',
-      },
       window: {
         label: '窗口',
         minimize: '最小化',

packages/neuron-wallet/src/models/subjects/command.ts

@@ -2,7 +2,7 @@ import { Subject } from 'rxjs'
 
 const CommandSubject = new Subject<{
   winID: number
-  type: 'nav' | 'toggle-address-book' | 'delete-wallet' | 'backup-wallet'
+  type: 'nav' | 'delete-wallet' | 'backup-wallet'
   payload: string | null
 }>()
 

packages/neuron-wallet/tests-e2e/tests/addressBook.ts

@@ -2,12 +2,11 @@ import Application from '../application'
 import { createWallet } from '../operations'
 
 /**
- * 1. toggle address book on
- * 2. navigate to the address book
- * 3. verify the count of receiving/changing addresses
- * 4. verify default data of the first address
- * 5. update description of the first address
- * 6. refresh the view and verify the description
+ * 1. navigate to the address book
+ * 2. verify the count of receiving/changing addresses
+ * 3. verify default data of the first address
+ * 4. update description of the first address
+ * 5. refresh the view and verify the description
  */
 export default (app: Application) => {
   beforeAll(async () => {
@@ -21,19 +20,6 @@ export default (app: Application) => {
     await app.waitUntilLoaded()
   })
 
-  app.test('Toggle address book on', async () => {
-    const { client } = app.spectron
-    let addressTab = await client.$('button[name=Addresses]')
-    expect(addressTab.state).toBe('failure')
-    app.clickMenu(['View', 'Address Book'])
-    await app.waitUntilLoaded()
-    addressTab = await client.$('button[name=Addresses]')
-    expect(addressTab.state).not.toBe('failure')
-    client.click('button[name=Addresses]')
-    await app.waitUntilLoaded()
-    await app.wait(1000)
-  })
-
   app.test('Address book should have 20 receiving addresses and 10 change addresses', async () => {
     const { client } = app.spectron
     const countOfReceivingAddresses = await client