diff --git a/app.json b/app.json
index b40a12b..5c5790b 100644
--- a/app.json
+++ b/app.json
@@ -16,7 +16,7 @@
       "supportsTablet": true,
       "bundleIdentifier": "com.cally.app",
       "googleServicesFile": "./ios/GoogleService-Info.plist",
-      "buildNumber": "12"
+      "buildNumber": "13"
     },
     "android": {
       "adaptiveIcon": {
diff --git a/components/pages/calendar/ManuallyAddEventModal.tsx b/components/pages/calendar/ManuallyAddEventModal.tsx
index 32de775..236e390 100644
--- a/components/pages/calendar/ManuallyAddEventModal.tsx
+++ b/components/pages/calendar/ManuallyAddEventModal.tsx
@@ -145,8 +145,6 @@ export const ManuallyAddEventModal = ({
     );
   }
 
-  console.log(startDate, startTime)
-
   return (
     <Modal
       visible={show}
diff --git a/components/pages/settings/SettingsPage.tsx b/components/pages/settings/SettingsPage.tsx
index 9a24d8d..8f717f5 100644
--- a/components/pages/settings/SettingsPage.tsx
+++ b/components/pages/settings/SettingsPage.tsx
@@ -25,9 +25,9 @@ const pageIndex = {
 const SettingsPage = () => {
   const [selectedPage, setSelectedPage] = useState<number>(0);
   return (
-      <View>
+      <View flexG>
         {selectedPage == 0 && (
-          <View centerH marginH-30 marginT-30>
+          <View flexG centerH marginH-30 marginT-30>
             <Button
               backgroundColor="white"
               style={styles.mainBtn}
diff --git a/components/pages/settings/UserSettings.tsx b/components/pages/settings/UserSettings.tsx
index 809be4f..85454a8 100644
--- a/components/pages/settings/UserSettings.tsx
+++ b/components/pages/settings/UserSettings.tsx
@@ -1,91 +1,83 @@
-import { View, Text, TouchableOpacity } from "react-native-ui-lib";
-import React, { useState } from "react";
-import { Ionicons } from "@expo/vector-icons";
-import {
-  KeyboardAvoidingView,
-  Platform,
-  ScrollView,
-  StyleSheet,
-} from "react-native";
+import {Text, TouchableOpacity, View} from "react-native-ui-lib";
+import React, {useState} from "react";
+import {Ionicons} from "@expo/vector-icons";
+import {ScrollView, StyleSheet,} from "react-native";
 import MyProfile from "./user_settings_views/MyProfile";
 import MyGroup from "./user_settings_views/MyGroup";
-import { useAuthContext } from "@/contexts/AuthContext";
 
 const UserSettings = (props: { setSelectedPage: (page: number) => void }) => {
-  const [selectedView, setSelectedView] = useState<boolean>(true);
-  return (
-      <ScrollView
-        contentContainerStyle={{ flexGrow: 1 }}
-      >
-        <View style={{ flex: 1 }}>
-          <TouchableOpacity onPress={() => props.setSelectedPage(0)}>
-            <View row marginT-20 marginL-20 marginB-35 centerV>
-              <Ionicons name="chevron-back" size={22} color="#979797" />
-              <Text text70 color="#979797">
-                Return to main settings
-              </Text>
-            </View>
-          </TouchableOpacity>
-          <View marginH-20>
-            <Text text60R marginB-25>
-              User Management
-            </Text>
-            <View style={styles.buttonSwitch} spread row>
-              <TouchableOpacity
-                onPress={() => setSelectedView(true)}
-                centerV
-                centerH
-                style={
-                  selectedView == true ? styles.btnSelected : styles.btnNot
-                }
-              >
-                <View>
-                  <Text text70 color={selectedView ? "white" : "black"}>
-                    My Profile
-                  </Text>
+    const [selectedView, setSelectedView] = useState<boolean>(true);
+    return (
+        <View flexG>
+            <ScrollView style={{paddingBottom: 20, minHeight: "100%"}}>
+                <TouchableOpacity onPress={() => props.setSelectedPage(0)}>
+                    <View row marginT-20 marginL-20 marginB-35 centerV>
+                        <Ionicons name="chevron-back" size={22} color="#979797"/>
+                        <Text text70 color="#979797">
+                            Return to main settings
+                        </Text>
+                    </View>
+                </TouchableOpacity>
+                <View marginH-20 flexG style={{minHeight: "90%"}}>
+                    <Text text60R marginB-25>
+                        User Management
+                    </Text>
+                    <View style={styles.buttonSwitch} spread row>
+                        <TouchableOpacity
+                            onPress={() => setSelectedView(true)}
+                            centerV
+                            centerH
+                            style={
+                                selectedView == true ? styles.btnSelected : styles.btnNot
+                            }
+                        >
+                            <View>
+                                <Text text70 color={selectedView ? "white" : "black"}>
+                                    My Profile
+                                </Text>
+                            </View>
+                        </TouchableOpacity>
+                        <TouchableOpacity
+                            onPress={() => setSelectedView(false)}
+                            centerV
+                            centerH
+                            style={
+                                selectedView == false ? styles.btnSelected : styles.btnNot
+                            }
+                        >
+                            <View>
+                                <Text text70 color={!selectedView ? "white" : "black"}>
+                                    My Group
+                                </Text>
+                            </View>
+                        </TouchableOpacity>
+                    </View>
+                    {selectedView && <MyProfile/>}
+                    {!selectedView && <MyGroup/>}
                 </View>
-              </TouchableOpacity>
-              <TouchableOpacity
-                onPress={() => setSelectedView(false)}
-                centerV
-                centerH
-                style={
-                  selectedView == false ? styles.btnSelected : styles.btnNot
-                }
-              >
-                <View>
-                  <Text text70 color={!selectedView ? "white" : "black"}>
-                    My Group
-                  </Text>
-                </View>
-              </TouchableOpacity>
-            </View>
-            {selectedView && <MyProfile />}
-            {!selectedView && <MyGroup />}
-          </View>
+            </ScrollView>
         </View>
-      </ScrollView>
-  );
+    );
 };
 
 const styles = StyleSheet.create({
-  buttonSwitch: {
-    borderRadius: 50,
-    width: "100%",
-    backgroundColor: "#ebebeb",
-    height: 45,
-  },
-  btnSelected: {
-    backgroundColor: "#05a8b6",
-    height: "100%",
-    width: "50%",
-    borderRadius: 50,
-  },
-  btnNot: {
-    height: "100%",
-    width: "50%",
-    borderRadius: 50,
-  },
+    buttonSwitch: {
+        borderRadius: 50,
+        width: "100%",
+        backgroundColor: "#ebebeb",
+        height: 45,
+    },
+    btnSelected: {
+        backgroundColor: "#05a8b6",
+        height: "100%",
+        width: "50%",
+        borderRadius: 50,
+    },
+    btnNot: {
+        height: "100%",
+        width: "50%",
+        borderRadius: 50,
+    },
 });
 
 export default UserSettings;
diff --git a/components/pages/settings/user_settings_views/MyGroup.tsx b/components/pages/settings/user_settings_views/MyGroup.tsx
index f19f716..5f7995e 100644
--- a/components/pages/settings/user_settings_views/MyGroup.tsx
+++ b/components/pages/settings/user_settings_views/MyGroup.tsx
@@ -1,43 +1,223 @@
-import { View, Text } from "react-native-ui-lib";
-import React from "react";
-import { StyleSheet } from "react-native";
+import {
+    Avatar,
+    Button,
+    Card,
+    Colors,
+    Dialog,
+    FloatingButton,
+    PanningProvider,
+    Picker,
+    Text,
+    TextField,
+    TouchableOpacity,
+    View
+} from "react-native-ui-lib";
+import React, {useState} from "react";
+import {ScrollView, StyleSheet} from "react-native";
+import {PickerSingleValue} from "react-native-ui-lib/src/components/picker/types";
+import {useCreateSubUser} from "@/hooks/firebase/useCreateSubUser";
+import {ProfileType} from "@/contexts/AuthContext";
 
 const MyGroup = () => {
-  return (
-    <View>
-      <View style={styles.card}>
-        <Text text70 marginV-10>
-          Family
-        </Text>
-        <Text text70 marginB-10 marginT-15>
-          Caregivers
-        </Text>
-      </View>
-    </View>
-  );
+    const [showAddUserDialog, setShowAddUserDialog] = useState(false)
+    const [showNewUserInfoDialog, setShowNewUserInfoDialog] = useState(false)
+
+    const [selectedStatus, setSelectedStatus] = useState<string | PickerSingleValue>('CHILD');
+    const [firstName, setFirstName] = useState('');
+    const [lastName, setLastName] = useState('');
+    const [email, setEmail] = useState('');
+
+    const {mutateAsync: createSubUser} = useCreateSubUser()
+
+    const handleCreateSubUser = async () => {
+        if (!firstName || !lastName || !email) {
+            console.error("All fields are required");
+            return;
+        }
+
+        if (!email.includes("@")) {
+            console.error("Invalid email address");
+            return;
+        }
+
+        await createSubUser({
+            firstName,
+            lastName,
+            email,
+            password: email,
+            userType: selectedStatus as ProfileType
+        });
+    }
+
+    return (
+        <View style={{flex: 1, height: "100%"}}>
+            <View>
+                <ScrollView style={styles.card}>
+                    <Text text70 marginV-10>
+                        Family
+                    </Text>
+                    <Text text70 marginB-10 marginT-15>
+                        Caregivers
+                    </Text>
+                </ScrollView>
+            </View>
+
+            <FloatingButton fullWidth hideBackgroundOverlay visible
+                            button={{label: '+ Add a user device', onPress: () => setShowAddUserDialog(true)}}/>
+
+            <Dialog
+                visible={showAddUserDialog}
+                onDismiss={() => setShowAddUserDialog(false)}
+                panDirection={PanningProvider.Directions.DOWN}
+            >
+                <Card padding-25 gap-10>
+                    <Text>
+                        Add a new user device
+                    </Text>
+
+                    <Button backgroundColor={"#FD1775"}><Text white>Show a QR Code</Text></Button>
+                    <Button backgroundColor={"#05A8B6"} onPress={() => {
+                        setShowAddUserDialog(false)
+                        setTimeout(() => {
+                            setShowNewUserInfoDialog(true)
+                        }, 500)
+                    }}><Text white>Enter email address</Text></Button>
+
+
+                    <TouchableOpacity onPress={() => setShowAddUserDialog(false)} center><Text>Return to user
+                        settings</Text></TouchableOpacity>
+                </Card>
+            </Dialog>
+
+            <Dialog
+                panDirection={PanningProvider.Directions.DOWN}
+                visible={showNewUserInfoDialog}
+                onDismiss={() => setShowNewUserInfoDialog(false)}
+            >
+                <Card padding-25 style={styles.dialogCard}>
+                    <View row spread>
+                        <Text text60M>
+                            New User Information
+                        </Text>
+                        <TouchableOpacity onPress={() => setShowAddUserDialog(false)}>
+                            <Text>X</Text>
+                        </TouchableOpacity>
+                    </View>
+
+                    <View row centerV gap-20 marginV-20>
+                        <Avatar imageStyle={{borderRadius: 10}} containerStyle={{borderRadius: 10,}} size={60}
+                                backgroundColor={Colors.grey60}/>
+                        <TouchableOpacity onPress={() => {
+                        }}>
+                            <Text style={{color: Colors.green10}}>Upload User Profile Photo</Text>
+                        </TouchableOpacity>
+                    </View>
+
+                    <Text style={styles.label}>Member Status</Text>
+                    <Picker
+                        value={selectedStatus}
+                        //@ts-ignore
+                        onChange={item => setSelectedStatus(item)}
+                        style={styles.picker}
+                        showSearch
+                        floatingPlaceholder
+                    >
+                        <Picker.Item label="Child" value="CHILD"/>
+                        <Picker.Item label="Parent" value="PARENT"/>
+                        <Picker.Item label="Caregiver" value="CAREGIVER"/>
+                    </Picker>
+
+
+                    <Text style={styles.label}>First Name</Text>
+                    <TextField
+                        placeholder="First name"
+                        value={firstName}
+                        onChangeText={setFirstName}
+                        style={styles.inputField}
+                    />
+
+                    <Text style={styles.label}>Last Name</Text>
+                    <TextField
+                        placeholder="Last name"
+                        value={lastName}
+                        onChangeText={setLastName}
+                        style={styles.inputField}
+                    />
+
+                    <Text style={styles.label}>Email Address</Text>
+                    <TextField
+                        placeholder="Email address"
+                        value={email}
+                        onChangeText={setEmail}
+                        keyboardType="email-address"
+                        autoCapitalize="none"
+                        style={styles.inputField}
+                    />
+
+                    <Button
+                        disabled={!firstName || !lastName || !email}
+                        label="Add group member"
+                        backgroundColor="#FD1775"
+                        style={{marginTop: 20}}
+                        onPress={handleCreateSubUser}
+                    />
+                </Card>
+            </Dialog>
+        </View>
+    );
 };
 
 const styles = StyleSheet.create({
-  card: {
-    marginVertical: 15,
-    backgroundColor: "white",
-    width: "100%",
-    borderRadius: 15,
-    padding: 20,
-  },
-  pfp: {
-    aspectRatio: 1,
-    width: 60,
-    backgroundColor: "green",
-    borderRadius: 20,
-  },
-  txtBox: {
-    backgroundColor: "#fafafa",
-    borderRadius: 50,
-    borderWidth: 2,
-    borderColor: "#cecece",
-    padding: 15,
-    height: 45,
-  },
+    card: {
+        marginVertical: 15,
+        backgroundColor: "white",
+        width: "100%",
+        borderRadius: 15,
+        padding: 20,
+    },
+    pfp: {
+        aspectRatio: 1,
+        width: 60,
+        backgroundColor: "green",
+        borderRadius: 20,
+    },
+    txtBox: {
+        backgroundColor: "#fafafa",
+        borderRadius: 50,
+        borderWidth: 2,
+        borderColor: "#cecece",
+        padding: 15,
+        height: 45,
+    },
+    inputField: {
+        borderRadius: 50,
+        paddingVertical: 12,
+        paddingHorizontal: 16,
+        backgroundColor: Colors.grey80,
+        marginBottom: 16,
+        borderColor: Colors.grey50,
+        borderWidth: 1,
+        height: 40,
+    },
+    picker: {
+        borderRadius: 50,
+        paddingVertical: 12,
+        paddingHorizontal: 16,
+        backgroundColor: Colors.grey80,
+        marginBottom: 16,
+        borderColor: Colors.grey50,
+        borderWidth: 1,
+        marginTop: -20,
+        height: 40,
+    },
+    label: {
+        marginBottom: 5,
+        fontSize: 12,
+        color: Colors.grey40,
+    },
+    dialogCard: {
+        borderRadius: 10,
+        gap: 10,
+    },
 });
 export default MyGroup;
diff --git a/components/pages/settings/user_settings_views/MyProfile.tsx b/components/pages/settings/user_settings_views/MyProfile.tsx
index b3c894f..eb2f01b 100644
--- a/components/pages/settings/user_settings_views/MyProfile.tsx
+++ b/components/pages/settings/user_settings_views/MyProfile.tsx
@@ -15,7 +15,7 @@ const MyProfile = () => {
 
   const { mutateAsync: updateUserData } = useUpdateUserData();
   return (
-    <View>
+    <ScrollView style={{paddingBottom: 100, flex: 1}}>
       <View style={styles.card}>
         <Text text70>Your Profile</Text>
         <View row spread paddingH-15 centerV marginV-15>
@@ -71,7 +71,7 @@ const MyProfile = () => {
         </Text>
         <TextField text70 placeholder="Time Zone" style={styles.txtBox} />
       </View>
-    </View>
+    </ScrollView>
   );
 };
 
diff --git a/firebase/functions/index.js b/firebase/functions/index.js
index d636a3d..dc98bc0 100644
--- a/firebase/functions/index.js
+++ b/firebase/functions/index.js
@@ -17,16 +17,11 @@ exports.createSubUser = onRequest(async (request, response) => {
         }
 
         const userRecord = await getAuth().createUser({
-            email,
-            password,
-            displayName: name,
+            email, password, displayName: name,
         });
 
         const userProfile = {
-            userType,
-            name,
-            email,
-            uid: userRecord.uid,
+            userType, name, email, uid: userRecord.uid,
         };
 
         await getFirestore().collection("Profiles").doc(userRecord.uid).set(userProfile);
@@ -34,8 +29,7 @@ exports.createSubUser = onRequest(async (request, response) => {
         response.status(200).json({
             data: {
 
-                message: "User created successfully",
-                userId: userRecord.uid,
+                message: "User created successfully", userId: userRecord.uid,
             }
         });
     } catch (error) {
diff --git a/firebase/functions/package-lock.json b/firebase/functions/package-lock.json
index 287bcd4..535835a 100644
--- a/firebase/functions/package-lock.json
+++ b/firebase/functions/package-lock.json
@@ -10,7 +10,8 @@
         "firebase-functions": "^5.0.0"
       },
       "devDependencies": {
-        "eslint": "^8.15.0",
+        "@typescript-eslint/eslint-plugin": "^8.7.0",
+        "eslint": "^8.57.1",
         "eslint-config-google": "^0.14.0",
         "firebase-functions-test": "^3.1.0"
       },
@@ -732,11 +733,10 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -953,14 +953,13 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
       "deprecated": "Use @eslint/config-array instead",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -987,8 +986,7 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
       "deprecated": "Use @eslint/object-schema instead",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "dev": true
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -1905,6 +1903,236 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.7.0.tgz",
+      "integrity": "sha512-RIHOoznhA3CCfSTFiB6kBGLQtB/sox+pJ6jeFu6FxJvqL8qRxq/FfGO/UhsGgQM9oGdXkV4xUgli+dt26biB6A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.7.0",
+        "@typescript-eslint/type-utils": "8.7.0",
+        "@typescript-eslint/utils": "8.7.0",
+        "@typescript-eslint/visitor-keys": "8.7.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.7.0.tgz",
+      "integrity": "sha512-lN0btVpj2unxHlNYLI//BQ7nzbMJYBVQX5+pbNXvGYazdlgYonMn4AhhHifQ+J4fGRYA/m1DjaQjx+fDetqBOQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.7.0",
+        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/typescript-estree": "8.7.0",
+        "@typescript-eslint/visitor-keys": "8.7.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.7.0.tgz",
+      "integrity": "sha512-87rC0k3ZlDOuz82zzXRtQ7Akv3GKhHs0ti4YcbAJtaomllXoSO8hi7Ix3ccEvCd824dy9aIX+j3d2UMAfCtVpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/visitor-keys": "8.7.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.7.0.tgz",
+      "integrity": "sha512-tl0N0Mj3hMSkEYhLkjREp54OSb/FI6qyCzfiiclvJvOqre6hsZTGSnHtmFLDU8TIM62G7ygEa1bI08lcuRwEnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.7.0",
+        "@typescript-eslint/utils": "8.7.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.7.0.tgz",
+      "integrity": "sha512-LLt4BLHFwSfASHSF2K29SZ+ZCsbQOM+LuarPjRUuHm+Qd09hSe3GCeaQbcCr+Mik+0QFRmep/FyZBO6fJ64U3w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.7.0.tgz",
+      "integrity": "sha512-MC8nmcGHsmfAKxwnluTQpNqceniT8SteVwd2voYlmiSWGOtjvGXdPl17dYu2797GVscK30Z04WRM28CrKS9WOg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/visitor-keys": "8.7.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.7.0.tgz",
+      "integrity": "sha512-ZbdUdwsl2X/s3CiyAu3gOlfQzpbuG3nTWKPoIvAu1pu5r8viiJvv2NPN2AqArL35NCYtw/lrPPfM4gxrMLNLPw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "8.7.0",
+        "@typescript-eslint/types": "8.7.0",
+        "@typescript-eslint/typescript-estree": "8.7.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.7.0.tgz",
+      "integrity": "sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.7.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -2319,7 +2547,6 @@
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -2950,17 +3177,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -3279,6 +3505,36 @@
       "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -3368,7 +3624,6 @@
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -4174,7 +4429,6 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -5382,6 +5636,16 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -5397,7 +5661,6 @@
       "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -5788,7 +6051,6 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -6766,7 +7028,6 @@
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -6790,6 +7051,19 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
     "node_modules/ts-deepmerge": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/ts-deepmerge/-/ts-deepmerge-2.0.7.tgz",
@@ -6853,6 +7127,21 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/typescript": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
diff --git a/firebase/functions/package.json b/firebase/functions/package.json
index 071683f..379e7e2 100644
--- a/firebase/functions/package.json
+++ b/firebase/functions/package.json
@@ -2,7 +2,7 @@
   "name": "functions",
   "description": "Cloud Functions for Firebase",
   "scripts": {
-    "lint": "eslint .",
+    "lint": "eslint",
     "serve": "firebase emulators:start --only functions",
     "shell": "firebase functions:shell",
     "start": "npm run shell",
@@ -18,7 +18,8 @@
     "firebase-functions": "^5.0.0"
   },
   "devDependencies": {
-    "eslint": "^8.15.0",
+    "@typescript-eslint/eslint-plugin": "^8.7.0",
+    "eslint": "^8.57.1",
     "eslint-config-google": "^0.14.0",
     "firebase-functions-test": "^3.1.0"
   },
diff --git a/ios/cally/Info.plist b/ios/cally/Info.plist
index 02d5589..bd4b355 100644
--- a/ios/cally/Info.plist
+++ b/ios/cally/Info.plist
@@ -45,7 +45,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>12</string>
+    <string>13</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>NSAppTransportSecurity</key>
@@ -64,6 +64,7 @@
       <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>