From 6509441e8ce46268ff8d1ddba5f406f15e4b883a Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Mon, 28 Apr 2014 02:36:43 +0200
Subject: [PATCH] add listeners to setupController

---
 .../btc/AccountRegistrationWallet.java        |  99 ++++++++-------
 .../io/bitsquare/btc/DownloadListener.java    |  10 --
 .../java/io/bitsquare/btc/WalletFacade.java   | 119 +++++++++++++++---
 .../java/io/bitsquare/gui/MainController.java |   3 +-
 .../bitsquare/gui/setup/SetupController.java  | 107 ++++++++++++----
 .../resources/images/tx/circleProgress0.png   | Bin 609 -> 2808 bytes
 .../images/unused/circleProgress0.png         | Bin 0 -> 609 bytes
 7 files changed, 240 insertions(+), 98 deletions(-)
 delete mode 100644 src/main/java/io/bitsquare/btc/DownloadListener.java
 create mode 100644 src/main/resources/images/unused/circleProgress0.png

diff --git a/src/main/java/io/bitsquare/btc/AccountRegistrationWallet.java b/src/main/java/io/bitsquare/btc/AccountRegistrationWallet.java
index 65b6322326..2a2f143f98 100644
--- a/src/main/java/io/bitsquare/btc/AccountRegistrationWallet.java
+++ b/src/main/java/io/bitsquare/btc/AccountRegistrationWallet.java
@@ -15,6 +15,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -26,8 +27,9 @@ public class AccountRegistrationWallet extends Wallet implements WalletEventList
     private static final Logger log = LoggerFactory.getLogger(AccountRegistrationWallet.class);
 
     private NetworkParameters networkParameters;
+    private List<WalletFacade.WalletListener> walletListeners = new ArrayList<>();
 
-    public AccountRegistrationWallet(NetworkParameters networkParameters, BlockChain chain, PeerGroup peerGroup)
+    AccountRegistrationWallet(NetworkParameters networkParameters, BlockChain chain, PeerGroup peerGroup)
     {
         super(networkParameters);
 
@@ -61,17 +63,33 @@ public class AccountRegistrationWallet extends Wallet implements WalletEventList
         autosaveToFile(walletFile, 1, TimeUnit.SECONDS, null);
     }
 
-    public Address getAddress()
+    Address getAddress()
     {
         return getKey().toAddress(networkParameters);
     }
 
-    public ECKey getKey()
+    ECKey getKey()
     {
         return getKeys().get(0);
     }
 
-    public void saveToBlockchain(byte[] dataToEmbed) throws InsufficientMoneyException
+    void addWalletListener(WalletFacade.WalletListener listener)
+    {
+        if (walletListeners.size() == 0)
+            addEventListener(this);
+
+        walletListeners.add(listener);
+    }
+
+    void removeWalletListener(WalletFacade.WalletListener listener)
+    {
+        walletListeners.remove(listener);
+
+        if (walletListeners.size() == 0)
+            removeEventListener(this);
+    }
+
+    void saveToBlockchain(byte[] dataToEmbed) throws InsufficientMoneyException
     {
         Script script = new ScriptBuilder()
                 .op(OP_RETURN)
@@ -116,47 +134,25 @@ public class AccountRegistrationWallet extends Wallet implements WalletEventList
         });
     }
 
-    public int getConfirmations()
-    {
-        // TODO just a quick impl. need to be checked if it works for all cases...
-        Set<Transaction> transactions = getTransactions(true);
-        if (transactions != null && transactions.size() == 1)
-        {
-            Transaction transaction = transactions.iterator().next();
-            final int lastBlockSeenHeight = getLastBlockSeenHeight();
-            int appearedAtChainHeight = 0;
-            if (transaction.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING)
-                appearedAtChainHeight = transaction.getConfidence().getAppearedAtChainHeight();
 
-            final int numberOfBlocksEmbedded = lastBlockSeenHeight - appearedAtChainHeight + 1;
-
-            if (numberOfBlocksEmbedded > 0)
-                return numberOfBlocksEmbedded;
-            else
-                return 0;
-        }
-        return 0;
-    }
-
-    public int getNumberOfPeersSeenTx()
-    {
-        // TODO just a quick impl. need to be checked if it works for all cases...
-        Set<Transaction> transactions = getTransactions(true);
-        if (transactions != null && transactions.size() == 1)
-        {
-            Transaction transaction = transactions.iterator().next();
-            return (transaction == null || transaction.getConfidence() == null) ? 0 : transaction.getConfidence().numBroadcastPeers();
-        }
-        return 0;
-    }
-
-    //TODO those handlers are not called yet...
     @Override
     public void onCoinsReceived(Wallet wallet, Transaction tx, BigInteger prevBalance, BigInteger newBalance)
     {
+        for (WalletFacade.WalletListener walletListener : walletListeners)
+            walletListener.onCoinsReceived(newBalance);
+
         log.info("onCoinsReceived");
     }
 
+    @Override
+    public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx)
+    {
+        for (WalletFacade.WalletListener walletListener : walletListeners)
+            walletListener.onConfidenceChanged(tx.getConfidence().numBroadcastPeers(), tx.getConfidence().getDepthInBlocks());
+
+        log.info("onTransactionConfidenceChanged " + tx.getConfidence().toString());
+    }
+
     @Override
     public void onCoinsSent(Wallet wallet, Transaction tx, BigInteger prevBalance, BigInteger newBalance)
     {
@@ -169,12 +165,6 @@ public class AccountRegistrationWallet extends Wallet implements WalletEventList
         log.info("onReorganize");
     }
 
-    @Override
-    public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx)
-    {
-        log.info("onTransactionConfidenceChanged");
-    }
-
     @Override
     public void onWalletChanged(Wallet wallet)
     {
@@ -193,5 +183,26 @@ public class AccountRegistrationWallet extends Wallet implements WalletEventList
         log.info("onScriptsAdded");
     }
 
+    int getConfirmationNumBroadcastPeers()
+    {
+        Transaction transaction = getTransaction();
+        return (transaction == null || transaction.getConfidence() == null) ? 0 : transaction.getConfidence().numBroadcastPeers();
+    }
 
+    int getConfirmationDepthInBlocks()
+    {
+        Transaction transaction = getTransaction();
+        return (transaction == null || transaction.getConfidence() == null) ? 0 : transaction.getConfidence().getDepthInBlocks();
+    }
+
+    //TODO only 1 tx supported yet...
+    private Transaction getTransaction()
+    {
+        Set<Transaction> transactions = getTransactions(true);
+        if (transactions != null && transactions.size() == 1)
+        {
+            return transactions.iterator().next();
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/io/bitsquare/btc/DownloadListener.java b/src/main/java/io/bitsquare/btc/DownloadListener.java
deleted file mode 100644
index b90886ba8d..0000000000
--- a/src/main/java/io/bitsquare/btc/DownloadListener.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.bitsquare.btc;
-
-import java.util.Date;
-
-public interface DownloadListener
-{
-    void progress(double percent, int blocksSoFar, Date date);
-
-    void doneDownload();
-}
diff --git a/src/main/java/io/bitsquare/btc/WalletFacade.java b/src/main/java/io/bitsquare/btc/WalletFacade.java
index 665d68f79d..b89054c32c 100644
--- a/src/main/java/io/bitsquare/btc/WalletFacade.java
+++ b/src/main/java/io/bitsquare/btc/WalletFacade.java
@@ -4,6 +4,7 @@ import com.google.bitcoin.core.*;
 import com.google.bitcoin.kits.WalletAppKit;
 import com.google.bitcoin.params.MainNetParams;
 import com.google.bitcoin.params.RegTestParams;
+import com.google.bitcoin.script.Script;
 import com.google.bitcoin.utils.Threading;
 import com.google.inject.Inject;
 import io.bitsquare.crypto.CryptoFacade;
@@ -22,7 +23,7 @@ import java.util.UUID;
  * Code from BitcoinJ must not be used outside that facade.
  * That way a change of the library will only affect that class.
  */
-public class WalletFacade
+public class WalletFacade implements WalletEventListener
 {
     public static final String MAIN_NET = "MAIN_NET";
     public static final String TEST_NET = "TEST_NET";
@@ -38,6 +39,7 @@ public class WalletFacade
     private AccountRegistrationWallet accountRegistrationWallet = null;
 
     private List<DownloadListener> downloadListeners = new ArrayList<>();
+    private List<WalletListener> walletListeners = new ArrayList<>();
 
     @Inject
     public WalletFacade(NetworkParameters networkParameters, WalletAppKit walletAppKit, CryptoFacade cryptoFacade, BlockChainFacade blockChainFacade)
@@ -80,6 +82,8 @@ public class WalletFacade
         walletAppKit.wallet().allowSpendingUnconfirmedTransactions();
         walletAppKit.peerGroup().setMaxConnections(11);
 
+        walletAppKit.wallet().addEventListener(this);
+
         log.info(walletAppKit.wallet().toString());
     }
 
@@ -89,16 +93,37 @@ public class WalletFacade
         walletAppKit.awaitTerminated();
     }
 
-    public void addDownloadListener(DownloadListener downloadListener)
+    public void addDownloadListener(DownloadListener listener)
     {
-        downloadListeners.add(downloadListener);
+        downloadListeners.add(listener);
     }
 
-    public void removeDownloadListener(DownloadListener downloadListener)
+    public void removeDownloadListener(DownloadListener listener)
     {
-        downloadListeners.remove(downloadListener);
+        downloadListeners.remove(listener);
     }
 
+    public void addWalletListener(WalletListener listener)
+    {
+        walletListeners.add(listener);
+    }
+
+    public void removeWalletListener(WalletListener listener)
+    {
+        walletListeners.remove(listener);
+    }
+
+    public void addRegistrationWalletListener(WalletListener listener)
+    {
+        getAccountRegistrationWallet().addWalletListener(listener);
+    }
+
+    public void removeRegistrationWalletListener(WalletListener listener)
+    {
+        getAccountRegistrationWallet().removeWalletListener(listener);
+    }
+
+
     //MOCK
     public KeyPair createNewAddress()
     {
@@ -132,16 +157,6 @@ public class WalletFacade
         return getAccountRegistrationWallet().getBalance(Wallet.BalanceType.ESTIMATED);
     }
 
-    public int getAccountRegistrationConfirmations()
-    {
-        return getAccountRegistrationWallet().getConfirmations();
-    }
-
-    public int getAccountRegistrationNumberOfPeersSeenTx()
-    {
-        return getAccountRegistrationWallet().getNumberOfPeersSeenTx();
-    }
-
     public void sendRegistrationTx(String stringifiedBankAccounts) throws InsufficientMoneyException
     {
         getAccountRegistrationWallet().saveToBlockchain(cryptoFacade.getEmbeddedAccountRegistrationData(getAccountRegistrationWallet().getKey(), stringifiedBankAccounts));
@@ -154,6 +169,66 @@ public class WalletFacade
                 && blockChainFacade.verifyAddressInBlockChain(hashAsHexStringToVerify, address);
     }
 
+    public int getRegistrationConfirmationNumBroadcastPeers()
+    {
+        return getAccountRegistrationWallet().getConfirmationNumBroadcastPeers();
+    }
+
+    public int getRegistrationConfirmationDepthInBlocks()
+    {
+        return getAccountRegistrationWallet().getConfirmationDepthInBlocks();
+    }
+
+    // WalletEventListener
+    @Override
+    public void onCoinsReceived(Wallet wallet, Transaction tx, BigInteger prevBalance, BigInteger newBalance)
+    {
+        for (WalletListener walletListener : walletListeners)
+            walletListener.onCoinsReceived(newBalance);
+
+        log.info("onCoinsReceived");
+    }
+
+    @Override
+    public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx)
+    {
+        for (WalletListener walletListener : walletListeners)
+            walletListener.onConfidenceChanged(tx.getConfidence().numBroadcastPeers(), tx.getConfidence().getDepthInBlocks());
+
+        log.info("onTransactionConfidenceChanged " + tx.getConfidence().toString());
+    }
+
+    @Override
+    public void onCoinsSent(Wallet wallet, Transaction tx, BigInteger prevBalance, BigInteger newBalance)
+    {
+        log.info("onCoinsSent");
+    }
+
+    @Override
+    public void onReorganize(Wallet wallet)
+    {
+        log.info("onReorganize");
+    }
+
+    @Override
+    public void onWalletChanged(Wallet wallet)
+    {
+        log.info("onWalletChanged");
+    }
+
+    @Override
+    public void onKeysAdded(Wallet wallet, List<ECKey> keys)
+    {
+        log.info("onKeysAdded");
+    }
+
+    @Override
+    public void onScriptsAdded(Wallet wallet, List<Script> scripts)
+    {
+        log.info("onScriptsAdded");
+    }
+
+
     private AccountRegistrationWallet getAccountRegistrationWallet()
     {
         if (accountRegistrationWallet == null)
@@ -182,4 +257,18 @@ public class WalletFacade
                 downloadListener.doneDownload();
         }
     }
+
+    public static interface DownloadListener
+    {
+        void progress(double percent, int blocksSoFar, Date date);
+
+        void doneDownload();
+    }
+
+    public static interface WalletListener
+    {
+        void onConfidenceChanged(int numBroadcastPeers, int depthInBlocks);
+
+        void onCoinsReceived(BigInteger newBalance);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/io/bitsquare/gui/MainController.java b/src/main/java/io/bitsquare/gui/MainController.java
index 41f6cb720e..077e88ddb5 100644
--- a/src/main/java/io/bitsquare/gui/MainController.java
+++ b/src/main/java/io/bitsquare/gui/MainController.java
@@ -1,7 +1,6 @@
 package io.bitsquare.gui;
 
 import com.google.inject.Inject;
-import io.bitsquare.btc.DownloadListener;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.di.GuiceFXMLLoader;
 import io.bitsquare.gui.components.NetworkSyncPane;
@@ -35,7 +34,7 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.ResourceBundle;
 
-public class MainController implements Initializable, NavigationController, DownloadListener
+public class MainController implements Initializable, NavigationController, WalletFacade.DownloadListener
 {
     private static final Logger log = LoggerFactory.getLogger(MainController.class);
 
diff --git a/src/main/java/io/bitsquare/gui/setup/SetupController.java b/src/main/java/io/bitsquare/gui/setup/SetupController.java
index f64d1857c2..65ec1a7271 100644
--- a/src/main/java/io/bitsquare/gui/setup/SetupController.java
+++ b/src/main/java/io/bitsquare/gui/setup/SetupController.java
@@ -23,6 +23,7 @@ import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
@@ -31,10 +32,11 @@ import javafx.scene.layout.GridPane;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
 import java.net.URL;
 import java.util.*;
 
-public class SetupController implements Initializable, ChildController
+public class SetupController implements Initializable, ChildController, WalletFacade.WalletListener
 {
     private static final Logger log = LoggerFactory.getLogger(SetupController.class);
 
@@ -45,8 +47,11 @@ public class SetupController implements Initializable, ChildController
     private Storage storage;
 
     private List<ProcessStepItem> processStepItems = new ArrayList();
+    private int depthInBlocks = 0;
 
     private NavigationController navigationController;
+    private ImageView confirmIconImageView;
+    private TextField balanceLabel, confirmationsLabel;
 
     @FXML
     private AnchorPane rootContainer;
@@ -59,6 +64,7 @@ public class SetupController implements Initializable, ChildController
     @FXML
     private Button nextButton, skipButton;
 
+
     @Inject
     public SetupController(User user, WalletFacade walletFacade, CryptoFacade cryptoFacade, Settings settings, Storage storage)
     {
@@ -76,6 +82,8 @@ public class SetupController implements Initializable, ChildController
         processStepItems.add(new ProcessStepItem("Complete", Colors.BLUE));
         processStepBar.setProcessStepItems(processStepItems);
 
+        walletFacade.addRegistrationWalletListener(this);
+
         buildStep0();
     }
 
@@ -91,8 +99,29 @@ public class SetupController implements Initializable, ChildController
         this.navigationController = navigationController;
     }
 
+    @Override
+    public void onConfidenceChanged(int numBroadcastPeers, int depthInBlocks)
+    {
+        this.depthInBlocks = depthInBlocks;
+
+        updateCreateAccountButton();
+        confirmIconImageView.setImage(getConfirmIconImage(numBroadcastPeers, depthInBlocks));
+        confirmationsLabel.setText(getConfirmationsText(numBroadcastPeers, depthInBlocks));
+        log.info("onConfidenceChanged " + numBroadcastPeers + " / " + depthInBlocks);
+    }
+
+    @Override
+    public void onCoinsReceived(BigInteger newBalance)
+    {
+        updateCreateAccountButton();
+        balanceLabel.setText(Formatter.formatSatoshis(walletFacade.getAccountRegistrationBalance(), true));
+        log.info("onCoinsReceived " + newBalance);
+    }
+
+
     private void close()
     {
+        walletFacade.removeRegistrationWalletListener(this);
         navigationController.navigateToView(NavigationController.HOME, "");
     }
 
@@ -108,13 +137,12 @@ public class SetupController implements Initializable, ChildController
         return result;
     }
 
-    private ImageView getConfirmIcon()
+    private Image getConfirmIconImage(int numBroadcastPeers, int depthInBlocks)
     {
-        int confirmations = walletFacade.getAccountRegistrationConfirmations();
-        if (confirmations > 0)
-            return Icons.getIconImageView(Icons.getIconIDForConfirmations(confirmations));
+        if (depthInBlocks > 0)
+            return Icons.getIconImage(Icons.getIconIDForConfirmations(depthInBlocks));
         else
-            return Icons.getIconImageView(Icons.getIconIDForPeersSeenTx(walletFacade.getAccountRegistrationNumberOfPeersSeenTx()));
+            return Icons.getIconImage(Icons.getIconIDForPeersSeenTx(numBroadcastPeers));
     }
 
 
@@ -122,27 +150,43 @@ public class SetupController implements Initializable, ChildController
     // GUI BUILDER
     ///////////////////////////////////////////////////////////////////////////////////
 
+    private String getConfirmationsText(int registrationConfirmationNumBroadcastPeers, int registrationConfirmationDepthInBlocks)
+    {
+        return registrationConfirmationDepthInBlocks + " confirmation(s) / " + "Seen by " + registrationConfirmationNumBroadcastPeers + " peer(s)";
+    }
+
     private void buildStep0()
     {
-        infoLabel.setText("You need to pay 0.01 BTC to the registration address.\n" +
+        infoLabel.setText("You need to pay 0.01 BTC to the registration address.\n\n" +
                 "That payment will be used to create a unique account connected with your bank account number.\n" +
                 "The privacy of your bank account number will be protected and only revealed to your trading partners.\n" +
                 "The payment will be spent to miners and is needed to store data into the blockchain.\n" +
-                "Your trading account will be the source for your reputation in the trading platform.");
+                "Your trading account will be the source for your reputation in the trading platform.\n\n" +
+                "You need at least 1 confirmation for doing the registration payment.");
 
-        int row = -1;
-        TextField addressLabel = FormBuilder.addInputField(formGridPane, "Registration address:", walletFacade.getAccountRegistrationAddress().toString(), ++row);
+        int gridRow = -1;
+
+        TextField addressLabel = FormBuilder.addInputField(formGridPane, "Registration address:", walletFacade.getAccountRegistrationAddress().toString(), ++gridRow);
         addressLabel.setEditable(false);
+
         Label copyIcon = new Label("");
-        formGridPane.add(copyIcon, 2, row);
+        formGridPane.add(copyIcon, 2, gridRow);
         copyIcon.setId("copy-icon");
         AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
         Tooltip.install(copyIcon, new Tooltip("Copy address to clipboard"));
-        formGridPane.add(getConfirmIcon(), 3, row);
-        TextField balanceLabel = FormBuilder.addInputField(formGridPane, "Balance:", Formatter.formatSatoshis(walletFacade.getAccountRegistrationBalance(), true), ++row);
+
+        balanceLabel = FormBuilder.addInputField(formGridPane, "Balance:", Formatter.formatSatoshis(walletFacade.getAccountRegistrationBalance(), true), ++gridRow);
         balanceLabel.setEditable(false);
 
+        confirmationsLabel = FormBuilder.addInputField(formGridPane, "Confirmations:", getConfirmationsText(walletFacade.getRegistrationConfirmationNumBroadcastPeers(), walletFacade.getRegistrationConfirmationDepthInBlocks()), ++gridRow);
+        confirmationsLabel.setEditable(false);
+
+        confirmIconImageView = new ImageView(getConfirmIconImage(walletFacade.getRegistrationConfirmationNumBroadcastPeers(), walletFacade.getRegistrationConfirmationDepthInBlocks()));
+        formGridPane.add(confirmIconImageView, 2, gridRow);
+
         nextButton.setText("Payment done");
+        updateCreateAccountButton();
+
         skipButton.setText("Register later");
 
         // handlers
@@ -170,18 +214,19 @@ public class SetupController implements Initializable, ChildController
                 "Only your trading partners will be able to read those data, so your privacy will be protected.");
 
         formGridPane.getChildren().clear();
-        int row = -1;
-        ComboBox bankTransferTypes = FormBuilder.addComboBox(formGridPane, "Bank account type:", settings.getAllBankAccountTypes(), ++row);
+        int gridRow = -1;
+        ComboBox bankTransferTypes = FormBuilder.addComboBox(formGridPane, "Bank account type:", settings.getAllBankAccountTypes(), ++gridRow);
         bankTransferTypes.setPromptText("Select");
         //TODO dev
         bankTransferTypes.getSelectionModel().select(1);
-        TextField accountHolderName = FormBuilder.addInputField(formGridPane, "Bank account holder name:", "Bob Brown", ++row);
-        TextField accountPrimaryID = FormBuilder.addInputField(formGridPane, "Bank account primary ID", "dummy IBAN", ++row);
-        TextField accountSecondaryID = FormBuilder.addInputField(formGridPane, "Bank account secondary ID:", "dummy BIC", ++row);
+        TextField accountHolderName = FormBuilder.addInputField(formGridPane, "Bank account holder name:", "Bob Brown", ++gridRow);
+        TextField accountPrimaryID = FormBuilder.addInputField(formGridPane, "Bank account primary ID", "dummy IBAN", ++gridRow);
+        TextField accountSecondaryID = FormBuilder.addInputField(formGridPane, "Bank account secondary ID:", "dummy BIC", ++gridRow);
         Button addButton = new Button("Add other Bank account");
-        formGridPane.add(addButton, 1, ++row);
+        formGridPane.add(addButton, 1, ++gridRow);
 
         nextButton.setText("Create account");
+        nextButton.setDisable(true);
         skipButton.setText("Register later");
 
         // handlers
@@ -197,6 +242,8 @@ public class SetupController implements Initializable, ChildController
                     accountPrimaryID.setPromptText(bankAccountType.getPrimaryIDName());
                     accountSecondaryID.setText("");
                     accountSecondaryID.setPromptText(bankAccountType.getSecondaryIDName());
+
+                    nextButton.setDisable(false);
                 }
             }
         });
@@ -254,22 +301,22 @@ public class SetupController implements Initializable, ChildController
                 "You have saved following bank accounts with your trading account to the blockchain:");
 
         formGridPane.getChildren().clear();
-        int row = -1;
+        int gridRow = -1;
         Map<String, BankAccount> bankAccounts = user.getBankAccounts();
         Iterator iterator = bankAccounts.entrySet().iterator();
         int index = 0;
         while (iterator.hasNext())
         {
-            FormBuilder.addHeaderLabel(formGridPane, "Bank account " + (index + 1), ++row);
+            FormBuilder.addHeaderLabel(formGridPane, "Bank account " + (index + 1), ++gridRow);
             Map.Entry<String, BankAccount> entry = (Map.Entry) iterator.next();
-            // need to get updated row from subroutine
-            row = buildBankAccountDetails(entry.getValue(), ++row);
-            FormBuilder.addVSpacer(formGridPane, ++row);
+            // need to get updated gridRow from subroutine
+            gridRow = buildBankAccountDetails(entry.getValue(), ++gridRow);
+            FormBuilder.addVSpacer(formGridPane, ++gridRow);
             index++;
         }
-        FormBuilder.addVSpacer(formGridPane, ++row);
-        FormBuilder.addInputField(formGridPane, "Registration address:", walletFacade.getAccountRegistrationAddress().toString(), ++row).setMouseTransparent(true);
-        FormBuilder.addInputField(formGridPane, "Balance:", Formatter.formatSatoshis(walletFacade.getAccountRegistrationBalance(), true), ++row).setMouseTransparent(true);
+        FormBuilder.addVSpacer(formGridPane, ++gridRow);
+        FormBuilder.addInputField(formGridPane, "Registration address:", walletFacade.getAccountRegistrationAddress().toString(), ++gridRow).setMouseTransparent(true);
+        FormBuilder.addInputField(formGridPane, "Balance:", Formatter.formatSatoshis(walletFacade.getAccountRegistrationBalance(), true), ++gridRow).setMouseTransparent(true);
 
         nextButton.setText("Done");
         skipButton.setOpacity(0);
@@ -289,5 +336,11 @@ public class SetupController implements Initializable, ChildController
         FormBuilder.addInputField(formGridPane, "Bank account secondary ID:", bankAccount.getAccountSecondaryID(), ++row).setMouseTransparent(true);
         return row;
     }
+
+    private void updateCreateAccountButton()
+    {
+        boolean funded = walletFacade.getAccountRegistrationBalance().compareTo(BigInteger.ZERO) > 0;
+        nextButton.setDisable(!funded || depthInBlocks == 0);
+    }
 }
 
diff --git a/src/main/resources/images/tx/circleProgress0.png b/src/main/resources/images/tx/circleProgress0.png
index 082410e8450c1d036741e359a1983d99c33b2f95..86e8064b4b49be0dd58c8889f12c5991c84271d0 100644
GIT binary patch
delta 2801
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
D2i`fV

delta 585
zcmV-P0=E7572yPsBYy%YNkl<ZI1!aoP0v|D6h8MBFWy$XG-)hoScp)ek=XeRD|@yU
zK7K?03nCJKfsF{3R!9jO5^7V4gea}A+j*wB-rHS!l6&XOoacGw%sDfHBuOe#*l;*>
zv|6p%a=D~Zsl+3>T#jru8zmBnPd=Y-rhp5AEO0uVKGbTpZ-0ZqfTGbT+3j}ncsv|C
z9*=3USWu_aA-~^GnM~%h(P;dNAQxD#*ABMZ%xpGOEEXfT+f9NX(B*RB0&2CI*hVy&
zOsL&%({{V1LZR?%u~^PrfRQif^O>^QEa~-nIv$UFyx;F!KorHt8e-LIl{6X+v7@PJ
zG#b6+^Lc4LpMSGWUhQ_fJtj&Yi@<_2olf7qVZ}Lly<Un$B7_~0I!1ih8O8+oD921D
z6YX|8>i7F!M5e~c`~9AifV^I>q*A>$2R_zd5C#?-f=e!!OJYTQq|3U&eO5pTspEqW
zlVk9~aXOt6&k?EpuYrRjszRX<PY-FK16r+?&=FKwHh%!Ih8T{5PGAIAbT}N;?RLpv
zFg%K;JTpX;HGvqg;D9Tp(`jR`*W))$t~y59hk$YpAGZ>mWHR}T41NTIL25ReJT(xI
zB7n+vVoi<#3r-*qIP)T=QmK!d&4$Y5GU49qbUF@3|K&S?HN+~F3IQ9B$Bh6z9@F7)
zc&XRx-$MW8F%^r&C&uOX90G6I<R{c%?7@hQM&s9NwfgHhTdh_Khr{n#>bpNk{(t%n
XU15YG%c!p;00000NkvXXu0mjfo8lB_

diff --git a/src/main/resources/images/unused/circleProgress0.png b/src/main/resources/images/unused/circleProgress0.png
new file mode 100644
index 0000000000000000000000000000000000000000..082410e8450c1d036741e359a1983d99c33b2f95
GIT binary patch
literal 609
zcmV-n0-pVeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006gNkl<ZI1!ao
zP0v|D6h8MBFWy$XG-)hoScp)ek=XeRD|@yUK7K?03nCJKfsF{3R!9jO5^7V4gea}A
z+j*wB-rHS!l6&XOoacGw%sDfHBuOe#*l;*>v|6p%a=D~Zsl+3>T#jru8zmBnPd=Y-
zrhp5AEO0uVKGbTpZ-c>rqR}YX?RN5bJRCb7k7==3P^Z%&zu!-pOy;xEX#9#G7g(>?
z4z}COY&KIY79+RYO@biM<#OQyYPFi!Ml_jBsNHVUcDtoQq3~?6Sk7F4kuT@-nX=g|
z>GgU#9*=yy-|t*N6vf9HV%2JuG#U-Dqp4{$8olK6d1*eMvrS&@cDp?$N*{~Bf-{{?
z-@ReQIeEQaibNuW9g#XleApSr1o$Y&OePcUc020#`(H$+#>xBro|AyQUazE5y*39v
z)?g3@78`;~E|*JUMSP^oy1{)`KnbbigAbEq@WF99of6Lxsr|2kgCnX!p%70GX`usJ
zt(MRcR9Q9vv4$9qf=*xrS9CZW)a`c3U@$z2raUu5lr@1Eu;73zrqgL-uh-)@O|Cjd
z*@u8~4j;D?oMbZjj0}DRgF$LGn>;lTkRpJ}c4AGA0Sitb5IFN9rc$Yoo6UyG<uc*k
z>vTE}M*rnIfHlM_l?nkHkH?JwJs#8HaCoWL>)-$7F%^r&C&uOX90G6I<R{c%?7@hQ
vM&s9NwfgHhTdh_Khr{n#>bpNk{(t%nU15YG%c!p;00000NkvXXu0mjf+iVp9

literal 0
HcmV?d00001