chimp1984
863a52077d
Rename getAmount to getAmountAsLong in Trade
2021-11-03 13:39:47 +01:00
chimp1984
d0cdf9fac6
Rename tradeVolumeProperty to volumeProperty in Trade
2021-11-03 13:35:58 +01:00
chimp1984
5bf02e944f
Rename getTradePrice to getPrice in Trade
2021-11-03 13:35:20 +01:00
chimp1984
bc4241cbe0
Rename tradeAmount to amount in Trade
2021-11-03 13:34:55 +01:00
chimp1984
c1e470d6f7
Add requestFocus call to createOfferView as well
...
Move method to base class
2021-11-03 12:34:49 +01:00
chimp1984
addfadeffd
Cleanups
2021-11-02 16:18:50 +01:00
chimp1984
726307c1bb
Combine nested if statements
2021-11-02 16:18:50 +01:00
chimp1984
20e83b6afe
Reset address entry if BSQ swap offer is used for create offer
...
We create a new address entry when opening the create offer view.
But we close and replace that view with the BSQ swap create offer view if
BSQ swap is selected, therefore the address entry would be dangling and
later cleaned up at openOfferManager. To clean it up directly we call the
resetAddressEntriesForOpenOffer on btcWalletService.
2021-11-02 16:18:50 +01:00
chimp1984
6890b50722
Add default value if no filter is available
2021-11-02 16:18:50 +01:00
chimp1984
884fe09b25
Workaround for weird JFXComboBox bug
...
The currency list would show up the list overlay. That gets triggered by unclear reasons.
The bindings on the action and cancel buttons are causing that behaviour (maybe causes some
render cycle which then causes the issue...). By requesting focus on our view directly after
the onTakeOffer updates the bindable properties we can get rid of that UI glitch.
2021-11-02 16:18:50 +01:00
chimp1984
5eec562953
Update dev mode values for create offer
2021-11-02 16:18:50 +01:00
chimp1984
9b1720f4c1
Improve BSQ swap offer details window
2021-11-02 16:18:50 +01:00
chimp1984
06bba393b1
Remove missingFundsListener after successful take offer
2021-11-02 16:18:50 +01:00
chimp1984
1c1b2802cc
Apply codacy review suggestions
2021-11-02 16:18:50 +01:00
chimp1984
f7fcaa915e
Add BSQ swap code
2021-11-02 16:18:50 +01:00
chimp1984
d5dfdb4a35
Merge branch 'chimp-bsq-swap-1' into bsq-swap-low-risk-refactorings-2
...
# Conflicts:
# core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
# core/src/main/java/bisq/core/api/CoreOffersService.java
# core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java
# core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java
# core/src/main/java/bisq/core/offer/OpenOfferManager.java
# core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java
# core/src/main/java/bisq/core/offer/bisq_v1/OfferPayload.java
# core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java
# core/src/main/java/bisq/core/offer/bisq_v1/TriggerPriceService.java
# core/src/main/java/bisq/core/proto/ProtoDevUtil.java
# core/src/main/java/bisq/core/trade/TradeManager.java
# core/src/main/java/bisq/core/trade/bisq_v1/TradeResultHandler.java
# core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java
# core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
# core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
# core/src/main/java/bisq/core/trade/protocol/Provider.java
# core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
# core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java
# core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java
# core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java
# core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
# core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
# desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
# desktop/src/main/java/bisq/desktop/main/PriceUtil.java
# desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java
# desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java
# desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
# desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java
# desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
# desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
# desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
# desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
# desktop/src/main/java/bisq/desktop/util/DisplayUtils.java
# desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java
# desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferViewModelTest.java
# desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java
# desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java
# desktop/src/test/java/bisq/desktop/maker/OfferMaker.java
# monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java
2021-11-02 16:04:12 +01:00
chimp1984
56759be40d
Move tests to package bisq.desktop.main.offer.bisq_v1.createoffer
2021-11-02 15:42:04 +01:00
chimp1984
7d48cdb941
Cleanups
2021-11-02 15:35:51 +01:00
chimp1984
6a8f612116
Cleanups, refromatting, add final qualifier
2021-11-02 15:35:51 +01:00
chimp1984
3b5b20d152
Move OfferViewModelUtil into bisq.desktop.main.offer.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
fbfdaf4e31
Rename FeeUtil to OfferViewModelUtil
2021-11-02 15:35:51 +01:00
chimp1984
4ebbaa35a5
Move OfferDataModel, OfferViewUtil into bisq.desktop.main.offer.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
cc4b0015e4
Move MutableOffer view classes into bisq.desktop.main.offer.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
9a1306af1d
Move takeoffer package inside bisq.desktop.main.offer.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
f25d0d1bab
Move createoffer package inside bisq.desktop.main.offer.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
ac8dd031b3
Move TradeDataValidation, DumpDelayedPayoutTx, TradeDataValidation, TradeUtil, TradeTxException to package bisq.core.trade.bisq_v1
2021-11-02 15:35:51 +01:00
chimp1984
3b7a14cd3a
Move TransactionResultHandler, TradeResultHandler to package bisq.core.trade.bisq_v1
2021-11-02 15:35:51 +01:00
chimp1984
0bc5ede803
Move CleanupMailboxMessagesService, ClosedTradeUtil to package bisq.core.trade.bisq_v1
2021-11-02 15:35:51 +01:00
chimp1984
c090116f04
Move ClosedTradableManager, FailedTradesManager into bisq.core.trade.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
83054349e8
Move tasks package into bisq.core.trade.protocol.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
21e9bb4bdf
Move protocol classes to bisq.core.trade.protocol.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
eef55b7d67
Move Tradable to bisq.core.trade.model package
2021-11-02 15:35:51 +01:00
chimp1984
2b573092a9
Move MakerTrade and TakerTrade to bisq.core.trade.model package
2021-11-02 15:35:51 +01:00
chimp1984
4dc71214a0
Move Trade to bisq.core.trade.model.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
09aa24ce2d
Move Contract, SellerAsMakerTrade, SellerAsTakerTrade, SellerTrade,
...
BuyerAsMakerTrade, BuyerAsTakerTrade, BuyerTrade
to bisq.core.trade.model.bisq_v1 package
2021-11-02 15:35:51 +01:00
chimp1984
4b968ce00c
Rename OfferFilter to OfferFilterService
2021-11-02 15:35:51 +01:00
chimp1984
aa02ac8a6d
Move content of bisq.core.offer.placeoffer package into package bisq.core.offer.placeoffer.bisq_v1
2021-11-02 15:35:51 +01:00
chimp1984
990c62b8e9
Move TriggerPriceService into package bisq.core.offer.bisq_v1
2021-11-02 15:35:51 +01:00
chimp1984
b93295ac0b
Move MutableOfferPayloadFields into package bisq.core.offer.bisq_v1
2021-11-02 15:35:51 +01:00
chimp1984
3838b45e15
Move CreateOfferService into package bisq.core.offer.bisq_v1
2021-11-02 15:35:51 +01:00
chimp1984
0942d8fc67
Move OfferPayload into package bisq.core.offer.bisq_v1
2021-11-02 15:35:51 +01:00
Christoph Atteneder
6f41558ae0
Merge pull request #5771 from jmacxx/fix_repeated_failed_trade_popup
...
Option to not repeat popup message of locked up funds from failed trade
2021-11-02 14:48:03 +01:00
Christoph Atteneder
50798f0d62
Revert to SNAPSHOT version
2021-10-29 16:06:49 +02:00
chimp1984
ebfd1b5574
Remove todo
2021-10-21 17:56:15 +02:00
chimp1984
54f17b00af
Cleanups
2021-10-21 17:44:48 +02:00
chimp1984
b194960c63
Use TradeModel instead of Trade where appropriate.
...
Extend methods with additional params.
Cleanups
2021-10-21 15:28:58 +02:00
chimp1984
d063aff5bf
Let OfferPayload extend OfferPayloadBase
2021-10-21 13:50:15 +02:00
chimp1984
dcd0101c52
Generify TradeResultHandler
2021-10-21 12:25:51 +02:00
chimp1984
5412f8b669
Merge branch 'chimp-bsq-swap' into bsq-swap-low-risk-refactorings
2021-10-21 11:48:00 +02:00
chimp1984
ab6e4e1b8f
Dummy commit to enforce rebuild at CI
2021-10-21 11:44:30 +02:00
