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
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
chimp1984
a9f10624c2
Move validation after adding dispute to list
2020-09-21 00:20:12 -05:00
chimp1984
c7a3f95925
Rename filterString to filterTerm
2020-09-20 23:15:20 -05:00
chimp1984
baa915f5de
Add validateNodeAddress at onOpenNewDisputeMessage
...
- Cleanups
2020-09-20 22:32:53 -05:00
chimp1984
9c0b40a3b9
Refactor: Move Regex test methods from GUIUtilTest to RegexValidatorTest in core
2020-09-20 22:16:22 -05:00
chimp1984
c6f2732062
Refactor: Move RegexValidator factory methods to RegexValidatorFactory in core
2020-09-20 22:14:14 -05:00
chimp1984
3675e76194
Refactor: Move egexValidator from desktop to core
2020-09-20 22:13:18 -05:00
chimp1984
987bf4953a
Add node address validation
2020-09-20 22:10:48 -05:00
chimp1984
3206c62151
Refactor: Move RegexValidator from bisq.desktop.util.validation to bisq.core.util.validation
...
Add RegexValidatorFactory
Move regex tests from GUIUtilTest to new RegexValidatorTest class
2020-09-20 21:58:32 -05:00
chimp1984
30e9add4dc
Refactor: rename DelayedPayoutTxValidation to TradeDataValidation
2020-09-20 21:40:21 -05:00
chimp1984
72dca0b55a
Add cylce index
2020-09-20 21:25:12 -05:00
chimp1984
c6778d6b2d
Add copy to csv data button to report screen
2020-09-20 20:20:39 -05:00
chimp1984
d31deff9c4
Remove dev log
2020-09-20 14:50:02 -05:00
chimp1984
c1850cb47b
Merge branch 'master_upstream' into dispute-agent-branch
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
2020-09-20 13:23:13 -05:00
chimp1984
48a3f7443e
Merge branch 'master_upstream' into fix-trade-protocol-issues
...
# Conflicts:
# core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
2020-09-19 10:23:40 -05:00
Oscar Guindzberg
fc70c11573
ok codacy, you win
2020-09-18 18:29:40 -03:00
Oscar Guindzberg
f1738f0b19
Code polishing to make Codacy happier
2020-09-18 18:29:38 -03:00
Oscar Guindzberg
f342c89c8e
Code polishing to make Codacy happy
2020-09-18 18:29:37 -03:00
Oscar Guindzberg
08cc836bab
bitcoinj 0.15: Fix TransactionAwareTradeTest
2020-09-18 18:29:34 -03:00
Oscar Guindzberg
9a9b067d70
bitcoinj 0.15: Replace deprecated Transaction.getHashAsString with Transaction.getTxId().toString().
2020-09-18 18:29:33 -03:00
Oscar Guindzberg
87481cdbf5
bitcoinj 0.15: Replace usage of bitcoinj's removed methods with new ones.
2020-09-18 18:29:30 -03:00
Oscar Guindzberg
7356b64f59
bitcoinj 0.15: Use LegacyAddress.fromBase58() instead of Address.fromBase58().
2020-09-18 18:29:30 -03:00
Oscar Guindzberg
46f2ba6ee0
bitcoinj 0.15: WalletEventListener was replaced by more granular listeners.
2020-09-18 18:29:29 -03:00
Oscar Guindzberg
d4ac45da21
bitcoinj 0.15: bitcoinj moved from spongycastle to bouncycastle.
2020-09-18 18:29:28 -03:00
