From 03278d2624d13847c71da01ef4a6e702ae079cc3 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Tue, 8 Nov 2022 01:36:57 -0800
Subject: [PATCH] Fix action required for mpv

---
 .../action-required/components/mpv-required.tsx      |  8 ++++----
 .../action-required/routes/action-required-route.tsx |  4 ++--
 src/renderer/router/app-outlet.tsx                   | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/renderer/features/action-required/components/mpv-required.tsx b/src/renderer/features/action-required/components/mpv-required.tsx
index 59b7d8b9b..ef45355a8 100644
--- a/src/renderer/features/action-required/components/mpv-required.tsx
+++ b/src/renderer/features/action-required/components/mpv-required.tsx
@@ -1,18 +1,18 @@
 import { useEffect, useState } from 'react';
 import isElectron from 'is-electron';
 import { FileInput, Text, Button } from '@/renderer/components';
-import { settings } from '@/renderer/features/settings';
+import { localSettings } from '@/renderer/features/settings';
 
 export const MpvRequired = () => {
   const [mpvPath, setMpvPath] = useState('');
   const handleSetMpvPath = (e: File) => {
-    settings.set('mpv_path', e.path);
+    localSettings.set('mpv_path', e.path);
   };
 
   useEffect(() => {
     const getMpvPath = async () => {
       if (!isElectron()) return setMpvPath('');
-      const mpvPath = await settings.get('mpv_path');
+      const mpvPath = await localSettings.get('mpv_path');
       return setMpvPath(mpvPath);
     };
 
@@ -26,7 +26,7 @@ export const MpvRequired = () => {
         below.
       </Text>
       <FileInput placeholder={mpvPath} onChange={handleSetMpvPath} />
-      <Button onClick={() => settings.restart()}>Restart</Button>
+      <Button onClick={() => localSettings.restart()}>Restart</Button>
     </>
   );
 };
diff --git a/src/renderer/features/action-required/routes/action-required-route.tsx b/src/renderer/features/action-required/routes/action-required-route.tsx
index 0862957cb..29acb536f 100644
--- a/src/renderer/features/action-required/routes/action-required-route.tsx
+++ b/src/renderer/features/action-required/routes/action-required-route.tsx
@@ -8,7 +8,7 @@ import { ActionRequiredContainer } from '@/renderer/features/action-required/com
 import { MpvRequired } from '@/renderer/features/action-required/components/mpv-required';
 import { ServerCredentialRequired } from '@/renderer/features/action-required/components/server-credential-required';
 import { ServerRequired } from '@/renderer/features/action-required/components/server-required';
-import { settings } from '@/renderer/features/settings';
+import { localSettings } from '@/renderer/features/settings';
 import { AnimatedPage, useServerCredential } from '@/renderer/features/shared';
 import { AppRoute } from '@/renderer/router/routes';
 import { useAuthStore } from '@/renderer/store';
@@ -23,7 +23,7 @@ export const ActionRequiredRoute = () => {
   useEffect(() => {
     const getMpvPath = async () => {
       if (!isElectron()) return setIsMpvRequired(false);
-      const mpvPath = await settings.get('mpv_path');
+      const mpvPath = await localSettings.get('mpv_path');
       return setIsMpvRequired(!mpvPath);
     };
 
diff --git a/src/renderer/router/app-outlet.tsx b/src/renderer/router/app-outlet.tsx
index 72bc44d37..5a14c8298 100644
--- a/src/renderer/router/app-outlet.tsx
+++ b/src/renderer/router/app-outlet.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 import isElectron from 'is-electron';
 import { Navigate, Outlet, useLocation } from 'react-router-dom';
-import { settings } from '@/renderer/features/settings';
+import { localSettings } from '@/renderer/features/settings';
 import { useServerCredential } from '@/renderer/features/shared';
 import { AppRoute } from '@/renderer/router/routes';
 import { useAuthStore } from '@/renderer/store';
@@ -24,7 +24,7 @@ export const AppOutlet = ({ redirectTo }: PrivateOutletProps) => {
   useEffect(() => {
     const getMpvPath = async () => {
       if (!isElectron()) return setIsMpvRequired(false);
-      const mpvPath = await settings.get('mpv_path');
+      const mpvPath = await localSettings.get('mpv_path');
       return setIsMpvRequired(!mpvPath);
     };
 
@@ -34,10 +34,6 @@ export const AppOutlet = ({ redirectTo }: PrivateOutletProps) => {
   const actions = [isServerRequired, isCredentialRequired, isMpvRequired];
   const actionRequired = actions.some((c) => c);
 
-  if (isAuthenticated) {
-    return <Outlet />;
-  }
-
   if (isAuthenticated && actionRequired) {
     return (
       <Navigate
@@ -48,6 +44,10 @@ export const AppOutlet = ({ redirectTo }: PrivateOutletProps) => {
     );
   }
 
+  if (isAuthenticated) {
+    return <Outlet />;
+  }
+
   logout();
   return <Navigate replace state={{ from: location }} to={redirectTo} />;
 };