Christoph Atteneder
195c2b8f5d
Merge pull request #4997 from chimp1984/remove-unused-code
...
Cleanup trade wallet code
2020-12-28 19:18:12 +01:00
Christoph Atteneder
976caeb14e
Merge pull request #5001 from chimp1984/deactivate-open-offer-if-trigger-price-is-reached
...
Deactivate open offer if trigger price is reached
2020-12-28 17:04:21 +01:00
Christoph Atteneder
78d4176f8a
Merge pull request #5004 from chimp1984/add-mediators-keybase-usernames
...
Add mediators keybase usernames
2020-12-28 16:50:56 +01:00
Christoph Atteneder
850e031158
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.2
...
# Conflicts:
# core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
# core/src/main/java/bisq/core/trade/closed/CleanupMailboxMessages.java
2020-12-28 14:57:08 +01:00
chimp1984
681fed603e
Fix log
2020-12-27 22:50:56 -05:00
chimp1984
62ca826217
Use java doc at constructor
2020-12-26 19:47:57 -05:00
chimp1984
e38fa9a819
Add user name to dispute window and to trade details window (json contract window)
2020-12-25 13:46:04 -05:00
chimp1984
2b047976af
Add lookup map for support agents keybase user names by onion address
...
Add it to dispute (client) views
2020-12-25 13:27:14 -05:00
chimp1984
64607de924
Add trigger icon column
2020-12-24 23:44:27 -05:00
chimp1984
39893a6aaf
Add trigger price to OpenOffersView
2020-12-24 23:05:23 -05:00
chimp1984
bb9de0b24c
Add trigger price field to create offer view
2020-12-24 20:01:04 -05:00
chimp1984
229d013844
Add PriceEventHandler
2020-12-23 21:52:35 -05:00
chimp1984
0e6b983564
Add triggerPrice
2020-12-23 21:50:53 -05:00
chimp1984
0c792a2916
Add comments to make context of parentTx more clear
2020-12-23 16:15:15 -05:00
chimp1984
aa06253b16
Remove unused code
2020-12-23 15:49:16 -05:00
sqrrm
7d7f1b09e7
Merge pull request #4966 from ghubstan/10-callrate-interceptor
...
Prevent excessive api calls
2020-12-23 16:19:29 +01:00
Christoph Atteneder
4e707a59fe
Merge pull request #4980 from Jakub-CZ/improve-msg-in-wallet-info
...
Improve paragraph under "Wallet balances"
2020-12-22 09:32:54 +01:00
Christoph Atteneder
142d14b58f
Merge pull request #4991 from m52go/walletinfo-path-wording
...
Improve path text on wallet info screen
2020-12-22 09:32:12 +01:00
Christoph Atteneder
73fdb9f6ec
Merge pull request #4984 from chimp1984/improve-localnode-popup-text
...
Improve popup text in case a local node is detected
2020-12-22 09:31:28 +01:00
chimp1984
823980c678
Improve text
2020-12-21 16:26:26 -05:00
sqrrm
c5218c66c3
Merge pull request #4971 from chimp1984/use-resource-file-instead-of-resync-from-genesis
...
Avoid resync from genesis in case of dao state issues
2020-12-21 22:00:42 +01:00
m52go
409b092c1f
Edit path text on wallet info screen
2020-12-21 15:21:05 -05:00
Jakub Loucký
a6f13223d1
Remove dangling line break
2020-12-21 21:06:14 +01:00
Jakub Loucký
9aeb775443
Apply suggestions from code review
...
Co-authored-by: m52go <735155+m52go@users.noreply.github.com>
2020-12-21 21:03:28 +01:00
ghubstan
27efc5f3c2
Merge branch '09-refactor-grpc-error-handling' into 10-callrate-interceptor
...
Adjust to reverting to reverting 6aa385e
2020-12-21 15:44:34 -03:00
ghubstan
8ee3a1599c
Merge branch '08-gettransaction' into 09-refactor-grpc-error-handling
...
Adjust to reverting 6aa385e
2020-12-21 15:35:15 -03:00
ghubstan
bdde24a463
Ajust TradeInfo to reverting 6aa385e494
2020-12-21 15:10:43 -03:00
ghubstan
672eb79f95
Revert "Append nullable withdrawalTxId field to Trade proto message"
...
This reverts commit 6aa385e494
2020-12-21 15:05:54 -03:00
Christoph Atteneder
d805b37a60
Merge pull request #4985 from chimp1984/improve-trade-fee-display
...
Improve trade fee display at create and take offer screens and popups
2020-12-21 11:23:07 +01:00
Christoph Atteneder
a344ae9310
Merge pull request #4977 from chimp1984/add-extra-note-for-amazon-gift-cards
...
[1.5.2] Add extra note for amazon gift cards
2020-12-21 11:22:13 +01:00
sqrrm
c801a57084
Merge pull request #4981 from chimp1984/fix-wrong-account-age-data-access
...
[1.5.2] Fix wrong account age data access
2020-12-21 10:14:10 +01:00
sqrrm
b9346883a6
Merge pull request #4975 from chimp1984/fix-isPubKeyValid-check
...
Improve CleanupMailboxMessages
2020-12-21 10:09:31 +01:00
chimp1984
e59f480392
Improve popup text in case a local node is detected
2020-12-20 19:02:06 -05:00
chimp1984
d689a3974b
Fix param change in test
2020-12-20 19:01:10 -05:00
chimp1984
4050644677
Remove redundant popup
2020-12-20 18:54:32 -05:00
chimp1984
bf720737db
Improve trade fee display at create and take offer screens and popups
2020-12-20 18:01:19 -05:00
sqrrm
99184567b3
Merge pull request #4953 from chimp1984/cache-results-in-account-witness-domain
...
Cache results in account witness domain
2020-12-20 23:56:51 +01:00
chimp1984
f5bb702d6b
Improve arbitratorSignOrphanWitness method
2020-12-20 10:32:50 -05:00
chimp1984
1462673e57
Use getSignedWitnessSet instead of
...
iterations over getSignedWitnessMapValues
2020-12-20 10:29:46 -05:00
chimp1984
aea904d24f
We do not need to lookup in getSignedWitnessMapValues
...
anymore as we maintain the signedWitnessSetByAccountAgeWitnessHash
at each add/remove operation.
2020-12-20 10:28:28 -05:00
chimp1984
b6a01d0ac7
Rename signedWitnessSetCache to signedWitnessSetByAccountAgeWitnessHash
...
Change comments (after understanding the domain usage better)
Maintain the set at add and remove methods
Use HashMap instead of ConcurrentHashMap as that class is only used
from UserThread and other fields are not threadsafe either.
2020-12-20 10:00:28 -05:00
chimp1984
35e2bf6383
Rename getSignedWitnessSetCache to signedWitnessSetCache
2020-12-20 09:34:00 -05:00
chimp1984
cccaa0a515
Update popup text
2020-12-20 09:31:29 -05:00
chimp1984
264a844274
We need to user accountAgeWitnessStorageService as
...
this supports the historical data store.
Using p2PService.getP2PDataStorage().getAppendOnlyDataStoreMap()
would not deliver all the data.
User stream API
2020-12-19 20:54:54 -05:00
sqrrm
442d65a730
Merge pull request #4973 from chimp1984/improve-logs
...
[1.5.2] Improve logs
2020-12-19 23:36:21 +01:00
chimp1984
814c5d13ee
Change text at amazon gift card popup
2020-12-19 17:16:25 -05:00
Jakub Loucký
ae21e709bb
Improve paragraph under "Wallet balances"
2020-12-19 23:11:16 +01:00
chimp1984
3cb3dc4c0c
Remove NGN (Nigerian Naira) as their central bank blocked Transferwise
...
See: https://twitter.com/cenbank/status/1339196770774093825
I tested it with setting that currency, doing offers and trades,
then remove it and continue the trades.
Offers with NGN cannot be taken anymore.
2020-12-19 16:55:34 -05:00
chimp1984
4e108380b8
Check if message matches trade before checking pubKey
...
Use stream filters instead of checks in method.
Change log level from error to warn.
2020-12-19 16:16:05 -05:00
ghubstan
a3eb4ed59a
Remove unused import
2020-12-19 17:37:24 -03:00
