From 167550abc30039af2162551098fa43b5902e888a Mon Sep 17 00:00:00 2001 From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Date: Wed, 22 Nov 2023 14:07:10 -0500 Subject: [PATCH] misc: get donation date from settings manager Change-Id: I4c39625b95efa1ad272ffa503e1f29228928adeb --- src/app/settingsview/components/SystemSettingsPage.qml | 2 +- src/app/tipsmodel.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/settingsview/components/SystemSettingsPage.qml b/src/app/settingsview/components/SystemSettingsPage.qml index abc472136..dd0697370 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("2023-11-01")) + visible: new Date() >= new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023VisibleDate))); checked: UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible) labelText: JamiStrings.enableDonation diff --git a/src/app/tipsmodel.cpp b/src/app/tipsmodel.cpp index 914713a61..1de7c0712 100644 --- a/src/app/tipsmodel.cpp +++ b/src/app/tipsmodel.cpp @@ -76,7 +76,9 @@ TipsModel::reset() tips_.clear(); QDate date = QDate::currentDate(); - if (date >= QDate::fromString("2023-11-27", "yyyy-MM-dd")) { + QDate donationStartDate = QDate::fromString( + settingsManager_->getValue("Donation2023VisibleDate").toString()); + if (date >= donationStartDate) { tips_.append({{"id", "14"}, {"title", tr("Donate")}, {"desc", ""}, {"type", "donation"}}); } tips_.append({{"id", "0"}, {"title", tr("Customize")}, {"desc", ""}, {"type", "customize"}}); -- GitLab