From 7ea5a92b785b172dcadf4db93a2241e0681df93c Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 23 Oct 2014 20:08:27 +0200 Subject: [PATCH] Adopt offer book filter for IRC demo mode --- .../account/content/registration/RegistrationViewCB.java | 5 ++--- .../bitsquare/gui/main/trade/orderbook/OrderBookModel.java | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java index e254e8c2d0..ed5bc93670 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java @@ -131,9 +131,8 @@ public class RegistrationViewCB extends CachedViewCB implements }); Popups.openInfo(BSResources.get("You have been successfully registered."), - BSResources.get("The transaction ID for the registration fee payment is:\n\n" + - presentationModel.getTransactionId() + - "\n\n You can now start trading."), + BSResources.get("Congratulation you have been successfully registered.\n\n" + + " You can now start trading."), actions); } }); diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookModel.java b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookModel.java index 430942dcdb..7ea47f6c94 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookModel.java +++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookModel.java @@ -181,6 +181,8 @@ class OrderBookModel extends UIModel { return true; boolean countryResult = offer.getAcceptedCountries().contains(user.getCurrentBankAccount().getCountry()); + // for IRC test version deactivate the check + countryResult = true; if (!countryResult) restrictionsInfo.set("This offer requires that the payments account resides in one of those countries:\n" + formatter.countryLocalesToString(offer.getAcceptedCountries()) + @@ -188,6 +190,7 @@ class OrderBookModel extends UIModel { ") is not included in that list." + "\n\n Do you want to edit your preferences now?"); + // TODO Not so clear how the restrictions will be handled // we might get rid of languages (handles viy arbitrators) /*