chimp1984
ce8a91fdb3
Make getUpdateChartResult ansync
2021-11-09 19:20:35 +01:00
chimp1984
041b07e2e1
Move getUpdateChartResult, getCandleData, getTimeFromTickIndex to ChartCalculations
...
Make maxTicks static and rename to MAX_TICKS
2021-11-09 19:20:35 +01:00
chimp1984
7ad5993aad
Run getUsdAveragePriceMapsPerTickUnit and getTradeStatisticsForCurrency
...
in parallel and once both are done we call asyncUpdateChartData (not yet refactored).
Clear all data at deactivate
This cause a bit of costs when we activate again but as we delegate
now all work to threads it should be OK. It decreases the memory usage
if we do not keep those data in the fields. The View classes are cached
in the view loader so all data in fields stays in memory once it was
activated once and not manually cleared in deactivate.
Move getTradeStatisticsForCurrency to ChartCalculations
Rename buildUsdPricesPerTickUnit to getUsdAveragePriceMapsPerTickUnit
Rename selectedTradeStatistics to tradeStatisticsByCurrency
Make itemsPerInterval final
Remove modelReady
Add deactivateCalled flag
2021-11-09 19:20:35 +01:00
chimp1984
65706e7c14
Add async handling with CompletableFuture to fillList
...
The creation of TradeStatistics3ListItem is rather fast but the
applying to the list is due sorting pretty slow (300 ms) as
its > 100k items. We do the applying on the callback thread.
Seems JavaFx permits that. So we can keep the UI thread unblocked.
Remove modelReadyListener
Renamed model.selectedTradeStatistics to model.tradeStatisticsByCurrency
2021-11-09 19:20:35 +01:00
chimp1984
ca145b0eb3
Add static method getTradeStatisticsForCurrency and
...
use it instead of updateSelectedTradeStatistics
(preparation for follow up commit)
2021-11-09 19:20:34 +01:00
chimp1984
0271af995b
Add modelReady property and let view fill list once model is ready
2021-11-09 19:20:34 +01:00
chimp1984
ea66a510dc
Make buildUsdPricesPerTickUnit async using CompletableFuture
2021-11-09 19:20:34 +01:00
chimp1984
deeb912f9b
Move buildUsdPricesPerTickUnit to ChartCalculations
2021-11-09 19:20:34 +01:00
chimp1984
c51060a6d4
Move getAveragePrice and roundToTick to ChartCalculations
...
Make buildUsdPricesPerTickUnit static and pass params
Rename usdPriceMapsPerTickUnit to usdAveragePriceMapsPerTickUnit
Rename local variable map to usdAveragePriceMap
Move method calls syncPriceFeedCurrency() and
setMarketPriceFeedCurrency() before other calls (those will become async later)
2021-11-09 19:20:33 +01:00
ghubstan
4f1899265f
Fix conflicts from previous master/merge
2021-11-09 09:48:33 -03:00
chimp1984
4d2d0717b5
Add getBlockTimeAtBlockHeight method
...
Improve getBlockStartDateByCycleIndex method
2021-11-09 13:01:18 +01:00
Christoph Atteneder
65c308f5ed
Merge pull request #5782 from chimp1984/redesign-dao-state-monitoring
...
Redesign dao state monitoring [4]
2021-11-09 12:12:22 +01:00
chimp1984
7e1696b095
Fix typos, cleanups
2021-11-08 21:49:08 +01:00
Christoph Atteneder
00d7913bc6
Merge pull request #5055 from Jakub-CZ/button-buy-bsq
...
Add "Buy BSQ" button next to trade fee selector
2021-11-08 11:13:52 +01:00
Christoph Atteneder
07e224e40a
Simplify containers and improve truncation behavior
2021-11-08 11:06:00 +01:00
Christoph Atteneder
2b90633263
Improve naming of helper method
2021-11-08 11:05:27 +01:00
Christoph Atteneder
fac4b3c5c3
Fix combobox BSQ selection error
2021-11-04 13:22:32 +01:00
chimp1984
8e3f95383e
Add daoStateBlockChainNotConnecting property (impl. will come in other commits)
...
Add Preferences to service classes
2021-11-04 12:48:09 +01:00
chimp1984
1f929926cc
Remove prevHash from StateHash classes (the prevHash was only used for display.
...
For creating the hash we take the hash from the previous element. By removing it
we safe about 3 MB on data)
Add isSelfCreated field to DaoStateHash (indicates if we have created
the hash by ourself or if we have received it from a peer -> will be
part of later commits)
2021-11-04 12:48:09 +01:00
chimp1984
1abe68637d
Add useFullModeDaoMonitor field to PreferencesPayload
...
Add toggle to PreferencesView
Set useFullModeDaoMonitor default to true for headless nodes
2021-11-04 12:48:08 +01:00
chimp1984
cd3e8217ae
Rename onChangeAfterBatchProcessing to onDaoStateHashesChanged
...
at DaoStateMonitoringService.Listener
2021-11-04 12:48:07 +01:00
Christoph Atteneder
851bdcf9ff
Merge pull request #5797 from jmacxx/fix_exception_opening_mediation
...
Prevent NPE in case delayedPayoutTx is not present (failed trade)
2021-11-04 11:47:17 +01:00
Christoph Atteneder
0e4933f8d1
Fix rebase merge errors
2021-11-04 10:55:51 +01:00
Christoph Atteneder
928208c200
Merge pull request #5791 from jmacxx/fix_monese_satispay
...
Include holder name field for Monese & Satispay accounts
2021-11-04 10:54:12 +01:00
Christoph Atteneder
e17fd9ef54
Add informational popup after account creation
2021-11-04 10:46:37 +01:00
Christoph Atteneder
55826cb4a2
Fix failing tests
2021-11-04 10:46:37 +01:00
Christoph Atteneder
b7c4e5ed17
Create BSQ account and take offer if not existing
...
Conflicts:
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/util/DisplayUtils.java
2021-11-04 10:46:27 +01:00
Christoph Atteneder
a5b2859d7e
Simplify and clean up data models
...
Conflicts:
desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
2021-11-04 10:41:46 +01:00
Christoph Atteneder
60a0d875fc
Refactor account name generation
2021-11-04 10:40:41 +01:00
Christoph Atteneder
4063b72b7d
Add tooltip for disabled create offer button
...
Conflicts:
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
2021-11-04 10:40:16 +01:00
Christoph Atteneder
5527208894
Add more context to buy BSQ button
2021-11-04 10:36:59 +01:00
Christoph Atteneder
9e2be92787
Not auto-close create offer view
2021-11-04 10:36:59 +01:00
Christoph Atteneder
ee30cd9739
Refactor auto-closing of sell BTC offer view
2021-11-04 10:36:58 +01:00
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
