chimp1984
84a4982732
Remove TradeProtocol from Trade
...
We keep the TradeProtocol now in TradeManager in a hashmap.
As TradeProtocol constructors get called now earlier we need to add an onInitialized method which signals that the TradeProtocol is ready.
The processModel needs to get set the transient fields after construction.
2020-09-26 21:34:28 -05:00
chimp1984
f0a30221ab
Fix bug with showing popup once arbitration has been started
2020-09-26 19:11:54 -05:00
chimp1984
5309f04b40
DO not deactivate move to failed trades button. Use different text in popup if all txs are valid.
...
Fix icon style issues.
2020-09-26 18:33:25 -05:00
chimp1984
a9ad72d0e4
Remove offer at close to avoid that button stays active when taking the offer
...
Cleanups
2020-09-26 16:21:19 -05:00
chimp1984
74317636b0
Apply code inspection suggestions
2020-09-26 16:00:03 -05:00
chimp1984
27ac2d8e57
Remove never read field
2020-09-26 15:52:31 -05:00
chimp1984
c39a9b074f
Remove onPaymentReceived delegate method in seller trade
2020-09-26 12:56:42 -05:00
chimp1984
a661ce6ed5
Remove onPaymentStarted delegate method in buyer trade
2020-09-26 12:55:23 -05:00
chimp1984
456f16ddf4
Remove handleTakeOfferRequest delegate method in maker trade
2020-09-26 12:51:43 -05:00
chimp1984
0c4af92f86
Refactor: rename methods
2020-09-26 12:28:38 -05:00
chimp1984
191b031f38
Refactor: Rename MediationProtocol to DisputeProtocol
2020-09-25 23:56:58 -05:00
chimp1984
561abd7a49
Refactor: Move publishDelayedPayoutTx from TradeManager to MediationProtocol
2020-09-25 23:07:16 -05:00
chimp1984
9f3fe7ad6d
Refactor: Move getAddressEntriesForAvailableBalanceStream to btcWalletService
...
Rename WithdrawalView.walletService to btcWalletService
2020-09-25 22:56:00 -05:00
chimp1984
35b758431d
Refactor: Move methods, rename methods
2020-09-25 22:50:42 -05:00
chimp1984
246d1e3ddf
Refactor: Remove onCancelAvailabilityRequest method
2020-09-25 22:31:08 -05:00
chimp1984
346d793d87
Refactor: Remove onOfferRemovedFromRemoteOfferBook method
2020-09-25 22:29:52 -05:00
chimp1984
86569b1b2d
Apply fluent protocol to MediationProtocol
...
Rename acceptMediationResult to onAcceptMediationResult
2020-09-25 21:58:32 -05:00
chimp1984
6af9cb3dfe
Refactor: rename getTradableList to getTradesAsObservableList
2020-09-25 21:38:49 -05:00
chimp1984
7023b2acf5
Remove onPaymentReceived method from TradeManager
2020-09-25 21:35:34 -05:00
chimp1984
a002fb33a5
Rename onFiatPaymentStarted to onPaymentStarted
2020-09-25 21:33:53 -05:00
chimp1984
612ecd3a6a
Rename onFiatPaymentReceived to onPaymentReceived
2020-09-25 21:32:27 -05:00
chimp1984
3cc633f39f
Add check if trade was already taken in the past. If so show a popup at take offer screen.
...
We could deactivate such offers as well but as it is only for exceptional cases I think this way is good enough (would be more effort otherwise).
2020-09-25 21:30:19 -05:00
chimp1984
3987f9cd5a
Fix incorrect getDepositTx calls
2020-09-25 18:16:50 -05:00
chimp1984
95cb3b2710
Fix deposit tx setters
2020-09-25 17:06:13 -05:00
chimp1984
568dcdaad4
Update tasks in debugview
2020-09-25 15:32:49 -05:00
chimp1984
10bedee803
Merge branch 'dispute-agent-branch' into fix-delayed-payout-tx-issues
...
# Conflicts:
# core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupDepositTxListener.java
2020-09-25 15:03:28 -05:00
chimp1984
25c4b4d0fc
Merge branch 'master_upstream' into dispute-agent-branch
...
# Conflicts:
# core/src/main/java/bisq/core/trade/DelayedPayoutTxValidation.java
2020-09-25 14:53:20 -05:00
chimp1984
f1df52790b
improve trade details window
2020-09-25 00:20:17 -05:00
chimp1984
7167e2a8bd
Add check if trade has been paid out for button disable state
2020-09-24 21:10:02 -05:00
chimp1984
b494434623
Add warn icon next to trash icon. Show popup with info about the problem and instructions.
...
Set trash button disabled if the tx chain is valid to avoid that users move to failed while trade is valid to be completed.
Contract: Add isMyRoleMaker method
Trade: Add hasErrorMessage and isTxChainInvalid methods
2020-09-24 21:07:40 -05:00
chimp1984
f6eefef1ae
Remove handling of failed trades. If a trade is in an invalid state (tx missing) or has an error message set we show in the pending trades view a red trash icon for moving the trade to failed trades.
...
The info icon next to the trade ID is then a warning icon (should be red but css is not my best friend) and if opening trade details window we also color the missing txs red with a warn icon and tooltip.
When clicking the trash button a popup is displayed with detail info.
At failed trades there is a "undo" icon for reverting the trade back to pending (if user wants to open mediation, etc).
All the automatic handling of the failed trades and popups are removed as it never worked well and just confused users...
In next commits we will add more instructions what a user should/can do for diff. error cases.
TradeManger:
- Remove all the failed checks at initPendingTrade.
- Remove tradesWithoutDepositTx
- Remove tradesForStatistics as it was never read
- Remove cleanUpAddressEntries
- Rename addTradeToClosedTrades to onTradeCompleted
TxIdTextField accepts a null for tx ID and shows then red colored N/A and a warning icon.
HyperlinkWithIcon exposed the icon to be accessible for style change.
DebugWindow was updated for one variation of the trade protocol (other is missing still).
Trade detail window show now always all 4 mandatory txs.
Beside that this commit has some cleanups and null pointer fixes (when testing error scenarios i got those NP).
2020-09-24 19:47:12 -05:00
chimp1984
0fa45650b6
Merge branch 'dispute-agent-branch' into wip-merge-tradeprot
...
# Conflicts:
# core/src/main/java/bisq/core/trade/DelayedPayoutTxValidation.java
# core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerVerifiesFinalDelayedPayoutTx.java
# desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java
# desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
2020-09-23 08:27:09 -05:00
chimp1984
6fa2225b65
Use fluent interface for checking state and conditions
2020-09-23 01:48:02 -05:00
chimp1984
1abe6adac6
Remove empty tasks.
2020-09-22 19:40:15 -05:00
chimp1984
8ce5ebadea
Refactoring: rename, cleanups
2020-09-22 19:35:24 -05:00
Oscar Guindzberg
59124e3e33
Replace deprecated bitcoinj methods
...
Replace output.getAddressFromP2PKHScript() and
output.getAddressFromP2SH() with
output.getScriptPubKey().getToAddress()
2020-09-22 14:55:47 -03:00
jmacxx
3e22b6e98d
Do not persist offer security deposit in user settings
...
Fixes #4426
Always calculate the suggested security deposit based on asset price
volatility rather than using a persisted value as the minimum.
2020-09-22 11:39:02 -05:00
Christoph Atteneder
44bf29b67e
Merge pull request #4546 from oscarguindzberg/code-cleanup
...
Minor code cleanup changes
2020-09-22 16:23:31 +02:00
Christoph Atteneder
64d4b9b136
Merge pull request #4544 from oscarguindzberg/removeListeners
...
Remove unnecessary listeners in TransactionsView
2020-09-22 16:22:37 +02:00
Christoph Atteneder
69d533d9ea
Merge pull request #4520 from cd2357/show-qubes-info-popup
...
Show info popup if Bisq started under Qubes OS
2020-09-22 16:21:03 +02:00
chimp1984
527f1537a9
Add listener on BuyerSendCounterCurrencyTransferStartedMessage to resend msg case it has not arrived
...
Add signed witness to PayoutTxPublishedMessage
Remove usage of RefreshTradeStateRequest but leave it for backward compatibility
Move removeMailboxMessageAfterProcessing calls in finally branch
Rename methods
2020-09-22 00:32:28 -05:00
chimp1984
690104e6ea
Show popup on MissingDelayedPayoutTxException. Update display string of popup
2020-09-21 18:56:58 -05:00
chimp1984
66a26893f0
Always show deposit and delayed payout tx in trade details window. If null it shows N/A
2020-09-21 18:55:49 -05:00
Oscar Guindzberg
6cf7a9977a
Code cleanup
2020-09-21 17:32:47 -03:00
Oscar Guindzberg
992441b9b5
Remove unnecessary listeners
2020-09-21 16:52:16 -03:00
Christoph Atteneder
6af2a46e49
Merge pull request #4542 from chimp1984/refactor-regexvalidator
...
Refactor regexvalidator
2020-09-21 20:16:53 +02:00
Oscar Guindzberg
93f9f83136
Make codacy happy
2020-09-21 12:40:53 -03:00
Oscar Guindzberg
e8c82549a8
Use Address.fromString() for btc addresses
...
Use Address.fromString() instead of LegacyAddress.fromBase58() for btc addresses.
Trade protocol addresses not migrated yet.
2020-09-21 12:40:52 -03:00
Oscar Guindzberg
8a3d403bfc
Rename WalletService.emptyWallet() to emtyBtcWallet()
2020-09-21 12:40:52 -03:00
chimp1984
81bea14af2
Show popup to peer who accepted mediators suggestion once locktime is over
2020-09-21 01:16:47 -05:00
