diff --git a/src/app/appsettingsmanager.h b/src/app/appsettingsmanager.h index 7a9230908dcad04c75af25e450cf2c4bdaabb9cf..9ed4984d46fc38fbc25098b3388d56dbfb7c9e98 100644 --- a/src/app/appsettingsmanager.h +++ b/src/app/appsettingsmanager.h @@ -99,9 +99,9 @@ extern const QString defaultDownloadPath; X(ShowMardownOption, false) \ X(ChatViewEnterIsNewLine, false) \ X(ShowSendOption, false) \ - X(DonationVisibleDate, "2023-11-01 05:00") \ + X(Donation2023VisibleDate, "2023-11-27 05:00") \ X(IsDonationVisible, true) \ - X(DonationEndDate, "2024-01-01 00:00") \ + X(Donation2023EndDate, "2024-01-31 00:00") \ X(EnablePtt, false) \ X(pttKey, 36) #endif diff --git a/src/app/constant/JamiQmlUtils.qml b/src/app/constant/JamiQmlUtils.qml index 5e104aa0ece7b1a64d662ccfd4a30d9182442b7d..968f98ca9fe114f604e3c17f79a23e3e30a3c48e 100644 --- a/src/app/constant/JamiQmlUtils.qml +++ b/src/app/constant/JamiQmlUtils.qml @@ -75,8 +75,8 @@ Item { // The banner is visible if the current date is after the date set in the settings and before the end date // And if the donation toggle is checked var isDonationVisible = UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible); - var endDonationDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.DonationEndDate))); - var donationVisibleDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.DonationVisibleDate))); - return new Date() < endDonationDate && new Date() > donationVisibleDate && isDonationVisible && false; + var endDonationDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023EndDate))); + var donationVisibleDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023VisibleDate))); + return new Date() < endDonationDate && new Date() > donationVisibleDate && isDonationVisible; } } diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml index 9cff727d130f98a8674a925c3f123902a859c40e..c8b96422b0cbfeb449360709fc0f00fe70e7d5f1 100644 --- a/src/app/constant/JamiStrings.qml +++ b/src/app/constant/JamiStrings.qml @@ -853,7 +853,7 @@ Item { property string zoomLevel: qsTr("Text zoom level") //Donation campaign - property string donationTipBoxText: qsTr("Free and private sharing. <a href=\"https://jami.net/donate/\">Donate</a> to expand it.") + property string donationTipBoxText: qsTr("Free and private sharing. <a href=\"https://jami.net/whydonate/\">Donate</a> to expand it.") property string donation: qsTr("Donate") property string donationText: qsTr("If you enjoy using Jami and believe in our mission, would you make a donation?") property string notNow: qsTr("Not now") diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml index 4c3b289901686610ae77380264a30f992b989002..716cbad3079542ae5e968f4c9d4037bd14f4ec5b 100644 --- a/src/app/constant/JamiTheme.qml +++ b/src/app/constant/JamiTheme.qml @@ -681,7 +681,7 @@ Item { // Donation campaign property color donationButtonTextColor: "#005699" property color donationBackgroundColor: "#D5E4EF" - property string donationUrl: "https://jami.net/donate/" + property string donationUrl: "https://jami.net/whydonate/" //Connection monitoring property color connectionMonitoringTableColor1: darkTheme ? "#4D4D4D" : "#f0efef" diff --git a/src/app/tipsmodel.cpp b/src/app/tipsmodel.cpp index a3a85fad5d2547738866593f7a4e29b936954f86..516a77bca3acf7c1d869945536ade335664aa8a1 100644 --- a/src/app/tipsmodel.cpp +++ b/src/app/tipsmodel.cpp @@ -77,7 +77,7 @@ TipsModel::reset() #ifndef APPSTORE QDate date = QDate::currentDate(); - if (date >= QDate::fromString("2023-11-01", "yyyy-MM-dd") && false) { + if (date >= QDate::fromString("2023-11-27", "yyyy-MM-dd")) { tips_.append({{"id", "14"}, {"title", tr("Donate")}, {"desc", ""}, {"type", "donation"}}); } #endif