[fix] resolve merge conflicts.

calblueprint · Jun 4, 2024 · bf7af67 · bf7af67
2 parents a5f5288 + 208feb8
commit bf7af67
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 97 deletions.
diff --git a/app.json b/app.json
@@ -23,7 +23,7 @@
         "NSMicrophoneUsageDescription": "Allow $(PRODUCT_NAME) to access your microphone"
       },
       "bundleIdentifier": "org.calblueprint.impactfund",
-      "buildNumber": "15"
+      "buildNumber": "16"
     },
     "android": {
       "adaptiveIcon": {
@@ -48,7 +48,7 @@
       [
         "expo-notifications",
         {
-          "icon": "./assets/icon.png",
+          "icon": "./assets/notification-logo.png",
           "color": "#ffffff"
         }
       ]

diff --git a/assets/notification-logo.png b/assets/notification-logo.png
diff --git a/eas.json b/eas.json
diff --git a/src/app/(BottomTabNavigation)/AllCases/index.tsx b/src/app/(BottomTabNavigation)/AllCases/index.tsx
@@ -1,4 +1,4 @@
-import * as Linking from 'expo-linking';
+// import * as Linking from 'expo-linking';
 import * as Notifications from 'expo-notifications';
 import { router } from 'expo-router';
 import React, { useContext, useState, useEffect, useRef } from 'react';
@@ -16,69 +16,70 @@ import {
 } from '../../../supabase/pushNotifications';
 
 import 'react-native-url-polyfill/auto';
-enum linkingEvents {
-  ADD_CASE = 'addCase',
-  NOTIFICATION = 'notification',
-}
 
-function CasesScreen() {
-  Notifications.setNotificationHandler({
-    handleNotification: async () => ({
-      shouldShowAlert: true,
-      shouldPlaySound: false,
-      shouldSetBadge: false,
-    }),
-  });
+// enum linkingEvents {
+//   ADD_CASE = 'addCase',
+//   NOTIFICATION = 'notification',
+// }
+
+Notifications.setNotificationHandler({
+  handleNotification: async () => ({
+    shouldShowAlert: true,
+    shouldPlaySound: false,
+    shouldSetBadge: false,
+  }),
+});
 
+function CasesScreen() {
   const notificationListener = useRef<Notifications.Subscription>();
   const responseListener = useRef<Notifications.Subscription>();
 
   const { allCases, loading } = useContext(CaseContext);
   const { session } = useSession();
   const [notificationResponse, setNotificationResponse] = useState<string>('');
 
-  const [url, setUrl] = useState<Linking.ParsedURL | null>(null);
-
-  function urlRedirect(parsedUrl: Linking.ParsedURL) {
-    if (!parsedUrl) return;
-    // parse query params and determine routing
-    const { queryParams } = parsedUrl;
-    // determine routing from the event variable
-    if (queryParams?.event) {
-      const event = queryParams.event.toString();
-      // TODO: determine a way to validate required parameters
-      // TODO: prevent users from routing to a case they're already involved in
-      if (event === linkingEvents.ADD_CASE)
-        router.push({
-          pathname: `/AllCases/AddCase/${queryParams.caseUid}`,
-        });
-    }
-  }
-
-  function handleDeepLink(event: any) {
-    const parsedUrl = Linking.parse(event.url);
-    if (parsedUrl) {
-      setUrl(parsedUrl);
-      urlRedirect(parsedUrl);
-    }
-  }
-
-  async function getInitialUrl() {
-    const initialUrl = await Linking.getInitialURL();
-    if (initialUrl) {
-      const parsed = Linking.parse(initialUrl);
-      setUrl(parsed);
-      urlRedirect(parsed);
-    }
-  }
+  // const [url, setUrl] = useState<Linking.ParsedURL | null>(null);
+
+  // function urlRedirect(parsedUrl: Linking.ParsedURL) {
+  //   if (!parsedUrl) return;
+  //   // parse query params and determine routing
+  //   const { queryParams } = parsedUrl;
+  //   // determine routing from the event variable
+  //   if (queryParams?.event) {
+  //     const event = queryParams.event.toString();
+  //     // TODO: determine a way to validate required parameters
+  //     // TODO: prevent users from routing to a case they're already involved in
+  //     if (event === linkingEvents.ADD_CASE)
+  //       router.push({
+  //         pathname: `/AllCases/AddCase/${queryParams.caseUid}`,
+  //       });
+  //   }
+  // }
+
+  // function handleDeepLink(event: any) {
+  //   const parsedUrl = Linking.parse(event.url);
+  //   if (parsedUrl) {
+  //     setUrl(parsedUrl);
+  //     urlRedirect(parsedUrl);
+  //   }
+  // }
+
+  // async function getInitialUrl() {
+  //   const initialUrl = await Linking.getInitialURL();
+  //   if (initialUrl) {
+  //     const parsed = Linking.parse(initialUrl);
+  //     setUrl(parsed);
+  //     urlRedirect(parsed);
+  //   }
+  // }
 
   useEffect(() => {
-    // will detect any incoming link requests, assuming the app is already open
-    Linking.addEventListener('url', handleDeepLink);
-    if (!url) {
-      // if the link opened the app, must route to the initial incoming route
-      getInitialUrl();
-    }
+    // // will detect any incoming link requests, assuming the app is already open
+    // Linking.addEventListener('url', handleDeepLink);
+    // if (!url) {
+    //   // if the link opened the app, must route to the initial incoming route
+    //   getInitialUrl();
+    // }
 
     if (session?.user) {
       registerForPushNotifications().then(async (token: string) => {
@@ -88,7 +89,7 @@ function CasesScreen() {
 
     notificationListener.current =
       Notifications.addNotificationReceivedListener(notification => {
-        const updateId = notification.request.content.data['id'];
+        const updateId = notification.request.content.data.updateId;
         const debugString =
           'NotificationRecieved: ' +
           notification +
@@ -105,7 +106,7 @@ function CasesScreen() {
 
     responseListener.current =
       Notifications.addNotificationResponseReceivedListener(response => {
-        const updateId = response.notification.request.content.data['id'];
+        const updateId = response.notification.request.content.data.updateId;
         const debugString =
           'NotificationResponseRecieved: ' +
           response +
@@ -142,6 +143,7 @@ function CasesScreen() {
             ListHeaderComponent={() => (
               <>
                 <View style={styles.headerContainer}>
+                  <Text>Notifications Debug: {notificationResponse}</Text>
                   <Text style={fonts.tabHeading}>My Cases</Text>
                 </View>
               </>