Revert "feat(neuron-ui): hide the general settings and redirect to wa…

…llets setting" This reverts commit b3e3d0e.
nervosnetwork · Nov 16, 2019 · f9b3c15 · f9b3c15
1 parent 476d101
commit f9b3c15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/neuron-ui/src/components/Settings/index.tsx b/packages/neuron-ui/src/components/Settings/index.tsx
@@ -13,7 +13,7 @@ import { WalletWizardPath } from 'components/WalletWizard'
 import { Routes } from 'utils/const'
 
 const pivotItems = [
-  // { label: 'settings.setting-tabs.general', url: Routes.SettingsGeneral },
+  { label: 'settings.setting-tabs.general', url: Routes.SettingsGeneral },
   { label: 'settings.setting-tabs.wallets', url: Routes.SettingsWallets },
   { label: 'settings.setting-tabs.network', url: Routes.SettingsNetworks },
 ]

diff --git a/packages/neuron-ui/src/containers/Main/index.tsx b/packages/neuron-ui/src/containers/Main/index.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react'
-import { Route, RouteComponentProps, Switch, Redirect } from 'react-router-dom'
+import { Route, RouteComponentProps } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 
 import { useState } from 'states/stateProvider'
@@ -157,8 +157,7 @@ const MainContent = ({
   })
 
   return (
-    <Switch>
-      <Redirect from={Routes.SettingsGeneral} to={Routes.SettingsWallets} />
+    <>
       {mainContents.map(container => (
         <Route
           exact={container.exact}
@@ -169,7 +168,7 @@ const MainContent = ({
           }}
         />
       ))}
-    </Switch>
+    </>
   )
 }