fix: pr suggestions

cypress/e2e/discover.cy.ts

@@ -176,19 +176,20 @@ describe('Discover', () => {
     cy.intercept('/api/v1/discover/watchlist', { fixture: 'watchlist' }).as(
       'getWatchlist'
     );
+    // Wait for one of the watchlist movies to resolve
+    cy.intercept('/api/v1/movie/361743').as('getTmdbMovie');
 
     cy.visit('/');
 
     cy.wait('@getWatchlist');
 
-    // Wait for one of the watchlist movies to resolve
-    cy.intercept('/api/v1/movie/361743').as('getTmdbMovie');
-
     const sliderHeader = cy.contains('.slider-header', 'Plex Watchlist');
 
     sliderHeader.scrollIntoView();
 
     cy.wait('@getTmdbMovie');
+    // Wait a little longer to make sure the movie component reloaded
+    cy.wait(500);
 
     sliderHeader
       .next('[data-testid=media-slider]')
@@ -202,6 +203,7 @@ describe('Discover', () => {
           .next('[data-testid=media-slider]')
           .find('[data-testid=title-card]')
           .first()
+          .click()
           .click();
         cy.get('[data-testid=media-title]').should('contain', text);
       });

src/components/Discover/DiscoverWatchlist/index.tsx

@@ -7,7 +7,7 @@ import Error from '../../../pages/_error';
 import type { WatchlistItem } from '../../../../server/interfaces/api/discoverInterfaces';
 
 const messages = defineMessages({
-  discoverwatchlist: 'Plex Watchlist',
+  discoverwatchlist: 'Your Plex Watchlist',
 });
 
 const DiscoverWatchlist = () => {

src/components/Discover/index.tsx

@@ -5,7 +5,7 @@ import useSWR from 'swr';
 import type { WatchlistItem } from '../../../server/interfaces/api/discoverInterfaces';
 import type { MediaResultsResponse } from '../../../server/interfaces/api/mediaInterfaces';
 import type { RequestResultsResponse } from '../../../server/interfaces/api/requestInterfaces';
-import { Permission, useUser } from '../../hooks/useUser';
+import { Permission, UserType, useUser } from '../../hooks/useUser';
 import PageTitle from '../Common/PageTitle';
 import MediaSlider from '../MediaSlider';
 import RequestCard from '../RequestCard';
@@ -26,12 +26,12 @@ const messages = defineMessages({
   noRequests: 'No requests.',
   upcoming: 'Upcoming Movies',
   trending: 'Trending',
-  plexwatchlist: 'Plex Watchlist',
+  plexwatchlist: 'Your Plex Watchlist',
 });
 
 const Discover = () => {
   const intl = useIntl();
-  const { hasPermission } = useUser();
+  const { user, hasPermission } = useUser();
 
   const { data: media, error: mediaError } = useSWR<MediaResultsResponse>(
     '/api/v1/media?filter=allavailable&take=20&sort=mediaAdded',
@@ -51,7 +51,7 @@ const Discover = () => {
     totalPages: number;
     totalResults: number;
     results: WatchlistItem[];
-  }>('/api/v1/discover/watchlist', {
+  }>(user?.userType === UserType.PLEX ? '/api/v1/discover/watchlist' : null, {
     revalidateOnMount: true,
   });
 
@@ -104,6 +104,12 @@ const Discover = () => {
         placeholder={<RequestCard.Placeholder />}
         emptyMessage={intl.formatMessage(messages.noRequests)}
       />
+      {!(
+        !!watchlistItems &&
+        !watchlistError &&
+        watchlistItems.results.length === 0
+      ) && (
+        <>
           <div className="slider-header">
             <Link href="/discover/watchlist">
               <a className="slider-title">
@@ -112,11 +118,6 @@ const Discover = () => {
               </a>
             </Link>
           </div>
-      {!(
-        !!watchlistItems &&
-        !watchlistError &&
-        watchlistItems.results.length === 0
-      ) && (
           <Slider
             sliderKey="watchlist"
             isLoading={!watchlistItems && !watchlistError}
@@ -134,6 +135,7 @@ const Discover = () => {
               />
             ))}
           />
+        </>
       )}
       <MediaSlider
         sliderKey="trending"

src/i18n/locale/en.json

@@ -10,7 +10,7 @@
   "components.Discover.DiscoverStudio.studioMovies": "{studio} Movies",
   "components.Discover.DiscoverTvGenre.genreSeries": "{genre} Series",
   "components.Discover.DiscoverTvLanguage.languageSeries": "{language} Series",
-  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Plex Watchlist",
+  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Your Plex Watchlist",
   "components.Discover.MovieGenreList.moviegenres": "Movie Genres",
   "components.Discover.MovieGenreSlider.moviegenres": "Movie Genres",
   "components.Discover.NetworkSlider.networks": "Networks",
@@ -21,7 +21,7 @@
   "components.Discover.discovermovies": "Popular Movies",
   "components.Discover.discovertv": "Popular Series",
   "components.Discover.noRequests": "No requests.",
-  "components.Discover.plexwatchlist": "Plex Watchlist",
+  "components.Discover.plexwatchlist": "Your Plex Watchlist",
   "components.Discover.popularmovies": "Popular Movies",
   "components.Discover.populartv": "Popular Series",
   "components.Discover.recentlyAdded": "Recently Added",
@@ -233,11 +233,11 @@
   "components.PermissionEdit.autoapproveSeries": "Auto-Approve Series",
   "components.PermissionEdit.autoapproveSeriesDescription": "Grant automatic approval for non-4K series requests.",
   "components.PermissionEdit.autorequest": "Auto-Request",
-  "components.PermissionEdit.autorequestDescription": "Grant permission to use Plex Watchlist Sync to automatically request media.",
+  "components.PermissionEdit.autorequestDescription": "Grant permission to automatically submit requests for non-4K media via Plex Watchlist.",
   "components.PermissionEdit.autorequestMovies": "Auto-Request Movies",
-  "components.PermissionEdit.autorequestMoviesDescription": "Grant permission to use Plex Watchlist Sync to automatically request movies.",
+  "components.PermissionEdit.autorequestMoviesDescription": "Grant permission to automatically submit requests for non-4K movies via Plex Watchlist.",
   "components.PermissionEdit.autorequestSeries": "Auto-Request Series",
-  "components.PermissionEdit.autorequestSeriesDescription": "Grant permission to use Plex Watchlist Sync to automatically request series.",
+  "components.PermissionEdit.autorequestSeriesDescription": "Grant permission to automatically submit requests for non-4K series via Plex Watchlist.",
   "components.PermissionEdit.createissues": "Report Issues",
   "components.PermissionEdit.createissuesDescription": "Grant permission to report media issues.",
   "components.PermissionEdit.manageissues": "Manage Issues",
@@ -930,7 +930,9 @@
   "components.UserProfile.UserSettings.UserGeneralSettings.owner": "Owner",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexuser": "Plex User",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncmovies": "Auto-Request Movies",
+  "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncmoviestip": "Automatically request movies on your <PlexWatchlistSupportLink>Plex Watchlist</PlexWatchlistSupportLink>",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncseries": "Auto-Request Series",
+  "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncseriestip": "Automatically request series on your <PlexWatchlistSupportLink>Plex Watchlist</PlexWatchlistSupportLink>",
   "components.UserProfile.UserSettings.UserGeneralSettings.region": "Discover Region",
   "components.UserProfile.UserSettings.UserGeneralSettings.regionTip": "Filter content by regional availability",
   "components.UserProfile.UserSettings.UserGeneralSettings.role": "Role",