Merge branch 'main' into T267849

codemagic-ci-cd · Nov 19, 2020 · 6cbd044 · 6cbd044
2 parents 88aee0a + 93a38c4
commit 6cbd044
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Wikipedia/Code/Article as a Living Document/ArticleAsLivingDocController.swift b/Wikipedia/Code/Article as a Living Document/ArticleAsLivingDocController.swift
@@ -77,9 +77,10 @@ class ArticleAsLivingDocController: NSObject {
     var shouldAttemptToShowArticleAsLivingDoc: Bool {
 
         guard let delegate = delegate,
+              delegate.articleURL.host == Configuration.Domain.englishWikipedia,
               let view = delegate.view,
-              view.effectiveUserInterfaceLayoutDirection == .leftToRight,
-              delegate.articleURL.host == Configuration.Domain.englishWikipedia else {
+              view.effectiveUserInterfaceLayoutDirection == .leftToRight
+               else {
             return false
         }
 

diff --git a/Wikipedia/Code/ArticleViewController+Announcements.swift b/Wikipedia/Code/ArticleViewController+Announcements.swift
@@ -5,7 +5,7 @@ extension ArticleViewController {
 
     func showAnnouncementIfNeeded() {
         guard UserDefaults.standard.shouldCheckForArticleAnnouncements,
-              ((shouldAttemptToShowArticleAsLivingDoc && userHasSeenSurveyPrompt) || !shouldAttemptToShowArticleAsLivingDoc) else {
+              ((isInValidSurveyCampaignAndArticleList && userHasSeenSurveyPrompt) || !isInValidSurveyCampaignAndArticleList) else {
             return
         }
         let predicate = NSPredicate(format: "placement == 'article'")