Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add BTC address param, use String for param value instead of long #1841

Merged
merged 13 commits into from Oct 30, 2018
Merged

Add BTC address param, use String for param value instead of long #1841

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1175320
Add comment
ManfredKarrer Oct 26, 2018
235e2fa
Add fiat amount to trade fees at maker
ManfredKarrer Oct 26, 2018
187f539
Adjust BSQ fee to current BTC price
ManfredKarrer Oct 27, 2018
1d5bd2c
Add don't show again checkbox to noPriceFeedAvailable popup
ManfredKarrer Oct 27, 2018
3884607
Add fee toggle in create offer screen
ManfredKarrer Oct 27, 2018
5ac3528
Fix test
ManfredKarrer Oct 27, 2018
b5568b8
Move fee toggle outside of box
ManfredKarrer Oct 28, 2018
ac11888
Add non-DAO version for fee display
ManfredKarrer Oct 28, 2018
509c3d1
Add trade fee display to take offer screen
ManfredKarrer Oct 28, 2018
9b9fab2
Merge branch 'release-candidate-0.9.0' into add-fiat-amount-to-fee
ManfredKarrer Oct 29, 2018
ea33899
Add BTC recipient address to params
ManfredKarrer Oct 30, 2018
dbbbf17
Merge branch 'release-candidate-0.9.0' into make-param-value-string
ManfredKarrer Oct 30, 2018
2ba68a1
Fix missing param in test class
ManfredKarrer Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/util/BsqFormatter.java
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ public class BsqFormatter extends BSFormatter {
private final MonetaryFormat btcCoinFormat;

@Inject
private BsqFormatter() {
public BsqFormatter() {
super();

btcCoinFormat = super.coinFormat;
Expand Down
6 changes: 4 additions & 2 deletions core/src/test/java/bisq/core/dao/state/DaoStateServiceTest.java
View file
Open in desktop
Expand Up @@ -18,16 +18,18 @@
package bisq.core.dao.state;

import bisq.core.dao.state.blockchain.Block;
import org.junit.Test;
import bisq.core.util.BsqFormatter;

import org.junit.Assert;
import org.junit.Test;

public class DaoStateServiceTest {
@Test
public void testIsBlockHashKnown() {
DaoStateService stateService = new DaoStateService(
new DaoState(),
new GenesisTxInfo("fakegenesistxid", 100));
new GenesisTxInfo("fakegenesistxid", 100),
new BsqFormatter());
Assert.assertEquals(
"Unknown block should not exist.",
false,
Expand Down