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

Provide more offer & contract detail to CLI #5357

Merged
merged 12 commits into from Apr 2, 2021
Merged

Provide more offer & contract detail to CLI #5357

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c3f5669
Add api method createcryptopaymentacct
ghubstan Mar 25, 2021
27b0900
Add cli side help for createcryptopaymentacct
ghubstan Mar 25, 2021
9e035e5
Provide more offer & contract detail available to CLI.
ghubstan Mar 25, 2021
780be1a
Adjust maker gettrade output checks to new column
ghubstan Mar 26, 2021
152f459
Remove unused parameter
ghubstan Mar 26, 2021
aad998c
Fix maker/taker fee format bug, rename methods
ghubstan Mar 28, 2021
2d66a59
Merge branch 'master' into 01-api-add-createcryptopaymentacct
ghubstan Apr 1, 2021
58c885e
Add support for creating instant altcoin payment accounts in api
ghubstan Apr 1, 2021
4fbdc32
Remove space char
ghubstan Apr 1, 2021
6299dc3
Merge branch '01-api-add-createcryptopaymentacct' into 02-api-trade-c…
ghubstan Apr 1, 2021
6bde12b
Improve takeoffer output and failure reason messaging
ghubstan Apr 1, 2021
bddc273
Fix spelling
ghubstan Apr 2, 2021
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
4 changes: 2 additions & 2 deletions cli/src/main/java/bisq/cli/TradeFormat.java
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ public static String format(TradeInfo tradeInfo) {
"%" + (COL_HEADER_TRADE_TAKER_FEE.length() + 2) + "s"
: "";

boolean showBsqBuyerAddress = shouldShowBqsBuyerAddress(tradeInfo, isTaker);
boolean showBsqBuyerAddress = shouldShowBsqBuyerAddress(tradeInfo, isTaker);
Supplier<String> bsqBuyerAddressHeader = () -> showBsqBuyerAddress ? COL_HEADER_TRADE_BSQ_BUYER_ADDRESS : "";
Supplier<String> bsqBuyerAddressHeaderSpec = () -> showBsqBuyerAddress ? "%s" : "";

Expand Down Expand Up @@ -203,7 +203,7 @@ private static String formatTradeData(String format,
}
};

private static boolean shouldShowBqsBuyerAddress(TradeInfo tradeInfo, boolean isTaker) {
private static boolean shouldShowBsqBuyerAddress(TradeInfo tradeInfo, boolean isTaker) {
if (tradeInfo.getOffer().getBaseCurrencyCode().equals("BTC")) {
return false;
} else {
Expand Down