mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove if blocks with !DevEnv.isDaoActivated() and combined && as isDaoActivated is always true the whole statement is always false

Browse Source 
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2022-11-03 11:00:02 -05:00
parent 80e7dc7203
commit e8a9132d30
No known key found for this signature in database
GPG Key ID: 02AA2BAE387C8307
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/bisq/core/offer/OfferFilterService.java
View File

@ -24,7 +24,6 @@ import bisq.core.payment.PaymentAccountUtil;
import bisq.core.user.Preferences; import bisq.core.user.Preferences;
import bisq.core.user.User; import bisq.core.user.User;
import bisq.common.app.DevEnv;
import bisq.common.app.Version; import bisq.common.app.Version;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
@ -129,9 +128,6 @@ public class OfferFilterService {
if (isMyInsufficientTradeLimit(offer)) { if (isMyInsufficientTradeLimit(offer)) {
return Result.IS_MY_INSUFFICIENT_TRADE_LIMIT; return Result.IS_MY_INSUFFICIENT_TRADE_LIMIT;
} }
if (!DevEnv.isDaoActivated() && offer.isBsqSwapOffer()) {
return Result.HIDE_BSQ_SWAPS_DUE_DAO_DEACTIVATED;
}
return Result.VALID; return Result.VALID;
} }

6
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/OfferViewModelUtil.java
View File

@ -26,8 +26,6 @@ import bisq.core.offer.OfferUtil;
import bisq.core.util.VolumeUtil; import bisq.core.util.VolumeUtil;
import bisq.core.util.coin.CoinFormatter; import bisq.core.util.coin.CoinFormatter;
import bisq.common.app.DevEnv;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import java.util.Optional; import java.util.Optional;
@ -38,10 +36,6 @@ public class OfferViewModelUtil {
Coin tradeFee, Coin tradeFee,
boolean isCurrencyForMakerFeeBtc, boolean isCurrencyForMakerFeeBtc,
CoinFormatter formatter) { CoinFormatter formatter) {
if (!isCurrencyForMakerFeeBtc && !DevEnv.isDaoActivated()) {
return "";
}
Optional<Volume> optionalBtcFeeInFiat = offerUtil.getFeeInUserFiatCurrency(tradeFee, Optional<Volume> optionalBtcFeeInFiat = offerUtil.getFeeInUserFiatCurrency(tradeFee,
isCurrencyForMakerFeeBtc, isCurrencyForMakerFeeBtc,
formatter); formatter);

9
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
View File

@ -316,13 +316,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
maybeShowAccountWarning(lastPaymentAccount, model.dataModel.isBuyOffer()); maybeShowAccountWarning(lastPaymentAccount, model.dataModel.isBuyOffer());
maybeShowCashByMailWarning(lastPaymentAccount, model.dataModel.getOffer()); maybeShowCashByMailWarning(lastPaymentAccount, model.dataModel.getOffer());
if (!DevEnv.isDaoActivated() && !model.isRange()) {
nextButton.setVisible(false);
cancelButton1.setVisible(false);
if (model.isOfferAvailable.get())
showNextStepAfterAmountIsSet();
}
boolean currencyForMakerFeeBtc = model.dataModel.isCurrencyForTakerFeeBtc(); boolean currencyForMakerFeeBtc = model.dataModel.isCurrencyForTakerFeeBtc();
tradeFeeInBtcToggle.setSelected(currencyForMakerFeeBtc); tradeFeeInBtcToggle.setSelected(currencyForMakerFeeBtc);
tradeFeeInBsqToggle.setSelected(!currencyForMakerFeeBtc); tradeFeeInBsqToggle.setSelected(!currencyForMakerFeeBtc);
@ -706,8 +699,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
if (isOfferAvailable) { if (isOfferAvailable) {
offerAvailabilityBusyAnimation.stop(); offerAvailabilityBusyAnimation.stop();
offerAvailabilityBusyAnimation.setVisible(false); offerAvailabilityBusyAnimation.setVisible(false);
if (!DevEnv.isDaoActivated() && !model.isRange() && !model.showPayFundsScreenDisplayed.get())
showNextStepAfterAmountIsSet();
} }
offerAvailabilityLabel.setVisible(!isOfferAvailable); offerAvailabilityLabel.setVisible(!isOfferAvailable);