use @obsidians/network

ObsidianLabs · Sep 24, 2020 · fbc04da · fbc04da
1 parent db914b5
commit fbc04da
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/config-overrides.js b/config-overrides.js
@@ -47,7 +47,7 @@ const overrides = [
     '@obsidians/bottombar': `@obsidians/${process.env.BUILD}-bottombar`,
     '@obsidians/explorer': `@obsidians/${process.env.BUILD}-explorer`,
     '@obsidians/header': `@obsidians/${process.env.BUILD}-header`,
-    '@obsidians/instances': `@obsidians/${process.env.BUILD}-instances`,
+    '@obsidians/network': `@obsidians/${process.env.BUILD}-network`,
     '@obsidians/project': `@obsidians/${process.env.BUILD}-project`,
     '@obsidians/sdk': `@obsidians/${process.env.BUILD}-sdk`,
     '@obsidians/welcome': `@obsidians/${process.env.BUILD}-welcome`,

diff --git a/src.main/init.js b/src.main/init.js
@@ -2,7 +2,7 @@ const { IpcChannel } = require('@obsidians/ipc')
 const KeypairManager = require('@obsidians/keypair')
 const { AutoUpdate } = require('@obsidians/global')
 const CompilerManager = require('@obsidians/conflux-compiler')
-const { InstanceManager } = require('@obsidians/conflux-instances')
+const { InstanceManager } = require('@obsidians/conflux-network')
 const ProjectChannel = require('@obsidians/conflux-project')
 
 let ipcChannel, keypairManager, autoUpdate, compilerManager, instanceManager, projectChannel

diff --git a/src/components/Header.js b/src/components/Header.js
@@ -1,7 +1,9 @@
 import React, { PureComponent } from 'react'
 
 import redux, { connect } from '@obsidians/redux'
-import headerActions, { networks, Header, NavGuard } from '@obsidians/header'
+
+import headerActions, { Header, NavGuard } from '@obsidians/header'
+import { networks } from '@obsidians/network'
 import { actions } from '@obsidians/project'
 
 class HeaderWithRedux extends PureComponent {

diff --git a/src/components/Routes/Network.js b/src/components/Routes/Network.js
@@ -1,23 +1,10 @@
 import React, { PureComponent } from 'react'
-
-import redux, { connect } from '@obsidians/redux'
-import { InstanceList } from '@obsidians/instances'
-
 import { withRouter } from 'react-router-dom'
 
-const onLifecycle = ({ lifecycle, runningInstance, algoNode }) => {
-  switch (lifecycle) {
-    case 'stopped':
-      redux.dispatch('UPDATE_UI_STATE', { localNetwork: '', algoNode: '' })
-      break
-    case 'started':
-      redux.dispatch('UPDATE_UI_STATE', { localNetwork: runningInstance, algoNode })
-      break
-    default:
-  }
-}
+import { connect } from '@obsidians/redux'
+import Network from '@obsidians/network'
 
-class Network extends PureComponent {
+class NetworkWithProps extends PureComponent {
   state = {
     active: true
   }
@@ -29,9 +16,8 @@ class Network extends PureComponent {
 
   render () {
     return (
-      <InstanceList
+      <Network
         network={this.props.network}
-        onLifecycle={onLifecycle}
         active={this.state.active}
       />
     )
@@ -41,4 +27,4 @@ class Network extends PureComponent {
 
 export default connect([
   'network',
-])(withRouter(Network))
+])(withRouter(NetworkWithProps))