Merge branch 'main' into dev

# Conflicts:
#	app/(auth)/_layout.tsx

.github/workflows/ci-cd.yml

@@ -34,7 +34,7 @@ jobs:
           token: ${{ secrets.EXPO_TOKEN }}
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
 
       - name: Prebuild, Build and Submit
         run: npm run prebuild-build-submit-ios-cicd

app.json

@@ -16,7 +16,7 @@
       "supportsTablet": true,
       "bundleIdentifier": "com.cally.app",
       "googleServicesFile": "./ios/GoogleService-Info.plist",
-      "buildNumber": "15"
+      "buildNumber": "18"
     },
     "android": {
       "adaptiveIcon": {

app/(auth)/settings/index.tsx

@@ -1,15 +1,11 @@
 import SettingsPage from "@/components/pages/settings/SettingsPage";
-import { AuthContextProvider } from "@/contexts/AuthContext";
-import { SettingsContextProvider } from "@/contexts/SettingsContext";
+import {SettingsContextProvider} from "@/contexts/SettingsContext";
 import React from "react";
-import { View } from "react-native-ui-lib";
 
 export default function Screen() {
     return (
-    <AuthContextProvider>
         <SettingsContextProvider>
-        <SettingsPage />
+            <SettingsPage/>
         </SettingsContextProvider>
-    </AuthContextProvider>
     );
 }

components/pages/calendar/CalendarPage.tsx

@@ -17,6 +17,7 @@ import { ManuallyAddEventModal } from "@/components/pages/calendar/ManuallyAddEv
 import { CalendarEvent, useCalendarContext } from "@/contexts/CalendarContext";
 import { useSettingsContext } from "@/contexts/SettingsContext";
 import EditEventDialog from "./EditEventDialog";
+import {useGetEvents} from "@/hooks/firebase/useGetEvents";
 
 const modeMap = new Map([
   [0, "day"],
@@ -63,7 +64,8 @@ export default function CalendarPage() {
   >(undefined);
 
   const calendarContainerRef = useRef(null);
-  const { events, familyEvents } = useCalendarContext();
+  // const { events, familyEvents } = useCalendarContext();
+  const {data: events} = useGetEvents()
 
   const onLayout = (event: LayoutChangeEvent) => {
     const { height } = event.nativeEvent.layout;
@@ -151,7 +153,7 @@ export default function CalendarPage() {
           <Calendar
             bodyContainerStyle={styles.calHeader}
             mode={mode}
-            events={isFamilyView ? familyEvents : events}
+            events={isFamilyView ? events ?? [] : events ?? []}
             eventCellStyle={{ backgroundColor: isFamilyView ? '#46a80a' : calendarColor }}
             onPressEvent={(event) => {
               setEditVisible(true);

hooks/firebase/useCreateEvent.ts

@@ -41,6 +41,13 @@ export const useCreateEventFromProvider = () => {
                     await firestore()
                         .collection("Events")
                         .add({...eventData, creatorId: currentUser?.uid})
+                } else {
+                    console.log("ENTER HERE")
+                    const docId = snapshot.docs[0].id;
+                    await firestore()
+                        .collection("Events")
+                        .doc(docId)
+                        .update({...eventData, creatorId: currentUser?.uid});
                 }
             } catch (e) {
                 console.error(e)

ios/cally/Info.plist

@@ -45,7 +45,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>15</string>
+    <string>18</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>NSAppTransportSecurity</key>
@@ -78,6 +78,9 @@
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
     </array>
     <key>UILaunchStoryboardName</key>
     <string>SplashScreen</string>