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
d6cd83ae88
Improve informational popup
2021-11-04 10:37:00 +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
6692ce574c
Improve wording
...
Co-authored-by: m52go <735155+m52go@users.noreply.github.com>
2021-11-04 10:36:00 +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
Christoph Atteneder
4cd057e2ba
Merge pull request #5805 from cd2357/gh-gradle-cache
...
GitHub build: Cache gradle dependencies
2021-11-04 10:16:35 +01:00
Christoph Atteneder
2d3cf388eb
Merge pull request #5788 from jmacxx/fix_refresh_ttl_exception
...
Gracefully handle null data in refresh offer message and log error
2021-11-04 10:06:44 +01:00
Christoph Atteneder
da66ffe8f5
Merge pull request #5775 from chimp1984/bsq-swap-impl
...
Bsq swap: Implementation [3]
2021-11-04 10:05:32 +01:00
Christoph Atteneder
26e75413d7
Fix mixed usage of static import to pacify Codacy
2021-11-04 09:31:53 +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
3023d5b353
Add confirmed state
...
Fix num trades
2021-11-03 20:47:35 +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
ba64ba55e8
Add methods for confirmed and unconfirmed trades
2021-11-03 20:06:01 +01:00
chimp1984
792bbaa6f2
Rename BSQ Swap Trades to Unconfirmed BSQ Swaps
2021-11-03 20:03:14 +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
b021f96738
Refactor methods
...
Prepare that BsqSwapTrades can be added
2021-11-03 18:58:10 +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
01b3691241
Add null check
2021-11-03 18:09:59 +01:00
chimp1984
a5eec8c998
Add getOptionalTakerFee and getOptionalMakerFee to Tradeable
2021-11-03 17:06:11 +01:00
chimp1984
080255ce11
Add getMakerFee to TradeModel
2021-11-03 17:04:00 +01:00
chimp1984
f6d2f7c8a5
Rename makerFee to makerFeeAsLong in BsqSwapTrade
2021-11-03 17:02:49 +01:00
chimp1984
128bd5b297
Add getOptionalTxFee method
2021-11-03 17:01:17 +01:00
chimp1984
310de35af3
Add getTakerFee to TradeModel
2021-11-03 17:00:59 +01:00
chimp1984
964144c89f
Rename takerFee to takerFeeAsLong
2021-11-03 16:58:27 +01:00
