Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-19 23:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix null pointers, use short id for payment request

Browse Source
This commit is contained in:
Manfred Karrer 2016-04-17 16:36:06 +02:00
parent e0598ef050
commit e671779414
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/bitsquare/trade/TradeManager.java
View File

@ -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 {

2
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View File

@ -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;

2
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
View File

@ -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();

2
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
View File

@ -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);

2
gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
View File

@ -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");