feat: fixes on beta testing

app/app.config.ts

@@ -8,7 +8,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   ...config,
   slug: "Lakbayan",
   name: "Lakbayan",
-  version: "1.0.0",
+  version: "1.0.1",
   orientation: "portrait",
   scheme: "myapp",
   userInterfaceStyle: "automatic",

app/src/app/(account)/bookmarked-trips.tsx

@@ -6,7 +6,7 @@ import {
   ActivityIndicator,
   Text,
   TouchableOpacity,
-  BackHandler
+  BackHandler,
 } from "react-native";
 import { useRouter } from "expo-router";
 import { useFocusEffect } from "@react-navigation/native";
@@ -33,7 +33,7 @@ export default function BookmarkedTrips() {
       postSegment: null,
     };
 
-    router.push({
+    router.replace({
       pathname: "/(search)/3-trip-overview",
       params: { tripData: JSON.stringify(tripSearch), from: "bookmarked-trips" },
     });
@@ -51,10 +51,7 @@ export default function BookmarkedTrips() {
         return true;
       };
 
-      const backHandler = BackHandler.addEventListener(
-        "hardwareBackPress",
-        backAction,
-      );
+      const backHandler = BackHandler.addEventListener("hardwareBackPress", backAction);
 
       return () => backHandler.remove();
     }, []),

app/src/app/(account)/submitted-trips.tsx

@@ -25,7 +25,7 @@ export default function SubmittedTrips() {
   const { submittedTrips, loading } = useSubmittedTrips(user?.id || null);
 
   function handleTripPress(trip: TripSearch) {
-    router.push({
+    router.replace({
       pathname: "/(search)/3-trip-overview",
       params: { tripData: JSON.stringify(trip), from: "submitted-trips" },
     });
@@ -43,18 +43,15 @@ export default function SubmittedTrips() {
         return true;
       };
 
-      const backHandler = BackHandler.addEventListener(
-        "hardwareBackPress",
-        backAction,
-      );
+      const backHandler = BackHandler.addEventListener("hardwareBackPress", backAction);
 
       return () => backHandler.remove();
     }, []),
   );
 
   return (
     <SafeAreaView className="flex-1">
-      <Header title="Submitted Trips" prevCallback={prevCallback}/>
+      <Header title="Submitted Trips" prevCallback={prevCallback} />
       <View className="flex-1 px-4">
         {loading ? (
           <ActivityIndicator size="small" testID="activity-indicator" />

app/src/app/(contribute)/2-review-trip.tsx

@@ -1,7 +1,7 @@
-import React, { useEffect } from "react";
+import React, { useState } from "react";
 import { router } from "expo-router";
 import { useFocusEffect } from "@react-navigation/native";
-import { SafeAreaView, View, Alert, BackHandler } from "react-native";
+import { ActivityIndicator, SafeAreaView, View, Alert, Text, BackHandler } from "react-native";
 
 import Header from "@components/ui/Header";
 import LineSource from "@components/map/LineSource";
@@ -22,6 +22,7 @@ import {
   fetchSubmitLogId,
   deleteSubmitLog,
 } from "@services/logs-service";
+import { set } from "lodash";
 
 export default function TripReview() {
   const { user } = useSession();
@@ -38,6 +39,9 @@ export default function TripReview() {
     clearRouteData,
     submitTrip,
   } = useTripCreator();
+
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
   if (!user) throw new Error("User must be logged in to create a trip!");
 
   const handleCreateSegment = async () => {
@@ -59,18 +63,20 @@ export default function TripReview() {
   };
 
   const handleSubmitTrip = async () => {
+    setIsSubmitting(true);
     try {
       await submitTrip();
-      Alert.alert("Trip Submitted", "Your trip has been submitted successfully!");
       const id = await fetchSubmitLogId({ userId: user.id });
       if (!id) {
         console.error("No submit log ID found.");
         return;
       }
-
       await updateSubmitLog({ id, status: "completed" });
+      Alert.alert("Trip Submitted", "Your trip has been submitted successfully!");
+      setIsSubmitting(false);
       router.replace("/(tabs)");
     } catch (error) {
+      setIsSubmitting(false);
       Alert.alert("Error", "Failed to submit your trip. Please try again.");
     }
   };
@@ -113,7 +119,7 @@ export default function TripReview() {
   });
 
   return (
-    <SafeAreaView style={{ flex: 1 }}>
+    <SafeAreaView className="flex-1 relative">
       <Header prevCallback={prevCallback} title="Trip Review" />
 
       <View className="flex justify-center items-center">
@@ -132,12 +138,20 @@ export default function TripReview() {
         deleteSegment={handleDeleteSegment}
       />
 
-      <View className="absolute bottom-0 z-50 p-5 w-full justify-center">
+      <View className="absolute bottom-0 p-5 w-full justify-center">
         <PrimaryButton
           label={isSegmentComplete ? "Submit" : "Add Transfers"}
           onPress={isSegmentComplete ? handleSubmitTrip : handleCreateSegment}
+          disabled={!isSubmitting}
         />
       </View>
+
+      {isSubmitting && (
+        <View className="absolute inset-0 bg-black/50 justify-center items-center z-50">
+          <ActivityIndicator size="large" color="#fff" />
+          <Text className="text-lg text-white">Submitting trip, please wait...</Text>
+        </View>
+      )}
     </SafeAreaView>
   );
 }

app/src/app/(contribute)/3-add-transfer.tsx

@@ -1,3 +1,4 @@
+import { useMemo } from "react";
 import { router } from "expo-router";
 import { SafeAreaView, View, Alert, BackHandler } from "react-native";
 import { useFocusEffect } from "@react-navigation/native";
@@ -54,13 +55,18 @@ export default function RouteSelectInfo() {
     return () => backHandler.remove();
   });
 
+  const memoizedEnd: [string | null, [number, number] | null] = useMemo(
+    () => [route.endLocation ?? null, route.endCoords ?? null],
+    [route.endLocation, route.endCoords],
+  );
+
   return (
     <SafeAreaView style={{ flex: 1 }}>
       <Header prevCallback={prevCallback} title="Route Information" />
       <StartEndSearchBar
         isStartActive={false}
         start={[route.startLocation, route.endCoords]}
-        end={[route.endLocation, route.endCoords]}
+        end={memoizedEnd}
         onEndChange={(l, c) => handleEndChange(c, l)}
       />
       <MapShell

app/src/app/(contribute)/4-edit-transfer.tsx

@@ -90,6 +90,7 @@ export default function RouteInput() {
       setSubmitting(false);
       return;
     }
+    console.log("Submitted route name: ", route.segmentName);
     try {
       await addSegment();
       clearRouteData();
@@ -169,6 +170,7 @@ export default function RouteInput() {
         sheetRef={bottomSheetRef}
         handleSubmit={handleSubmit}
         setIsEditingWaypoints={setIsEditingWaypoints}
+        isEditing={editingIndex !== -1}
       />
     </SafeAreaView>
   );

app/src/app/(contribute)/toda-stops.tsx

@@ -33,6 +33,7 @@ export default function TodaStops() {
   const [stops, setStops] = useState<StopData[]>([]);
   const [loadingStops, setLoadingStops] = useState(false);
   const [formSnapshot, setFormSnapshot] = useState("");
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   const loadStops = async () => {
     setLoadingStops(true);
@@ -114,7 +115,15 @@ export default function TodaStops() {
         coordinates={coordinates}
         onNewStopAdded={loadStops}
         onFormChange={(form) => setFormSnapshot(JSON.stringify(form))}
+        setIsSubmitting={setIsSubmitting}
+        isSubmitting={isSubmitting}
       />
+      {isSubmitting && (
+        <View className="absolute inset-0 bg-black/50 justify-center items-center z-50">
+          <ActivityIndicator size="large" color="#fff" />
+          <Text className="text-lg text-white">Submitting TODA stop, please wait...</Text>
+        </View>
+      )}
     </SafeAreaView>
   );
 }

app/src/app/(journal)/journal-review.tsx

@@ -1,6 +1,6 @@
 import { useRouter } from "expo-router";
 import React, { useState, useCallback } from "react";
-import { SafeAreaView, Alert, BackHandler } from "react-native";
+import { SafeAreaView, Alert, BackHandler, View, ActivityIndicator, Text } from "react-native";
 import { useFocusEffect } from "@react-navigation/native";
 
 import Header from "@components/ui/Header";
@@ -26,7 +26,8 @@ export default function JournalReview() {
   const router = useRouter();
   const { user } = useSession();
   const { cameraRef } = useMapView();
-  const { trip, segments, transitJournal, rating, hasDeviated, setRating, setHasDeviated } = useTransitJournal();
+  const { trip, segments, transitJournal, rating, hasDeviated, setRating, setHasDeviated } =
+    useTransitJournal();
   const [newComment, setNewComment] = useState("");
   const [isSubmitting, setIsSubmitting] = useState(false);
 
@@ -39,8 +40,14 @@ export default function JournalReview() {
 
   const handleSubmit = async () => {
     setIsSubmitting(true);
-    if (!newComment.trim()) { setIsSubmitting(false); return; }
-    if (!trip || !segments || !user) { setIsSubmitting(false); return; }
+    if (!newComment.trim()) {
+      setIsSubmitting(false);
+      return;
+    }
+    if (!trip || !segments || !user) {
+      setIsSubmitting(false);
+      return;
+    }
 
     const journalPayload: Partial<TransitJournal> = {
       id: transitJournal.id,
@@ -56,7 +63,10 @@ export default function JournalReview() {
 
       // // if did not deviate, increment GPS count
       if (!Boolean(hasDeviated)) {
-        await incrementSegmentGPSCount(trip.segments.map(({ id }) => id), !Boolean(hasDeviated));
+        await incrementSegmentGPSCount(
+          trip.segments.map(({ id }) => id),
+          !Boolean(hasDeviated),
+        );
       }
       await updateTransitJournal(journalPayload);
       await updateProfile({ id: user.id, transitJournalId: null });
@@ -65,6 +75,7 @@ export default function JournalReview() {
       setIsSubmitting(false);
       router.replace("/(tabs)");
     } catch (error) {
+      setIsSubmitting(false);
       Alert.alert("Error", "Failed to submit your transit journal. Please try again.");
     }
   };
@@ -88,10 +99,7 @@ export default function JournalReview() {
         return true;
       };
 
-      const backHandler = BackHandler.addEventListener(
-        "hardwareBackPress",
-        backAction,
-      );
+      const backHandler = BackHandler.addEventListener("hardwareBackPress", backAction);
 
       return () => backHandler.remove();
     }, []),
@@ -122,6 +130,13 @@ export default function JournalReview() {
         setHasDeviated={setHasDeviated}
         isSubmitting={isSubmitting}
       />
+
+      {isSubmitting && (
+        <View className="absolute inset-0 bg-black/50 justify-center items-center z-50">
+          <ActivityIndicator size="large" color="#fff" />
+          <Text className="text-lg text-white">Submitting trip, please wait...</Text>
+        </View>
+      )}
     </SafeAreaView>
   );
 }

app/src/app/(search)/1-search-trip.tsx

@@ -59,7 +59,7 @@ export default function SearchTrip() {
     }
     try {
       await fetchSuggestedTrips();
-      router.push("/(search)/2-trip-suggestions");
+      router.replace("/(search)/2-trip-suggestions");
     } catch (error) {
       Alert.alert("Error fetching trips. Please try again.");
     }

app/src/app/(search)/2-trip-suggestions.tsx

@@ -2,7 +2,6 @@ import { useEffect, useRef } from "react";
 import { useRouter } from "expo-router";
 import BottomSheet from "@gorhom/bottom-sheet";
 import { Text, SafeAreaView, View, Pressable } from "react-native";
-import { MaterialIcons } from "@expo/vector-icons";
 
 import Header from "@components/ui/Header";
 import TripPreview from "@components/ui/TripPreview";
@@ -47,9 +46,10 @@ export default function SuggestedTrips() {
     }
   }, []);
 
-  const handleSelectTrip = (trip: TripSearch) => {
+  const handleSelectTrip = (trip: TripSearch, index: number) => {
     setTrip(trip);
-    router.push("/(search)/3-trip-overview");
+    console.log(`Selected trip: ${trip.id} with index ${index}`);
+    router.replace("/(search)/3-trip-overview");
   };
 
   const handleOpenFilters = () => filterSheetRef.current?.snapToIndex(1);
@@ -70,10 +70,11 @@ export default function SuggestedTrips() {
         </View>
       ) : (
         <ScrollView className="flex-1 p-4" showsVerticalScrollIndicator={false}>
-          {filteredTrips.map((trip) => (
+          {filteredTrips.map((trip, index) => (
             <Pressable
               key={`${trip.id}-${filters.timeToLeave}`}
-              onPress={() => handleSelectTrip(trip)}
+              onPress={() => handleSelectTrip(trip, index)}
+              android_ripple={{ color: "#ccc" }}
             >
               <TripPreview trip={trip} timeToLeave={filters.timeToLeave} />
             </Pressable>

app/src/app/(social)/comments-list.tsx

@@ -8,6 +8,7 @@ import { getComments, addComment } from "@services/socials-service";
 import Header from "@components/ui/Header";
 import CommentItem from "@components/ui/CommentItem";
 import PrimaryButton from "@components/ui/PrimaryButton";
+import { set } from "lodash";
 
 export default function CommentsList() {
   const { user } = useSession();
@@ -18,6 +19,7 @@ export default function CommentsList() {
   const [comments, setComments] = useState<CommentData[]>([]);
   const [content, setContent] = useState("");
   const [loading, setLoading] = useState(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   useEffect(() => {
     async function fetchComments() {
@@ -36,14 +38,19 @@ export default function CommentsList() {
   }, [tripId]);
 
   const handleCommentSubmit = async () => {
-    if (!content.trim()) return;
-
+    setIsSubmitting(true);
+    if (!content.trim()) {
+      setIsSubmitting(false);
+      return;
+    }
     try {
       await addComment(tripId, user?.id || "", content, isGpsVerified);
       const updatedComments = await getComments(tripId);
       setComments(updatedComments || []);
       setContent("");
+      setIsSubmitting(false);
     } catch (error) {
+      setIsSubmitting(false);
       console.error("Error adding comment:", error);
     }
   };
@@ -84,7 +91,11 @@ export default function CommentsList() {
             className="flex-1 border border-gray-200 rounded-lg px-3"
             testID="comment-input"
           />
-          <PrimaryButton label="Post" onPress={handleCommentSubmit} />
+          <PrimaryButton
+            label="Post"
+            onPress={handleCommentSubmit}
+            disabled={isSubmitting || !content}
+          />
         </View>
       </View>
     </SafeAreaView>