From 9d0d81a7b8950b8e7c7c7c612eca54215cce01e6 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 21 Aug 2014 18:32:19 +0200 Subject: [PATCH] fix bug with bank account --- src/main/java/io/bitsquare/BitSquare.java | 2 +- src/main/java/io/bitsquare/di/GuiceFXMLLoader.java | 1 - .../trade/protocol/taker/ProtocolForTakerAsSeller.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/BitSquare.java index bd4aa2cc2b..5539e088ed 100644 --- a/src/main/java/io/bitsquare/BitSquare.java +++ b/src/main/java/io/bitsquare/BitSquare.java @@ -33,7 +33,7 @@ public class BitSquare extends Application { private static final Logger log = LoggerFactory.getLogger(BitSquare.class); - public static boolean fillFormsWithDummyData = true; + public static boolean fillFormsWithDummyData = false; private static String APP_NAME = "bitsquare"; private static Stage primaryStage; diff --git a/src/main/java/io/bitsquare/di/GuiceFXMLLoader.java b/src/main/java/io/bitsquare/di/GuiceFXMLLoader.java index 0418644ec8..3cc1d69b6b 100644 --- a/src/main/java/io/bitsquare/di/GuiceFXMLLoader.java +++ b/src/main/java/io/bitsquare/di/GuiceFXMLLoader.java @@ -40,7 +40,6 @@ public class GuiceFXMLLoader { this.url = url; - // useCaching = false; isCached = useCaching && cachedGUIItems.containsKey(url); if (!isCached) { diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java b/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java index 2eb5946955..0254f978e0 100644 --- a/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java +++ b/src/main/java/io/bitsquare/trade/protocol/taker/ProtocolForTakerAsSeller.java @@ -125,7 +125,7 @@ public class ProtocolForTakerAsSeller peersMessagePublicKey = offer.getMessagePublicKey(); - bankAccount = user.getBankAccount(offer.getBankAccountId()); + bankAccount = user.getCurrentBankAccount(); accountId = user.getAccountId(); messagePublicKey = user.getMessagePublicKey();