From e671779414bbd58313abd769e1e0c9e9e3a503fa Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sun, 17 Apr 2016 16:36:06 +0200
Subject: [PATCH] Fix null pointers, use short id for payment request

---
 core/src/main/java/io/bitsquare/trade/TradeManager.java         | 2 +-
 gui/src/main/java/io/bitsquare/app/BitsquareApp.java            | 2 +-
 .../gui/main/offer/createoffer/CreateOfferDataModel.java        | 2 ++
 .../gui/main/offer/createoffer/CreateOfferViewModel.java        | 2 +-
 .../bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java  | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
index 6b5c8d1bca..c76bc65251 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -176,8 +176,8 @@ public class TradeManager {
         for (Trade trade : trades) {
             trade.setStorage(tradableListStorage);
             if (trade.isDepositFeePaid()) {
-                trade.updateDepositTxFromWallet();
                 initTrade(trade, trade.getProcessModel().getUseSavingsWallet(), trade.getProcessModel().getFundsNeededForTrade());
+                trade.updateDepositTxFromWallet();
             } else if (trade.isTakerFeePaid()) {
                 addTradeToFailedTrades(trade);
             } else {
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
index cf61f7da3f..2a4348d9a5 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
@@ -76,7 +76,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY;
 public class BitsquareApp extends Application {
     private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class);
 
-    public static final boolean DEV_MODE = true;
+    public static final boolean DEV_MODE = false;
     public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true;
 
     private static Environment env;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
index 97cb8f8e44..53a64ceb10 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
@@ -70,6 +70,7 @@ class CreateOfferDataModel extends ActivatableDataModel {
     private final KeyRing keyRing;
     private final P2PService p2PService;
     private final PriceFeed priceFeed;
+    private final String shortOfferId;
     private Navigation navigation;
     private final BlockchainService blockchainService;
     private final BSFormatter formatter;
@@ -135,6 +136,7 @@ class CreateOfferDataModel extends ActivatableDataModel {
         // isMainNet.set(preferences.getBitcoinNetwork() == BitcoinNetwork.MAINNET);
 
         offerId = UUID.randomUUID().toString();
+        shortOfferId = offerId.substring(0, Math.min(8, offerId.length()));
         addressEntry = walletService.getOrCreateAddressEntry(offerId, AddressEntry.Context.OFFER_FUNDING);
         offerFeeAsCoin = FeePolicy.getCreateOfferFee();
         networkFeeAsCoin = FeePolicy.getFixedTxFeeForTrades();
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
index 84867e7e23..54bd0b2729 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
@@ -753,7 +753,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
                 isFiatInputValid(volume.get()).isValid &&
                 dataModel.isMinAmountLessOrEqualAmount() &&
                 !dataModel.useMarketBasedPrice.get() || dataModel.getMarketPriceMargin() != 0 &&
-                dataModel.useMarketBasedPrice.get() || dataModel.priceAsFiat.get().getValue() != 0;
+                dataModel.useMarketBasedPrice.get() || (dataModel.priceAsFiat.get() != null && dataModel.priceAsFiat.get().getValue() != 0);
         isNextButtonDisabled.set(!inputDataValid);
         // boolean notSufficientFees = dataModel.isWalletFunded.get() && dataModel.isMainNet.get() && !dataModel.isFeeFromFundingTxSufficient.get();
         //isPlaceOfferButtonDisabled.set(createOfferRequested || !inputDataValid || notSufficientFees);
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
index 4dab1ea3c7..b5edb1238e 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
@@ -165,7 +165,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
         amountRange = formatter.formatCoin(offer.getMinAmount()) + " - " + formatter.formatCoin(offer.getAmount());
         price = formatter.formatFiat(dataModel.tradePrice);
         marketPriceMargin = formatter.formatToPercentWithSymbol(offer.getMarketPriceMargin());
-        paymentLabel = BSResources.get("takeOffer.fundsBox.paymentLabel", offer.getId());
+        paymentLabel = BSResources.get("takeOffer.fundsBox.paymentLabel", offer.getShortId());
 
         checkNotNull(dataModel.getAddressEntry(), "dataModel.getAddressEntry() must not be null");