From e221fabe397bb49a055087288a2ec115e9d1fecf Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nat.hourt@gmail.com>
Date: Fri, 17 Jul 2015 16:06:07 -0400
Subject: [PATCH] [GUI] Fixes in transfer form

---
 programs/light_client/qml/AccountPicker.qml | 7 ++++---
 programs/light_client/qml/TransferForm.qml  | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml
index f789eefe..2de1ce86 100644
--- a/programs/light_client/qml/AccountPicker.qml
+++ b/programs/light_client/qml/AccountPicker.qml
@@ -28,9 +28,10 @@ RowLayout {
       Layout.fillWidth: true
       TextField {
          id: accountNameField
-
          width: parent.width
+
          onEditingFinished: accountDetails.update(text)
+         onTextChanged: if (account && account.name !== text) accountDetails.update("")
       }
       Text {
          id: accountDetails
@@ -57,8 +58,8 @@ RowLayout {
                   var text = qsTr("Account ID: %1").arg(account.id < 0? qsTr("Loading...")
                                                                       : account.id)
                   if (showBalance >= 0) {
-                     text += "\n" + qsTr("Balance: %1 %2").arg(balances[showBalance].amountReal())
-                                                          .arg(balances[showBalance].type.symbol)
+                     var bal = balances[showBalance]
+                     text += "\n" + qsTr("Balance: %1 %2").arg(String(bal.amountReal())).arg(bal.type.symbol)
                   }
                   return text
                })
diff --git a/programs/light_client/qml/TransferForm.qml b/programs/light_client/qml/TransferForm.qml
index 18ac15bf..5ea3df2f 100644
--- a/programs/light_client/qml/TransferForm.qml
+++ b/programs/light_client/qml/TransferForm.qml
@@ -58,13 +58,13 @@ Rectangle {
             maximumValue: maxBalance? maxBalance.amountReal() : 0
             decimals: maxBalance? maxBalance.type.precision : 0
 
-            property Balance maxBalance: senderPicker.balances && senderPicker.showBalance >= 0?
-                            senderPicker.balances[senderPicker.showBalance] : null
+            property Balance maxBalance: assetField.enabled && senderPicker.showBalance >= 0?
+                                            senderPicker.balances[senderPicker.showBalance] : null
          }
          ComboBox {
             id: assetField
             Layout.minimumWidth: Scaling.cm(3)
-            enabled: Boolean(senderPicker.balances)
+            enabled: senderPicker.balances instanceof Array && senderPicker.balances.length > 0
             model: enabled? senderPicker.balances.filter(function(balance) { return balance.amount > 0 })
                                                  .map(function(balance) { return balance.type.symbol })
                           : ["Asset Type"]
@@ -76,7 +76,7 @@ Rectangle {
          }
          Button {
             text: qsTr("Transfer")
-            enabled: senderPicker.account
+            enabled: senderPicker.account && recipientPicker.account && senderPicker.account !== recipientPicker.account && amountField.value
             onClicked: console.log(amountField.value)
          }
       }