fix: rule size

MetaCubeX · Sep 4, 2023 · 2ff31d4 · 2ff31d4
1 parent b5d0ef9
commit 2ff31d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -5,6 +5,7 @@ import { ROUTES } from '~/constants'
 import {
   curTheme,
   endpoint,
+  renderProxiesInSamePage,
   selectedEndpoint,
   useAutoSwitchTheme,
   useProxies,
@@ -48,7 +49,9 @@ export const App = () => {
           <Show when={selectedEndpoint()}>
             <Route path={ROUTES.Overview} component={Overview} />
             <Route path={ROUTES.Proxies} component={Proxies} />
-            <Route path={ROUTES.ProxyProvider} component={ProxyProvider} />
+            <Show when={!renderProxiesInSamePage()}>
+              <Route path={ROUTES.ProxyProvider} component={ProxyProvider} />
+            </Show>
             <Route path={ROUTES.Rules} component={Rules} />
             <Route path={ROUTES.Conns} component={Connections} />
             <Route path={ROUTES.Log} component={Logs} />

diff --git a/src/pages/Rules.tsx b/src/pages/Rules.tsx
@@ -48,7 +48,9 @@ export default () => {
             <div class="card card-bordered card-compact mb-2 bg-base-200 p-4">
               <div class="break-all">
                 {rule.payload}
-                {rule.size !== -1 && ` (${rule.size})`}
+                {typeof rule.size === 'number' &&
+                  rule.size !== -1 &&
+                  ` (${rule.size})`}
               </div>
               <div class="text-xs text-slate-500">
                 {rule.type} :: {rule.proxy}