mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-01 01:32:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
12217 commits 3 branches 150 tags 4.1 GiB
Commit graph

758 commits

Author SHA1 Message Date
chimp1984
25e64cd6b5
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:44 -05:00
chimp1984
e071d5e025
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:28 -05:00
chimp1984
9cf368c449
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:09 -05:00
chimp1984
c3d3e5230e
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:05:46 -05:00
chimp1984
6c114b44e8
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:05:21 -05:00
chimp1984
77ae1bddfa
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:45 -05:00
chimp1984
92902102ec
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:27 -05:00
chimp1984
4e2ccf249b
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:17 -05:00
chimp1984
1fef02e6f1
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:04 -05:00
chimp1984
dc15c7dfa7
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:53 -05:00
chimp1984
e3cc62ed60
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:41 -05:00
chimp1984
126f99668d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:30 -05:00
chimp1984
08e2a2e0b0
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:18 -05:00
chimp1984
c448b1b58d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:01 -05:00
chimp1984
285003743d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:02:49 -05:00
chimp1984
6be21fa86c
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:02:11 -05:00
chimp1984
28a85c1ce5
Fix display strings 2020-09-27 02:04:35 -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
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
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
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
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
690104e6ea
Show popup on MissingDelayedPayoutTxException. Update display string of popup 2020-09-21 18:56:58 -05:00
chimp1984
81bea14af2
Show popup to peer who accepted mediators suggestion once locktime is over 2020-09-21 01:16:47 -05:00
chimp1984
b0b4334345
Merge branch 'master_upstream' into dispute-agents-sign-summary 2020-09-16 20:38:45 -05:00
sqrrm
e8c2974f14
Merge pull request #4515 from m52go/refresh-strings-1 
Refresh strings, 1/n
 2020-09-16 14:46:06 +02:00
Christoph Atteneder
98b03937d8
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8 
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java
#	core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
 2020-09-15 13:24:06 +02:00
cd2357
8d793e9a83
Show info popup if Bisq started under Qubes OS 
Show popup informing the user about the OS-specific setup guide.
 2020-09-13 13:23:12 +02:00
chimp1984
de4fb17a19
Improve summary notes 2020-09-12 20:18:04 -05:00
chimp1984
0c46e7dd52
Add more data to summary msg 2020-09-12 16:19:42 -05:00
chimp1984
7ac6e715d3
Dispute agent sign summary. Add tool for verification 2020-09-12 00:35:58 -05:00
chimp1984
677211badf
Allow close dispute for refund agent without payout 2020-09-11 20:24:31 -05:00
chimp1984
d82631f52c
Fix some issues found during testing 
Refactorings
 2020-09-11 19:41:08 -05:00
chimp1984
4f1cbbd00e
Add check for refund agent if donation address is valid 2020-09-11 15:35:47 -05:00
chimp1984
00d267e4db
Merge branch 'master_upstream' into fix-bug-with-seed-restore-and-open-offers 2020-09-09 14:29:27 -05:00
chimp1984
6821c582e9
Add check for open offers and remove them if present at restore from seed 2020-09-09 14:12:03 -05:00
wiz
bafd116c82
Tweak string for "Service Addresses" to "Monero Explorer URLs" 2020-09-09 15:12:16 +02:00
wiz
8949eaa7e2
Tweak strings of "BSQ Explorer" -> "Bisq Explorer" and "Bitcoin Explorer" 2020-09-09 15:05:56 +02:00
chimp1984
0ee86b3fcb
Improve text in UI in case of failure or error 2020-09-09 15:03:30 +02:00
chimp1984
b39e6b5934
Improve text in UI in case of failure or error 2020-09-08 16:22:28 -05:00
sqrrm
f1a284ceb0
Merge pull request #4492 from wiz/use-https-for-xmr-explorer-api 
Use https:// for XMR explorer API endpoints, except if localhost or Tor
 2020-09-08 18:17:11 +02:00
sqrrm
38d62dbf1b
Merge pull request #4501 from wiz/update-mempool-explorer-urls 
Update old Bisq Explorer URLs with new Mempool Explorer URLs, tweak strings
 2020-09-08 13:50:24 +02:00
wiz
a2c6f279a6
Merge remote-tracking branch 'bisq/master' into use-https-for-xmr-explorer-api 2020-09-08 20:19:20 +09:00
m52go
67fc398f9b
Add note to SetXmrTxKeyWindow 
To convey what it's about, and that it's optional.
 2020-09-08 11:36:39 +02:00
wiz
41bebd7811
Tweak strings of "BSQ Explorer" -> "Bisq Explorer" and "Bitcoin Explorer" 2020-09-08 12:44:33 +09:00
wiz
1461d95b0b
Tweak string for "Service Addresses" to "Monero Explorer URLs" 2020-09-08 12:08:44 +09:00