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.

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

Update icons and languages ui in message offer #2722

Merged
merged 2 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void onActivate() {
boolean isCustomPaymentMethod = fiatPaymentMethod.isCustomPaymentMethod();
if (!isCustomPaymentMethod && isPredefinedPaymentMethodsContainName(name)) {
maybeAddFiatPaymentMethod(fiatPaymentMethod);
} else {
} else if (isCustomPaymentMethod) {
maybeAddCustomFiatPaymentMethod(fiatPaymentMethod);
}
}));
Expand All @@ -168,7 +168,10 @@ public void onActivate() {
return;
}
BitcoinPaymentMethod bitcoinPaymentMethod = BitcoinPaymentMethodUtil.getPaymentMethod(name);
maybeAddBitcoinPaymentMethod(bitcoinPaymentMethod);
boolean isCustomPaymentMethod = bitcoinPaymentMethod.isCustomPaymentMethod();
if (!isCustomPaymentMethod) {
maybeAddBitcoinPaymentMethod(bitcoinPaymentMethod);
}
}));
maybeAddOnChainPaymentMethodAsSelected();
}
Expand Down Expand Up @@ -311,7 +314,7 @@ private void maybeRemoveCustomFiatPaymentMethods() {
// To ensure backwards compatibility we need to drop custom fiat payment methods if the user has more than 3,
// which is the max allowed number of custom fiat payment methods per market
while (model.getAddedCustomFiatPaymentMethods().size() > MAX_ALLOWED_CUSTOM_FIAT_PAYMENTS) {
model.getAddedCustomFiatPaymentMethods().remove(model.getAddedCustomBitcoinPaymentMethods().size() - 1);
model.getAddedCustomFiatPaymentMethods().remove(model.getAddedCustomFiatPaymentMethods().size() - 1);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ private HBox createAndGetSupportedLanguagesBox() {
String languageCode = offer.getSupportedLanguageCodes().get(i).toUpperCase();
Label codeLabel = (i == codesCount - 1) ? new Label(languageCode) : new Label(languageCode + ",");
codeLabel.setTooltip(new BisqTooltip(LanguageRepository.getDisplayString(languageCode)));
codeLabel.getStyleClass().add("text-fill-white");
hBox.getChildren().add(codeLabel);
}
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading