fix(HQM-376): Update new navigation

haqq-network · May 6, 2024 · b2a5765 · b2a5765
1 parent be479fa
commit b2a5765
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/src/components/popup/dismiss-popup-button.tsx b/src/components/popup/dismiss-popup-button.tsx
@@ -16,9 +16,7 @@ export const DismissPopupButton = () => {
       style={page.container}
       testID="dismissPopupButton"
       onPress={() => {
-        try {
-          navigation.pop();
-        } catch (e) {
+        if (navigation.canGoBack()) {
           navigation.goBack();
         }
       }}>

diff --git a/src/event-actions/on-push-notification.ts b/src/event-actions/on-push-notification.ts
@@ -51,13 +51,15 @@ export async function onPushNotification(message: RemoteMessage<Data>) {
 
         VariablesBool.set('isNewNews', true);
       }
-
-      navigator.navigate(NewsStackRoutes.NewsDetail, {
-        id: message.data.id,
+      navigator.navigate('homeNews', {
         // @ts-ignore
-        openEvent: MarketingEvents.newsOpenPushItem,
-        linkEvent: MarketingEvents.newsOpenPushLink,
-        scrollEvent: MarketingEvents.newsScrolledPushItem,
+        screen: NewsStackRoutes.NewsDetail,
+        params: {
+          id: id,
+          openEvent: MarketingEvents.newsOpenPushItem,
+          linkEvent: MarketingEvents.newsOpenPushLink,
+          scrollEvent: MarketingEvents.newsScrolledPushItem,
+        },
       });
       break;
     case PushNotificationTypes.raffle:

diff --git a/src/route-types.ts b/src/route-types.ts
@@ -209,7 +209,7 @@ export enum NewsStackRoutes {
   OurNews = 'ourNews',
 }
 
-export type NewsStackParamList = HomeStackParamList & {
+export type NewsStackParamList = {
   [NewsStackRoutes.News]: undefined;
   [NewsStackRoutes.NewsDetail]: {
     id: string;

diff --git a/src/types.ts b/src/types.ts
@@ -177,6 +177,14 @@ export type RootStackParamList = {
           | 'browserEditBookmarksScreen'
           | 'browserHomePage';
       };
+  homeNews:
+    | undefined
+    | {
+        id: string;
+        openEvent: MarketingEvents;
+        linkEvent: MarketingEvents;
+        scrollEvent: MarketingEvents;
+      };
   homeSettings:
     | undefined
     | {