diff --git a/.github/workflows/clients.yml b/.github/workflows/clients.yml index b9a5e302d..02cc111e0 100644 --- a/.github/workflows/clients.yml +++ b/.github/workflows/clients.yml @@ -29,7 +29,7 @@ jobs: uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main - name: Generate release, if needed shell: bash - run: HUSKY=0 pnpm dlx semantic-release + run: HUSKY=0 pnpm dlx semantic-release@24.2.9 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Check for new release diff --git a/clients/web/public/locales/en/goodbye.json b/clients/web/public/locales/en/goodbye.json index 7fdb0fc14..2269b80b4 100644 --- a/clients/web/public/locales/en/goodbye.json +++ b/clients/web/public/locales/en/goodbye.json @@ -1,9 +1,10 @@ { "announcement": "<0>So long, farewell, Auf Wiedersehen...<1>After careful consideration, we’ve made the difficult decision to phase out Pocket - our read-it-later and content discovery app. This includes the Pocket Web, Android, iOS, and macOS apps, as well as the Pocket browser extensions.", "investing-in-the-future": "<0>Investing in the future<1>Firefox is the only major browser not backed by a billionaire and our independence shapes everything we build. This independence allows us to prioritize building products and tools, which shape the future of the internet for the better. And it means we have to be intentional about where we invest our time and resources so we can make the biggest impact.", - "mozilla-commitment": "<0>Mozilla’s commitment to high-quality content recommendations<1>While Pocket is shutting down, Mozilla continues with our commitment to high-quality content recommendations in Firefox. We take an “algotorial” approach to curating the best of the web for the millions of users who make Firefox their window to the internet. We use machine learning algorithms to scour the internet for high quality content that will appeal to Firefox’s large and diverse user base, while relying on a human editorial team to provide oversight to ensure that the recommendations on Firefox New Tab are trustworthy, engaging, and high quality.", + "mozilla-commitment": "<0>Mozilla’s commitment to high-quality content recommendations<1>While Pocket has shut down, Mozilla continues with our commitment to high-quality content recommendations in Firefox. We take an “algotorial” approach to curating the best of the web for the millions of users who make Firefox their window to the internet. We use machine learning algorithms to scour the internet for high quality content that will appeal to Firefox’s large and diverse user base, while relying on a human editorial team to provide oversight to ensure that the recommendations on Firefox New Tab are trustworthy, engaging, and high quality.", "pocket-heritage": "<0>Pocket’s Heritage<1>What began as a read-it-later app evolved into something much bigger. After Mozilla acquired Pocket in 2017, we invested in building content curation and recommendation capabilities so people everywhere can discover and access high quality web content.<2>In the past 8 years, we’ve expanded high-quality content recommendations to more than a dozen countries and five languages, connecting tens of millions of people each month with articles worthy of their time and attention.", "thank-you": "<0>Thank you for being a part of this journey<1><2>Contact us for press inquiries at <2>press@getpocket.com.", "what-happens-next": "<0>What happens next?<1><0>Saves Export<1><0>You can <2>export saves anytime until October 8, 2025, after which all user data will be permanently deleted.<1>For account support and enquiries, please visit the <2>Pocket support page.<2><0>Premium User Subscriptions<1><0>Premium monthly subscriptions will be cancelled automatically before their next billing cycle.<1>Premium annual subscriptions will be cancelled on July 8, and users will receive a prorated refund automatically. The refund will be based on how much time is left in their subscription after July 8, 2025.<2>We’ve arranged refunds to users’ original payment method based on their subscription type.<3><0>Pocket Hits <1><0>The Pocket email newsletter “Pocket Hits”, which offers readers daily and weekly curation of engaging content from trustworthy sources, will be renamed mid-June 2025, to “Ten Tabs ”. All readers will be notified about these changes in the email newsletter.<1>Readers will continue receiving the same high-quality content in the usual format, curated by the same editorial team, but now powered by Firefox. Those who no longer wish to receive the newsletter can opt out via the unsubscribe link at the bottom of the email.<4><0>Additional details", - "why": "<0>Why is Pocket shutting down?<1>Pocket has helped millions save articles and discover stories worth reading. But the way people save and consume content on the web has evolved, so we’re channeling our resources into projects that better match browsing habits today. Discovery also continues to evolve; Pocket helped shape the curated content recommendations you already see in Firefox, and that experience will keep getting better. Meanwhile, new features like Tab Groups and enhanced bookmarks now provide built-in ways to manage reading lists easily." + "additional-details": "Additional details", + "why": "<0>Why has Pocket shut down?<1>Pocket has helped millions save articles and discover stories worth reading. But the way people save and consume content on the web has evolved, so we’re channeling our resources into projects that better match browsing habits today. Discovery also continues to evolve; Pocket helped shape the curated content recommendations you already see in Firefox, and that experience will keep getting better. Meanwhile, new features like Tab Groups and enhanced bookmarks now provide built-in ways to manage reading lists easily." } diff --git a/clients/web/src/pages/discover/[slug].js b/clients/web/src/archive/pages/discover/[slug].js similarity index 100% rename from clients/web/src/pages/discover/[slug].js rename to clients/web/src/archive/pages/discover/[slug].js diff --git a/clients/web/src/pages/discover/index.js b/clients/web/src/archive/pages/discover/index.js similarity index 100% rename from clients/web/src/pages/discover/index.js rename to clients/web/src/archive/pages/discover/index.js diff --git a/clients/web/src/pages/discover/item/[slug].js b/clients/web/src/archive/pages/discover/item/[slug].js similarity index 100% rename from clients/web/src/pages/discover/item/[slug].js rename to clients/web/src/archive/pages/discover/item/[slug].js diff --git a/clients/web/src/connectors/global-nav/global-nav.js b/clients/web/src/connectors/global-nav/global-nav.js index d8b0f549d..60facc340 100644 --- a/clients/web/src/connectors/global-nav/global-nav.js +++ b/clients/web/src/connectors/global-nav/global-nav.js @@ -21,8 +21,6 @@ import { sendSnowplowEvent } from 'connectors/snowplow/snowplow.state' import { itemsImportShow } from 'connectors/items/mutation-import.state' import { featureFlagActive } from 'connectors/feature-flags/feature-flags' -import { Banner } from './global-nav-banner' - // check empty avatar value coming from endpoint (sample default avatar url to overwrite https://pocket-profile-images.s3.amazonaws.com/profileBlue.png) export const enforceDefaultAvatar = (avatarUrl = '') => { const DISALLOWED_PROFILE_IMGS = ['profileBlue.png'] // file names of default urls returned by BE. If a user avatar url contains one of these, we prefer to return an empty string, in order to use the Web UI's Avatar default image instead @@ -42,7 +40,7 @@ export const enforceDefaultAvatar = (avatarUrl = '') => { * provided to it to the GlobalNav component. */ const GlobalNav = (props) => { - const { selectedLink: selected, subset, tag, noNav, bannerCampaign, onlyLogout } = props + const { selectedLink: selected, subset, tag, bannerCampaign, onlyLogout } = props const { t } = useTranslation() const dispatch = useDispatch() const router = useRouter() @@ -115,7 +113,6 @@ const GlobalNav = (props) => { } const NavTakeover = navChildren[appMode] - const hideNav = noNav const onLoginClick = (event) => { event.preventDefault() @@ -127,8 +124,6 @@ const GlobalNav = (props) => { dispatch(itemsImportShow()) } - const CurrentBanner = bannerCampaign ? Banner : null - return ( { setDetailMode={setDetailMode} sendImpression={sendImpressionEvent} tools={tools} - noNav={hideNav} + noNav={true} onlyLogout={onlyLogout} bannerCampaign={bannerCampaign} - Banner={CurrentBanner} flagsReady={flagsReady}> {NavTakeover ? ( diff --git a/clients/web/src/containers/farewell/farewell.js b/clients/web/src/containers/farewell/farewell.js index d637eabbc..45eb12711 100644 --- a/clients/web/src/containers/farewell/farewell.js +++ b/clients/web/src/containers/farewell/farewell.js @@ -42,7 +42,7 @@ export function Farewell() {
-

Why is Pocket shutting down?

+

Why has Pocket shut down?

Pocket has helped millions save articles and discover stories worth reading. But the way people save and consume content on the web has evolved, so we’re channeling our @@ -97,7 +97,7 @@ export function Farewell() {

Mozilla’s commitment to high-quality content recommendations

- While Pocket is shutting down, Mozilla continues with our commitment to high-quality + While Pocket has shut down, Mozilla continues with our commitment to high-quality content recommendations in Firefox. We take an “algotorial” approach to curating the best of the web for the millions of users who make Firefox their window to the internet. We use machine learning algorithms to scour the internet for high quality @@ -113,69 +113,13 @@ export function Farewell() {

- -

What happens next?

- -
-

Saves Export

-
    -
  • - You can{' '} - export{' '} - saves anytime until October 8, 2025, after which all user data will be permanently - deleted. -
    • -
  • - For account support and enquiries, please visit the{' '} - Pocket support page. -
    • -
-
-
-

Premium User Subscriptions

-
    -
  • - Premium monthly subscriptions will be cancelled automatically before their next - billing cycle. -
    • -
  • - Premium annual subscriptions will be cancelled on July 8, and users will receive a - prorated refund automatically. The refund will be based on how much time is left - in their subscription after July 8, 2025. -
    • -
  • - We’ve arranged refunds to users’ original payment method based on their - subscription type. -
    • -
-
- -
-

Pocket Hits

-
    -
  • - The Pocket email newsletter “Pocket Hits”, which offers readers daily and weekly - curation of engaging content from trustworthy sources, will be renamed mid-June - 2025, to “Ten Tabs ”. All readers will be notified about these changes in the - email newsletter. -
    • -
  • - Readers will continue receiving the same high-quality content in the usual format, - curated by the same editorial team, but now powered by Firefox. Those who no - longer wish to receive the newsletter can opt out via the unsubscribe link at the - bottom of the email. -
    • -
-
- - - +