diff --git a/browser/extensions/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx b/browser/extensions/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx index 655a51f490f5..4945abbde9ae 100644 --- a/browser/extensions/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx +++ b/browser/extensions/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx @@ -31,7 +31,6 @@ const PREF_BILLBOARD_ENABLED = "newtabAdSize.billboard"; const PREF_LEADERBOARD_ENABLED = "newtabAdSize.leaderboard"; const PREF_LEADERBOARD_POSITION = "newtabAdSize.leaderboard.position"; const PREF_BILLBOARD_POSITION = "newtabAdSize.billboard.position"; -const PREF_REFINED_CARDS_ENABLED = "discoverystream.refinedCardsLayout.enabled"; const INTERSECTION_RATIO = 0.5; const VISIBLE = "visible"; const VISIBILITY_CHANGE_EVENT = "visibilitychange"; @@ -362,7 +361,6 @@ export class _CardGrid extends React.PureComponent { const listFeedSelectedFeed = prefs[PREF_LIST_FEED_SELECTED_FEED]; const billboardEnabled = prefs[PREF_BILLBOARD_ENABLED]; const leaderboardEnabled = prefs[PREF_LEADERBOARD_ENABLED]; - const refinedCardsLayout = prefs[PREF_REFINED_CARDS_ENABLED]; // filter out recs that should be in ListFeed const recs = this.props.data.recommendations @@ -398,7 +396,7 @@ export class _CardGrid extends React.PureComponent { features={rec.features} showTopics={showTopics} selectedTopics={selectedTopics} - excerpt={refinedCardsLayout && rec.excerpt} + excerpt={rec.excerpt} availableTopics={availableTopics} url={rec.url} id={rec.id} diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js index f721a913b4ee..45d613bdf67d 100644 --- a/browser/extensions/newtab/data/content/activity-stream.bundle.js +++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js @@ -4905,7 +4905,6 @@ const PREF_BILLBOARD_ENABLED = "newtabAdSize.billboard"; const PREF_LEADERBOARD_ENABLED = "newtabAdSize.leaderboard"; const PREF_LEADERBOARD_POSITION = "newtabAdSize.leaderboard.position"; const PREF_BILLBOARD_POSITION = "newtabAdSize.billboard.position"; -const PREF_REFINED_CARDS_ENABLED = "discoverystream.refinedCardsLayout.enabled"; const CardGrid_INTERSECTION_RATIO = 0.5; const CardGrid_VISIBLE = "visible"; const CardGrid_VISIBILITY_CHANGE_EVENT = "visibilitychange"; @@ -5189,7 +5188,6 @@ class _CardGrid extends (external_React_default()).PureComponent { const listFeedSelectedFeed = prefs[PREF_LIST_FEED_SELECTED_FEED]; const billboardEnabled = prefs[PREF_BILLBOARD_ENABLED]; const leaderboardEnabled = prefs[PREF_LEADERBOARD_ENABLED]; - const refinedCardsLayout = prefs[PREF_REFINED_CARDS_ENABLED]; // filter out recs that should be in ListFeed const recs = this.props.data.recommendations.filter(item => !item.feedName).slice(0, items); @@ -5214,7 +5212,7 @@ class _CardGrid extends (external_React_default()).PureComponent { features: rec.features, showTopics: showTopics, selectedTopics: selectedTopics, - excerpt: refinedCardsLayout && rec.excerpt, + excerpt: rec.excerpt, availableTopics: availableTopics, url: rec.url, id: rec.id, @@ -11237,7 +11235,7 @@ const CardSections_PREF_BILLBOARD_ENABLED = "newtabAdSize.billboard"; const CardSections_PREF_LEADERBOARD_ENABLED = "newtabAdSize.leaderboard"; const CardSections_PREF_LEADERBOARD_POSITION = "newtabAdSize.leaderboard.position"; const CardSections_PREF_BILLBOARD_POSITION = "newtabAdSize.billboard.position"; -const CardSections_PREF_REFINED_CARDS_ENABLED = "discoverystream.refinedCardsLayout.enabled"; +const PREF_REFINED_CARDS_ENABLED = "discoverystream.refinedCardsLayout.enabled"; function getLayoutData(responsiveLayouts, index, refinedCardsLayout) { let layoutData = { classNames: [], @@ -11312,7 +11310,7 @@ function CardSection({ const mayHaveThumbsUpDown = prefs[CardSections_PREF_THUMBS_UP_DOWN_ENABLED]; const selectedTopics = prefs[CardSections_PREF_TOPICS_SELECTED]; const availableTopics = prefs[CardSections_PREF_TOPICS_AVAILABLE]; - const refinedCardsLayout = prefs[CardSections_PREF_REFINED_CARDS_ENABLED]; + const refinedCardsLayout = prefs[PREF_REFINED_CARDS_ENABLED]; const { saveToPocketCard } = (0,external_ReactRedux_namespaceObject.useSelector)(state => state.DiscoveryStream);