feat(rebase): rebase

src/components/MovieDetails/index.tsx

@@ -486,7 +486,7 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
                     />
                   </svg>
                   <span>
-                    {data.mediaInfo?.mediaUrl || data.mediaInfo?.mediaUrl
+                    {data.mediaInfo?.mediaUrl || data.mediaInfo?.mediaUrl4k
                       ? intl.formatMessage(
                           settings.currentSettings.mediaServerType ==
                             MediaServerType.PLEX

src/components/TvDetails/index.tsx

@@ -33,11 +33,7 @@ import ConfirmButton from '../Common/ConfirmButton';
 import DownloadBlock from '../DownloadBlock';
 import PageTitle from '../Common/PageTitle';
 import useSettings from '../../hooks/useSettings';
-<<<<<<< HEAD
 import PlayButton, { PlayButtonLink } from '../Common/PlayButton';
-=======
-import { MediaServerType } from '../../../server/constants/server';
->>>>>>> 2fe4add... feat(rebase): rebase
 
 const messages = defineMessages({
   firstAirDate: 'First Air Date',

src/context/SettingsContext.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { PublicSettingsResponse } from '../../server/interfaces/api/settingsInterfaces';
 import useSWR from 'swr';
+import { MediaServerType } from '../../server/constants/server';
 
 export interface SettingsContextProps {
   currentSettings: PublicSettingsResponse;
@@ -15,7 +16,7 @@ const defaultSettings = {
   series4kEnabled: false,
   region: '',
   originalLanguage: '',
-  mediaServerType: 'PLEX',
+  mediaServerType: MediaServerType.NOT_CONFIGURED,
 };
 
 export const SettingsContext = React.createContext<SettingsContextProps>({

src/pages/_app.tsx

@@ -16,6 +16,7 @@ import { InteractionProvider } from '../context/InteractionContext';
 import StatusChecker from '../components/StatusChacker';
 import { PublicSettingsResponse } from '../../server/interfaces/api/settingsInterfaces';
 import { SettingsProvider } from '../context/SettingsContext';
+import { MediaServerType } from '../../server/constants/server';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const loadLocaleData = (locale: AvailableLocales): Promise<any> => {
@@ -146,7 +147,7 @@ CoreApp.getInitialProps = async (initialProps) => {
     localLogin: true,
     region: '',
     originalLanguage: '',
-    mediaServerType: 'PLEX',
+    mediaServerType: MediaServerType.NOT_CONFIGURED,
   };
 
   let locale = 'en';