merge jsonrpc

cmd/mist/assets/qml/main.qml

@@ -47,7 +47,6 @@ ApplicationWindow {
 
 		console.log("starting browser")
 		newBrowserTab("http://etherian.io");
-		console.log("done")
 
 		// Command setup
 		gui.sendCommand(0)

cmd/mist/assets/qml/views/info.qml

@@ -28,7 +28,7 @@ Rectangle {
 			text: "Address"
 		}
 		TextField {
-			text: eth.key().address
+			text: ""//eth.key().address
 			width: 500
 		}
 

cmd/mist/assets/qml/views/wallet.qml

@@ -22,7 +22,8 @@ Rectangle {
 	function setBalance() {
 		//balance.text = "<b>Balance</b>: " + eth.numberToHuman(eth.balanceAt(eth.key().address))
 		if(menuItem)
-			menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.key().address))
+			menuItem.secondaryTitle = eth.numberToHuman("0")
+			//menuItem.secondaryTitle = eth.numberToHuman(eth.balanceAt(eth.key().address))
 	}
 
 	ListModel {
@@ -155,16 +156,6 @@ Rectangle {
 				model: ListModel {
 					id: txModel
 					Component.onCompleted: {
-						/*
-						var me = eth.key().address;
-						var filterTo = ethx.watch({latest: -1, to: me});
-						var filterFrom = ethx.watch({latest: -1, from: me});
-						filterTo.changed(addTxs)
-						filterFrom.changed(addTxs)
-
-						addTxs(filterTo.messages())
-						addTxs(filterFrom.messages())
-						*/
 					}
 
 					function addTxs(messages) {