Merge pull request #5562 from wikimedia/7.8.6

7.8.6

Author: mazevedofs

WMFData/Sources/WMFData/Data Controllers/Year In Review/WMFYearInReviewDataController.swift

@@ -108,11 +108,10 @@ import CoreData
 
     public var hasPresentedYiRFeatureAnnouncementModel: Bool {
         get {
-            return featureAnnouncementStatus.hasPresentedYiRFeatureAnnouncementModal
-        } set {
-            var currentAnnouncementStatus = featureAnnouncementStatus
-            currentAnnouncementStatus.hasPresentedYiRFeatureAnnouncementModal = newValue
-            try? userDefaultsStore?.save(key: WMFUserDefaultsKey.seenYearInReviewFeatureAnnouncement.rawValue, value: currentAnnouncementStatus)
+            (try? userDefaultsStore?.load(key: WMFUserDefaultsKey.seenYearInReviewFeatureAnnouncement.rawValue)) ?? false
+        }
+        set {
+            try? userDefaultsStore?.save(key: WMFUserDefaultsKey.seenYearInReviewFeatureAnnouncement.rawValue, value: newValue)
         }
     }
 

WMFData/Sources/WMFData/Store/WMFUserDefaultsKey.swift

@@ -6,11 +6,11 @@ public enum WMFUserDefaultsKey: String {
     case developerSettingsArticleTab = "dev-settings-article-tab"
     case developerSettingsForceMaxArticleTabsTo5 = "dev-settings-article-tab-max-5"
     case hasLocallySavedDonations = "donate-history-has-locally-saved-donations"
-    case yearInReviewSettingsIsEnabled = "year-in-review-settings-is-enabled"
-    case seenYearInReviewFeatureAnnouncement = "year-in-review-feature-announcement"
-    case yearInReviewSurveyPresented = "year-in-review-survey-presented"
+    case yearInReviewSettingsIsEnabled = "year-in-review-settings-is-enabled-v3"
+    case seenYearInReviewFeatureAnnouncement = "year-in-review-feature-announcement-v3"
+    case yearInReviewSurveyPresented = "year-in-review-survey-presented-v3"
     case bypassDonation = "bypass-donation"
-    case seenYearInReviewIntroSlide = "seen-year-in-review-intro-slide"
+    case seenYearInReviewIntroSlide = "seen-year-in-review-intro-slide-v3"
     case tappedYIR = "tapped-yir"
     case forceEmailAuth = "force-email-auth"
     case articleTabsOnboarding = "article-tabs-onboarding"

Wikipedia/Code/ArticleViewController+Announcements.swift

@@ -147,7 +147,7 @@ extension ArticleViewController {
 
     func donateAlreadyDonated() {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-            let title = WMFLocalizedString("donate-already-donated", value: "Thank you, dear donor! Your generosity helps keep Wikipedia and its sister sites thriving.", comment: "Thank you toast shown when user clicks already donated on fundraising banner")
+            let title = WMFLocalizedString("donate-already-donated", value: "Thank you, dear donor! Your generosity helps keep Wikipedia and its and other free knowledge projects thriving.", comment: "Thank you toast shown when user clicks already donated on fundraising banner")
 
             WMFAlertManager.sharedInstance.showBottomAlertWithMessage(title, subtitle: nil, image: UIImage.init(systemName: "checkmark.circle.fill"), type: .custom, customTypeName: "watchlist-add-remove-success", duration: -1, dismissPreviousAlerts: true)
         }

Wikipedia/Localizations/en.lproj/Localizable.strings

@@ -321,7 +321,7 @@
 "donate-accessibility-monthly-recurring-hint" = "Double tap to enable automatic monthly donations of this amount.";
 "donate-accessibility-textfield-hint" = "Enter custom amount to donate.";
 "donate-accessibility-transaction-fee-hint" = "Double tap to add transaction fee to donation amount.";
-"donate-already-donated" = "Thank you, dear donor! Your generosity helps keep Wikipedia and its sister sites thriving.";
+"donate-already-donated" = "Thank you, dear donor! Your generosity helps keep Wikipedia and its and other free knowledge projects thriving.";
 "donate-apple-fine-print" = "Apple is not in charge of raising money for this purpose.";
 "donate-email-opt-in-text" = "Yes, the Wikimedia Foundation can send me an occasional email.";
 "donate-help-frequently-asked-questions" = "Frequently asked questions";