Fix microservice

ApollosProject · Apr 18, 2024 · 8d84805 · 8d84805
1 parent b1ff8e0
commit 8d84805
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/micro-service/src/App.js b/micro-service/src/App.js
@@ -6,6 +6,7 @@ import {
   AppProvider,
   createBrowserRouter,
   RouterProvider,
+  NavigationProvider,
 } from '@apollosproject/web-shared/providers';
 
 import AppHeader from '@apollosproject/web-shared/components/AppHeader';
@@ -36,7 +37,9 @@ function App({ searchParams, url }) {
     <>
       <AppHeader />
       <Styled.FeedWrapper>
-        <FeatureFeed featureFeed={`${type}:${randomId}`} church={churchSlug} />
+        <NavigationProvider>
+          <FeatureFeed featureFeed={`${type}:${randomId}`} church={churchSlug} />
+        </NavigationProvider>
       </Styled.FeedWrapper>
     </>
   );

diff --git a/packages/web-shared/embeds/FeatureFeed.js b/packages/web-shared/embeds/FeatureFeed.js
@@ -10,7 +10,6 @@ import { useNavigation } from '../providers/NavigationProvider';
 
 function RenderFeatures(props) {
   const { id } = useNavigation();
-
   const { type, randomId } = parseSlugToIdAndType(id) ?? {};
 
   const Component = getComponentFromType({ type, id: randomId });

diff --git a/packages/web-shared/providers/NavigationProvider.js b/packages/web-shared/providers/NavigationProvider.js
@@ -15,7 +15,7 @@ const NavigationProvider = (props = {}) => {
 
   if (shouldUsePathRouter) {
     navigate = ({ id } = {}) => {
-      const type = id.includes('FeatureFeed') ? 'feed' : 'content';
+      const type = id?.includes('FeatureFeed') ? 'feed' : 'content';
       if (id) {
         nativeNavigate({
           pathname: `/${type === 'content' ? 'ac' : 'af'}/${id}`,

diff --git a/packages/web-shared/providers/index.js b/packages/web-shared/providers/index.js
@@ -5,6 +5,7 @@ import ContentItemProvider from './ContentItemProvider';
 import FeatureFeedProvider from './FeatureFeedProvider';
 import ModalProvider from './ModalProvider';
 import SearchProvider from './SearchProvider';
+import NavigationProvider from './NavigationProvider';
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 
 export {
@@ -17,4 +18,5 @@ export {
   SearchProvider,
   createBrowserRouter,
   RouterProvider,
+  NavigationProvider,
 };