adding the bridge back in but without routing now...

hicommonwealth · Dec 30, 2024 · 5871222 · 5871222
1 parent 0e6f32c
commit 5871222
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/packages/commonwealth/client/scripts/App.tsx b/packages/commonwealth/client/scripts/App.tsx
@@ -9,6 +9,7 @@ import { HelmetProvider } from 'react-helmet-async';
 import { RouterProvider } from 'react-router-dom';
 import { ToastContainer } from 'react-toastify';
 import { queryClient } from 'state/api/config';
+import { ReactNativeBridge } from 'views/components/ReactNativeBridge';
 import { Splash } from './Splash';
 import { openFeatureProvider } from './helpers/feature-flags';
 import useAppStatus from './hooks/useAppStatus';
@@ -37,6 +38,7 @@ const App = () => {
                 ) : (
                   <>
                     <Mava />
+                    <ReactNativeBridge />
                     <RouterProvider router={router()} />
                     {isAddedToHomeScreen || isMarketingPage ? null : (
                       <AddToHomeScreenPrompt

diff --git a/packages/commonwealth/client/scripts/navigation/Router.tsx b/packages/commonwealth/client/scripts/navigation/Router.tsx
@@ -7,7 +7,6 @@ import {
   Route,
 } from 'react-router-dom';
 import { fetchCachedCustomDomain } from 'state/api/configuration';
-import { ReactNativeBridge } from 'views/components/ReactNativeBridge';
 import { withLayout } from 'views/Layout';
 import { PageNotFound } from 'views/pages/404';
 import CommonDomainRoutes from './CommonDomainRoutes';
@@ -39,7 +38,6 @@ const Router = () => {
         : CommonDomainRoutes(flags)),
       <>
         <Route key="routes" path="*" element={withLayout(PageNotFound, {})} />,
-        <ReactNativeBridge />
       </>,
     ]),
   );

diff --git a/...ages/commonwealth/client/scripts/views/components/ReactNativeBridge/ReactNativeBridge.tsx b/...ages/commonwealth/client/scripts/views/components/ReactNativeBridge/ReactNativeBridge.tsx
@@ -1,6 +1,5 @@
 import useUserStore from 'client/scripts/state/ui/user';
 import { useCallback, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 
 interface ReactNativeWebView {
   // allows us to send messages to ReactNative.
@@ -65,25 +64,22 @@ function isNavigateBack(data: object): data is NavigateBack {
  */
 export const ReactNativeBridge = () => {
   const user = useUserStore();
-  const navigate = useNavigate();
+  // const navigate = useNavigate();
 
   const [userInfo, setUserInfo] = useState<UserInfo | null>(null);
 
-  const handleMessage = useCallback(
-    (message: MessageEvent) => {
-      const obj = messageToObject(message.data);
-      if (obj && typeof message.data === 'object') {
-        if (isNavigateToLink(obj)) {
-          navigate(getPathAndQuery(obj.link));
-        }
-
-        if (isNavigateBack(obj)) {
-          navigate(-1);
-        }
-      }
-    },
-    [navigate],
-  );
+  const handleMessage = useCallback((message: MessageEvent) => {
+    const obj = messageToObject(message.data);
+    // if (obj && typeof message.data === 'object') {
+    //   if (isNavigateToLink(obj)) {
+    //     navigate(getPathAndQuery(obj.link));
+    //   }
+    //
+    //   if (isNavigateBack(obj)) {
+    //     navigate(-1);
+    //   }
+    // }
+  }, []);
 
   useEffect(() => {
     window.addEventListener('message', handleMessage);