Compare commits

..

No commits in common. "7e4e9507105c687f63b006d644a7dac72e02b778" and "7e29dc188de20ee138a29d313a4430aa42d154ee" have entirely different histories.

7 changed files with 9 additions and 18 deletions

View file

@ -610,7 +610,7 @@ configure(project(':desktop')) {
apply plugin: 'com.github.johnrengelman.shadow'
apply from: 'package/package.gradle'
version = '1.0.15-SNAPSHOT'
version = '1.0.14-SNAPSHOT'
jar.manifest.attributes(
"Implementation-Title": project.name,

View file

@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkArgument;
public class Version {
// The application versions
// We use semantic versioning with major, minor and patch
public static final String VERSION = "1.0.15";
public static final String VERSION = "1.0.14";
/**
* Holds a list of the tagged resource files for optimizing the getData requests.

View file

@ -657,8 +657,6 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
ThreadUtils.submitToPool(() -> {
if (newValue == Trade.Phase.DEPOSIT_REQUESTED) startPolling();
if (newValue == Trade.Phase.DEPOSITS_PUBLISHED) onDepositsPublished();
if (newValue == Trade.Phase.DEPOSITS_CONFIRMED) onDepositsConfirmed();
if (newValue == Trade.Phase.DEPOSITS_UNLOCKED) onDepositsUnlocked();
if (newValue == Trade.Phase.PAYMENT_SENT) onPaymentSent();
if (isDepositsPublished() && !isPayoutUnlocked()) updatePollPeriod();
if (isPaymentReceived()) {
@ -2894,16 +2892,10 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
ThreadUtils.submitToPool(() -> xmrWalletService.freezeOutputs(getSelf().getReserveTxKeyImages()));
}
private void onDepositsConfirmed() {
HavenoUtils.notificationService.sendTradeNotification(this, Phase.DEPOSITS_CONFIRMED, "Trade Deposits Confirmed", "The deposit transactions have confirmed");
}
private void onDepositsUnlocked() {
HavenoUtils.notificationService.sendTradeNotification(this, Phase.DEPOSITS_UNLOCKED, "Trade Deposits Unlocked", "The deposit transactions have unlocked");
}
private void onPaymentSent() {
HavenoUtils.notificationService.sendTradeNotification(this, Phase.PAYMENT_SENT, "Payment Sent", "The buyer has sent the payment");
if (this instanceof SellerTrade) {
HavenoUtils.notificationService.sendTradeNotification(this, Phase.PAYMENT_SENT, "Payment Sent", "The buyer has sent the payment"); // TODO (woodser): use language translation
}
}
///////////////////////////////////////////////////////////////////////////////////////////

View file

@ -60,6 +60,6 @@
</content_rating>
<releases>
<release version="1.0.15" date="2024-12-19"/>
<release version="1.0.14" date="2024-11-15"/>
</releases>
</component>

View file

@ -5,10 +5,10 @@
<!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->
<key>CFBundleVersion</key>
<string>1.0.15</string>
<string>1.0.14</string>
<key>CFBundleShortVersionString</key>
<string>1.0.15</string>
<string>1.0.14</string>
<key>CFBundleExecutable</key>
<string>Haveno</string>

View file

@ -1039,7 +1039,6 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel<?>> exten
securityDepositAndFeeBox.getChildren().addAll(getSecurityDepositBox(), tradeFeeFieldsBox);
buyerAsTakerWithoutDepositSlider = FormBuilder.addSlideToggleButton(gridPane, ++gridRow, Res.get("createOffer.buyerAsTakerWithoutDeposit"));
buyerAsTakerWithoutDepositSlider.setPadding(new Insets(0, 0, 0, 0));
buyerAsTakerWithoutDepositSlider.setOnAction(event -> {
// popup info box

View file

@ -41,7 +41,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class SeedNodeMain extends ExecutableForAppWithP2p {
private static final long CHECK_CONNECTION_LOSS_SEC = 30;
private static final String VERSION = "1.0.15";
private static final String VERSION = "1.0.14";
private SeedNode seedNode;
private Timer checkConnectionLossTime;