fix: load web home container

OneKeyHQ · Oct 21, 2023 · ee283b4 · ee283b4
1 parent fa287c5
commit ee283b4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/packages/kit/src/views/Discover/Controller/gotoSite.tsx b/packages/kit/src/views/Discover/Controller/gotoSite.tsx
@@ -38,9 +38,9 @@ export const gotoSite = ({
       // TODO: add to history
     }
 
-    if (webHandler === 'browser') {
-      return openUrl(validatedUrl);
-    }
+    // if (webHandler === 'browser') {
+    //   return openUrl(validatedUrl);
+    // }
 
     const tabId = tab.id;
     const isDeepLink =

diff --git a/...ews/Discover/Content/WebHomeContainer.tsx → ...ver/Explorer/Content/WebHomeContainer.tsx b/...ews/Discover/Content/WebHomeContainer.tsx → ...ver/Explorer/Content/WebHomeContainer.tsx
@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 
-import { openMatchDApp } from '../Controller/gotoSite';
-import DiscoverDashboard from '../Dashboard';
+import { openMatchDApp } from '../../Controller/gotoSite';
+import DiscoverDashboard from '../../Dashboard';
 
 const WebHomeContainer: FC<{ alwaysOpenNewWindow?: boolean }> = ({
   alwaysOpenNewWindow,

diff --git a/packages/kit/src/views/Discover/Explorer/Desktop/ExplorerDesktop.tsx b/packages/kit/src/views/Discover/Explorer/Desktop/ExplorerDesktop.tsx
@@ -5,13 +5,14 @@ import useSafeAreaInsets from '@onekeyhq/components/src/Provider/hooks/useSafeAr
 import { simpleDb } from '@onekeyhq/kit/src/components/WebView/mock';
 
 import { usePromiseResult } from '../../../../hooks/usePromiseResult';
+import { webHandler } from '../../explorerUtils';
+import WebHomeContainer from '../Content/WebHomeContainer';
 import {
   homeTab,
   setWebTabsWriteAtom,
   useAtomWebTabs,
   withProviderWebTabs,
 } from '../Context/contextWebTabs';
-import { webHandler } from '../../explorerUtils';
 
 import ControllerBarDesktop from './ControllerBarDesktop';
 import TabBarDesktop from './TabBarDesktop';
@@ -59,7 +60,7 @@ function ExplorerDesktop() {
   return (
     <Stack flex={1} zIndex={3}>
       {!showExplorerBar && <ExplorerHeader />}
-      <Stack>WebView Content</Stack>
+      <WebHomeContainer />
     </Stack>
   );
 }

diff --git a/packages/kit/src/views/Discover/explorerUtils.ts b/packages/kit/src/views/Discover/explorerUtils.ts
@@ -47,7 +47,7 @@ export function getWebviewWrapperRef(id?: string) {
   let tabId = id;
   if (!tabId) {
     const { getCurrentTabId } =
-      require('./Context/contextWebTabs') as typeof import('./Explorer/Context/contextWebTabs');
+      require('./Explorer/Context/contextWebTabs') as typeof import('./Explorer/Context/contextWebTabs');
     tabId = getCurrentTabId();
   }
   const ref = tabId ? webviewRefs[tabId] : null;