From 9804b7baa4fa1580796c7ba55f7da8918cc53f8c Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 14 Jan 2019 11:39:13 +0100
Subject: [PATCH] Update remixAppManager.js

---
 src/remixAppManager.js | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/remixAppManager.js b/src/remixAppManager.js
index b3564aad9d..98deccb7af 100644
--- a/src/remixAppManager.js
+++ b/src/remixAppManager.js
@@ -18,35 +18,16 @@ export class RemixAppManager extends AppManagerApi {
     return this.data.proxy
   }
 
-  doActivate (name) {
-    this.activateOne(name)
-    // temp
-    this.store.activate(name)
-    // promise ?
+  setActive (name, isActive) {
     const entity = this.getEntity(name)
-    if (entity.profile.icon && entity.api.render && typeof entity.api.render === 'function') {
-      this.event.emit('requestContainer', entity.profile, entity.api.render()) 
-    }
-    if (name === 'SolidityCompile') {
-      this.data.proxy.register(entity.api)
+    if (entity && entity.profile.icon && entity.api.render && typeof entity.api.render === 'function') {
+      isActive ? this.event.emit('requestContainer', entity.profile, entity.api.render())  
+        : this.event.emit('removingItem', entity.profile)
     }
-  }
-
-  doDeactivate (name) {
-    this.deactivateOne(name)
     // temp
-    this.store.deactivate(name)
-    // promise ?
-    const entity = this.getEntity(name)
-    if (entity.profile.icon && entity.api.render && typeof entity.api.render === 'function') {
-      this.event.emit('removingItem', entity.profile)
-    }
-    if (name === 'SolidityCompile') {
-      this.data.proxy.unregister(entity.api)
+    if (entity && name === 'SolidityCompiler') {
+      isActive ? this.data.proxy.register(entity.api) : this.data.proxy.unregister(entity.api)
     }
-  }
-
-  setActive (name, isActive) {
     isActive ? this.store.activate(name) : this.store.deactivate(name)
   }
 
@@ -57,4 +38,4 @@ export class RemixAppManager extends AppManagerApi {
   addEntity (entity) {
     this.store.add(entity.profile.name, entity)
   }
-}
\ No newline at end of file
+}