feat(rebase): rebase

This commit is contained in:
Aiden Vigue
2021-02-15 15:44:50 -05:00
parent 29274614c3
commit 9d61092f37
7 changed files with 78 additions and 44 deletions

View File

@@ -490,7 +490,7 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
settings.currentSettings.mediaServerType ===
MediaServerType.PLEX
? 'Plex'
: settings.currentSettings.jellyfinServerName,
: 'Jellyfin',
})
: data.mediaInfo?.mediaUrl4k &&
(hasPermission(Permission.REQUEST_4K) ||
@@ -500,7 +500,7 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
settings.currentSettings.mediaServerType ===
MediaServerType.PLEX
? 'Plex'
: settings.currentSettings.jellyfinServerName,
: 'Jellyfin',
})
: intl.formatMessage(messages.watchtrailer)}
</span>
@@ -543,7 +543,7 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
settings.currentSettings.mediaServerType ===
MediaServerType.PLEX
? 'Plex'
: settings.currentSettings.jellyfinServerName,
: 'Jellyfin',
})}
</ButtonWithDropdown.Item>
)}