Commit graph

2519 commits

Author SHA1 Message Date
sqrrm
94995da39a
Revert "Lower tolerated small amount"
This reverts commit 99123b7297.
2021-03-22 11:37:49 +01:00
Christoph Atteneder
378fd026bf
Bump version number for v1.6.0 2021-03-18 19:19:26 +01:00
jmacxx
47ad4219e2
Merge branch 'master' into mempool_check_maker_tx 2021-03-17 16:26:38 -05:00
jmacxx
9fcd65f320
Validate maker/taker fees using mempool lookup
apply @chimp1984 patch.txt code review suggestions
taker tx check moved to trade step 2, after confirmation
solve issue with calculating expected fees for unconfirmed tx
resolve conflict with PR5207 (Disputes UI)
check new offers after 1 block; check Json string not null; warn -> info
remove unused parameter
remove debugging log.warn message
2021-03-17 16:23:18 -05:00
Christoph Atteneder
9270398fb3
Merge pull request #5207 from jmacxx/improve_dispute_chat
Improve chat functionality of mediation/arbitration
2021-03-17 09:38:35 +01:00
Christoph Atteneder
16230c7723
Merge pull request #5316 from chimp1984/add-pay-from-bsq-wallet-button
Add pay from BSQ wallet button
2021-03-17 09:35:09 +01:00
Christoph Atteneder
033ec325d2
Merge pull request #5318 from sqrrm/lower-unsigned-size
Lower tolerated small amount
2021-03-17 09:27:02 +01:00
jmacxx
f93f202f8d
process icon use GAVEL 2021-03-16 19:33:29 -05:00
jmacxx
ae9e6dad59
double-click opens chat window 2021-03-16 07:23:23 -05:00
sqrrm
99123b7297
Lower tolerated small amount
Split tolerated amount for placing offers with unsigned accounts
and tolerated amount for taking offers.
2021-03-16 13:07:42 +01:00
chimp1984
2702a7eff4
Add button to buyers trade step 2 view in case of a BSQ
trade to fill in the amount and address to the BSQ send view.
2021-03-15 17:58:05 -05:00
jmacxx
ad4927a666
code review changes requested by @ripcurlx
renamed alertCountProperty to badgeCountProperty
changed the badge counting policy so that the count of chat messages does not contribute to the badge number, but merely the presence of chat messages, and/or the new flag.
show an explanatory message when trader is not allowed to close own dispute ticket
removed some comments and code that were accidentally included from PR5160
renamed variable tpe to tradePeriodEnd
renamed variable cptyName to counterpartyName
clear the new badge on double-click of dispute tablerow
2021-03-15 17:24:00 -05:00
chimp1984
80c23883c8
Add popup for summary of trade history 2021-03-15 16:30:11 -05:00
chimp1984
1e593205d7
Fix taker trade fee amount.
We need to use fee from trade not from offer
2021-03-15 11:34:37 -05:00
chimp1984
e2a99a988a
Fix incorrect taker trade fee.
We had only displayed the fee for 1 tx, but taker pays 3 times that fee.
The real miner fee is a bit higher in case we used BSQ as we add the
burned BSQ to miner fee, we ignore that small difference as it would
add more complexity and for that use case it't not that important to
be exact.
2021-03-15 11:15:21 -05:00
chimp1984
5327657806
Various improvements to make make work with csv data easier
Separate volume with currency (add new column for currency)
Separate trade fee in btc and bsq, remove currency from value
Replace "-" with empty string

Improve detection of bsq fee tx. Previous version was more complicate
and would not have covered case where BSQ fee input matches exactly
required fee so not BSQ output would have been created.
2021-03-15 11:12:57 -05:00
chimp1984
b421605345
Add formatCoin method with appendCode param
Remove @NotNull annotation (unnecessary verbose, default is non null, if null then we annotate with @Nullable)
2021-03-15 11:07:12 -05:00
Christoph Atteneder
6148b610a0
Merge pull request #5231 from BtcContributor/bankidcopy
Fix copy of BankName value + BranchId/BankId
2021-03-12 09:54:00 +01:00
jmacxx
35f6ea2508
color of new badge should be red 2021-03-11 11:36:21 -06:00
BtcContributor
fbf7af8093
Change naming of variables and methods 2021-03-11 17:37:32 +01:00
Christoph Atteneder
9a2dbd7147
Merge pull request #5215 from jmacxx/fix_issue_5214
Fix Multiple Warnings on Enable All Offers
2021-03-11 17:01:05 +01:00
Christoph Atteneder
38a9bf0277
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.9
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2021-03-11 16:26:50 +01:00
Christoph Atteneder
fb053e85ad
Revert to SNAPSHOT version 2021-03-11 16:24:32 +01:00
Christoph Atteneder
944fa7e120
Merge pull request #5232 from BtcContributor/darkread
Fix dark mode readibility of specific texts
2021-03-11 16:22:59 +01:00
Christoph Atteneder
caac1b4c1e
Merge pull request #5272 from BtcContributor/fixbackupbutton
Fix Set Password text button
2021-03-11 16:07:26 +01:00
BtcContributor
2c945b0c40
change text and navigation 2021-03-11 15:55:47 +01:00
BtcContributor
144b3e4f9a
fix css 2021-03-11 13:23:39 +01:00
Christoph Atteneder
7394da5462
Merge pull request #5206 from jmacxx/improve_mediation_tools
Improve mediation tools / logging.
2021-03-11 11:49:58 +01:00
Christoph Atteneder
337c7bb0cd
Merge pull request #5291 from wallclockbuilder/master
Fix typo
2021-03-11 11:35:45 +01:00
Mawueli Kofi Adzoe
dda2570ee6
Fix
typo in test function name.
2021-03-11 02:26:18 -08:00
sqrrm
463f87b39e
Merge pull request #5284 from ghubstan/07-validate-paymentacct-n-new-offer
Validate offer <-> payment-acct in createoffer
2021-03-09 16:51:56 +01:00
ghubstan
99fea74e09
Validate offer <-> payment-acct in createoffer
This change prohibits creation of new offers with incompatible payment
accounts with the api.

- PaymentAccountUtil
  Renamed isAnyTakerPaymentAccountValidForOffer -> isAnyPaymentAccountValidForOffer.
  Renmaed isTakerPaymentAccountValidForOffer -> isPaymentAccountValidForOffer.
  Deleted commented code.

- PaymentAccounts: Adjusted to PaymentAccountUtil method name changes.

- OfferFilter: Adjusted to PaymentAccountUtil method name changes.

- OfferBookViewModelTest: Adjusted to PaymentAccountUtil method name changes.

- Add CoreOffersService#verifyPaymentAccountIsValidForOffer

- ValidateCreateOfferTest, OfferTest: Added test cases.
2021-03-07 19:51:29 -03:00
chimp1984
f43dc2032f
Handle flush at shutdown differently to flush at backup 2021-03-06 12:02:17 -05:00
chimp1984
a055a8bd36
Call PersistenceManager.flushAllDataToDisk before doing backup 2021-03-06 10:36:14 -05:00
jmacxx
cc56470b2f
Improve chat functionality of mediation/arbitration
Show badge with number of unread chat messages on each ticket
Use icons for chat, info and process ticket functions
Select a row by clicking on it, no clunky select button needed.
Show chat messages in a movable popup window.
More space for ticket list.

Implement requested feature additions:

Indicate if the trade period is over
Indicate more clearly the sender of each chat message
Support badge count
Indicate the XMR tx proof (when applicable)
Allow trader to close own mediation ticket if the trade is paid out

Fixes:

null check for cases when extraData null/not applicable
when upgrading closed disputes, clear chat unread count
2021-03-03 18:41:17 -06:00
jmacxx
9777181ff9
Dark mode: highlight text fields +8% vs background 2021-03-03 16:16:26 -06:00
BtcContributor
ba5705ca74
fix setpassword text button 2021-03-03 12:13:10 +01:00
Christoph Atteneder
c1d6ea93bb
Bump version number for v1.5.9 2021-03-02 18:53:37 +01:00
Christoph Atteneder
bdf6463e61
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.8
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2021-03-02 10:06:49 +01:00
Christoph Atteneder
996e264cfb
Revert to SNAPSHOT version 2021-03-02 10:03:29 +01:00
jmacxx
a043e3bdf1
Update Preferences tests to new constructor signature 2021-03-01 11:24:56 +01:00
jmacxx
6efeae09c5
Obtain minimumFee from mempool api in place of hardcoded value 2021-03-01 11:24:38 +01:00
Christoph Atteneder
5288d0840b
Bump version number for v1.5.8 2021-03-01 11:24:04 +01:00
Christoph Atteneder
0c9d278629
Merge pull request #5235 from jmacxx/mempool_minimumFee
Obtain minimumFee from mempool api in place of hardcoded value
2021-03-01 11:18:16 +01:00
sqrrm
80c722803d
Merge pull request #5247 from bisq-network/release/v1.5.7
Release/v1.5.7
2021-02-26 22:34:08 +01:00
Christoph Atteneder
52c90dc9c1
Revert to SNAPSHOT version 2021-02-26 21:06:35 +01:00
jmacxx
be78f47b0e
Update Preferences tests to new constructor signature 2021-02-25 08:27:30 -06:00
jmacxx
c33ac1b983
Obtain minimumFee from mempool api in place of hardcoded value 2021-02-24 22:47:06 -06:00
BtcContributor
9460318dfb
fix dark mode readibility 2021-02-24 13:22:16 +01:00
BtcContributor
d2dd99fdb3
fix #5200 2021-02-24 12:17:27 +01:00