Fix New Plex Login option being tied to localLogin settings, and also…

… being disabled unecessarily
sct · Nov 9, 2024 · 06954a0 · 06954a0
1 parent 502b9fb
commit 06954a0
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/src/components/Login/index.tsx b/src/components/Login/index.tsx
@@ -120,26 +120,26 @@ const Login = () => {
             <Accordion single atLeastOne>
               {({ openIndexes, handleClick, AccordionContent }) => (
                 <>
-                  <button
-                    className={`w-full cursor-default bg-gray-800 bg-opacity-70 py-2 text-center text-sm font-bold text-gray-400 transition-colors duration-200 focus:outline-none sm:rounded-t-lg ${
-                      openIndexes.includes(0) && 'text-indigo-500'
-                    } ${
-                      settings.currentSettings.localLogin &&
-                      'hover:cursor-pointer hover:bg-gray-700'
-                    }`}
-                    onClick={() => handleClick(0)}
-                    disabled={!settings.currentSettings.localLogin}
-                  >
-                    {intl.formatMessage(messages.signinwithplex)}
-                  </button>
-                  <AccordionContent isOpen={openIndexes.includes(0)}>
-                    <div className="px-10 py-8">
-                      <PlexLoginButton
-                        isProcessing={isProcessing}
-                        onAuthToken={(authToken) => setAuthToken(authToken)}
-                      />
+                  {settings.currentSettings.newPlexLogin && (
+                    <div>
+                      <button
+                        className={`w-full cursor-default bg-gray-800 bg-opacity-70 py-2 text-center text-sm font-bold text-gray-400 transition-colors duration-200 hover:cursor-pointer hover:bg-gray-700 focus:outline-none ${
+                          openIndexes.includes(0) && 'text-indigo-500'
+                        }`}
+                        onClick={() => handleClick(0)}
+                      >
+                        {intl.formatMessage(messages.signinwithplex)}
+                      </button>
+                      <AccordionContent isOpen={openIndexes.includes(0)}>
+                        <div className="px-10 py-8">
+                          <PlexLoginButton
+                            isProcessing={isProcessing}
+                            onAuthToken={(authToken) => setAuthToken(authToken)}
+                          />
+                        </div>
+                      </AccordionContent>
                     </div>
-                  </AccordionContent>
+                  )}
                   {settings.currentSettings.localLogin && (
                     <div>
                       <button
@@ -160,8 +160,8 @@ const Login = () => {
                       </AccordionContent>
                     </div>
                   )}
-                  {settings.currentSettings.oidcLogin ? (
-                    <>
+                  {settings.currentSettings.oidcLogin && (
+                    <div>
                       <button
                         className={`w-full cursor-default bg-gray-800 bg-opacity-70 py-2 text-center text-sm font-bold text-gray-400 transition-colors duration-200 hover:cursor-pointer hover:bg-gray-700 focus:outline-none ${
                           openIndexes.includes(2)
@@ -182,8 +182,8 @@ const Login = () => {
                           />
                         </div>
                       </AccordionContent>
-                    </>
-                  ) : null}
+                    </div>
+                  )}
                 </>
               )}
             </Accordion>