Merge branch 'release/0.6.6'v0.6.6

3 files changed, 12 insertions, 11 deletions

diff --git a/mist/assets/qml/views/jeffcoin/jeffcoin.qml b/mist/assets/qml/views/jeffcoin/jeffcoin.qml
index dc8678d1c..6506b53b8 100644
--- a/mist/assets/qml/views/jeffcoin/jeffcoin.qml
+++ b/mist/assets/qml/views/jeffcoin/jeffcoin.qml
@@ -47,9 +47,9 @@ Rectangle {
 		});
 
 		var blockNumber = eth.block(-1).number;
-		var messages = filter.messages()
-		for(var i = messages.length-1; i >= 0; i--) {
-			var message = messages.get(i)
+		var msgs = filter.messages()
+		for(var i = msgs.length-1; i >= 0; i--) {
+			var message = JSON.parse(msgs.getAsJson(i))
 
 			insertTx(message, blockNumber)
 		}
diff --git a/mist/assets/qml/views/wallet.qml b/mist/assets/qml/views/wallet.qml
index fbe1dfd0e..a3a4a6e7c 100644
--- a/mist/assets/qml/views/wallet.qml
+++ b/mist/assets/qml/views/wallet.qml
@@ -151,7 +151,7 @@ Rectangle {
 				model: ListModel {
 					id: txModel
 					Component.onCompleted: {
-                        var filter = ethx.watch({latest: -1, from: eth.key().address});
+						var filter = ethx.watch({latest: -1, from: eth.key().address});
 						filter.changed(addTxs)
 
 						addTxs(filter.messages())
diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
index 6075b621b..885d09116 100644
--- a/mist/assets/qml/wallet.qml
+++ b/mist/assets/qml/wallet.qml
@@ -254,6 +254,7 @@ ApplicationWindow {
 
     statusBar: StatusBar {
         height: 32
+	id: statusBar
         RowLayout {
             Button {
                 id: miningButton
@@ -294,16 +295,16 @@ ApplicationWindow {
         }
 
         ProgressBar {
-            id: syncProgressIndicator
-            visible: false
-            objectName: "syncProgressIndicator"
+            id: downloadIndicator
+	    value: 0
+            visible: true
+            objectName: "downloadIndicator"
             y: 3
-            width: 140
-            indeterminate: true
-            anchors.right: peerGroup.left
-            anchors.rightMargin: 5
+	    x: statusBar.width / 2 - this.width / 2
+            width: 160
         }
 
+
         RowLayout {
             id: peerGroup
             y: 7