Merge pull request #151 from axic/patch/account-cleanup

assets/js/app.js

@@ -890,11 +890,7 @@ $(document).ready(function() {
 			} else $txOrigin.val('unknown');
 		}
 
-		if (executionContext === 'vm') {
 		dapp.getAccounts(renderAccounts);
-		} else {
-			web3.eth.getAccounts(renderAccounts);
-		}
 
 		$contractOutput.find('.title').click(function(ev){ $(this).closest('.contract').toggleClass('hide'); });
 		$('#output').append( $contractOutput );

assets/js/universal-dapp.js

@@ -38,9 +38,13 @@ UniversalDApp.prototype.addAccount = function (privateKey, balance) {
 };
 
 UniversalDApp.prototype.getAccounts = function (cb) {
+    if (!this.vm) {
+        web3.eth.getAccounts(cb);
+    } else {
         if (!this.accounts) return cb("No accounts?");
 
         cb(null, Object.keys(this.accounts));
+    }
 };
 
 UniversalDApp.prototype.render = function () {