From 0fcea104a4320cc889329f649f7aa40c6ebe670b Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Fri, 2 Feb 2018 09:54:15 -0500
Subject: [PATCH] move ui modal dialog from setProviderFromEndPoint to caller;
 remove ui dependency from execution-context

---
 src/app/tabs/run-tab.js  | 7 ++++++-
 src/execution-context.js | 5 +----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js
index f66cbf943d..04bef97669 100644
--- a/src/app/tabs/run-tab.js
+++ b/src/app/tabs/run-tab.js
@@ -252,7 +252,12 @@ function runTab (container, appAPI, appEvents, opts) {
 
       modalDialogCustom.confirm(null, 'Are you sure you want to connect to an ethereum node?', () => {
           modalDialogCustom.prompt(null, 'Web3 Provider Endpoint', 'http://localhost:8545', (target) => {
-            executionContext.setProviderFromEndpoint(target, context, setFinalContext)
+            executionContext.setProviderFromEndpoint(target, context, (alertMsg) => {
+              if (alertMsg) {
+                modalDialogCustom.alert(alertMsg)
+              }
+              setFinalContext()
+            })
           }, setFinalContext)
         }, setFinalContext)
 
diff --git a/src/execution-context.js b/src/execution-context.js
index 2ef37353ce..3b23ce9919 100644
--- a/src/execution-context.js
+++ b/src/execution-context.js
@@ -8,7 +8,6 @@ var ethUtil = require('ethereumjs-util')
 var StateManager = require('ethereumjs-vm/lib/stateManager')
 var Web3VMProvider = remixLib.vm.Web3VMProvider
 var rlp = ethUtil.rlp
-var modalDialogCustom = require('./app/ui/modal-dialog-custom')
 
 var injectedProvider
 
@@ -203,7 +202,6 @@ function ExecutionContext () {
 
   // TODO: not used here anymore and needs to be moved
   function setProviderFromEndpoint (endpoint, context, cb) {
-    if (!cb) cb = () => {}
     var oldProvider = web3.currentProvider
 
     if (endpoint === 'ipc') {
@@ -220,8 +218,7 @@ function ExecutionContext () {
       web3.setProvider(oldProvider)
       var alertMsg = 'Not possible to connect to the Web3 provider. '
       alertMsg += 'Make sure the provider is running and a connection is open (via IPC or RPC).'
-      modalDialogCustom.alert(alertMsg)
-      cb()
+      cb(alertMsg)
     }
   }
   this.setProviderFromEndpoint = setProviderFromEndpoint;