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