Manfred Karrer
a8b3d96e26
Fix resource key
2019-04-10 21:08:05 -05:00
Manfred Karrer
f551bd9803
Merge pull request #2688 from ripcurlx/add-dao-launch-popup
...
Add DAO launch popup
2019-04-10 11:11:18 -05:00
Manfred Karrer
e5f4299a77
Merge pull request #2689 from ripcurlx/adapt-update-popup
...
Adapt update popup
2019-04-10 11:03:27 -05:00
Christoph Atteneder
bf3fe2ca83
Change dao link
2019-04-10 17:59:24 +02:00
Christoph Atteneder
ed26b4d63f
Improve cheaper fees screenshot and popup layout
2019-04-10 17:40:23 +02:00
Manfred Karrer
68436f5f85
Merge branch 'master' into rc_v1.0.0
...
# Conflicts:
# common/src/main/proto/pb.proto
# core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVotePayload.java
2019-04-10 09:39:15 -05:00
Christoph Atteneder
bbfe663f52
Darken background less, to feel less dark.
2019-04-10 16:38:25 +02:00
Manfred Karrer
6aca2cd64c
Merge pull request #2690 from ripcurlx/align-hyperlinks
...
Remove unnecessary negative left padding
2019-04-10 09:22:04 -05:00
Christoph Atteneder
3a3a11ed26
Make blurred background even darker based on #2337 .
2019-04-10 16:15:03 +02:00
Christoph Atteneder
33fc7daf84
Remove unnecessary negative left padding
2019-04-10 16:03:12 +02:00
Christoph Atteneder
bc3aed4aeb
Adapt update popup to general information popup and darken blurred background for regular popups
2019-04-10 15:52:45 +02:00
Christoph Atteneder
17d5f2ac4a
Add DAO launch popup
2019-04-10 12:29:51 +02:00
Christoph Atteneder
83770dbfd4
Add votes as shared translation
2019-04-10 12:29:51 +02:00
Christoph Atteneder
ce731564a3
Add proposal as shared translation
2019-04-10 12:29:51 +02:00
Manfred Karrer
a1be8a4ee7
Make base class protected and remove Inject annotation
2019-04-09 12:10:03 -05:00
Manfred Karrer
8e82fa6654
Handle dao state conflicts better
...
- Check if conflicting node is seed node or not. Show info in list entry
and only show resync button and red color in text if conflict is with
seed node.
- At resync move all p2p network data to a dedicated directory so they
will be reloaded from the seeds.
2019-04-08 16:39:13 -05:00
Christoph Atteneder
ee7864bc34
Revert to SNAPSHOT versions
2019-04-08 12:12:01 +02:00
Christoph Atteneder
f9a0dd1502
Bump version number
2019-04-08 12:10:59 +02:00
Manfred Karrer
38a6d58254
Add filter for min required version for DAO
2019-04-07 18:58:17 -05:00
Manfred Karrer
ed3ab79044
Cleanup TODOs
2019-04-06 21:46:11 -05:00
Manfred Karrer
a6a0c6ec70
Remove DAO testing feedback window
2019-04-06 21:39:42 -05:00
Christoph Atteneder
400fbbd080
Merge pull request #2655 from ripcurlx/improve-tx-display-for-btc-withdrawal-from-bsq-wallet
...
Improve tx display for BTC withdrawal from BSQ wallet
2019-04-05 17:52:34 +02:00
Christoph Atteneder
e5d28b67c1
Prevent transaction already when there is a zero BTC output
2019-04-05 17:44:00 +02:00
Christoph Atteneder
dda54f8b64
Show zero BSQ transferred for BTC withdrawal form BSQ wallet
2019-04-05 17:41:32 +02:00
Christoph Atteneder
79376f3faf
Prevent user from creating transactions that will burn money (mining fees > amount to transfer)
2019-04-05 16:28:55 +02:00
Christoph Atteneder
3275dfed10
Improve transaction display for BTC withrawals from BSQ wallet
2019-04-05 16:28:08 +02:00
Devin Bileck
71481396ae
Fix incorrect transaction size shown for bonding
...
When locking up or unlocking a bond, the displayed transaction size was
in bytes, but the prompt was indicating it was Kb. So adjust the value
so it is shown as Kb.
2019-04-05 00:16:54 -07:00
Manfred Karrer
32264070b7
Merge pull request #2643 from devinbileck/update-insufficient-funds-warning-for-proposal
...
Update insufficient BTC warning for issuance proposals
2019-04-04 18:28:37 -05:00
Manfred Karrer
7953295be6
Remove network selection in settings
2019-04-04 17:06:52 -05:00
Devin Bileck
837e79248f
Update insufficient BTC warning for issuance proposals
...
When attempting to submit a compensation request or reimbursement
request with insufficient BTC, the warning message only indicated that
BTC is required for mining fees. It did not indicate that BTC is also
required for the BSQ issuance.
So another display string was added and displayed when submitting an
issuance proposal with insufficient BTC funds available.
2019-04-04 12:59:30 -07:00
Manfred Karrer
4e173ac976
Merge pull request #2636 from ripcurlx/check-for-nullable-selected-proposal
...
Check if selected proposal is null
2019-04-04 12:54:47 -05:00
Christoph Atteneder
f2eabbc0b0
Add missing Bsq state listeners
2019-04-04 19:29:17 +02:00
Christoph Atteneder
77df0f9b53
Hide and show selected proposal window whenever new block has been parsed
2019-04-04 16:34:27 +02:00
Christoph Atteneder
b30f166e92
Add information of Satoshis needed for coloring
2019-04-04 13:19:30 +02:00
Christoph Atteneder
1782a364ca
Check if selected proposal is null and ignore vote in this case
2019-04-04 12:06:14 +02:00
Devin Bileck
fb9774c6ff
Fix max available stake for voting showing negative
...
When attempting to vote on proposals with insufficient BSQ,
the max available stake for voting was showing a negative value.
2019-04-03 00:26:41 -07:00
Manfred Karrer
8d22d7b926
Improve error message
...
See https://github.com/bisq-network/bisq/issues/2620
https://github.com/bisq-network/bisq/pull/2614#discussion_r271290565
2019-04-02 19:25:34 -05:00
Christoph Atteneder
7f2e406e8d
Revert to SNAPSHOT versions
2019-04-02 17:25:03 +02:00
Christoph Atteneder
0ffc93a091
Bump version number
2019-04-02 17:13:04 +02:00
Christoph Atteneder
21e63066af
Revert to SNAPSHOT versions
2019-04-02 11:21:11 +02:00
Christoph Atteneder
fb3c8c214e
Bump version number
2019-04-02 11:19:03 +02:00
Christoph Atteneder
38728a1132
Update DBs
2019-04-01 15:43:53 +02:00
Christoph Atteneder
2942425d4c
Make create offer label cases easier to translate
2019-04-01 11:51:47 +02:00
Manfred Karrer
e9e4b49014
Add number of irregular txs to UI
2019-03-31 17:41:59 -05:00
Manfred Karrer
fa3ec340fa
Merge branch 'master' into add-check-for-bsq-balance
...
# Conflicts:
# core/src/main/resources/i18n/displayStrings_de.properties
# core/src/main/resources/i18n/displayStrings_el.properties
# core/src/main/resources/i18n/displayStrings_es.properties
# core/src/main/resources/i18n/displayStrings_fa.properties
# core/src/main/resources/i18n/displayStrings_fr.properties
# core/src/main/resources/i18n/displayStrings_hu.properties
# core/src/main/resources/i18n/displayStrings_pt.properties
# core/src/main/resources/i18n/displayStrings_ro.properties
# core/src/main/resources/i18n/displayStrings_ru.properties
# core/src/main/resources/i18n/displayStrings_sr.properties
# core/src/main/resources/i18n/displayStrings_th.properties
# core/src/main/resources/i18n/displayStrings_vi.properties
# core/src/main/resources/i18n/displayStrings_zh.properties
2019-03-31 16:09:53 -05:00
Manfred Karrer
c7bd2ee4b8
Add BTC_DAO_TESTNET again to keep supporting current dao testnet
...
- It is more safe to separate the BTC_DAO_TESTNET and BTC_DAO_REGTEST
by the network ID as that prevents on the P2P network layer that the
network could interconnect. We would have risked that we receive network
data from the other network as users would use the persisted peers for
connections.
2019-03-31 15:55:55 -05:00
Manfred Karrer
e624625bbb
Fix missing close handler and avoid nullPointer exception
2019-03-31 15:46:09 -05:00
Manfred Karrer
d5fc7cb97e
Use burnedBsq field in Tx for burnedFee and invalidatedBsq
...
In case of an invalid tx we burn all available BSQ input. We only know
that at parsing time. We renamed the burntFee field to burntBsq to make
it more generic and use it for the burnt fee in case if a normal tx and
as invalidatedBsq in case of an invalid tx.
2019-03-30 19:35:12 -05:00
Manfred Karrer
d422a732e7
Handle merits better
...
We did not update the merit correctly in case there was no proposal
selected.
2019-03-30 16:58:28 -05:00
Manfred Karrer
bec73dce53
Add popup in case the utxo balance does not match the bsq balance
2019-03-29 19:42:56 -05:00
