Commit Graph

16131 Commits

Author SHA1 Message Date
jmacxx
5b03c1a4c5
Fix DAO needs resync popup.
The resync popup was being shown when flag isInConflictWithSeedNode
was set, but there is also a different relevant flag
isDaoStateBlockChainNotConnecting which can happen in certain
situations.  For that case we also need to show the popup.
2022-03-04 14:17:53 -06:00
Christoph Atteneder
e7f1bf2d7d
Merge pull request #6082 from bisq-network/dependabot/github_actions/actions/setup-java-3
Bump actions/setup-java from 2.5.0 to 3
2022-02-28 20:47:06 +01:00
dependabot[bot]
60aa44dadb
Bump actions/setup-java from 2.5.0 to 3
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.5.0 to 3.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](f0bb916062...f69f00b5e5)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 14:13:48 +00:00
Christoph Atteneder
de1c9bafb2
Merge pull request #6081 from ghubstan/10-fix-grpcproto-tradeinfo-fieldnames
Fix 3 misleading .proto TradeInfo field names [#10]
2022-02-28 09:29:13 +01:00
Christoph Atteneder
bed05714fc
Merge pull request #6080 from ghubstan/9-use-snake_case-field-names
Convert grpc.proto field names to snake_case [#9]
2022-02-28 09:27:58 +01:00
Christoph Atteneder
92b48af6c0
Merge pull request #6079 from ghubstan/8-remove-trdstats-service
Remove GetTradeStatistics service from grpc.proto [#8]
2022-02-28 09:27:03 +01:00
Christoph Atteneder
d301b0d39b
Merge pull request #6068 from ghubstan/7-more-grpcproto-comments
Continue documenting grpc.proto for API reference site [#7]
2022-02-28 09:24:53 +01:00
Christoph Atteneder
a73ee0352b
Merge pull request #6065 from ghubstan/6-disambiguate-api-pct-field-names
Clarify meaning of API/Offer related % fields [#6]
2022-02-28 09:21:18 +01:00
Christoph Atteneder
dbd6f330e1
Merge pull request #6062 from ghubstan/5-change-tradeinfo-proto-prc-n-vol-to-string
Change TradeInfo proto's tradePrice & tradeVolume fields to string [#5]
2022-02-28 09:17:44 +01:00
Christoph Atteneder
532efcc8b8
Merge pull request #6060 from ghubstan/4-change-grpc-proto-volume-to-string
Change API OfferInfo volume/minVolume proto fields to string [#4]
2022-02-28 09:14:04 +01:00
Christoph Atteneder
068fedb9f8
Merge pull request #6057 from ghubstan/3-change-grpc-proto-triggerprice-to-string
Change API grpc.proto triggerPrice field to string [#3]
2022-02-28 09:11:57 +01:00
Christoph Atteneder
c471936789
Merge pull request #6056 from ghubstan/2-change-offerinfo-price-to-string
Change API's OfferInfo proto's price field to string [#2]
2022-02-28 09:09:34 +01:00
ghubstan
06c6b0c3d2
Adjust apitest cases to TradeInfo field name changes
See commit b9b66b4826.
2022-02-27 18:24:19 -03:00
ghubstan
82a0f0060c
Adjust to grpc.proto TradeInfo field name changes
See commit b9b66b4826.
2022-02-27 18:13:54 -03:00
ghubstan
b9b66b4826
Change grpc.proto TradeInfo field names
- is_fiat_sent		->	is_payment_started_message_sent
	Payment can be in altcoin.
- is_fiat_received	->	is_payment_received_message_sent
	Payment can be in altcoin.
- is_withdrawn		->	is_completed
	Trade can be closed with funds kept in Bisq wallet.
2022-02-27 18:09:36 -03:00
ghubstan
68ebdb2b08
Change grpc.proto field names to snake_case
Java client code can still use the camelCase field naming convention,
and other language bindings will not be forced to do the same.

Snake_case field names are also recommended in the Protocol Buffers
Sytle Guide:  https://developers.google.com/protocol-buffers/docs/style
2022-02-27 09:42:17 -03:00
ghubstan
a1f059ded4
Merge branch '7-more-grpcproto-comments' into 8-remove-trdstats-service 2022-02-26 17:53:04 -03:00
ghubstan
3d33aa21c9
Merge branch '7-more-grpcproto-comments' of https://github.com/ghubstan/bisq into 7-more-grpcproto-comments 2022-02-26 17:50:05 -03:00
ghubstan
f14806ea1f
Let minAmount param be optional 2022-02-26 17:48:44 -03:00
ghubstan
c20f2568d4
Allow clients to pass empty string for minAmount param 2022-02-26 17:43:17 -03:00
ghubstan
b904002991
Avoid number formatting problems if clients pass empty (default) str params 2022-02-26 17:17:42 -03:00
ghubstan
aa6f530555
Revert "Allow editoffer clients to pass empty string for price parameter"
This reverts commit fcd2bcd34f.
2022-02-26 15:26:24 -03:00
ghubstan
fcd2bcd34f
Allow editoffer clients to pass empty string for price parameter
The client may have passed an empty string for the price parameter,
if only enabling or disabling the offer.  If so, validate with new
price = old price.
2022-02-26 15:13:21 -03:00
ghubstan
ab8a3433c3
Use a zero fixed-price if useMarketBasedPrice=true
The CLI and apitest cases always pass "0", but java & python clients
might pass an empty string. This change avoids number formatting
& scaling problems when clients pass an empty string in the price
parameter.
2022-02-26 14:27:52 -03:00
ghubstan
2e9e51eb41
Remove GetTradeStatistics service from grpc.proto
This protobuf definition and service stub has been in place since
the start of work on the API, but was never fully implmented, nor
intended to be included in the API beta & v1 releases.

Its presence added a useless section to the gRPC API Reference doc.

	https://ghubstan.github.io/slate

Based on branch `7-more-grpcproto-comments`,
PR https://github.com/bisq-network/bisq/pull/6068.
2022-02-26 11:11:26 -03:00
ghubstan
c0631eb31f
Fix file/merge conflict 2022-02-25 20:51:55 -03:00
Stan
1499465c11
Merge branch 'master' into 7-more-grpcproto-comments 2022-02-25 20:46:05 -03:00
ghubstan
66c04134fc
Check offer exists before trying to take it
This was overlooked in tests, but client might use a bad offer-id param.
2022-02-25 18:51:07 -03:00
Christoph Atteneder
c0ab215388
Merge pull request #6078 from jmacxx/5396_privacy_enhancement
[1.8.3] Clear sensitive dispute data based on dispute opening date.
2022-02-25 17:29:02 +01:00
jmacxx
327ea680ac
Clear sensitive dispute data based on dispute opening date.
Change recommended setting for sensitive data clearing to 60 days.
2022-02-25 09:49:36 -06:00
Christoph Atteneder
5824c9cabb
Merge pull request #6076 from jmacxx/5396_privacy_enhancement
[1.8.3] Keep first dispute chat msg when clearing sensitive data.
2022-02-25 16:01:25 +01:00
jmacxx
f430243b5e
Keep first dispute chat msg when clearing sensitive data.
Fixes https://github.com/bisq-network/bisq/pull/6001#issuecomment-1049710029
2022-02-24 11:44:36 -06:00
ghubstan
5e754a25a1
Fix comment 2022-02-24 08:28:36 -03:00
Christoph Atteneder
4eada6fc76
Merge pull request #6055 from ghubstan/1-prep-for-offer-service-proto-changes
Prepare API Offers .proto defs for significant changes [#1]
2022-02-24 10:59:37 +01:00
Christoph Atteneder
7409b2b573
Merge pull request #6074 from ghubstan/fix-mistake-in-api-beta-guide
Fix BSQ swap description of BTC price for 1 BSQ
2022-02-24 09:53:06 +01:00
ghubstan
dd7d803053
Fix BSQ swap description of BTC price for 1 BSQ 2022-02-23 19:44:25 -03:00
Christoph Atteneder
07f0e70731
Merge pull request #6072 from jmacxx/5396_privacy_enhancement
[1.8.3 fix] Get payment method ID from offerPayload pt.II
2022-02-23 15:42:54 +01:00
jmacxx
70752a1ffd
Get payment method ID from offerPayload.
Another problem with closed trades older than v1.7.0.
The payment method ID can always be obtained from offerPayload.
2022-02-21 23:22:54 -06:00
Christoph Atteneder
da25c058a1
Merge pull request #6070 from jmacxx/fix_issue_6059
Disable roll over popups in combobox item renderers.
2022-02-21 20:23:55 +01:00
Christoph Atteneder
d12a13b1a1
Merge pull request #6069 from jmacxx/5396_privacy_enhancement
[1.8.3 fix] Get payment method ID from offerPayload
2022-02-21 20:22:59 +01:00
jmacxx
a9630feb19
Disable roll over popups in combobox item renderers.
Due to JFX bug https://bugs.openjdk.java.net/browse/JDK-8265835
2022-02-21 12:54:51 -06:00
jmacxx
f3dfc14779
Get payment method ID from offerPayload.
Was getting an NPE with closed trades older than v1.7.0.
makerPaymentMethodId was new at that point (null for older trades).
makerPaymentAccountPayload can be null for trades where we have
removed account info for privacy reasons (see #6001).
The payment method ID can always be obtained from offerPayload.
2022-02-21 10:59:32 -06:00
Christoph Atteneder
b739b4c347
Merge pull request #6063 from jmacxx/bsq_swap_improve_dao_errmsg
Improve BSQ swap error messaging & DAO resync popup.
2022-02-21 14:50:31 +01:00
Christoph Atteneder
737faa6443
Merge pull request #6064 from xyzmaker123/fix-parser
Fix bug with text rendering on trade step info
2022-02-21 14:49:46 +01:00
Christoph Atteneder
e293437826
Merge pull request #6067 from jmacxx/copy_popup_to_clipboard
Cosmetic cleanup for popup message copy function.
2022-02-21 14:49:11 +01:00
ghubstan
464c5a81c9
Be consistent in use of apostrophe 2022-02-21 08:13:13 -03:00
ghubstan
6e56660394
Fix comment error 2022-02-21 08:09:42 -03:00
ghubstan
9f013bd6c2
Fix errors in comments 2022-02-21 08:00:31 -03:00
ghubstan
fcd9c7e4d3
Finish 1st full pass of documenting grpc.proto for API reference site 2022-02-21 07:48:02 -03:00
jmacxx
b54a85dca9
Omit copy icon for popups without any textual message. 2022-02-20 21:29:09 -06:00