Merge branch 'main' into Home-screen-navigation-issue

app.config.js

@@ -46,13 +46,6 @@ export default {
     },
     crashReporter: true, // Add this line to enable crash reporting
     extra: {
-      apiKey: process.env.FIREBASE_API_KEY,
-      authDomain: process.env.AUTH_DOMAIN,
-      projectId: process.env.PROJECT_ID,
-      storageBucket: process.env.STORAGE_BUCKET,
-      messagingSenderId: process.env.MESSAGING_SENDER_ID,
-      appId: process.env.APP_ID,
-      measurementId: process.env.MEASUREMENT_ID,
       eas: {
         projectId: "801029ef-db83-4668-a97a-5adcc4c333e2"
       }

grounded-pager-399120-8575f4f00514.json

@@ -0,0 +1,12 @@
+{
+    "type": "service_account",
+    "project_id": "grounded-pager-399120",
+    "private_key_id": "8575f4f00514569dfec3c0eebcbbc4504b1a0d94",
+    "client_email": "[email protected]",
+    "client_id": "100787133320962237457",
+    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+    "token_uri": "https://oauth2.googleapis.com/token",
+    "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+    "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/where-s-religion%40grounded-pager-399120.iam.gserviceaccount.com",
+    "universe_domain": "googleapis.com"
+  }

lib/screens/MorePage.tsx

@@ -16,6 +16,7 @@ import { User } from "../models/user_class";
 import { useTheme } from "../components/ThemeProvider";
 import { useDispatch } from "react-redux";
 
+
 const user = User.getInstance();
 const { width, height } = Dimensions.get("window");
 
@@ -26,6 +27,7 @@ export default function MorePage() {
   // Use the Redux dispatch for logging out
   const dispatch = useDispatch();
 
+
   const handleToggleDarkMode = () => {
     if (toggleDarkmode) {
       toggleDarkmode(); // Ensure this is a valid function

lib/screens/loginScreens/LoginScreen.tsx

@@ -21,6 +21,8 @@ import { useSelector, useDispatch } from 'react-redux';
 import { setNavState } from "../../../redux/slice/navigationSlice";
 import { RootState } from "../../../redux/store/store";
 import { Keyboard } from "react-native";
+
+
 const user = User.getInstance();
 
 type LoginProps = {
@@ -37,6 +39,7 @@ const LoginScreen: React.FC<LoginProps> = ({ navigation, route }) => {
   const navState = useSelector((state: RootState) => state.navigation.navState);
   const dispatch = useDispatch()
 
+
   const fadeOut = () => {
     Animated.timing(fadeAnim, {
       toValue: 0,
@@ -74,8 +77,6 @@ const LoginScreen: React.FC<LoginProps> = ({ navigation, route }) => {
       toggleSnack(!snackState);
     } else {
 
-      // changes made by karthik 
-
       try {
         const status = await user.login(username, password)
         if (status == "success") {
@@ -182,6 +183,7 @@ const LoginScreen: React.FC<LoginProps> = ({ navigation, route }) => {
         )}
       </ImageBackground>
     </KeyboardAwareScrollView>
+
   );
 };
 

package.json

@@ -62,7 +62,7 @@
     "react-native-image-picker": "^7.1.2",
     "react-native-image-viewing": "^0.2.2",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
-    "react-native-maps": "1.14.0",
+    "react-native-maps": "1.15.6",
     "react-native-onboarding-swiper": "^1.2.0",
     "react-native-paper": "^5.12.3",
     "react-native-pell-rich-editor": "^1.9.0",

yarn.lock

@@ -10813,4 +10813,4 @@ zod-validation-error@^2.1.0:
 zod@^3.22.4:
   version "3.23.8"
   resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
-  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==