bug fix

mix/qml/DeploymentDialogSteps.qml

@@ -74,6 +74,7 @@ Rectangle {
 	{
 		anchors.fill: parent
 		anchors.margins: 1
+		spacing: 0
 		Repeater
 		{
 			id: menu
@@ -225,19 +226,54 @@ Rectangle {
 			}
 		}
 
+		Rectangle
+		{
+			Layout.fillWidth: true
+			Layout.preferredHeight: 2
+			color: "#cccccc"
+		}
 
+		ScrollView
+		{
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			Text
+			{
+				anchors.left: parent.left
+				anchors.leftMargin: 2
+				font.pointSize: 9
+				font.italic: true
+				id: log
+			}
+		}
 
-		RowLayout
+		Rectangle
 		{
-			anchors.horizontalCenter: parent.horizontalCenter
 			Layout.preferredHeight: 20
-			anchors.left: parent.left
-			spacing: 0
+			Layout.fillWidth: true
+			color: "#cccccc"
+			LogsPaneStyle
+			{
+				id: style
+			}
+
+			Label
+			{
+				anchors.horizontalCenter: parent.horizontalCenter
+				anchors.verticalCenter: parent.verticalCenter
+				text: qsTr("Logs")
+				font.italic: true
+				font.pointSize: style.absoluteSize(-1)
+			}
 
 			Button
 			{
+				height: 20
+				width: 20
+				anchors.right: parent.right
 				action: clearAction
-				text: qsTr("Clear Messages")
+				iconSource: "qrc:/qml/img/cleariconactive.png"
+				tooltip: qsTr("Clear Messages")
 			}
 
 			Action {
@@ -249,28 +285,8 @@ Rectangle {
 					log.text = deployLogs.logs[root.sel]
 				}
 			}
-
-			Rectangle
-			{
-				Layout.fillWidth: true
-				Layout.preferredHeight: 1
-				color: "#cccccc"
-			}
 		}
 
-		ScrollView
-		{
-			Layout.fillHeight: true
-			Layout.fillWidth: true
-			Text
-			{
-				anchors.left: parent.left
-				anchors.leftMargin: 2
-				font.pointSize: 9
-				font.italic: true
-				id: log
-			}
-		}
 	}
 }
 

mix/qml/RegisteringStep.qml

@@ -156,9 +156,12 @@ Rectangle {
 						NetworkDeploymentCode.checkPathCreationCost(applicationUrlEthCtrl.text, function(pathCreationCost)
 						{
 							var ether = QEtherHelper.createBigInt(pathCreationCost);
-							var gasTotal = ether.multiply(deploymentDialog.deployStep.gasPrice.value.toWei());
-							gasToUseDeployInput.value = QEtherHelper.createEther(gasTotal.value(), QEther.Wei, parent);
-							gasToUseDeployInput.update();
+							if (deploymentDialog.deployStep.gasPrice.value)
+							{
+								var gasTotal = ether.multiply(deploymentDialog.deployStep.gasPrice.value.toWei());
+								gasToUseDeployInput.value = QEtherHelper.createEther(gasTotal.value(), QEther.Wei, parent);
+								gasToUseDeployInput.update();
+							}
 						});
 					}
 				}

mix/qml/js/TransactionHelper.js

@@ -33,7 +33,8 @@ function rpcCall(requests, callBack, error)
 			{
 				var errorText = qsTr("Unable to initiate request to the live network. Please verify your ethereum node is up.") + qsTr(" Error status: ")  + httpRequest.status;
 				console.log(errorText);
-				error(errorText);
+				if (error)
+					error(errorText);
 			}
 			else
 			{