From eae76a619a8a008849d4d38ab05d24bdf79ab2a7 Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Mon, 27 Nov 2023 09:43:01 -0500
Subject: [PATCH] Revert "misc: get donation date from settings manager"
This reverts commit 167550abc30039af2162551098fa43b5902e888a.
Reason for revert: Donation2023VisibleDate will be updated when user select "Not now".
Change-Id: I6f1d6647e947811e78eb8db07ddc955c81e7de0e
---
src/app/settingsview/components/SystemSettingsPage.qml | 2 +-
src/app/tipsmodel.cpp | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/app/settingsview/components/SystemSettingsPage.qml b/src/app/settingsview/components/SystemSettingsPage.qml
index eb23dbd91..d9a490e5a 100644
--- a/src/app/settingsview/components/SystemSettingsPage.qml
+++ b/src/app/settingsview/components/SystemSettingsPage.qml
@@ -84,7 +84,7 @@ SettingsPageBase {
ToggleSwitch {
id: enableDonation
width: parent.width
- visible: new Date() >= new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023VisibleDate)));
+ visible: new Date() >= new Date(Date.parse("2023-11-01"))
checked: UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible)
labelText: JamiStrings.enableDonation
diff --git a/src/app/tipsmodel.cpp b/src/app/tipsmodel.cpp
index 1de7c0712..914713a61 100644
--- a/src/app/tipsmodel.cpp
+++ b/src/app/tipsmodel.cpp
@@ -76,9 +76,7 @@ TipsModel::reset()
tips_.clear();
QDate date = QDate::currentDate();
- QDate donationStartDate = QDate::fromString(
- settingsManager_->getValue("Donation2023VisibleDate").toString());
- if (date >= donationStartDate) {
+ if (date >= QDate::fromString("2023-11-27", "yyyy-MM-dd")) {
tips_.append({{"id", "14"}, {"title", tr("Donate")}, {"desc", ""}, {"type", "donation"}});
}
tips_.append({{"id", "0"}, {"title", tr("Customize")}, {"desc", ""}, {"type", "customize"}});
--
GitLab