Commit Graph

3201 Commits

Author SHA1 Message Date
Christoph Atteneder
d2baabc180
Move utility methods from GUIUtil to OfferViewUtil 2021-11-04 10:36:58 +01:00
Christoph Atteneder
e1b405f20b
Apply minor refactorings
Conflicts:
	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
2021-11-04 10:36:46 +01:00
Christoph Atteneder
9cf373a9bb
Not show buy bsq hint for buy bsq offers 2021-11-04 10:36:01 +01:00
Christoph Atteneder
35e76e30b2
Add Button to confirm payment in BSQ wallet 2021-11-04 10:36:01 +01:00
Christoph Atteneder
717d7c205b
Close current SELL offer tab
TODO: fix bug with currency combobox

 Conflicts:
	desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/OfferViewUtil.java
2021-11-04 10:35:50 +01:00
Jakub Loucký
57b9c6f138
Display button only when insufficient BSQ funds 2021-11-04 10:28:58 +01:00
Jakub Loucký
4c77044274
Move button style to bisq.css
Add link to bisq.wiki
2021-11-04 10:28:57 +01:00
Jakub Loucký
107cc3a8dd
Tiny refactoring 2021-11-04 10:28:56 +01:00
Christoph Atteneder
f59d6fe591
Add "Buy BSQ" button next to trade fee selector
Conflicts:
	desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
2021-11-04 10:28:30 +01:00
chimp1984
19eac435e5
Remove ClosedTradableListItem
Was empty wrapper for Tradable
2021-11-04 01:57:57 +01:00
chimp1984
733b4f06af
Fix layout 2021-11-04 01:26:59 +01:00
chimp1984
1ca0ed5e36
Add notification when BSQ swap trade got confirmed 2021-11-04 01:20:50 +01:00
chimp1984
8fa66ea7aa
Moved instance methods to ClosedTradableManager
Renamed ClosedTradeUtil to ClosedTradableUtil

Leaves only static functional methods in ClosedTradableUtil
Domain methods requiring services are in ClosedTradableManager
This keeps also the TradableList

All formatting code is in ClosedTradableFormatter
2021-11-03 23:54:18 +01:00
chimp1984
27df58b336
Extract formatter methods to ClosedTradeFormatter 2021-11-03 23:12:13 +01:00
chimp1984
acf7c216ae
Moved PriceUtil to bisq.core.util 2021-11-03 22:02:21 +01:00
chimp1984
7109666047
Moved AltcoinValidator, FiatPriceValidator and NumberValidator
to bisq.core.util.validation package. No code change.

Is needed for next refactorings.
2021-11-03 21:58:53 +01:00
chimp1984
24f18b75ae
Rename txFeeAsLong to tradeTxFee and txFeeAsLong to txFeeAsLong
Implement getTxFee in concrete classes. For Maker trades we return the txFee from the offer.

We use txFee in 2 different context:
1. For the txFee the taker pays and which is used for all the trade txs
2. As generic tx fee the user has paid. The makers tx fee is in the offer.
   The taker pays 3 times the tradeTxFee
2021-11-03 21:52:04 +01:00
chimp1984
5da5d47ad7
Fix getNumPastTrades method 2021-11-03 21:21:58 +01:00
chimp1984
c4a8627183
Use TradeModel instead of Trade in the avatar icon
classes and comparators
Add bsq wallet balance listener to update list
Use BsqSwapTrade details window if Bsq trade
Show "N/A" for deposits in case of BSQ swaps
Cleanup ClosedTradesDataModel
2021-11-03 20:10:15 +01:00
chimp1984
2ac5b3532c
Rename BSQ swap trades tab to Unconfirmed BSQ swaps
Move it left to closed trades
2021-11-03 19:06:06 +01:00
chimp1984
d4dc75ba23
Rename CompletedBsqSwapsView* classes to UnconfirmedBsqSwapsView* 2021-11-03 19:05:03 +01:00
chimp1984
680040d37e
Add info about trade if checkArgument fails
checkArgument(trade instanceof BuyerTrade) failed in dev testing
when clicking very fast confirm buttons.
Likely due lagging UI (previous trade in selection...).
Could not reproduce it afterwards
2021-11-03 19:00:09 +01:00
chimp1984
98bed9682d
Move ClosedTradableManager and ClosedTradeUtil one level up
We will move BsqSwapTrades into closed trades as well once confrimed
2021-11-03 18:21:45 +01:00
chimp1984
f6d2f7c8a5
Rename makerFee to makerFeeAsLong in BsqSwapTrade 2021-11-03 17:02:49 +01:00
chimp1984
964144c89f
Rename takerFee to takerFeeAsLong 2021-11-03 16:58:27 +01:00
chimp1984
3fa4b57d70
Rename getTradeVolume to getVolume in Trade 2021-11-03 14:10:34 +01:00
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
jmacxx
c916e9b749
Prevent NPE in case delayedPayoutTx is not present (failed trade) 2021-11-02 21:56:03 -05: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
jmacxx
f5c653b92a
Include owner name for Monese & Satispay accounts 2021-11-02 14:54:24 +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
chimp1984
080dc3e8a1
Merge branch 'chimp-bsq-swap' into wip-merge021.10
# Conflicts:
#	desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java
2021-10-21 11:26:37 +02:00
chimp1984
2ae1860dac
Move tests to package bisq.desktop.main.offer.bisq_v1.createoffer 2021-10-21 11:23:17 +02:00
chimp1984
cfae096c1f
Add null checks, extract variables, cleanups 2021-10-21 11:08:10 +02:00
chimp1984
9fb6a6ca9f
Add isNotPublished method (will be combined later with bsq swap checks)
Cleanups
2021-10-21 11:07:00 +02:00
chimp1984
c60df6e978
Add linebreak (no code change)
Cleanup
2021-10-21 11:04:57 +02:00
chimp1984
8ac40a3e0c
Add style 2021-10-21 11:04:17 +02:00
chimp1984
1aa5e7053d
Add method 2021-10-21 11:03:53 +02:00
chimp1984
8bb42e1421
Add methods, move field up 2021-10-21 11:03:29 +02:00
chimp1984
d285157442
Reduce visibility 2021-10-21 11:02:39 +02:00
chimp1984
9d8c705104
Only add delay if not devmode 2021-10-21 11:02:07 +02:00
chimp1984
2e384ede59
Make onDeleteAccount more clear 2021-10-21 11:01:51 +02:00
chimp1984
1c0b52cd31
Move OfferDirection from bisq.core.offer.bisq_v1 to bisq.core.offer 2021-10-21 09:43:14 +02:00
chimp1984
ee374c3c39
Cleanups, apply rename of getTradePhase 2021-10-21 01:23:36 +02:00
chimp1984
544dd895fc
Rename trade.getState to getTradeState 2021-10-20 23:59:29 +02:00
chimp1984
5b0e9ab92f
Rename trade.getPhase to getTradePhase 2021-10-20 23:57:55 +02:00
jmacxx
1dffec00f2
Add option to not repeat popup message of locked up funds from failed trade 2021-10-20 16:54:14 -05:00
chimp1984
9d106468b0
Move getRandomOfferId method to OfferUtil
Add more methods to OfferUtil
Cleanups
2021-10-20 23:54:12 +02:00
chimp1984
d7f1b00221
Rename processModel.getTradingPeer to getTradePeer 2021-10-20 22:58:20 +02:00
chimp1984
cfc404b4c0
Rename signTx to signTxAndVerifyNoDustOutputs (no code change) 2021-10-20 16:29:00 +02:00
chimp1984
559bc58ec2
Fix merge issues 2021-10-20 15:30:31 +02:00
chimp1984
8ee255412f
Merge branch 'bsq-swap-low-risk-refactorings' into wip-merge2
# 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/Offer.java
#	core/src/main/java/bisq/core/offer/OfferForJson.java
#	core/src/main/java/bisq/core/offer/OfferUtil.java
#	core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.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/statistics/TradeStatistics2.java
#	core/src/test/java/bisq/core/offer/OfferMaker.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/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/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
2021-10-20 15:29:38 +02:00
chimp1984
561ebe940e
Move test classes into bisq.desktop.main.offer.bisq_v1.createoffer 2021-10-20 14:30:07 +02:00
chimp1984
88198be7ff
Rename availableConfirmedBalance to availableBalance
It does not include only confirmed txs as we include
the unconfirmed own change outputs.
2021-10-20 13:25:29 +02:00
chimp1984
dad19ba1c1
Add isFiat and isAltcoin methods.
Use isFiat instead of negation of isBlockchain.
Use isAltcoin if all non btc assets are targeted
2021-10-20 13:12:54 +02:00
chimp1984
6cf0a7c126
Rename paymentMethod.isAsset to paymentMethod.isBlockchain
We will need later to distinguish between BSQ and other Blockchain assets
2021-10-20 12:52:59 +02:00
chimp1984
dfbc746d5b
Move Offer.Direction one level up and rename to OfferDirection 2021-10-20 12:51:41 +02:00
chimp1984
d1d1706a7f
Add delegate methods to offer
Remove unused methods
2021-10-20 12:49:11 +02:00
chimp1984
8768345b74
Remove Inject annotation at abstract classes 2021-10-20 12:34:26 +02:00
chimp1984
dc82fbabab
Increase visibility 2021-10-20 12:33:29 +02:00
chimp1984
9f3034e91c
Fix layout/text issues 2021-10-20 12:33:11 +02:00
chimp1984
e752965577
Add linebreak in error popup
Remove delay for success popup
2021-10-20 12:26:05 +02:00
chimp1984
dca0c93f47
Cleanups 2021-10-20 12:20:53 +02:00
chimp1984
777287af95
Cleanups, refromatting, add final qualifier 2021-10-20 11:58:04 +02:00
chimp1984
25bbad1f9c
Move OfferViewModelUtil into bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
4a9db79068
Rename FeeUtil to OfferViewModelUtil 2021-10-20 11:58:04 +02:00
chimp1984
9777005ec7
Move OfferDataModel, OfferViewUtil into bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
601956dc1f
Move MutableOffer view classes into bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
0efa0bd7ca
Move takeoffer package inside bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
932c0f856a
Move createoffer package inside bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
eacf446ab4
Move TradeDataValidation, DumpDelayedPayoutTx, TradeDataValidation, TradeUtil, TradeTxException to package bisq.core.trade.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
956ffc902d
Move TransactionResultHandler, TradeResultHandler to package bisq.core.trade.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
e80cdf8ac7
Move CleanupMailboxMessagesService, ClosedTradeUtil to package bisq.core.trade.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
fd6934c4e3
Move ClosedTradableManager, FailedTradesManager into bisq.core.trade.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
508296c2a3
Move tasks package into bisq.core.trade.protocol.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
1b2e798faa
Move protocol classes to bisq.core.trade.protocol.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
58cfcffeb9
Move Tradable to bisq.core.trade.model package 2021-10-20 11:58:04 +02:00
chimp1984
fc3177c23f
Move MakerTrade and TakerTrade to bisq.core.trade.model package 2021-10-20 11:58:04 +02:00
chimp1984
d42242762f
Move Trade to bisq.core.trade.model.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
1e9b606544
Move Contract, SellerAsMakerTrade, SellerAsTakerTrade, SellerTrade,
BuyerAsMakerTrade, BuyerAsTakerTrade, BuyerTrade
to bisq.core.trade.model.bisq_v1 package
2021-10-20 11:58:04 +02:00
chimp1984
1b4c4871c0
Rename OfferFilter to OfferFilterService 2021-10-20 11:58:04 +02:00
chimp1984
7197b316fc
Move content of bisq.core.offer.placeoffer package into package bisq.core.offer.placeoffer.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
d9fd8a45f7
Move TriggerPriceService into package bisq.core.offer.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
042476a68a
Move MutableOfferPayloadFields into package bisq.core.offer.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
edf5c3e097
Move CreateOfferService into package bisq.core.offer.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
41d9d3f505
Move OfferPayload into package bisq.core.offer.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
72284d7d9f
Cleanups, refromatting, add final qualifier 2021-10-20 00:11:36 +02:00
chimp1984
1e03aae2ac
Move OfferViewModelUtil into bisq.desktop.main.offer.bisq_v1 package 2021-10-19 23:43:52 +02:00
chimp1984
a9f4bb76b6
Rename FeeUtil to OfferViewModelUtil 2021-10-19 23:43:36 +02:00
chimp1984
a2a7e87af5
Move OfferDataModel, OfferViewUtil into bisq.desktop.main.offer.bisq_v1 package 2021-10-19 23:42:37 +02:00
chimp1984
4169a8719b
Move MutableOffer view classes into bisq.desktop.main.offer.bisq_v1 package 2021-10-19 23:41:44 +02:00
chimp1984
0cd0e16b53
Move takeoffer package inside bisq.desktop.main.offer.bisq_v1 package 2021-10-19 23:40:59 +02:00
chimp1984
30dd5683ef
Move createoffer package inside bisq.desktop.main.offer.bisq_v1 package 2021-10-19 23:40:38 +02:00
chimp1984
71c663eb53
Move TradeDataValidation, DumpDelayedPayoutTx, TradeDataValidation, TradeUtil, TradeTxException to package bisq.core.trade.bisq_v1 2021-10-19 23:18:38 +02:00
chimp1984
f871e8339d
Move TransactionResultHandler, TradeResultHandler to package bisq.core.trade.bisq_v1 2021-10-19 23:16:50 +02:00
chimp1984
2141f8f665
Move CleanupMailboxMessagesService, ClosedTradeUtil to package bisq.core.trade.bisq_v1 2021-10-19 23:13:19 +02:00
chimp1984
c9817ed6db
Move ClosedTradableManager, FailedTradesManager into bisq.core.trade.bisq_v1 package 2021-10-19 23:11:30 +02:00
chimp1984
babd70cc2a
Move tasks package into bisq.core.trade.protocol.bisq_v1 package 2021-10-19 22:57:40 +02:00
chimp1984
87c12fda8c
Move protocol classes to bisq.core.trade.protocol.bisq_v1 package 2021-10-19 22:56:24 +02:00
chimp1984
5a0145d1d9
Move Tradable to bisq.core.trade.model package 2021-10-19 22:51:40 +02:00
chimp1984
5944218a4b
Move MakerTrade and TakerTrade to bisq.core.trade.model package 2021-10-19 22:51:05 +02:00
chimp1984
0f7cfa99d5
Move Trade to bisq.core.trade.model.bisq_v1 package 2021-10-19 22:44:31 +02:00
chimp1984
0e23cbe24e
Move Contract, SellerAsMakerTrade, SellerAsTakerTrade, SellerTrade,
BuyerAsMakerTrade, BuyerAsTakerTrade, BuyerTrade
to bisq.core.trade.model.bisq_v1 package
2021-10-19 22:42:20 +02:00
chimp1984
b584fdf419
Rename OfferFilter to OfferFilterService 2021-10-19 21:22:12 +02:00
chimp1984
ed9f248c27
Move content of bisq.core.offer.placeoffer package into package bisq.core.offer.placeoffer.bisq_v1 2021-10-19 21:21:04 +02:00
chimp1984
8a4c05c1e4
Move TriggerPriceService into package bisq.core.offer.bisq_v1 2021-10-19 21:17:06 +02:00
chimp1984
346fc79094
Move MutableOfferPayloadFields into package bisq.core.offer.bisq_v1 2021-10-19 21:16:46 +02:00
chimp1984
19f813eea3
Move CreateOfferService into package bisq.core.offer.bisq_v1 2021-10-19 21:16:00 +02:00
chimp1984
577b07ba9a
Move OfferPayload into package bisq.core.offer.bisq_v1 2021-10-19 21:15:38 +02:00
Christoph Atteneder
8fbccb7547
Bump version number for v1.7.5 2021-10-19 11:32:09 +02:00
jmacxx
0bb103ee42
Fix exception in offer entry UI 2021-10-13 16:27:15 -05:00
jmacxx
b72b70ee8c
Add payment methods Strike and Verse 2021-10-12 14:37:26 -05:00
Christoph Atteneder
e5d73e90a7
Merge pull request #5747 from jmacxx/display_fields_allow_mark_copy
Allow standard mark & copy functionality for displayed text fields
2021-10-12 10:47:17 +02:00
Christoph Atteneder
d238234957
Fix wrong logger setup 2021-10-12 10:28:29 +02:00
Christoph Atteneder
9ad4671773
Merge pull request #5746 from jmacxx/missing_invalid_transaction_diagnostic
Fix issue of Trade Step 1 validation done too soon
2021-10-12 10:02:23 +02:00
jmacxx
56b3f3fae1
Check for invalid tx chain only after deposit published 2021-10-11 14:20:17 -05:00
jmacxx
26028dfad5
Allow standard mark & copy functionality for displayed text fields 2021-10-11 14:03:30 -05:00
jmacxx
9ab659ceac
Fix issue of Trade Step 1 validation done too soon
Deprecate 4 states which are not used.
ShareBuyerPaymentAccountMessage can arrive before deposit broadcast completes.
2021-10-11 09:31:57 -05:00
Christoph Atteneder
2d3182ca2f
Merge pull request #5745 from jmacxx/add_monese_satispay
Add payment methods Monese and Satispay
2021-10-11 09:29:36 +02:00
Christoph Atteneder
2e38c3cf35
Merge pull request #5742 from jmacxx/trader_chat_trade_complete
Allow trader chat to continue after trade complete
2021-10-09 13:03:32 +02:00
jmacxx
df2d0b3332
Add payment methods Monese and SatisPay 2021-10-07 17:28:42 -05:00
jmacxx
c13fb950e3
Allow trader chat after trade complete 2021-10-06 19:25:39 -05:00
ghubstan
fae7288385
Adjust to renamed method 2021-10-05 14:24:09 -03:00
ghubstan
999c4a516d
Refactor desktop Closed Tradable model utils for API use
Move some potentially sharable utility code from desktop's ClosedTrade
models to core's new ClosedTradeUtil.

The API's `gettrades --category=<open|closed|failed>` method will need
some of this logic on the server side, but the scope of this refactoring
is larger in the interest of a more complete refactor, and avoiding
duplication in the future.
2021-10-05 14:13:51 -03:00
sqrrm
bef38e6e01
Merge pull request #5736 from bisq-network/revert-5680-community-tab
Revert "Community tab"
2021-10-04 11:56:25 +02:00
Christoph Atteneder
b7859e3ce4
Merge pull request #5741 from jmacxx/add_payments_pix_bizum
Add payment methods Bizum and Pix
2021-10-04 10:32:03 +02:00
jmacxx
b156f034ad
add payment methods Bizum and Pix 2021-10-03 18:19:37 -05:00
ghubstan
36dcb99cf8
Be consistent about line-breaks when using conditional operator 2021-10-02 17:45:41 -03:00
ghubstan
db6e2a51b2
Move volume formatting from DisplayUtils to VolumeUtil
In practice, presentation/display logic should be kept in UIs, but the core
api will need to duplicate a very small part of the code in DisplayUtils if
a very small part of this refactoring is not done.  Instead of moving a tiny
bit of the volume formatting methods, all of them are moved to core.
2021-10-02 17:33:25 -03:00
Christoph Atteneder
2cca574427
Merge pull request #5724 from jmacxx/add_nequi
Add Nequi payment method
2021-09-30 10:06:54 +02:00
Christoph Atteneder
94d56e4e47
Revert "Community tab" 2021-09-30 10:03:09 +02:00
sqrrm
5e84713520
Merge pull request #5730 from bisq-network/release/v1.7.4
Release/v1.7.4
2021-09-28 15:05:42 +02:00
jmacxx
f792db98d0
add Nequi payment method
Signed-off-by: jmacxx <47253594+jmacxx@users.noreply.github.com>
2021-09-28 07:51:06 -05:00
jmacxx
9e5a1c2fd4
add payment method CelPay
Signed-off-by: jmacxx <47253594+jmacxx@users.noreply.github.com>
2021-09-28 07:51:05 -05:00
Christoph Atteneder
e98ae2becf
Merge pull request #5719 from jmacxx/clockwatcher_popup
Show a warning if PC has been in sleep mode
2021-09-27 11:06:58 +02:00
Christoph Atteneder
b098656d0d
Merge pull request #5680 from xyzmaker123/community-tab
Community tab
2021-09-27 11:04:13 +02:00
Christoph Atteneder
eef3e5480c
Increase initial window width to 1240 2021-09-27 10:48:43 +02:00
Christoph Atteneder
8859a523ec
Add license headers and do a minor cleanup 2021-09-27 10:30:45 +02:00
Christoph Atteneder
c4d0117988
Merge pull request #5696 from jmacxx/add_indian_payment
Add five Indian payment methods
2021-09-27 09:40:21 +02:00
jmacxx
2add4039ad
fix: prevent repeated display of account warning popup 2021-09-25 17:45:57 -05:00
Christoph Atteneder
f73274b0b9
Revert to SNAPSHOT version 2021-09-24 19:28:11 +02:00
Christoph Atteneder
e04f94d66a
Create file including jar signatures for all platforms 2021-09-24 19:25:11 +02:00
chimp1984
d01f82a5db
Adjust the UI in case the DAO is disabled 2021-09-23 19:11:09 +02:00
jmacxx
71c2278a68
show a warning if the computer was in sleep mode for > 10s 2021-09-22 21:22:22 -05:00
jmacxx
ec4b4cdb11
add payment method popup text per spec 2021-09-22 20:07:57 -05:00
Christoph Atteneder
64274cf82e
Bump version number for v1.7.4 2021-09-21 09:24:26 +02:00
chimp1984
2419e1dae5
Add dao activated toggle to preferences
We write the value to the properties file not to
the preferences as we need the value early at startup
before the preferences are loaded.
2021-09-21 01:31:13 +02:00
sqrrm
fae1852220
Merge pull request #5685 from ghubstan/1-fix-api-payacct-ccy-support
Let API user set currencies in some payment account json forms
2021-09-17 14:07:09 +02:00
jmacxx
78cd61564c
Add five Indian payment methods 2021-09-15 15:25:43 -05:00
xyzmaker123
7f2c01e02d
Community tab - use AutoTooltip components, define elements in java instead fxml 2021-09-15 17:31:13 +02:00
xyzmaker123
393acf6961
Community tab 2021-09-15 12:26:31 +02:00
sqrrm
0e2da2850e
Merge pull request #5694 from ripcurlx/improve-japanese-bank-validation
Improve japanese bank branch validation
2021-09-14 14:24:10 +02:00
Christoph Atteneder
4d62136d62
Add further simplification and minor cleanups for japanese bank validation 2021-09-14 09:15:12 +02:00
Christoph Atteneder
90b2f9eeae
Merge pull request #5672 from jmacxx/swift_payment_method
Add SWIFT payment method
2021-09-13 14:49:47 +02:00
Christoph Atteneder
c781394dbb
Accept U+3007
Fixes #5688
2021-09-13 14:24:03 +02:00
Christoph Atteneder
851ef07812
Clean up formatting and imports 2021-09-13 14:20:55 +02:00
jmacxx
51eca30770
customize payment popup fee info for SWIFT 2021-09-13 06:44:17 -05:00
jmacxx
c94c4b3fa4
SWIFT review changes & bugfix 2021-09-09 10:27:18 -05:00
Christoph Atteneder
81571d72e7
Fix wrong translation key and use AutoTooltipCheckbox 2021-09-09 10:33:07 +02:00
jmacxx
3430055144
add SWIFT payment method
rebased to master
2021-09-08 14:57:08 -05:00
ghubstan
e00cc86fea
Adjust to PaymentAccount changes in commit de23fc0 2021-09-06 12:18:51 -03:00
Christoph Atteneder
5595f7d4c4
Merge pull request #5682 from ghubstan/cache-the-offerpayload-hash
Reduce # of hash calculations in UI OfferBook view
2021-09-06 11:32:22 +02:00
ghubstan
7351b08850
Reduce # of hash calculations in UI OfferBook view
We can cache an offer payload hash as soon as its `offerFeePaymentTxId`
is set.  (The payload hash cannot be calculated until the object can
be transformed into a protobuf message, which requires a non-null
offerFeePaymentTxId.)

Another benefit is removal of the payload hash argument from the
`OfferBookListItem` constructor.

Changes include

- `OfferPayload` Added `transient byte[] hash` field + getter method
   (where hash is calculated and cached).

- `OfferBookService` Removed `P2PDataStorage.ByteArray hashOfPayload`
   parameter from `OfferBookChangedListener` listener methods
  `onAdded` & `onRemoved`.  (Hash is cached in `OfferPayload`.)

- `P2PDataStorage` Added null check to `ByteArray` class constructor.

- `OfferBook` Adjusted for change to `OfferBookChangedListener`.
   Also removed redundant payload hash null checks.

- `TakeOfferDataModel` and `MarketAlerts` Adjusted for change to
  `OfferBookChangedListener`.

- `OfferBookListItem` Removed overloaded constructor with
  `@Nullable P2PDataStorage.ByteArray hashOfPayload` parameter.
   (Field value is set from cached offer payload hash.)

- `OfferBookViewModelTest` and `OfferMaker`  Adjusted test and test fixture:
   do not attempt to create offer payloads without an `offerFeePaymentTxId`.
2021-09-01 15:48:35 -03:00
jmacxx
07cf5e34a3
Allow user to initiate arbitration once locktime has expired 2021-09-01 09:04:52 -05:00
sqrrm
fc329f6f15
Merge pull request #5678 from bisq-network/release/v1.7.3
Release/v1.7.3
2021-08-30 14:29:27 +02:00
Christoph Atteneder
0e4278012b
Revert to SNAPSHOT version 2021-08-30 14:16:11 +02:00
sqrrm
58e09c96ee
Merge pull request #5666 from ghubstan/08-handle-extradata-in-editoffer
Adjust API 'editoffer' to PR 5651 (include extraData field when editing offer)
2021-08-30 10:46:23 +02:00
jmacxx
984a269776
Add Payment Methods: Paysera and Paxum 2021-08-25 13:38:54 -05:00
ghubstan
84036bd862
Add TODOs (delete debug statement)
The new debug log statements included in this PR help trace add/remove
list item actions if problems are seen in the UI's OfferBook, after the
API 'editoffer' method is released.

They can and should be removed in a future PR if the released API feature
proves it did not introduce bugs into the UI.
2021-08-25 11:09:19 -03:00
ghubstan
98a5b1722c
Add missing detail to comment 2021-08-25 10:40:57 -03:00
ghubstan
4889da6bba
Remove redundant list.size check 2021-08-25 10:34:22 -03:00
Christoph Atteneder
ad95e5b3be
Bump version number for v1.7.3 2021-08-23 11:20:09 +02:00
ghubstan
59192e98f1
Do not filter on paylaod hash when deleting duplicate list items
Any and all view list items with a matching offerId should be
removed from view just before adding a new list item.
2021-08-22 10:24:18 -03:00
ghubstan
b93f6ea28e
Remove sequence-number checks from OfferBook
Checking offer payload hashes in OfferBook's onAdded and onRemove methods
is sufficient to prevent incorrect removal of offer list items from the
UI OfferBook view (where api 'editoffer' causes onRemoved to be called
after onAdded on peers).
2021-08-20 11:49:00 -03:00
ghubstan
fdc78b2fb5
Remove unused methods 2021-08-18 14:48:55 -03:00
ghubstan
fb4e00fb6b
Fix OfferBookService bug causing extra check in OfferBook.onRemoved
Hash of protectedStorageEntry (should be offerPayload) was sometimes
resulting in incorrect hash being sent to OfferBook listener methods
onAdded(offer,  hashOfPayload,  sequenceNumber), and
onRemoved(offer,  hashOfPayload,  sequenceNumber).
Hash of OfferPayload is correctly passed to listener with this change.

Sending the correct hash allows removal of a dubious code block that
removed a book view list item when hash compare failed, and no matching
offer existed in the OfferBookService.
See https://github.com/bisq-network/bisq/pull/5659#discussion_r689634240
2021-08-18 14:27:20 -03:00
ghubstan
859a5ab4e4
Merge branch '07-show-new-offer-with-pending-status' into 08-handle-extradata-in-editoffer 2021-08-16 14:31:03 -03:00
ghubstan
59c0313277
Fix long method name
Resolves https://github.com/bisq-network/bisq/pull/5659#discussion_r687839333
2021-08-16 14:23:28 -03:00
ghubstan
d709338d63
Refactor 2 predicates as single predicate
Resolves https://github.com/bisq-network/bisq/pull/5659#discussion_r689631147
2021-08-16 14:17:28 -03:00
ghubstan
1c096d0e3a
Merge branch 'master' into 08-handle-extradata-in-editoffer
Resolve file conflicts resulting from merging PRs
    https://github.com/bisq-network/bisq/pull/5577
    https://github.com/bisq-network/bisq/pull/5651
2021-08-16 12:36:49 -03:00
sqrrm
15093720b9
Merge pull request #5625 from ripcurlx/unsigned-account-tooltip
Tooltip for unsigned accounts needs to provide more information
2021-08-16 12:15:43 +02:00
sqrrm
6881c3e0f7
Merge pull request #5640 from ripcurlx/update-public-key
Update expired public key
2021-08-16 11:03:12 +02:00
Christoph Atteneder
b9038fcf3a
Merge pull request #5651 from jmacxx/fix_edit_offer_extra_data
Fix issue with extraData field when editing offer
2021-08-16 10:17:51 +02:00
ghubstan
6a4aceda7b
Handle API's edit+disable offer use case in UI.
This change is a refactoring for handling the removal of a peer UI's offer
item when it is deactivated and edited in the same CLI `editoffer` command.

On the API side, an `editoffer --price=N --enable=false` command results
in the edited offer not being re-published.  On a UI peer's side, the edited
offer is not added to the peer's storage, and the peer's onRemoved(offer)
listener event does not find a storage entry with matching payload-hash.

This fix assumes an offer that is not in the local store should be removed
from the UI's view list -- when the onRemoved method's hashOfPayload does
not match the UI's view list item's hashOfPayload.
2021-08-13 14:53:17 -03:00
Christoph Atteneder
9db2c18f2c
Merge pull request #5649 from sqrrm/refund-double-payout-fix
Avoid creating more than one refund payout
2021-08-12 20:43:22 +02:00
ghubstan
713867b990
Remove comment (question answered) 2021-08-11 11:29:17 -03:00
ghubstan
1a7ad0be0d
Merge branch 'master' into 06-safe-offerbook-add-remove-events 2021-08-07 14:27:11 -03:00
ghubstan
d3508d2037
Revert logback debug config changes
(Accidentally included in last commit.)
2021-08-07 14:11:47 -03:00
ghubstan
6e2400fb0f
Ensure UI OfferBook items are correctly added and removed
Using the API's CLI to edit offers can sometimes result in add/remove messages
being received on peers in the same batch of envolopes, and these messages
are sometimes passed to the UI in (1) add, (2) remove order.  This can result in
a newly edited offer being removed immediately after being added to the OfferBook
list. This change uses storage entry sequence number and storage entry payload
hash comparisons to avoid the problem.

- OfferBookListItem Added new constructor taking P2PDataStorage.ByteArray hashOfPayload,
  and int sequenceNumber params.  Added a new toString() method.

- OfferBook Added new checks on OfferBookListItem hashOfPayload and sequenceNumber while
  determining if offer candidates should be added or removed from the UI's OfferBook List.
  See OfferBook contructor's implementation of OfferBookChangedListener#onAdded and
  OfferBookChangedListener#onRemoved.  Added many comments explaining the add/remove rules,
  and plenty of debug statements to help trace the add/remove event process.

- OfferBookService#OfferBookChangedListener Added new P2PDataStorage.ByteArray hashOfPayload,
  and int sequenceNumber params to listener's onAdded and onRemoved method signatures.
  Added these two new paramater values to listener.onAdded and listener.onRemoved calls.

- TakeOfferDataModel Replaced unused, old tradeManager param in offerBook.removeOffer()
  with (null) P2PDataStorage.ByteArray hashOfPayload, and (-1) int sequenceNumber params.
  OfferBook will remove the candidate offer as before.

- MarketAlerts Adjusted onAdded() & onRemoved listener method signatures, even though
  new P2PDataStorage.ByteArray hashOfPayload, int sequenceNumber params are not used
  by the implementations.
2021-08-07 14:06:38 -03:00
jmacxx
8d9a03bc39
fix issue with extraData field when editing offer 2021-08-02 22:22:29 -05:00
sqrrm
8c666dba92
Avoid creating more than one refund payout
Double clicking the close ticketbutton creates two payout transactions.
This fix makes sure only one payout transaction is created for the
dispute.

Restarting the client allows for creating another refund transaction
for the dispute if needed.
2021-08-02 10:17:17 +02:00
ghubstan
b8379e2003
Merge branch 'master' into 05-update-api-beta-test-guide 2021-07-30 11:53:34 -03:00
jmacxx
3f511f3068
prevent negative suggested mining fee when burning BSQ for fees 2021-07-29 21:59:36 -05:00
Christoph Atteneder
4ef8242719
Update expired public key 2021-07-27 13:43:51 +02:00
Christoph Atteneder
4c451ebc11
Revert to SNAPSHOT version 2021-07-23 14:02:37 +02:00
jmacxx
5cc3f8680e
keep chatview listener open until ack, mailbox, or error 2021-07-23 08:05:56 +02:00
Christoph Atteneder
0cd20d6cc5
Increase MaxRam setting to 8g 2021-07-22 15:01:11 +02:00
Christoph Atteneder
548ecaa595
Update Java options as described in #5609 and #5550 2021-07-22 15:01:10 +02:00
Christoph Atteneder
4ae8ecaecb
Improve formatting and simplify code 2021-07-19 13:55:12 +02:00
BtcContributor
e357528ba5
Remove unused import 2021-07-19 13:55:11 +02:00
BtcContributor
351d26555e
Remove payment account info popup 2021-07-19 13:55:11 +02:00
BtcContributor
870448f5fa
Add review feedbacks from KaiWitt 2021-07-19 13:55:11 +02:00
BtcContributor
41e4e91044
Fix Codacy issues 2021-07-19 13:55:10 +02:00