feat(neuron-ui): call generate mnemonic method from neuron-wallet in …

…neuron-ui with remote module
nervosnetwork · Jul 25, 2019 · 5a27c7b · 5a27c7b
1 parent 7e74cc9
commit 5a27c7b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 47 deletions.
diff --git a/packages/neuron-ui/src/components/WalletWizard/index.tsx b/packages/neuron-ui/src/components/WalletWizard/index.tsx
@@ -7,8 +7,8 @@ import withWizard, { WizardElementProps, WithWizardState } from 'components/with
 
 import { MnemonicAction, BUTTON_GAP } from 'utils/const'
 import { verifyWalletSubmission } from 'utils/validators'
-import { helpersCall, walletsCall } from 'services/UILayer'
-import { validateMnemonic, showErrorMessage } from 'services/remote'
+import { walletsCall } from 'services/UILayer'
+import { generateMnemonic, validateMnemonic, showErrorMessage } from 'services/remote'
 import { registerIcons, buttonGrommetIconStyles } from 'utils/icons'
 
 export enum WalletWizardPath {
@@ -104,18 +104,11 @@ const Mnemonic = ({
 
   useEffect(() => {
     if (type === MnemonicAction.Create) {
-      helpersCall
-        .generateMnemonic()
-        .then((res: string) => {
-          dispatch({
-            type: 'generated',
-            payload: res,
-          })
-        })
-        .catch(err => {
-          console.error(err)
-          history.goBack()
-        })
+      const mnemonic = generateMnemonic()
+      dispatch({
+        type: 'generated',
+        payload: mnemonic,
+      })
     } else {
       dispatch({
         type: 'imported',

diff --git a/packages/neuron-ui/src/services/remote/index.ts b/packages/neuron-ui/src/services/remote/index.ts
@@ -18,6 +18,15 @@ export const validateMnemonic = (mnemonic: string): boolean => {
   return remoteValidateMnemonic(mnemonic)
 }
 
+export const generateMnemonic = (): string => {
+  if (!window.remote) {
+    console.warn('remote is not supported')
+    return ''
+  }
+  const { generateMnemonic: remoteGenerateMnemonic } = window.remote.require('./models/keys/key')
+  return remoteGenerateMnemonic()
+}
+
 export const showMessage = (options: any, callback: Function) => {
   if (!window.remote) {
     console.warn('remote is not supported')
@@ -39,6 +48,7 @@ export const showErrorMessage = (title: string, content: string) => {
 export default {
   initWindow,
   validateMnemonic,
+  generateMnemonic,
   showMessage,
   showErrorMessage,
 }
diff --git a/packages/neuron-wallet/src/controllers/helpers.ts b/packages/neuron-wallet/src/controllers/helpers.ts
diff --git a/packages/neuron-wallet/src/controllers/index.ts b/packages/neuron-wallet/src/controllers/index.ts
@@ -2,14 +2,12 @@ import AppController from './app'
 import NetworksController from './networks'
 import WalletsController from './wallets'
 import TransactionsController from './transactions'
-import HelpersController from './helpers'
 import SyncInfoController from './sync-info'
 
 export default {
   AppController,
   NetworksController,
   WalletsController,
   TransactionsController,
-  HelpersController,
   SyncInfoController,
 }