Merge branch 'dev'

# Conflicts:
#	app/(auth)/_layout.tsx
#	components/pages/settings/user_settings_views/MyProfile.tsx
#	yarn.lock

app/(auth)/_layout.tsx

@@ -17,6 +17,7 @@ import {
     toDosPageIndex,
     userSettingsView,
 } from "@/components/pages/calendar/atoms";
+import FeedbackNavIcon from "@/assets/svgs/FeedbackNavIcon";
 
 export default function TabLayout() {
     const {mutateAsync: signOut} = useSignOut();
@@ -39,8 +40,8 @@ export default function TabLayout() {
             }}
             drawerContent={(props) => {
                 return (
-                    <DrawerContentScrollView {...props} style={{height: "100%"}}>
-                        <View centerV margin-30 row>
+                    <DrawerContentScrollView {...props} style={{}}>
+                        <View centerV marginH-30 marginT-20 marginB-20row>
                             <ImageBackground
                                 source={require("../../assets/images/splash.png")}
                                 style={{
@@ -83,7 +84,19 @@ export default function TabLayout() {
                                         setUserView(true);
                                         setIsFamilyView(false);
                                     }}
-                                    icon={<NavGroceryIcon/>}
+                                    icon={<NavGroceryIcon/>}/>
+                                <DrawerButton
+                                    color="#ea156d"
+                                    title={"Feedback"}
+                                    bgColor={"#fdedf4"}
+                                    pressFunc={() => {
+                                        props.navigation.navigate("feedback");
+                                        setPageIndex(0);
+                                        setToDosIndex(0);
+                                        setUserView(true);
+                                        setIsFamilyView(false);
+                                    }}
+                                    icon={<FeedbackNavIcon/>}
                                 />
                             </View>
                             <View style={{flex: 1}}>
@@ -162,6 +175,7 @@ export default function TabLayout() {
                         <Button
                             size={ButtonSize.large}
                             marginH-10
+                            marginT-12
                             paddingV-15
                             style={{
                                 marginTop: 50,
@@ -228,6 +242,10 @@ export default function TabLayout() {
                     title: "To-Dos",
                 }}
             />
+            <Drawer.Screen
+                name="feedback"
+                options={{drawerLabel: "Feedback", title: "Feedback"}}
+            />
         </Drawer>
     );
 }

app/(auth)/feedback/_layout.tsx

@@ -0,0 +1,5 @@
+import {Stack} from "expo-router";
+
+export default function StackLayout () {
+    return <Stack screenOptions={{headerShown: false}}/>
+}

app/(auth)/feedback/index.tsx

@@ -0,0 +1,13 @@
+import FeedbackPage from "@/components/pages/feedback/FeedbackPage";
+import { FeedbackProvider } from "@/contexts/FeedbackContext";
+import { View } from "react-native-ui-lib";
+
+export default function Screen() {
+  return (
+    <FeedbackProvider>
+      <View>
+          <FeedbackPage />
+      </View>
+    </FeedbackProvider>
+  );
+}