From fb090f239b8080b1195b4793b0cfb9a548ab791c Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Tue, 22 Feb 2022 16:20:20 -0500
Subject: [PATCH 1/2] Update name of mixed library type

---
 src/controllers/dashboard/library.js | 2 +-
 src/strings/en-us.json               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/controllers/dashboard/library.js b/src/controllers/dashboard/library.js
index 7248d5603d..e8b9301a93 100644
--- a/src/controllers/dashboard/library.js
+++ b/src/controllers/dashboard/library.js
@@ -242,7 +242,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
             name: globalize.translate('MusicVideos'),
             value: 'musicvideos'
         }, {
-            name: globalize.translate('Other'),
+            name: globalize.translate('MixedMoviesShows'),
             value: 'mixed',
             message: globalize.translate('MessageUnsetContentHelp')
         }];
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 821f24e1f9..b28f9d60f8 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1095,6 +1095,7 @@
     "MillisecondsUnit": "ms",
     "MinutesAfter": "minutes after",
     "MinutesBefore": "minutes before",
+    "MixedMoviesShows": "Mixed Movies and Shows",
     "Mixer": "Mixer",
     "Mobile": "Mobile",
     "Monday": "Monday",

From 11fdd8a48758dc58aa945048a5b8a49142eacabe Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Tue, 22 Feb 2022 16:20:57 -0500
Subject: [PATCH 2/2] Fix help message not displaying for mixed library type

---
 src/components/mediaLibraryCreator/mediaLibraryCreator.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.js b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
index 3126ed00af..86369b853e 100644
--- a/src/components/mediaLibraryCreator/mediaLibraryCreator.js
+++ b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
@@ -87,12 +87,11 @@ import template from './mediaLibraryCreator.template.html';
                 if (index != -1) {
                     const name = this.options[index].innerHTML.replace('*', '').replace('&amp;', '&');
                     $('#txtValue', dlg).val(name);
-                    const folderOption = collectionTypeOptions.filter(i => {
-                        return i.value == value;
-                    })[0];
-                    $('.collectionTypeFieldDescription', dlg).html(folderOption.message || '');
                 }
             }
+
+            const folderOption = collectionTypeOptions.find(i => i.value === value);
+            $('.collectionTypeFieldDescription', dlg).html(folderOption?.message || '');
         });
         page.querySelector('.btnAddFolder').addEventListener('click', onAddButtonClick);
         page.querySelector('.btnSubmit').addEventListener('click', onAddLibrary);