wordpress-mobile · ashiagr · Feb 18, 2022 · Feb 9, 2022 · Feb 9, 2022 · Feb 9, 2022
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -7,6 +7,7 @@
 * [*] Site creation: Fixed bug where sites created within the app were not given the correct time zone, leading to post scheduling issues. [https://github.com/wordpress-mobile/WordPress-Android/pull/15904]
 * [*] Login Epilogue: Fixed bug where if no sites available, then new login epilogue screen without clickable sites and with "create new site" is shown instead of no sites empty "My Site" view. [https://github.com/wordpress-mobile/WordPress-Android/pull/15944]
 * [*] Fixes flickering when changing the preview mode in Page or Site design picker [https://github.com/wordpress-mobile/WordPress-Android/pull/15943]
+* [**] Jetpack App: Signup using WordPress.com, create your favorite site and enjoy the Reader inside Jetpack app. [https://github.com/wordpress-mobile/WordPress-Android/pull/15946]
 * [*] Reader: Admins and Editors can edit comments from Reader [https://github.com/wordpress-mobile/WordPress-Android/pull/15957]
 * [*] Improves the error message shown when trying to create a new site with non-English characters in the domain name [https://github.com/wordpress-mobile/WordPress-Android/pull/15969]
 

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -117,6 +117,16 @@ android {
         buildConfigField "boolean", "COMMENTS_SNIPPET", "false"
         buildConfigField "boolean", "READER_COMMENTS_MODERATION", "false"
 
+        // Override these constants in jetpack product flavor to enable/ disable features
+        buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
+        buildConfigField "boolean", "ENABLE_ADD_SELF_HOSTED_SITE", "true"
+        buildConfigField "boolean", "ENABLE_SIGNUP", "true"
+        buildConfigField "boolean", "ENABLE_READER", "true"
+        buildConfigField "boolean", "ENABLE_CREATE_FAB", "true"
+        buildConfigField "boolean", "ENABLE_QUICK_ACTION", "true"
+        buildConfigField "boolean", "ENABLE_FOLLOWED_SITES_SETTINGS", "true"
+        buildConfigField "boolean", "ENABLE_WHATS_NEW_FEATURE", "true"
+
         manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }
 
@@ -151,6 +161,14 @@ android {
 
             applicationId "com.jetpack.android"
             buildConfigField "boolean", "IS_JETPACK_APP", "true"
+            buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
+            buildConfigField "boolean", "ENABLE_ADD_SELF_HOSTED_SITE", "false"
+            buildConfigField "boolean", "ENABLE_SIGNUP", "true"
+            buildConfigField "boolean", "ENABLE_READER", "true"
+            buildConfigField "boolean", "ENABLE_CREATE_FAB", "true"
+            buildConfigField "boolean", "ENABLE_QUICK_ACTION", "true"
+            buildConfigField "boolean", "ENABLE_FOLLOWED_SITES_SETTINGS", "true"
+            buildConfigField "boolean", "ENABLE_WHATS_NEW_FEATURE", "true"
             buildConfigField "String", "TRACKS_EVENT_PREFIX", '"jpandroid_"'
             buildConfigField "String", "PUSH_NOTIFICATIONS_APP_KEY", '"com.jetpack.android"'
 

diff --git a/WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueViewModel.kt b/WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueViewModel.kt
@@ -17,6 +17,7 @@ import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Flow
 import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Step.PROLOGUE
 import org.wordpress.android.ui.accounts.login.LoginPrologueViewModel.ButtonUiState.ContinueWithWpcomButtonState
 import org.wordpress.android.ui.accounts.login.LoginPrologueViewModel.ButtonUiState.EnterYourSiteAddressButtonState
+import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
@@ -26,6 +27,7 @@ import javax.inject.Named
 class LoginPrologueViewModel @Inject constructor(
     private val unifiedLoginTracker: UnifiedLoginTracker,
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val buildConfigWrapper: BuildConfigWrapper,
     @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher
 ) : ScopedViewModel(mainDispatcher) {
     private val _navigationEvents = MediatorLiveData<Event<LoginNavigationEvents>>()
@@ -44,7 +46,14 @@ class LoginPrologueViewModel @Inject constructor(
 
         _uiState.value = UiState(
                 enterYourSiteAddressButtonState = EnterYourSiteAddressButtonState(::onEnterYourSiteAddressButtonClick),
-                continueWithWpcomButtonState = ContinueWithWpcomButtonState(::onContinueWithWpcomButtonClick)
+                continueWithWpcomButtonState = ContinueWithWpcomButtonState(
+                        title = if (buildConfigWrapper.isSignupEnabled) {
+                            R.string.continue_with_wpcom
+                        } else {
+                            R.string.continue_with_wpcom_no_signup
+                        },
+                        onClick = ::onContinueWithWpcomButtonClick
+                )
         )
     }
 
@@ -71,9 +80,10 @@ class LoginPrologueViewModel @Inject constructor(
         abstract val title: Int
         abstract val onClick: (() -> Unit)
 
-        data class ContinueWithWpcomButtonState(override val onClick: () -> Unit) : ButtonUiState() {
-            override val title = R.string.continue_with_wpcom_no_signup
-        }
+        data class ContinueWithWpcomButtonState(
+            override val title: Int,
+            override val onClick: () -> Unit
+        ) : ButtonUiState()
 
         data class EnterYourSiteAddressButtonState(override val onClick: () -> Unit) : ButtonUiState() {
             override val title = R.string.enter_your_site_address

diff --git a/WordPress/src/jetpack/res/drawable/img_post_signup_interstitial_screen.xml b/WordPress/src/jetpack/res/drawable/img_post_signup_interstitial_screen.xml
@@ -0,0 +1,3 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/img_jetpack_empty_state"/>
+</layer-list>
diff --git a/WordPress/src/jetpack/res/values/strings.xml b/WordPress/src/jetpack/res/values/strings.xml
@@ -6,6 +6,9 @@
     <!-- About View -->
     <string name="app_title">Jetpack for Android</string>
 
+    <!-- Post-Signup Interstitial -->
+    <string name="post_signup_interstitial_title">Welcome to Jetpack</string>
+
     <!-- Login Prologue -->
     <string name="app_tagline">Site security and performance from your pocket</string>
     <string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

diff --git a/WordPress/src/jetpack/res/xml/shortcuts.xml b/WordPress/src/jetpack/res/xml/shortcuts.xml
@@ -34,7 +34,7 @@
         android:icon="@drawable/ic_shortcut_create_post"
         android:shortcutId="new_post"
         android:shortcutShortLabel="@string/new_post"
-        android:enabled="false">
+        android:enabled="true">
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="org.wordpress.android.ui.main.WPMainActivity"

diff --git a/WordPress/src/jetpackJalapeno/res/xml/shortcuts.xml b/WordPress/src/jetpackJalapeno/res/xml/shortcuts.xml
@@ -34,7 +34,7 @@
         android:icon="@drawable/ic_shortcut_create_post"
         android:shortcutId="new_post"
         android:shortcutShortLabel="@string/new_post"
-        android:enabled="false">
+        android:enabled="true">
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="org.wordpress.android.ui.main.WPMainActivity"

diff --git a/WordPress/src/jetpackWasabi/res/xml/shortcuts.xml b/WordPress/src/jetpackWasabi/res/xml/shortcuts.xml
@@ -34,7 +34,7 @@
         android:icon="@drawable/ic_shortcut_create_post"
         android:shortcutId="new_post"
         android:shortcutShortLabel="@string/new_post"
-        android:enabled="false">
+        android:enabled="true">
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="org.wordpress.android.ui.main.WPMainActivity"

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -1379,12 +1379,12 @@ public static void showLoginEpilogue(
             Activity activity,
             boolean doLoginUpdate,
             ArrayList<Integer> oldSitesIds,
-            boolean isJetpackApp
+            boolean isSiteCreationEnabled
     ) {
         Intent intent = new Intent(activity, LoginEpilogueActivity.class);
         intent.putExtra(LoginEpilogueActivity.EXTRA_DO_LOGIN_UPDATE, doLoginUpdate);
         intent.putIntegerArrayListExtra(LoginEpilogueActivity.ARG_OLD_SITES_IDS, oldSitesIds);
-        if (!isJetpackApp) {
+        if (isSiteCreationEnabled) {
             activity.startActivityForResult(intent, RequestCodes.LOGIN_EPILOGUE);
         } else {
             activity.startActivity(intent);

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java
@@ -70,6 +70,7 @@
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.BuildConfigWrapper;
 import org.wordpress.android.util.SelfSignedSSLUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
@@ -132,6 +133,7 @@ private enum SmartLockHelperState {
     @Inject UnifiedLoginTracker mUnifiedLoginTracker;
     @Inject protected SiteStore mSiteStore;
     @Inject protected ViewModelProvider.Factory mViewModelFactory;
+    @Inject BuildConfigWrapper mBuildConfigWrapper;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -158,7 +160,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     break;
                 case JETPACK_LOGIN_ONLY:
                     mUnifiedLoginTracker.setSource(Source.DEFAULT);
-                    mIsSignupFromLoginEnabled = false;
+                    mIsSignupFromLoginEnabled = mBuildConfigWrapper.isSignupEnabled();
                     loginFromPrologue();
                     break;
                 case WPCOM_LOGIN_ONLY:
@@ -305,10 +307,19 @@ public LoginMode getLoginMode() {
     private void loggedInAndFinish(ArrayList<Integer> oldSitesIds, boolean doLoginUpdate) {
         switch (getLoginMode()) {
             case JETPACK_LOGIN_ONLY:
-                if (!mSiteStore.hasSite()) {
+                if (!mSiteStore.hasSite() && !mBuildConfigWrapper.isSiteCreationEnabled()) {
                     handleNoJetpackSites();
                 } else {
-                    ActivityLauncher.showMainActivityAndLoginEpilogue(this, oldSitesIds, doLoginUpdate);
+                    if (!mSiteStore.hasSite()
+                        && AppPrefs.shouldShowPostSignupInterstitial()
+                        && !doLoginUpdate
+                        && mBuildConfigWrapper.isSiteCreationEnabled()
+                        && mBuildConfigWrapper.isSignupEnabled()
+                    ) {
+                        ActivityLauncher.showPostSignupInterstitial(this);
+                    } else {
+                        ActivityLauncher.showMainActivityAndLoginEpilogue(this, oldSitesIds, doLoginUpdate);
+                    }
                     setResult(Activity.RESULT_OK);
                     finish();
                 }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModel.kt
@@ -31,10 +31,10 @@ class LoginEpilogueViewModel @Inject constructor(
     }
 
     private fun handleNoSitesFound() {
-        if (buildConfigWrapper.isJetpackApp) {
+        if (buildConfigWrapper.isJetpackApp && !buildConfigWrapper.isSiteCreationEnabled) {
             _navigationEvents.postValue(Event(LoginNavigationEvents.ShowNoJetpackSites))
         } else {
-            if (appPrefsWrapper.shouldShowPostSignupInterstitial) {
+            if (appPrefsWrapper.shouldShowPostSignupInterstitial && buildConfigWrapper.isSignupEnabled) {
                 _navigationEvents.postValue(Event(LoginNavigationEvents.ShowPostSignupInterstitialScreen))
             }
             _navigationEvents.postValue(Event(LoginNavigationEvents.CloseWithResultOk))

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
@@ -121,7 +121,7 @@ && getResources().getConfiguration().orientation == Configuration.ORIENTATION_PO
     }
 
     private boolean isNewLoginEpilogueScreenEnabled() {
-        return !mBuildConfigWrapper.isJetpackApp()
+        return mBuildConfigWrapper.isSiteCreationEnabled()
                && !mShowAndReturn;
     }
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
@@ -50,6 +50,7 @@
 import org.wordpress.android.util.AccessibilityUtils;
 import org.wordpress.android.util.ActivityUtils;
 import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.BuildConfigWrapper;
 import org.wordpress.android.util.DeviceUtils;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.SiteUtils;
@@ -116,6 +117,7 @@ public class SitePickerActivity extends LocaleAwareActivity
     @Inject Dispatcher mDispatcher;
     @Inject StatsStore mStatsStore;
     @Inject ViewModelProvider.Factory mViewModelFactory;
+    @Inject BuildConfigWrapper mBuildConfigWrapper;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -241,7 +243,7 @@ private void updateMenuItemVisibility() {
         } else {
             // don't allow editing visibility unless there are multiple wp.com and jetpack sites
             mMenuEdit.setVisible(mSiteStore.getSitesAccessedViaWPComRestCount() > 1);
-            mMenuAdd.setVisible(!BuildConfig.IS_JETPACK_APP);
+            mMenuAdd.setVisible(mBuildConfigWrapper.isSiteCreationEnabled());
         }
 
         // no point showing search if there aren't multiple blogs
@@ -753,18 +755,26 @@ public void onDestroyActionMode(ActionMode actionMode) {
         }
     }
 
-    public static void addSite(Activity activity, boolean isSignedInWpCom) {
-        // if user is signed into wp.com use the dialog to enable choosing whether to
-        // create a new wp.com blog or add a self-hosted one
-        if (isSignedInWpCom) {
-            DialogFragment dialog = new AddSiteDialog();
-            dialog.show(activity.getFragmentManager(), AddSiteDialog.ADD_SITE_DIALOG_TAG);
+    public static void addSite(Activity activity, boolean hasAccessToken) {
+        if (hasAccessToken) {
+            if (!BuildConfig.ENABLE_ADD_SELF_HOSTED_SITE) {
+                ActivityLauncher.newBlogForResult(activity);
+            } else {
+                // user is signed into wordpress app, so use the dialog to enable choosing whether to
+                // create a new wp.com blog or add a self-hosted one
+                showAddSiteDialog(activity);
+            }
         } else {
-            // user isn't signed into wp.com, so simply enable adding self-hosted
+            // user doesn't have an access token, so simply enable adding self-hosted
             ActivityLauncher.addSelfHostedSiteForResult(activity);
         }
     }
 
+    private static void showAddSiteDialog(Activity activity) {
+        DialogFragment dialog = new AddSiteDialog();
+        dialog.show(activity.getFragmentManager(), AddSiteDialog.ADD_SITE_DIALOG_TAG);
+    }
+
     /*
      * dialog which appears after user taps "Add site" - enables choosing whether to create
      * a new wp.com blog or add an existing self-hosted one

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
@@ -472,7 +472,7 @@ private boolean isValidPosition(int position) {
     }
 
     private boolean isNewLoginEpilogueScreenEnabled() {
-        return !mBuildConfigWrapper.isJetpackApp()
+        return mBuildConfigWrapper.isSiteCreationEnabled()
                && !mShowAndReturn;
     }
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
@@ -380,7 +380,7 @@ && getIntent().getExtras().getBoolean(ARG_CONTINUE_JETPACK_CONNECT, false)) {
                     this,
                     getIntent().getBooleanExtra(ARG_DO_LOGIN_UPDATE, false),
                     getIntent().getIntegerArrayListExtra(ARG_OLD_SITES_IDS),
-                    mBuildConfigWrapper.isJetpackApp()
+                    mBuildConfigWrapper.isSiteCreationEnabled()
             );
         } else if (getIntent().getBooleanExtra(ARG_SHOW_SIGNUP_EPILOGUE, false) && savedInstanceState == null) {
             canShowAppRatingPrompt = false;
@@ -1279,7 +1279,7 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
                                 this,
                                 true,
                                 getIntent().getIntegerArrayListExtra(ARG_OLD_SITES_IDS),
-                                mBuildConfigWrapper.isJetpackApp()
+                                mBuildConfigWrapper.isSiteCreationEnabled()
                         );
                     }
                 }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt
@@ -80,7 +80,7 @@ class WPMainNavigationView @JvmOverloads constructor(
 
         // overlay each item with our custom view
         val menuView = getChildAt(0) as BottomNavigationMenuView
-        if (BuildConfig.IS_JETPACK_APP) hideReaderTab()
+        if (!BuildConfig.ENABLE_READER) hideReaderTab()
 
         val inflater = LayoutInflater.from(context)
         for (i in 0 until menu.size()) {
@@ -315,7 +315,7 @@ class WPMainNavigationView @JvmOverloads constructor(
     }
 
     companion object {
-        private val pages = if (BuildConfig.IS_JETPACK_APP) listOf(MY_SITE, NOTIFS) else listOf(MY_SITE, READER, NOTIFS)
+        private val pages = if (BuildConfig.ENABLE_READER) listOf(MY_SITE, READER, NOTIFS) else listOf(MY_SITE, NOTIFS)
 
         private const val TAG_MY_SITE = "tag-mysite"
         private const val TAG_READER = "tag-reader"

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt
@@ -304,7 +304,7 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
                 action.site,
                 CTA_DOMAIN_CREDIT_REDEMPTION
         )
-        is SiteNavigationAction.AddNewSite -> SitePickerActivity.addSite(activity, action.isSignedInWpCom)
+        is SiteNavigationAction.AddNewSite -> SitePickerActivity.addSite(activity, action.hasAccessToken)
         is SiteNavigationAction.ShowQuickStartDialog -> showQuickStartDialog(
                 action.title,
                 action.message,

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt
@@ -68,6 +68,7 @@ import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Dis
 import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Negative
 import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Positive
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.FluxCUtilsWrapper
 import org.wordpress.android.util.MediaUtilsWrapper
@@ -121,7 +122,8 @@ class MySiteViewModel @Inject constructor(
     private val mySiteSourceManager: MySiteSourceManager,
     private val cardsTracker: CardsTracker,
     private val siteItemsTracker: SiteItemsTracker,
-    private val domainRegistrationCardShownTracker: DomainRegistrationCardShownTracker
+    private val domainRegistrationCardShownTracker: DomainRegistrationCardShownTracker,
+    private val buildConfigWrapper: BuildConfigWrapper
 ) : ScopedViewModel(mainDispatcher) {
     private val _onSnackbarMessage = MutableLiveData<Event<SnackbarMessageHolder>>()
     private val _onTechInputDialogShown = MutableLiveData<Event<TextInputDialogModel>>()
@@ -345,7 +347,8 @@ class MySiteViewModel @Inject constructor(
 
     private fun buildNoSiteState(): NoSites {
         // Hide actionable empty view image when screen height is under specified min height.
-        val shouldShowImage = displayUtilsWrapper.getDisplayPixelHeight() >= MIN_DISPLAY_PX_HEIGHT_NO_SITE_IMAGE
+        val shouldShowImage = !buildConfigWrapper.isJetpackApp &&
+                displayUtilsWrapper.getDisplayPixelHeight() >= MIN_DISPLAY_PX_HEIGHT_NO_SITE_IMAGE
         return NoSites(shouldShowImage)
     }
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt
@@ -52,7 +52,7 @@ sealed class SiteNavigationAction {
     ) : SiteNavigationAction()
 
     data class OpenDomainRegistration(val site: SiteModel) : SiteNavigationAction()
-    data class AddNewSite(val isSignedInWpCom: Boolean) : SiteNavigationAction()
+    data class AddNewSite(val hasAccessToken: Boolean) : SiteNavigationAction()
     data class ShowQuickStartDialog(
         @StringRes val title: Int,
         @StringRes val message: Int,

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/CardsBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/CardsBuilder.kt
@@ -36,7 +36,7 @@ class CardsBuilder @Inject constructor(
     ): List<MySiteCardAndItem> {
         val cards = mutableListOf<MySiteCardAndItem>()
         cards.add(siteInfoCardBuilder.buildSiteInfoCard(siteInfoCardBuilderParams))
-        if (!buildConfigWrapper.isJetpackApp) {
+        if (buildConfigWrapper.isQuickActionEnabled) {
             cards.add(quickActionsCardBuilder.build(quickActionsCardBuilderParams))
         }
         if (domainRegistrationCardBuilderParams.isDomainCreditAvailable) {

diff --git a/...ess/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt b/...ess/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
@@ -358,10 +358,10 @@ class NotificationsListFragmentPage : ViewPagerFragment(R.layout.notifications_l
             }
             else -> titleResId = R.string.notifications_empty_list
         }
-        if (BuildConfig.IS_JETPACK_APP) {
-            showEmptyView(titleResId)
-        } else {
+        if (BuildConfig.ENABLE_READER) {
             showEmptyView(titleResId, descriptionResId, buttonResId)
+        } else {
+            showEmptyView(titleResId)
         }
         actionableEmptyView.image.visibility = if (DisplayUtils.isLandscape(context)) View.GONE else View.VISIBLE
     }